diff --git a/examples/assets/meshes/build.ninja b/examples/assets/meshes/build.ninja new file mode 100644 index 000000000..232ba6b62 --- /dev/null +++ b/examples/assets/meshes/build.ninja @@ -0,0 +1,18 @@ +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 diff --git a/examples/assets/meshes/makefile b/examples/assets/meshes/makefile deleted file mode 100644 index c171432eb..000000000 --- a/examples/assets/meshes/makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# Copyright 2011-2016 Branimir Karadzic. All rights reserved. -# License: http://www.opensource.org/licenses/BSD-2-Clause -# - -BGFX_DIR=../../.. -RUNTIME_DIR=$(BGFX_DIR)/examples/runtime -BUILD_DIR=../../.build - -include $(BGFX_DIR)/scripts/tools.mk - -GEOMETRY_SRC= \ - bunny \ - bunny_decimated \ - bunny_patched \ - column \ - cube \ - hollowcube \ - orb \ - platform \ - tree \ - tree1b_lod0_1 \ - tree1b_lod0_2 \ - tree1b_lod1_1 \ - tree1b_lod1_2 \ - tree1b_lod2_1 \ - tree1b_lod2_2 - -GEOMETRY_BIN=$(addprefix $(RUNTIME_DIR)/meshes/, $(addsuffix .bin, $(basename $(GEOMETRY_SRC)))) - -all: $(GEOMETRY_BIN) - -clean: - @echo Cleaning... - @-rm -vf $(GEOMETRY_BIN) - -rebuild: clean all - -$(RUNTIME_DIR)/meshes/%.bin : %.obj - $(SILENT) $(GEOMETRYC) -f $(<) -o $(@) --packnormal 1 diff --git a/examples/runtime/meshes/bunny.bin b/examples/runtime/meshes/bunny.bin index 794ec22c7..adcca877e 100644 Binary files a/examples/runtime/meshes/bunny.bin and b/examples/runtime/meshes/bunny.bin differ diff --git a/examples/runtime/meshes/bunny_decimated.bin b/examples/runtime/meshes/bunny_decimated.bin index d2f2f07e3..74810680e 100644 Binary files a/examples/runtime/meshes/bunny_decimated.bin and b/examples/runtime/meshes/bunny_decimated.bin differ diff --git a/examples/runtime/meshes/bunny_patched.bin b/examples/runtime/meshes/bunny_patched.bin index 217bffeb5..4031761a5 100644 Binary files a/examples/runtime/meshes/bunny_patched.bin and b/examples/runtime/meshes/bunny_patched.bin differ diff --git a/examples/runtime/meshes/column.bin b/examples/runtime/meshes/column.bin index 2d1d1dc5d..a58c780d1 100644 Binary files a/examples/runtime/meshes/column.bin and b/examples/runtime/meshes/column.bin differ diff --git a/examples/runtime/meshes/cube.bin b/examples/runtime/meshes/cube.bin index 874c9408e..9395fc6a3 100644 Binary files a/examples/runtime/meshes/cube.bin and b/examples/runtime/meshes/cube.bin differ diff --git a/examples/runtime/meshes/hollowcube.bin b/examples/runtime/meshes/hollowcube.bin index 0ea300901..3234750e0 100644 Binary files a/examples/runtime/meshes/hollowcube.bin and b/examples/runtime/meshes/hollowcube.bin differ diff --git a/examples/runtime/meshes/orb.bin b/examples/runtime/meshes/orb.bin index ac9455a25..336f36805 100644 Binary files a/examples/runtime/meshes/orb.bin and b/examples/runtime/meshes/orb.bin differ diff --git a/examples/runtime/meshes/platform.bin b/examples/runtime/meshes/platform.bin index 27b604341..de63c2457 100644 Binary files a/examples/runtime/meshes/platform.bin and b/examples/runtime/meshes/platform.bin differ diff --git a/examples/runtime/meshes/tree.bin b/examples/runtime/meshes/tree.bin index 6daa0cef7..93aaea0bc 100644 Binary files a/examples/runtime/meshes/tree.bin and b/examples/runtime/meshes/tree.bin differ diff --git a/examples/runtime/meshes/tree1b_lod0_1.bin b/examples/runtime/meshes/tree1b_lod0_1.bin index dcce8a7aa..66b672664 100644 Binary files a/examples/runtime/meshes/tree1b_lod0_1.bin and b/examples/runtime/meshes/tree1b_lod0_1.bin differ diff --git a/examples/runtime/meshes/tree1b_lod0_2.bin b/examples/runtime/meshes/tree1b_lod0_2.bin index c7cdb1dd6..8cb6e5f9e 100644 Binary files a/examples/runtime/meshes/tree1b_lod0_2.bin and b/examples/runtime/meshes/tree1b_lod0_2.bin differ diff --git a/examples/runtime/meshes/tree1b_lod1_1.bin b/examples/runtime/meshes/tree1b_lod1_1.bin index d27ea1f0e..8d69ed81a 100644 Binary files a/examples/runtime/meshes/tree1b_lod1_1.bin and b/examples/runtime/meshes/tree1b_lod1_1.bin differ diff --git a/examples/runtime/meshes/tree1b_lod1_2.bin b/examples/runtime/meshes/tree1b_lod1_2.bin index 08d57375f..2c903cb9f 100644 Binary files a/examples/runtime/meshes/tree1b_lod1_2.bin and b/examples/runtime/meshes/tree1b_lod1_2.bin differ diff --git a/examples/runtime/meshes/tree1b_lod2_1.bin b/examples/runtime/meshes/tree1b_lod2_1.bin index 4b8d4b7d2..5a172df2a 100644 Binary files a/examples/runtime/meshes/tree1b_lod2_1.bin and b/examples/runtime/meshes/tree1b_lod2_1.bin differ diff --git a/examples/runtime/meshes/tree1b_lod2_2.bin b/examples/runtime/meshes/tree1b_lod2_2.bin index 821151e0d..8b44cb322 100644 Binary files a/examples/runtime/meshes/tree1b_lod2_2.bin and b/examples/runtime/meshes/tree1b_lod2_2.bin differ diff --git a/scripts/common.ninja b/scripts/common.ninja new file mode 100644 index 000000000..64f8b5cb0 --- /dev/null +++ b/scripts/common.ninja @@ -0,0 +1,5 @@ +builddir = ../.build + +rule geometryc_pack_normal + command = geometryc -f $in -o $out --packnormal 1 + description = Converting geometry $in...