From 41397e1b82fba2342c327d842272b6b8ea2f4bce Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Mon, 11 Mar 2019 14:21:51 -0700 Subject: [PATCH] Move 3p models to models/ directory --- README.md | 1 + .../{ => models}/helmet/FlightHelmet.bin | Bin .../{ => models}/helmet/FlightHelmet.gltf | 0 .../helmet/FlightHelmet_baseColor.png | Bin .../helmet/FlightHelmet_baseColor1.png | Bin .../helmet/FlightHelmet_baseColor2.png | Bin .../helmet/FlightHelmet_baseColor3.png | Bin .../helmet/FlightHelmet_baseColor4.png | Bin .../helmet/FlightHelmet_normal.png | Bin .../helmet/FlightHelmet_normal1.png | Bin .../helmet/FlightHelmet_normal2.png | Bin .../helmet/FlightHelmet_normal3.png | Bin .../helmet/FlightHelmet_normal4.png | Bin ...lightHelmet_occlusionRoughnessMetallic.png | Bin ...ightHelmet_occlusionRoughnessMetallic1.png | Bin ...ightHelmet_occlusionRoughnessMetallic2.png | Bin ...ightHelmet_occlusionRoughnessMetallic3.png | Bin ...ightHelmet_occlusionRoughnessMetallic4.png | Bin third_party/{ => models}/helmet/README.md | 0 third_party/{ => models}/lucy/README | 0 third_party/{ => models}/lucy/lucy.obj | 0 third_party/{ => models}/shader_ball/LICENSE | 0 .../{ => models}/shader_ball/README.md | 0 .../{ => models}/shader_ball/shader_ball.mtl | 0 .../{ => models}/shader_ball/shader_ball.obj | 0 web/samples/CMakeLists.txt | 30 +++++++++--------- 26 files changed, 16 insertions(+), 15 deletions(-) rename third_party/{ => models}/helmet/FlightHelmet.bin (100%) rename third_party/{ => models}/helmet/FlightHelmet.gltf (100%) rename third_party/{ => models}/helmet/FlightHelmet_baseColor.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_baseColor1.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_baseColor2.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_baseColor3.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_baseColor4.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_normal.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_normal1.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_normal2.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_normal3.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_normal4.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_occlusionRoughnessMetallic.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_occlusionRoughnessMetallic1.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_occlusionRoughnessMetallic2.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_occlusionRoughnessMetallic3.png (100%) rename third_party/{ => models}/helmet/FlightHelmet_occlusionRoughnessMetallic4.png (100%) rename third_party/{ => models}/helmet/README.md (100%) rename third_party/{ => models}/lucy/README (100%) rename third_party/{ => models}/lucy/lucy.obj (100%) rename third_party/{ => models}/shader_ball/LICENSE (100%) rename third_party/{ => models}/shader_ball/README.md (100%) rename third_party/{ => models}/shader_ball/shader_ball.mtl (100%) rename third_party/{ => models}/shader_ball/shader_ball.obj (100%) diff --git a/README.md b/README.md index 0acf435201..0c901f3e37 100644 --- a/README.md +++ b/README.md @@ -136,6 +136,7 @@ and tools. - `shaders`: Shaders used by `filamat` and `matc` - `third_party`: External libraries and assets - `environments`: Environment maps under CC0 license that can be used with `cmgen` + - `models`: Models under permissive licenses - `textures`: Textures under CC0 license - `tools`: Host tools - `cmgen`: Image-based lighting asset generator diff --git a/third_party/helmet/FlightHelmet.bin b/third_party/models/helmet/FlightHelmet.bin similarity index 100% rename from third_party/helmet/FlightHelmet.bin rename to third_party/models/helmet/FlightHelmet.bin diff --git a/third_party/helmet/FlightHelmet.gltf b/third_party/models/helmet/FlightHelmet.gltf similarity index 100% rename from third_party/helmet/FlightHelmet.gltf rename to third_party/models/helmet/FlightHelmet.gltf diff --git a/third_party/helmet/FlightHelmet_baseColor.png b/third_party/models/helmet/FlightHelmet_baseColor.png similarity index 100% rename from third_party/helmet/FlightHelmet_baseColor.png rename to third_party/models/helmet/FlightHelmet_baseColor.png diff --git a/third_party/helmet/FlightHelmet_baseColor1.png b/third_party/models/helmet/FlightHelmet_baseColor1.png similarity index 100% rename from third_party/helmet/FlightHelmet_baseColor1.png rename to third_party/models/helmet/FlightHelmet_baseColor1.png diff --git a/third_party/helmet/FlightHelmet_baseColor2.png b/third_party/models/helmet/FlightHelmet_baseColor2.png similarity index 100% rename from third_party/helmet/FlightHelmet_baseColor2.png rename to third_party/models/helmet/FlightHelmet_baseColor2.png diff --git a/third_party/helmet/FlightHelmet_baseColor3.png b/third_party/models/helmet/FlightHelmet_baseColor3.png similarity index 100% rename from third_party/helmet/FlightHelmet_baseColor3.png rename to third_party/models/helmet/FlightHelmet_baseColor3.png diff --git a/third_party/helmet/FlightHelmet_baseColor4.png b/third_party/models/helmet/FlightHelmet_baseColor4.png similarity index 100% rename from third_party/helmet/FlightHelmet_baseColor4.png rename to third_party/models/helmet/FlightHelmet_baseColor4.png diff --git a/third_party/helmet/FlightHelmet_normal.png b/third_party/models/helmet/FlightHelmet_normal.png similarity index 100% rename from third_party/helmet/FlightHelmet_normal.png rename to third_party/models/helmet/FlightHelmet_normal.png diff --git a/third_party/helmet/FlightHelmet_normal1.png b/third_party/models/helmet/FlightHelmet_normal1.png similarity index 100% rename from third_party/helmet/FlightHelmet_normal1.png rename to third_party/models/helmet/FlightHelmet_normal1.png diff --git a/third_party/helmet/FlightHelmet_normal2.png b/third_party/models/helmet/FlightHelmet_normal2.png similarity index 100% rename from third_party/helmet/FlightHelmet_normal2.png rename to third_party/models/helmet/FlightHelmet_normal2.png diff --git a/third_party/helmet/FlightHelmet_normal3.png b/third_party/models/helmet/FlightHelmet_normal3.png similarity index 100% rename from third_party/helmet/FlightHelmet_normal3.png rename to third_party/models/helmet/FlightHelmet_normal3.png diff --git a/third_party/helmet/FlightHelmet_normal4.png b/third_party/models/helmet/FlightHelmet_normal4.png similarity index 100% rename from third_party/helmet/FlightHelmet_normal4.png rename to third_party/models/helmet/FlightHelmet_normal4.png diff --git a/third_party/helmet/FlightHelmet_occlusionRoughnessMetallic.png b/third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic.png similarity index 100% rename from third_party/helmet/FlightHelmet_occlusionRoughnessMetallic.png rename to third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic.png diff --git a/third_party/helmet/FlightHelmet_occlusionRoughnessMetallic1.png b/third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic1.png similarity index 100% rename from third_party/helmet/FlightHelmet_occlusionRoughnessMetallic1.png rename to third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic1.png diff --git a/third_party/helmet/FlightHelmet_occlusionRoughnessMetallic2.png b/third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic2.png similarity index 100% rename from third_party/helmet/FlightHelmet_occlusionRoughnessMetallic2.png rename to third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic2.png diff --git a/third_party/helmet/FlightHelmet_occlusionRoughnessMetallic3.png b/third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic3.png similarity index 100% rename from third_party/helmet/FlightHelmet_occlusionRoughnessMetallic3.png rename to third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic3.png diff --git a/third_party/helmet/FlightHelmet_occlusionRoughnessMetallic4.png b/third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic4.png similarity index 100% rename from third_party/helmet/FlightHelmet_occlusionRoughnessMetallic4.png rename to third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic4.png diff --git a/third_party/helmet/README.md b/third_party/models/helmet/README.md similarity index 100% rename from third_party/helmet/README.md rename to third_party/models/helmet/README.md diff --git a/third_party/lucy/README b/third_party/models/lucy/README similarity index 100% rename from third_party/lucy/README rename to third_party/models/lucy/README diff --git a/third_party/lucy/lucy.obj b/third_party/models/lucy/lucy.obj similarity index 100% rename from third_party/lucy/lucy.obj rename to third_party/models/lucy/lucy.obj diff --git a/third_party/shader_ball/LICENSE b/third_party/models/shader_ball/LICENSE similarity index 100% rename from third_party/shader_ball/LICENSE rename to third_party/models/shader_ball/LICENSE diff --git a/third_party/shader_ball/README.md b/third_party/models/shader_ball/README.md similarity index 100% rename from third_party/shader_ball/README.md rename to third_party/models/shader_ball/README.md diff --git a/third_party/shader_ball/shader_ball.mtl b/third_party/models/shader_ball/shader_ball.mtl similarity index 100% rename from third_party/shader_ball/shader_ball.mtl rename to third_party/models/shader_ball/shader_ball.mtl diff --git a/third_party/shader_ball/shader_ball.obj b/third_party/models/shader_ball/shader_ball.obj similarity index 100% rename from third_party/shader_ball/shader_ball.obj rename to third_party/models/shader_ball/shader_ball.obj diff --git a/web/samples/CMakeLists.txt b/web/samples/CMakeLists.txt index aa3fb9806c..a33dbed2a8 100644 --- a/web/samples/CMakeLists.txt +++ b/web/samples/CMakeLists.txt @@ -85,21 +85,21 @@ add_ktxfiles("assets/models/monkey/metallic.png" "metallic_etc.ktx" "${ETC_R11_A add_ktxfiles("assets/models/monkey/ao.png" "ao.ktx" "--grayscale") add_ktxfiles("assets/models/monkey/ao.png" "ao_etc.ktx" "${ETC_R11_ARGS}") -add_pngfile("third_party/helmet/FlightHelmet_baseColor.png" "FlightHelmet_baseColor.png") -add_pngfile("third_party/helmet/FlightHelmet_baseColor1.png" "FlightHelmet_baseColor1.png") -add_pngfile("third_party/helmet/FlightHelmet_baseColor2.png" "FlightHelmet_baseColor2.png") -add_pngfile("third_party/helmet/FlightHelmet_baseColor3.png" "FlightHelmet_baseColor3.png") -add_pngfile("third_party/helmet/FlightHelmet_baseColor4.png" "FlightHelmet_baseColor4.png") -add_pngfile("third_party/helmet/FlightHelmet_normal.png" "FlightHelmet_normal.png") -add_pngfile("third_party/helmet/FlightHelmet_normal1.png" "FlightHelmet_normal1.png") -add_pngfile("third_party/helmet/FlightHelmet_normal2.png" "FlightHelmet_normal2.png") -add_pngfile("third_party/helmet/FlightHelmet_normal3.png" "FlightHelmet_normal3.png") -add_pngfile("third_party/helmet/FlightHelmet_normal4.png" "FlightHelmet_normal4.png") -add_pngfile("third_party/helmet/FlightHelmet_occlusionRoughnessMetallic.png" "FlightHelmet_occlusionRoughnessMetallic.png") -add_pngfile("third_party/helmet/FlightHelmet_occlusionRoughnessMetallic1.png" "FlightHelmet_occlusionRoughnessMetallic1.png") -add_pngfile("third_party/helmet/FlightHelmet_occlusionRoughnessMetallic2.png" "FlightHelmet_occlusionRoughnessMetallic2.png") -add_pngfile("third_party/helmet/FlightHelmet_occlusionRoughnessMetallic3.png" "FlightHelmet_occlusionRoughnessMetallic3.png") -add_pngfile("third_party/helmet/FlightHelmet_occlusionRoughnessMetallic4.png" "FlightHelmet_occlusionRoughnessMetallic4.png") +add_pngfile("third_party/models/helmet/FlightHelmet_baseColor.png" "FlightHelmet_baseColor.png") +add_pngfile("third_party/models/helmet/FlightHelmet_baseColor1.png" "FlightHelmet_baseColor1.png") +add_pngfile("third_party/models/helmet/FlightHelmet_baseColor2.png" "FlightHelmet_baseColor2.png") +add_pngfile("third_party/models/helmet/FlightHelmet_baseColor3.png" "FlightHelmet_baseColor3.png") +add_pngfile("third_party/models/helmet/FlightHelmet_baseColor4.png" "FlightHelmet_baseColor4.png") +add_pngfile("third_party/models/helmet/FlightHelmet_normal.png" "FlightHelmet_normal.png") +add_pngfile("third_party/models/helmet/FlightHelmet_normal1.png" "FlightHelmet_normal1.png") +add_pngfile("third_party/models/helmet/FlightHelmet_normal2.png" "FlightHelmet_normal2.png") +add_pngfile("third_party/models/helmet/FlightHelmet_normal3.png" "FlightHelmet_normal3.png") +add_pngfile("third_party/models/helmet/FlightHelmet_normal4.png" "FlightHelmet_normal4.png") +add_pngfile("third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic.png" "FlightHelmet_occlusionRoughnessMetallic.png") +add_pngfile("third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic1.png" "FlightHelmet_occlusionRoughnessMetallic1.png") +add_pngfile("third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic2.png" "FlightHelmet_occlusionRoughnessMetallic2.png") +add_pngfile("third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic3.png" "FlightHelmet_occlusionRoughnessMetallic3.png") +add_pngfile("third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic4.png" "FlightHelmet_occlusionRoughnessMetallic4.png") # Convert OBJ files into filamesh files. function(add_mesh SOURCE TARGET)