Samples: get shadergenerator from singleton

OGRECave · Jan 31, 2025 · 84b4bea · 84b4bea
1 parent 1ded2ef
commit 84b4bea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git a/Samples/Common/include/Sample.h b/Samples/Common/include/Sample.h
@@ -67,12 +67,12 @@ namespace OgreBites
             }
         };
 
-#ifdef OGRE_BUILD_COMPONENT_RTSHADERSYSTEM
-        Sample() : mShaderGenerator(0)
-#else
         Sample()
-#endif
         {
+#ifdef OGRE_BUILD_COMPONENT_RTSHADERSYSTEM
+            mShaderGenerator = Ogre::RTShader::ShaderGenerator::getSingletonPtr();
+#endif
+
             mRoot = Ogre::Root::getSingletonPtr();
             mWindow = 0;
             mSceneMgr = 0;
@@ -283,11 +283,6 @@ namespace OgreBites
         bool mContentSetup;       // whether or not scene was created
 #ifdef OGRE_BUILD_COMPONENT_RTSHADERSYSTEM
         Ogre::RTShader::ShaderGenerator*            mShaderGenerator;           // The Shader generator instance.
-    public:
-        void setShaderGenerator(Ogre::RTShader::ShaderGenerator* shaderGenerator) 
-        { 
-            mShaderGenerator = shaderGenerator;
-        }
 #endif
     private:
         // VisualTest fields

diff --git a/Samples/Common/include/SampleContext.h b/Samples/Common/include/SampleContext.h
@@ -100,9 +100,6 @@ namespace OgreBites
 
                 // test system capabilities against sample requirements
                 s->testCapabilities(mRoot->getRenderSystem()->getCapabilities());
-#ifdef OGRE_BUILD_COMPONENT_RTSHADERSYSTEM
-                s->setShaderGenerator(mShaderGenerator);
-#endif
                 s->_setup(this);   // start new sample
             }
 

diff --git a/Samples/Emscripten/Context.cpp b/Samples/Emscripten/Context.cpp
@@ -223,6 +223,5 @@ void Context::setup() {
     addInputListener(this);
 
     mCurrentSample = new Sample_Character();
-    mCurrentSample->setShaderGenerator(mShaderGenerator);
     mCurrentSample->_setup(this);
 }