diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | configure.lua | 2 | ||||
| -rw-r--r-- | intermediate/cube.glb | bin | 0 -> 1844 bytes | |||
| -rw-r--r-- | intermediate/greybox.mat | 6 | ||||
| -rw-r--r-- | src/cube.blend | bin | 0 -> 492988 bytes |
5 files changed, 15 insertions, 3 deletions
@@ -112,6 +112,8 @@ data/ui.csh: intermediate/ui.glsl shadercompiler | data data/monkey.mdl: convmodel intermediate/monkey.glb data/debug.csh data/mip_spec.csh data/sky.csh data/surface.csh data/surface_depthonly.csh data/tonemap.csh data/triangle.csh data/ui.csh | data ./convmodel data intermediate/monkey.glb data/monkey.mdl +data/cube.mdl: convmodel intermediate/cube.glb data/debug.csh data/mip_spec.csh data/sky.csh data/surface.csh data/surface_depthonly.csh data/tonemap.csh data/triangle.csh data/ui.csh | data + ./convmodel data intermediate/cube.glb data/cube.mdl data/22.tex: convtexture intermediate/22.bmp | data ./convtexture intermediate/22.bmp data/22.tex bc1 @@ -130,9 +132,11 @@ data/bricks.mat: convmaterial intermediate/bricks.mat | data ./convmaterial intermediate/bricks.mat data/bricks.mat data/plastic.mat: convmaterial intermediate/plastic.mat | data ./convmaterial intermediate/plastic.mat data/plastic.mat +data/greybox.mat: convmaterial intermediate/greybox.mat | data + ./convmaterial intermediate/greybox.mat data/greybox.mat -pack: packer data/debug.csh data/mip_spec.csh data/sky.csh data/surface.csh data/surface_depthonly.csh data/tonemap.csh data/triangle.csh data/ui.csh data/monkey.mdl data/22.tex data/kita.tex data/brick_albedo.tex data/brick_ao.tex data/brick_normal.tex data/sky.tex data/bricks.mat data/plastic.mat - ./packer pack data debug.csh mip_spec.csh sky.csh surface.csh surface_depthonly.csh tonemap.csh triangle.csh ui.csh monkey.mdl 22.tex kita.tex brick_albedo.tex brick_ao.tex brick_normal.tex sky.tex bricks.mat plastic.mat +pack: packer data/debug.csh data/mip_spec.csh data/sky.csh data/surface.csh data/surface_depthonly.csh data/tonemap.csh data/triangle.csh data/ui.csh data/monkey.mdl data/cube.mdl data/22.tex data/kita.tex data/brick_albedo.tex data/brick_ao.tex data/brick_normal.tex data/sky.tex data/bricks.mat data/plastic.mat data/greybox.mat + ./packer pack data debug.csh mip_spec.csh sky.csh surface.csh surface_depthonly.csh tonemap.csh triangle.csh ui.csh monkey.mdl cube.mdl 22.tex kita.tex brick_albedo.tex brick_ao.tex brick_normal.tex sky.tex bricks.mat plastic.mat greybox.mat data: mkdir -p data @@ -140,7 +144,7 @@ data: -include qstd/memory.d qstd/plat.d qstd/str.d qstd/pack.d cfg/cfgparse.d sc/sc.d sc/includer.d app.d asset.d c2.d camera.d debugdraw.d editor.d maths.d model.d physics.d pipeline.d scene.d ui.d video.d world.d convtexture.d convmodel.d convmaterial.d packer.d clean: - rm -f qstd/memory.o qstd/plat.o qstd/str.o qstd/pack.o cfg/cfgparse.o sc/sc.o sc/includer.o app.o asset.o c2.o camera.o debugdraw.o editor.o maths.o model.o physics.o pipeline.o scene.o ui.o video.o world.o convtexture.o convmodel.o convmaterial.o packer.o qstd/memory.d qstd/plat.d qstd/str.d qstd/pack.d cfg/cfgparse.d sc/sc.d sc/includer.d app.d asset.d c2.d camera.d debugdraw.d editor.d maths.d model.d physics.d pipeline.d scene.d ui.d video.d world.d convtexture.d convmodel.d convmaterial.d packer.d data/debug.csh data/mip_spec.csh data/sky.csh data/surface.csh data/surface_depthonly.csh data/tonemap.csh data/triangle.csh data/ui.csh data/monkey.mdl data/22.tex data/kita.tex data/brick_albedo.tex data/brick_ao.tex data/brick_normal.tex data/sky.tex data/bricks.mat data/plastic.mat + rm -f qstd/memory.o qstd/plat.o qstd/str.o qstd/pack.o cfg/cfgparse.o sc/sc.o sc/includer.o app.o asset.o c2.o camera.o debugdraw.o editor.o maths.o model.o physics.o pipeline.o scene.o ui.o video.o world.o convtexture.o convmodel.o convmaterial.o packer.o qstd/memory.d qstd/plat.d qstd/str.d qstd/pack.d cfg/cfgparse.d sc/sc.d sc/includer.d app.d asset.d c2.d camera.d debugdraw.d editor.d maths.d model.d physics.d pipeline.d scene.d ui.d video.d world.d convtexture.d convmodel.d convmaterial.d packer.d data/debug.csh data/mip_spec.csh data/sky.csh data/surface.csh data/surface_depthonly.csh data/tonemap.csh data/triangle.csh data/ui.csh data/monkey.mdl data/cube.mdl data/22.tex data/kita.tex data/brick_albedo.tex data/brick_ao.tex data/brick_normal.tex data/sky.tex data/bricks.mat data/plastic.mat data/greybox.mat rm -f shadercompiler rmdir data rm -f c2 diff --git a/configure.lua b/configure.lua index 7f126ac..2e34888 100644 --- a/configure.lua +++ b/configure.lua @@ -53,9 +53,11 @@ config = { materials = { "bricks", "plastic", + "greybox" }, models = { "monkey", + "cube" }, textures = { { "22", "bmp", "bc1" }, diff --git a/intermediate/cube.glb b/intermediate/cube.glb Binary files differnew file mode 100644 index 0000000..f03340e --- /dev/null +++ b/intermediate/cube.glb diff --git a/intermediate/greybox.mat b/intermediate/greybox.mat new file mode 100644 index 0000000..84160f7 --- /dev/null +++ b/intermediate/greybox.mat @@ -0,0 +1,6 @@ +[params] +metalness: 0.0 +roughness: 1.0 +ao: 1.0 +albedo: f9f9f9 + diff --git a/src/cube.blend b/src/cube.blend Binary files differnew file mode 100644 index 0000000..1d6284a --- /dev/null +++ b/src/cube.blend |