diff --git a/.editorconfig b/.editorconfig index 350f2a6e8..4fa189592 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,6 +11,9 @@ trim_trailing_whitespace = true [include/bgfx/c99/*.h] indent_style = space +[*.ninja] +indent_style = space + [*.md] trim_trailing_whitespace = false max_line_length = 80 diff --git a/examples/08-update/update.cpp b/examples/08-update/update.cpp index 17ce20a44..3d2918d70 100644 --- a/examples/08-update/update.cpp +++ b/examples/08-update/update.cpp @@ -149,9 +149,9 @@ public: // Create vertex stream declaration. PosTexcoordVertex::init(); - m_textures[0] = loadTexture("textures/texture_compression_bc1.dds", BGFX_TEXTURE_U_CLAMP|BGFX_TEXTURE_V_CLAMP); - m_textures[1] = loadTexture("textures/texture_compression_bc2.dds", BGFX_TEXTURE_U_CLAMP); - m_textures[2] = loadTexture("textures/texture_compression_bc3.dds", BGFX_TEXTURE_V_CLAMP); + m_textures[0] = loadTexture("textures/texture_compression_bc1.ktx", BGFX_TEXTURE_U_CLAMP|BGFX_TEXTURE_V_CLAMP); + m_textures[1] = loadTexture("textures/texture_compression_bc2.ktx", BGFX_TEXTURE_U_CLAMP); + m_textures[2] = loadTexture("textures/texture_compression_bc3.ktx", BGFX_TEXTURE_V_CLAMP); m_textures[3] = loadTexture("textures/texture_compression_etc1.ktx", BGFX_TEXTURE_U_BORDER|BGFX_TEXTURE_V_BORDER|BGFX_TEXTURE_BORDER_COLOR(1) ); m_textures[4] = loadTexture("textures/texture_compression_etc2.ktx"); m_textures[5] = loadTexture("textures/texture_compression_ptc12.pvr"); diff --git a/examples/assets/textures/build.ninja b/examples/assets/textures/build.ninja new file mode 100644 index 000000000..019e5f868 --- /dev/null +++ b/examples/assets/textures/build.ninja @@ -0,0 +1,8 @@ +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 diff --git a/examples/08-update/texture_compression.png b/examples/assets/textures/texture_compression.png similarity index 100% rename from examples/08-update/texture_compression.png rename to examples/assets/textures/texture_compression.png diff --git a/examples/runtime/textures/texture_compression_bc1.dds b/examples/runtime/textures/texture_compression_bc1.dds deleted file mode 100644 index 68fa18230..000000000 Binary files a/examples/runtime/textures/texture_compression_bc1.dds and /dev/null differ diff --git a/examples/runtime/textures/texture_compression_bc1.ktx b/examples/runtime/textures/texture_compression_bc1.ktx new file mode 100644 index 000000000..6dfe1108c Binary files /dev/null and b/examples/runtime/textures/texture_compression_bc1.ktx differ diff --git a/examples/runtime/textures/texture_compression_bc2.dds b/examples/runtime/textures/texture_compression_bc2.dds deleted file mode 100644 index 4a92b37c2..000000000 Binary files a/examples/runtime/textures/texture_compression_bc2.dds and /dev/null differ diff --git a/examples/runtime/textures/texture_compression_bc2.ktx b/examples/runtime/textures/texture_compression_bc2.ktx new file mode 100644 index 000000000..5b191d2b2 Binary files /dev/null and b/examples/runtime/textures/texture_compression_bc2.ktx differ diff --git a/examples/runtime/textures/texture_compression_bc3.dds b/examples/runtime/textures/texture_compression_bc3.dds deleted file mode 100644 index 9a3919889..000000000 Binary files a/examples/runtime/textures/texture_compression_bc3.dds and /dev/null differ diff --git a/examples/runtime/textures/texture_compression_bc3.ktx b/examples/runtime/textures/texture_compression_bc3.ktx new file mode 100644 index 000000000..ed4ae91ee Binary files /dev/null and b/examples/runtime/textures/texture_compression_bc3.ktx differ diff --git a/examples/runtime/textures/texture_compression_etc1.ktx b/examples/runtime/textures/texture_compression_etc1.ktx index a818345a2..b5006848d 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 5f9738edd..0d14cf29d 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/common.ninja b/scripts/common.ninja index 64f8b5cb0..0cde35fa3 100644 --- a/scripts/common.ninja +++ b/scripts/common.ninja @@ -3,3 +3,24 @@ builddir = ../.build rule geometryc_pack_normal command = geometryc -f $in -o $out --packnormal 1 description = Converting geometry $in... + +rule texturec_bc1 + command = texturec -f $in -o $out -t bc1 -m + +rule texturec_bc2 + command = texturec -f $in -o $out -t bc2 -m + +rule texturec_bc3 + command = texturec -f $in -o $out -t bc3 -m + +rule texturec_bc4 + command = texturec -f $in -o $out -t bc4 -m + +rule texturec_bc5 + command = texturec -f $in -o $out -t bc5 -m + +rule texturec_etc1 + command = texturec -f $in -o $out -t etc1 -m + +rule texturec_etc2 + command = texturec -f $in -o $out -t etc2 -m