Browse Source

Fixed issue #815.

Branimir Karadžić 9 years ago
parent
commit
9c84ef8cf7

+ 0 - 18
examples/assets/meshes/build.ninja

@@ -1,18 +0,0 @@
-include ../../../scripts/common.ninja
-meshes = ../../runtime/meshes
-
-build $meshes/bunny.bin:           geometryc_pack_normal bunny.obj
-build $meshes/bunny_decimated.bin: geometryc_pack_normal bunny_decimated.obj
-build $meshes/bunny_patched.bin:   geometryc_pack_normal bunny_patched.obj
-build $meshes/column.bin:          geometryc_pack_normal column.obj
-build $meshes/cube.bin:            geometryc_pack_normal cube.obj
-build $meshes/hollowcube.bin:      geometryc_pack_normal hollowcube.obj
-build $meshes/orb.bin:             geometryc_pack_normal orb.obj
-build $meshes/platform.bin:        geometryc_pack_normal platform.obj
-build $meshes/tree.bin:            geometryc_pack_normal tree.obj
-build $meshes/tree1b_lod0_1.bin:   geometryc_pack_normal tree1b_lod0_1.obj
-build $meshes/tree1b_lod0_2.bin:   geometryc_pack_normal tree1b_lod0_2.obj
-build $meshes/tree1b_lod1_1.bin:   geometryc_pack_normal tree1b_lod1_1.obj
-build $meshes/tree1b_lod1_2.bin:   geometryc_pack_normal tree1b_lod1_2.obj
-build $meshes/tree1b_lod2_1.bin:   geometryc_pack_normal tree1b_lod2_1.obj
-build $meshes/tree1b_lod2_2.bin:   geometryc_pack_normal tree1b_lod2_2.obj

+ 17 - 0
examples/assets/meshes/meshes.ninja

@@ -0,0 +1,17 @@
+meshes = $pwd/../../runtime/meshes
+
+build $meshes/bunny.bin:           geometryc_pack_normal_barycentric $pwd/bunny.obj
+build $meshes/bunny_decimated.bin: geometryc_pack_normal             $pwd/bunny_decimated.obj
+build $meshes/bunny_patched.bin:   geometryc_pack_normal             $pwd/bunny_patched.obj
+build $meshes/column.bin:          geometryc_pack_normal             $pwd/column.obj
+build $meshes/cube.bin:            geometryc_pack_normal             $pwd/cube.obj
+build $meshes/hollowcube.bin:      geometryc_pack_normal_barycentric $pwd/hollowcube.obj
+build $meshes/orb.bin:             geometryc_pack_normal_barycentric $pwd/orb.obj
+build $meshes/platform.bin:        geometryc_pack_normal             $pwd/platform.obj
+build $meshes/tree.bin:            geometryc_pack_normal             $pwd/tree.obj
+build $meshes/tree1b_lod0_1.bin:   geometryc_pack_normal             $pwd/tree1b_lod0_1.obj
+build $meshes/tree1b_lod0_2.bin:   geometryc_pack_normal             $pwd/tree1b_lod0_2.obj
+build $meshes/tree1b_lod1_1.bin:   geometryc_pack_normal             $pwd/tree1b_lod1_1.obj
+build $meshes/tree1b_lod1_2.bin:   geometryc_pack_normal             $pwd/tree1b_lod1_2.obj
+build $meshes/tree1b_lod2_1.bin:   geometryc_pack_normal             $pwd/tree1b_lod2_1.obj
+build $meshes/tree1b_lod2_2.bin:   geometryc_pack_normal             $pwd/tree1b_lod2_2.obj

+ 0 - 8
examples/assets/textures/build.ninja

@@ -1,8 +0,0 @@
-include ../../../scripts/common.ninja
-textures = ../../runtime/textures
-
-build $textures/texture_compression_bc1.ktx:  texturec_bc1  texture_compression.png
-build $textures/texture_compression_bc2.ktx:  texturec_bc2  texture_compression.png
-build $textures/texture_compression_bc3.ktx:  texturec_bc3  texture_compression.png
-build $textures/texture_compression_etc1.ktx: texturec_etc1 texture_compression.png
-build $textures/texture_compression_etc2.ktx: texturec_etc2 texture_compression.png

+ 7 - 0
examples/assets/textures/textures.ninja

@@ -0,0 +1,7 @@
+textures = $pwd/../../runtime/textures
+
+build $textures/texture_compression_bc1.ktx:  texturec_bc1  $pwd/texture_compression.png
+build $textures/texture_compression_bc2.ktx:  texturec_bc2  $pwd/texture_compression.png
+build $textures/texture_compression_bc3.ktx:  texturec_bc3  $pwd/texture_compression.png
+build $textures/texture_compression_etc1.ktx: texturec_etc1 $pwd/texture_compression.png
+build $textures/texture_compression_etc2.ktx: texturec_etc2 $pwd/texture_compression.png

BIN
examples/runtime/meshes/bunny.bin


BIN
examples/runtime/meshes/hollowcube.bin


BIN
examples/runtime/meshes/orb.bin


+ 10 - 0
scripts/common.ninja → scripts/build.ninja

@@ -4,6 +4,10 @@ rule geometryc_pack_normal
     command = geometryc -f $in -o $out --packnormal 1
     description = Converting geometry $in...
 
+rule geometryc_pack_normal_barycentric
+    command = geometryc -f $in -o $out --packnormal 1 --barycentric
+    description = Converting geometry $in...
+
 rule texturec_bc1
     command = texturec -f $in -o $out -t bc1 -m
 
@@ -24,3 +28,9 @@ rule texturec_etc1
 
 rule texturec_etc2
     command = texturec -f $in -o $out -t etc2 -m
+
+pwd = ../examples/assets/meshes
+subninja ../examples/assets/meshes/meshes.ninja
+
+pwd = ../examples/assets/textures
+subninja ../examples/assets/textures/textures.ninja