Updated 12-lod.

This commit is contained in:
bkaradzic 2013-05-18 09:34:36 -07:00
parent 33b52a3cea
commit 71fb00a298
18 changed files with 20 additions and 25 deletions

View File

@ -344,6 +344,7 @@ Contributors
Garett Bass ([@gtbass](https://github.com/gtbass)) - OSX port. Garett Bass ([@gtbass](https://github.com/gtbass)) - OSX port.
Jeremie Roy ([@jeremieroy](https://github.com/jeremieroy)) - Font system and examples. Jeremie Roy ([@jeremieroy](https://github.com/jeremieroy)) - Font system and examples.
Milos Tosic ([@milostosic](https://github.com/milostosic)) - LOD example.
License (BSD 2-clause) License (BSD 2-clause)
---------------------- ----------------------

View File

@ -9,30 +9,20 @@ BUILD_DIR=../../.build
include $(BGFX_DIR)/premake/shader.mk include $(BGFX_DIR)/premake/shader.mk
geometry: ../runtime/meshes/tree1b_lod0_1.bin GEOMETRY_SOURCES = \
../runtime/meshes/tree1b_lod0_2.bin tree1b_lod0_1 \
../runtime/meshes/tree1b_lod1_1.bin tree1b_lod0_2 \
../runtime/meshes/tree1b_lod1_2.bin tree1b_lod1_1 \
../runtime/meshes/tree1b_lod2_1.bin tree1b_lod1_2 \
../runtime/meshes/tree1b_lod2_2.bin tree1b_lod2_1 \
tree1b_lod2_2
../runtime/meshes/tree1b_lod0_1.bin: tree1b_lod0_1.obj GEOMETRY_BIN = $(addprefix ../runtime/meshes/, $(addsuffix .bin, $(basename $(GEOMETRY_SOURCES))))
..\..\tools\bin\geometryc -f tree1b_lod0_1.obj -o ..\runtime\meshes\tree1b_lod0_1.bin -s 0.1 --packnormal 1
../runtime/meshes/tree1b_lod0_2.bin: tree1b_lod0_2.obj geometry: $(GEOMETRY_BIN)
..\..\tools\bin\geometryc -f tree1b_lod0_2.obj -o ..\runtime\meshes\tree1b_lod0_2.bin -s 0.1 --packnormal 1
../runtime/meshes/tree1b_lod1_1.bin: tree1b_lod1_1.obj ../runtime/meshes/%.bin : %.obj
..\..\tools\bin\geometryc -f tree1b_lod1_1.obj -o ..\runtime\meshes\tree1b_lod1_1.bin -s 0.1 --packnormal 1 $(BGFX_DIR)/tools/bin/geometryc -f $(<) -o $(@) -s 0.1 --packnormal 1
../runtime/meshes/tree1b_lod1_2.bin: tree1b_lod1_2.obj
..\..\tools\bin\geometryc -f tree1b_lod1_2.obj -o ..\runtime\meshes\tree1b_lod1_2.bin -s 0.1 --packnormal 1
../runtime/meshes/tree1b_lod2_1.bin: tree1b_lod2_1.obj
..\..\tools\bin\geometryc -f tree1b_lod2_1.obj -o ..\runtime\meshes\tree1b_lod2_1.bin -s 0.1 --packnormal 1
../runtime/meshes/tree1b_lod2_2.bin: tree1b_lod2_2.obj
..\..\tools\bin\geometryc -f tree1b_lod2_2.obj -o ..\runtime\meshes\tree1b_lod2_2.bin -s 0.1 --packnormal 1
rebuild: rebuild:
@make -s --no-print-directory TARGET=0 clean all @make -s --no-print-directory TARGET=0 clean all
@ -40,4 +30,3 @@ rebuild:
@make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=2 clean all
@make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=3 clean all
@make -s --no-print-directory TARGET=4 clean all @make -s --no-print-directory TARGET=4 clean all

View File

@ -13,4 +13,8 @@ rebuild:
@make -s --no-print-directory rebuild -C 07-callback @make -s --no-print-directory rebuild -C 07-callback
@make -s --no-print-directory rebuild -C 08-update @make -s --no-print-directory rebuild -C 08-update
@make -s --no-print-directory rebuild -C 09-hdr @make -s --no-print-directory rebuild -C 09-hdr
@make -s --no-print-directory rebuild -C 10-font
@make -s --no-print-directory rebuild -C 11-fontsdf
@make -s --no-print-directory rebuild -C 12-lod
@make -s --no-print-directory rebuild -C common/font @make -s --no-print-directory rebuild -C common/font
@make -s --no-print-directory rebuild -C common/imgui

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -118,8 +118,9 @@ exampleProject("06-bump", "ffb23e6c-167b-11e2-81df-94c4dd6a022f")
exampleProject("07-callback", "acc53bbc-52f0-11e2-9781-ad8edd4b7d02") exampleProject("07-callback", "acc53bbc-52f0-11e2-9781-ad8edd4b7d02")
exampleProject("08-update", "e011e246-5862-11e2-b202-b7cb257a7926") exampleProject("08-update", "e011e246-5862-11e2-b202-b7cb257a7926")
exampleProject("09-hdr", "969a4626-67ee-11e2-9726-9023267a7926") exampleProject("09-hdr", "969a4626-67ee-11e2-9726-9023267a7926")
exampleProject("10-font" , "EF6FD5B3-B52A-41C2-A257-9DFE709AF9E1") exampleProject("10-font" , "ef6fd5b3-b52a-41c2-a257-9dfe709af9e1")
exampleProject("11-fontsdf", "F4E6F96F-3DAA-4C68-8DF8-BF2A3ECD9092") exampleProject("11-fontsdf", "f4e6f96f-3daa-4c68-8df8-bf2a3ecd9092")
exampleProject("12-lod", "0512e9e6-bfd8-11e2-8e34-0291bd4c8125")
dofile "makedisttex.lua" dofile "makedisttex.lua"
dofile "shaderc.lua" dofile "shaderc.lua"
dofile "texturec.lua" dofile "texturec.lua"