diff --git a/examples/09-hdr/hdr.cpp b/examples/09-hdr/hdr.cpp index c4e7c0c18..8e59b49d0 100644 --- a/examples/09-hdr/hdr.cpp +++ b/examples/09-hdr/hdr.cpp @@ -168,7 +168,7 @@ public: // Create vertex stream declaration. PosColorTexCoord0Vertex::init(); - m_uffizi = loadTexture("textures/uffizi.dds" + m_uffizi = loadTexture("textures/uffizi.ktx" , 0 | BGFX_TEXTURE_U_CLAMP | BGFX_TEXTURE_V_CLAMP diff --git a/examples/assets/textures/textures.ninja b/examples/assets/textures/textures.ninja index 72b284919..ee31be41d 100644 --- a/examples/assets/textures/textures.ninja +++ b/examples/assets/textures/textures.ninja @@ -7,7 +7,8 @@ build $textures/texture_compression_bc7.ktx: texturec_bc7 $pwd/texture_compres build $textures/texture_compression_etc1.ktx: texturec_etc1 $pwd/texture_compression.png build $textures/texture_compression_etc2.ktx: texturec_etc2 $pwd/texture_compression.png -build $textures/parallax-d.ktx: texturec_diffuse $pwd/parallax-d.png -build $textures/parallax-n.ktx: texturec_normal $pwd/parallax-n.png -build $textures/parallax-h.ktx: texturec_height $pwd/parallax-h.png -build $textures/lightmap.ktx: texturec_height $pwd/../sky/lightmap.png +build $textures/parallax-d.ktx: texturec_diffuse $pwd/parallax-d.png +build $textures/parallax-n.ktx: texturec_normal $pwd/parallax-n.png +build $textures/parallax-h.ktx: texturec_height $pwd/parallax-h.png +build $textures/lightmap.ktx: texturec_height $pwd/../sky/lightmap.png +build $textures/uffizi.ktx: texturec_equirect $pwd/uffizi-large.exr diff --git a/examples/assets/textures/uffizi-large.exr b/examples/assets/textures/uffizi-large.exr new file mode 100644 index 000000000..f93148c4f Binary files /dev/null and b/examples/assets/textures/uffizi-large.exr differ diff --git a/examples/runtime/textures/uffizi.dds b/examples/runtime/textures/uffizi.ktx similarity index 59% rename from examples/runtime/textures/uffizi.dds rename to examples/runtime/textures/uffizi.ktx index e6c4fc328..dee260dec 100644 Binary files a/examples/runtime/textures/uffizi.dds and b/examples/runtime/textures/uffizi.ktx differ diff --git a/scripts/build.ninja b/scripts/build.ninja index a27c523d9..1cfcac5c4 100644 --- a/scripts/build.ninja +++ b/scripts/build.ninja @@ -41,6 +41,9 @@ rule texturec_normal rule texturec_height command = texturec -f $in -o $out -t r8 +rule texturec_equirect + command = texturec -f $in -o $out --max 512 -t rgba16f --equirect + pwd = ../examples/assets/meshes subninja ../examples/assets/meshes/meshes.ninja