From: Mikko Rasa Date: Sat, 9 Oct 2021 17:59:44 +0000 (+0300) Subject: Change various generated texture names to use the unified extension X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c8520aa336e92f2eaf9a38c3430c608520a90324;p=libs%2Fgl.git Change various generated texture names to use the unified extension --- diff --git a/source/builders/font.cpp b/source/builders/font.cpp index 58b23fe9..aac416ba 100644 --- a/source/builders/font.cpp +++ b/source/builders/font.cpp @@ -154,7 +154,7 @@ void Font::Loader::texture() { RefPtr 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 8149e408..8c31a53f 100644 --- 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(name); if(rotate_lookup) return *rotate_lookup; diff --git a/source/effects/colorcurve.cpp b/source/effects/colorcurve.cpp index c64f8531..30cb2bc7 100644 --- 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 6fb0e5c3..bf09085b 100644 --- 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(name); if(fresnel_lookup) return *fresnel_lookup; diff --git a/source/render/rendertarget.cpp b/source/render/rendertarget.cpp index b2dbef2c..00176710 100644 --- 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;