Changeset 812 for OGRE

Timestamp:

04/25/06 09:27:16 (18 years ago)

Author:

szirmay

Message:

 

Location:

OGRE/trunk/ogre_changes/Ogre1.2/OgreMain

Files:

• include/OgreMaterialSerializer.h (added)
• include/OgrePass.h (modified) (2 diffs)
• src/OgreMaterialSerializer.cpp (modified) (4 diffs)

OGRE/trunk/ogre_changes/Ogre1.2/OgreMain/include/OgrePass.h

@@ -34 +34 @@
 
 namespace Ogre {
+
+#ifdef GAMETOOLS_ILLUMINATION_MODULE
+        
+        class IllumTechniqueParams
+        {
+                String techniqueType;
+                NameValuePairList params;
+
+                public:
+
+                void setTypeName(String& type){ techniqueType = type;}
+                void addParam(String& param, String& value)
+                {
+                        params[param] = value;
+                }
+
+                String& getTypeName(){return techniqueType;}
+                NameValuePairList& getParams(){return params;}
+        };
+
+#endif
     /** Class defining a single pass of a Technique (of a Material), ie
         a single rendering call. 
@@ -1153 +1174 @@
 #ifdef GAMETOOLS_ILLUMINATION_MODULE
                 public:
+
                         void setActive(bool active){mActive = active;}
                         bool isActive() const {return mActive;} 
+
+                        void addIllumTechniqueParams(IllumTechniqueParams* params)
+                        {
+                                illumTechniques.push_back(params);
+                        }
+                        std::vector<IllumTechniqueParams*>& getIllumTechniques()
+                        {
+                                return illumTechniques;
+                        }
+
                 protected:
+
                         bool mActive;
+
+                        std::vector<IllumTechniqueParams*> illumTechniques;
 #endif
     };

OGRE/trunk/ogre_changes/Ogre1.2/OgreMain/src/OgreMaterialSerializer.cpp

@@ -1979 +1979 @@
         return true;
     }
+
+#ifdef GAMETOOLS_ILLUMINATION_MODULE
+
+        bool parseIllumTechniques(String& params, MaterialScriptContext& context)
+    {
+
+                
+                context.section = MSS_ILLUMTECHNIQUES;
+                return true;
+
+        }
+
+        bool parseIllumTechniqueParams(String& params, MaterialScriptContext& context)
+    {
+                IllumTechniqueParams* illumParams = new IllumTechniqueParams();
+                context.pass->addIllumTechniqueParams(illumParams);
+                context.illumTechniqueParams = illumParams;
+                
+                illumParams->setTypeName(params);
+
+                context.section = MSS_ILLUMTECHNIQUE_PARAMS;
+                return true;
+        }
+
+        bool parseUnknownIllumParam(String& paramName, String& paramValue, MaterialScriptContext& context)
+        {
+                context.illumTechniqueParams->addParam(paramName, paramValue);
+
+                return false;
+        }
+
+#endif
     //-----------------------------------------------------------------------
     bool parseTextureUnit(String& params, MaterialScriptContext& context)
@@ -2518 +2550 @@
 #ifdef  GAMETOOLS_ILLUMINATION_MODULE
                 mTextureUnitAttribParsers.insert(AttribParserList::value_type("vertex_texture", (ATTRIBUTE_PARSER)parseVertexTexture));
+
+                mPassAttribParsers.insert(AttribParserList::value_type("IllumTechniques", (ATTRIBUTE_PARSER)parseIllumTechniques));
+                mIllumTechniqueParsers.insert(AttribParserList::value_type("RenderTechnique", (ATTRIBUTE_PARSER)parseIllumTechniqueParams));
 #endif
         // Set up program reference attribute parsers
@@ -2684 +2719 @@
             }
             break;
+#ifdef GAMETOOLS_ILLUMINATION_MODULE
+
+                case MSS_ILLUMTECHNIQUES:
+                        if (line == "}")
+            {
+                // End of illumtechniques
+                                mScriptContext.section = MSS_PASS;                
+                                mScriptContext.stateLev = -1;   //Reset state level (yes, the state level)
+            }
+            else
+            {
+                // find & invoke a parser
+                return invokeParser(line, mIllumTechniqueParsers); 
+            }
+            break;
+                case MSS_ILLUMTECHNIQUE_PARAMS:
+                        if (line == "}")
+            {
+                // End of illumtechnique params
+                                mScriptContext.section = MSS_ILLUMTECHNIQUES;
+                                mScriptContext.illumTechniqueParams = NULL;
+                                mScriptContext.stateLev = -1;   //Reset state level (yes, the state level)
+            }
+            else
+            {
+                // find & invoke a parser
+                return invokeParser(line, mIllumTechniqueParsers); 
+            }
+            break;
+#endif
         case MSS_TEXTUREUNIT:
             if (line == "}")
@@ -2901 +2966 @@
         if (iparser == parsers.end())
         {
+#ifdef GAMETOOLS_ILLUMINATION_MODULE
+                        
+                        if(mScriptContext.section == MSS_ILLUMTECHNIQUE_PARAMS)
+                                if(splitCmd.size() >= 2)
+                                        return parseUnknownIllumParam(  splitCmd[0],
+                                                                                                        splitCmd[1],
+                                                                                                        mScriptContext);
+#endif
             // BAD command. BAD!
             logParseError("Unrecognised command: " + splitCmd[0], mScriptContext);