Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move 3p models to models/ directory

Browse Source
This commit is contained in:
Romain Guy
2019-03-11 14:21:51 -07:00
parent 31a70d2352
commit 41397e1b82
26 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -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

0
third_party/helmet/FlightHelmet.bin → third_party/models/helmet/FlightHelmet.bin vendored
View File

0
third_party/helmet/FlightHelmet.gltf → third_party/models/helmet/FlightHelmet.gltf vendored
View File

0
third_party/helmet/FlightHelmet_baseColor.png → third_party/models/helmet/FlightHelmet_baseColor.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB

0
third_party/helmet/FlightHelmet_baseColor1.png → third_party/models/helmet/FlightHelmet_baseColor1.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 MiB

After

Width:  |  Height:  |  Size: 5.1 MiB

0
third_party/helmet/FlightHelmet_baseColor2.png → third_party/models/helmet/FlightHelmet_baseColor2.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 806 KiB

After

Width:  |  Height:  |  Size: 806 KiB

0
third_party/helmet/FlightHelmet_baseColor3.png → third_party/models/helmet/FlightHelmet_baseColor3.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 MiB

After

Width:  |  Height:  |  Size: 2.9 MiB

0
third_party/helmet/FlightHelmet_baseColor4.png → third_party/models/helmet/FlightHelmet_baseColor4.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 MiB

After

Width:  |  Height:  |  Size: 3.8 MiB

0
third_party/helmet/FlightHelmet_normal.png → third_party/models/helmet/FlightHelmet_normal.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 MiB

After

Width:  |  Height:  |  Size: 3.0 MiB

0
third_party/helmet/FlightHelmet_normal1.png → third_party/models/helmet/FlightHelmet_normal1.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 MiB

After

Width:  |  Height:  |  Size: 5.4 MiB

0
third_party/helmet/FlightHelmet_normal2.png → third_party/models/helmet/FlightHelmet_normal2.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
third_party/helmet/FlightHelmet_normal3.png → third_party/models/helmet/FlightHelmet_normal3.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

0
third_party/helmet/FlightHelmet_normal4.png → third_party/models/helmet/FlightHelmet_normal4.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

0
third_party/helmet/FlightHelmet_occlusionRoughnessMetallic.png → third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.4 MiB

0
third_party/helmet/FlightHelmet_occlusionRoughnessMetallic1.png → third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic1.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 MiB

After

Width:  |  Height:  |  Size: 5.1 MiB

0
third_party/helmet/FlightHelmet_occlusionRoughnessMetallic2.png → third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic2.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 737 KiB

After

Width:  |  Height:  |  Size: 737 KiB

0
third_party/helmet/FlightHelmet_occlusionRoughnessMetallic3.png → third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic3.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 MiB

After

Width:  |  Height:  |  Size: 3.6 MiB

0
third_party/helmet/FlightHelmet_occlusionRoughnessMetallic4.png → third_party/models/helmet/FlightHelmet_occlusionRoughnessMetallic4.png vendored
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 MiB

After

Width:  |  Height:  |  Size: 4.3 MiB

0
third_party/helmet/README.md → third_party/models/helmet/README.md vendored
View File

0
third_party/lucy/README → third_party/models/lucy/README vendored
View File

0
third_party/lucy/lucy.obj → third_party/models/lucy/lucy.obj vendored
View File

0
third_party/shader_ball/LICENSE → third_party/models/shader_ball/LICENSE vendored
View File

0
third_party/shader_ball/README.md → third_party/models/shader_ball/README.md vendored
View File

0
third_party/shader_ball/shader_ball.mtl → third_party/models/shader_ball/shader_ball.mtl vendored
View File

0
third_party/shader_ball/shader_ball.obj → third_party/models/shader_ball/shader_ball.obj vendored
View File

30
web/samples/CMakeLists.txt
View File

@@ -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)