diff --git a/examples/assets/textures/textures.ninja b/examples/assets/textures/textures.ninja index bc7f67c51..72b284919 100644 --- a/examples/assets/textures/textures.ninja +++ b/examples/assets/textures/textures.ninja @@ -3,6 +3,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_bc7.ktx: texturec_bc7 $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 diff --git a/examples/runtime/meshes/bunny.bin b/examples/runtime/meshes/bunny.bin index e3aaed17b..7f9645499 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..176344675 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..e8645370e 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 7e3e4b842..1ed9d7cc9 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 bd454afba..ff8d16628 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/test_scene.bin b/examples/runtime/meshes/test_scene.bin index 6f75d1a8c..bf234cb0b 100644 Binary files a/examples/runtime/meshes/test_scene.bin and b/examples/runtime/meshes/test_scene.bin differ diff --git a/examples/runtime/meshes/tree.bin b/examples/runtime/meshes/tree.bin index 6daa0cef7..aec00bfb2 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..26ed0727b 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..97f939dbd 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..563e82c91 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..1983f8360 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..d2aa057f6 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..886d7b3be 100644 Binary files a/examples/runtime/meshes/tree1b_lod2_2.bin and b/examples/runtime/meshes/tree1b_lod2_2.bin differ diff --git a/examples/runtime/textures/parallax-d.ktx b/examples/runtime/textures/parallax-d.ktx index 4b73fc379..54c74a060 100644 Binary files a/examples/runtime/textures/parallax-d.ktx and b/examples/runtime/textures/parallax-d.ktx differ diff --git a/examples/runtime/textures/parallax-n.ktx b/examples/runtime/textures/parallax-n.ktx index a5a2d7b21..1280e92ce 100644 Binary files a/examples/runtime/textures/parallax-n.ktx and b/examples/runtime/textures/parallax-n.ktx differ diff --git a/examples/runtime/textures/texture_compression_bc1.ktx b/examples/runtime/textures/texture_compression_bc1.ktx index 21bc68403..0be5ced96 100644 Binary files a/examples/runtime/textures/texture_compression_bc1.ktx and b/examples/runtime/textures/texture_compression_bc1.ktx differ diff --git a/examples/runtime/textures/texture_compression_bc2.ktx b/examples/runtime/textures/texture_compression_bc2.ktx index 1bfa7ba34..473406fa7 100644 Binary files a/examples/runtime/textures/texture_compression_bc2.ktx and b/examples/runtime/textures/texture_compression_bc2.ktx differ diff --git a/examples/runtime/textures/texture_compression_bc3.ktx b/examples/runtime/textures/texture_compression_bc3.ktx index fa27b104a..8d3d85567 100644 Binary files a/examples/runtime/textures/texture_compression_bc3.ktx and b/examples/runtime/textures/texture_compression_bc3.ktx differ diff --git a/examples/runtime/textures/texture_compression_bc7.ktx b/examples/runtime/textures/texture_compression_bc7.ktx new file mode 100644 index 000000000..265dde5bb Binary files /dev/null and b/examples/runtime/textures/texture_compression_bc7.ktx differ diff --git a/examples/runtime/textures/texture_compression_etc1.ktx b/examples/runtime/textures/texture_compression_etc1.ktx index fea5ac28f..0206deadd 100644 Binary files a/examples/runtime/textures/texture_compression_etc1.ktx and b/examples/runtime/textures/texture_compression_etc1.ktx differ diff --git a/examples/runtime/textures/texture_compression_etc2.ktx b/examples/runtime/textures/texture_compression_etc2.ktx index 61bbf0a63..f6dd5b454 100644 Binary files a/examples/runtime/textures/texture_compression_etc2.ktx and b/examples/runtime/textures/texture_compression_etc2.ktx differ diff --git a/scripts/build.ninja b/scripts/build.ninja index f36701ea3..a27c523d9 100644 --- a/scripts/build.ninja +++ b/scripts/build.ninja @@ -23,6 +23,9 @@ rule texturec_bc4 rule texturec_bc5 command = texturec -f $in -o $out -t bc5 -m +rule texturec_bc7 + command = texturec -f $in -o $out -t bc7 -m + rule texturec_etc1 command = texturec -f $in -o $out -t etc1 -m