From 84b4beabcd467825ac5ae3b905821c46492e12d1 Mon Sep 17 00:00:00 2001
From: Pavel Rojtberg <rojtberg@gmail.com>
Date: Fri, 31 Jan 2025 01:41:00 +0100
Subject: [PATCH] Samples: get shadergenerator from singleton

---
 Samples/Common/include/Sample.h        | 13 ++++---------
 Samples/Common/include/SampleContext.h |  3 ---
 Samples/Emscripten/Context.cpp         |  1 -
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Samples/Common/include/Sample.h b/Samples/Common/include/Sample.h
index 91664781629..898f0bdee92 100644
--- 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
index 590fe54d840..635cedf0992 100644
--- 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
index 8e459d43815..a76c79498ee 100755
--- 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);
 }