Change various generated texture names to use the unified extension

diff --git a/source/builders/font.cpp b/source/builders/font.cpp
index 58b23fe9dac150cefb9f0212c7b7777cba8584a3..aac416ba5b55b4958b45bcfe67319bbbcd99120e 100644 (file)
--- a/source/builders/font.cpp
+++ b/source/builders/font.cpp
@@ -154,7 +154,7 @@ void Font::Loader::texture()
 {
        RefPtr<Texture2D> tex = new Texture2D;
        load_sub(*tex);
-       get_collection().add(FS::basename(get_source())+".tex2d", tex.get());
+       get_collection().add(FS::basename(get_source())+".tex", tex.get());
        obj.texture = tex.release();
 }
 

diff --git a/source/effects/ambientocclusion.cpp b/source/effects/ambientocclusion.cpp
index 8149e408ee0a1dcc323e441c61c91d4f58842349..8c31a53fb115ddfe5ff25dd1f540e60132f6dc5b 100644 (file)
--- a/source/effects/ambientocclusion.cpp
+++ b/source/effects/ambientocclusion.cpp
@@ -32,7 +32,7 @@ const Texture2D &AmbientOcclusion::get_or_create_rotate_lookup()
 {
        Resources &resources = Resources::get_global();
 
-       static const string name = "_ambientocclusion_rotate.tex2d";
+       static const string name = "_ambientocclusion_rotate.tex";
        Texture2D *rotate_lookup = resources.find<Texture2D>(name);
        if(rotate_lookup)
                return *rotate_lookup;

diff --git a/source/effects/colorcurve.cpp b/source/effects/colorcurve.cpp
index c64f85317ed2822424db8fc95e5e1a6a1f813e2d..30cb2bc7b6621ab8fe1452434a2a9b206f974c49 100644 (file)
--- a/source/effects/colorcurve.cpp
+++ b/source/effects/colorcurve.cpp
@@ -79,7 +79,7 @@ void ColorCurve::set_debug_name(const string &name)
 {
 #ifdef DEBUG
        shdata.set_debug_name(name+" [UBO]");
-       curve.set_debug_name(name+"/curve.tex1d");
+       curve.set_debug_name(name+"/curve.tex");
 #else
        (void)name;
 #endif

diff --git a/source/effects/environmentmap.cpp b/source/effects/environmentmap.cpp
index 6fb0e5c3b314656dca8361dc9b54544969c98c68..bf09085ba862db8b06aac7606dd05a0f41ec0454 100644 (file)
--- a/source/effects/environmentmap.cpp
+++ b/source/effects/environmentmap.cpp
@@ -179,7 +179,7 @@ void EnvironmentMap::render(Renderer &renderer, Tag tag) const
 void EnvironmentMap::set_debug_name(const string &name)
 {
 #ifdef DEBUG
-       env_tex.set_debug_name(name+"/environment.texcb");
+       env_tex.set_debug_name(name+"/environment.tex");
        depth_buf.set_debug_name(name+"/environment_depth.rbuf");
        static const char *const face_names[] = { "X+", "X-", "Y+", "Y-", "Z+", "Z-" };
        for(unsigned i=0; i<6; ++i)
@@ -188,7 +188,7 @@ void EnvironmentMap::set_debug_name(const string &name)
                faces[i].camera.set_debug_name(format("%s/%s.camera", name, face_names[i]));
        }
 
-       irradiance.set_debug_name(name+"/irradiance.texcb");
+       irradiance.set_debug_name(name+"/irradiance.tex");
        irradiance_fbo.set_debug_name(name+" [FBO:irradiance]");
        for(unsigned i=0; i<specular_fbos.size(); ++i)
                specular_fbos[i].set_debug_name(format("%s [FBO:specular_mip%d]", name, i+1));

diff --git a/source/effects/shadowmap.cpp b/source/effects/shadowmap.cpp
index 36011107e3d19de1f6aa07eb7235d0fdc9d869bc..bfb053421440d98bdd3164a6e16d092e1479aa47 100644 (file)
--- a/source/effects/shadowmap.cpp
+++ b/source/effects/shadowmap.cpp
@@ -194,7 +194,7 @@ void ShadowMap::set_debug_name(const string &name)
        fbo.set_debug_name(name+" [FBO]");
        for(unsigned i=0; i<lights.size(); ++i)
                lights[i].shadow_camera.set_debug_name(format("%s/light%d.camera", name, i));
-       depth_buf.set_debug_name(name+"/depth.tex2d");
+       depth_buf.set_debug_name(name+"/depth.tex");
        shdata.set_debug_name(name+" [UBO]");
 #else
        (void)name;

diff --git a/source/materials/pbrmaterial.cpp b/source/materials/pbrmaterial.cpp
index ed94bf799f53179e17ad977c782d365272e88edc..e01bbb9d5f0043463a6d38a987f04758a2c95022 100644 (file)
--- a/source/materials/pbrmaterial.cpp
+++ b/source/materials/pbrmaterial.cpp
@@ -36,7 +36,7 @@ const Texture2D &PbrMaterial::get_or_create_fresnel_lookup()
 {
        Resources &resources = Resources::get_global();
 
-       static const string name = "_pbr_fresnel_lookup.tex2d";
+       static const string name = "_pbr_fresnel_lookup.tex";
        Texture2D *fresnel_lookup = resources.find<Texture2D>(name);
        if(fresnel_lookup)
                return *fresnel_lookup;

diff --git a/source/render/rendertarget.cpp b/source/render/rendertarget.cpp
index b2dbef2c9f498b35c34e478aa9894bce12b29090..00176710c4a796047e02c462e899fde26d0c8ffd 100644 (file)
--- a/source/render/rendertarget.cpp
+++ b/source/render/rendertarget.cpp
@@ -80,7 +80,7 @@ void RenderTarget::set_debug_name(const string &name)
                else
                        tex_name = Msp::format("%s/color%d", name, attach_pt);
 
-               textures[i++]->set_debug_name(tex_name+".tex2d");
+               textures[i++]->set_debug_name(tex_name+".tex");
        }
 #else
        (void)name;