Changeset 948 for OGRE/trunk

Timestamp:

05/11/06 10:06:49 (19 years ago)

Author:

szirmay

Message:

 

Location:

OGRE/trunk/ogre_changes/Ogre1.2/OgreMain

Files:

• include/OgreRenderTarget.h (modified) (1 diff)
• include/OgreRenderable.h (modified) (2 diffs)
• include/OgreSceneManager.h (modified) (1 diff)
• src/OgreSceneManager.cpp (modified) (2 diffs)
• src/OgreTextureUnitState.cpp (modified) (2 diffs)

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

@@ -358 +358 @@
                 /// internal method for firing events
                 virtual void fireViewportRemoved(Viewport* vp);
+
+#ifdef GAMETOOLS_ILLUMINATION_MODULE 
+                public:
+                        unsigned long getLastFrameNumber(){return lastFrame;}
+                protected:
+                        unsigned long lastFrame;
+#endif
+
     };
 

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

@@ -57 +57 @@
                 , mId(-1)
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
-                {}
+
+
+                {
+                #ifdef GAMETOOLS_ILLUMINATION_MODULE
+                        this->mRenderTechniqueGroup = 0;                        
+                #endif
+                }
 
         /** Virtual destructor needed as class has virtual methods. */
@@ -263 +269 @@
                 int mId;
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
+
+
+#ifdef GAMETOOLS_ILLUMINATION_MODULE
+        public:
+
+                virtual void setRenderTechniqueGroup(UserDefinedObject* renderTechniqueGroup)
+                {
+                        this->mRenderTechniqueGroup = renderTechniqueGroup;
+                }
+
+                virtual UserDefinedObject* getRenderTechniqueGroup(void) const
+                {
+                        return this->mRenderTechniqueGroup;
+                }               
+
+                virtual void setMaterialName(const String &name){}
+
+                protected:
+
+                        UserDefinedObject* mRenderTechniqueGroup;
+#endif
+
     };
 

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

@@ -2379 +2379 @@
                 */
                 RenderSystem *getDestinationRenderSystem();
+
+
+#ifdef GAMETOOLS_ILLUMINATION_MODULE 
+                public:
+                        void prepareRenderQueue_Wrap(){this->prepareRenderQueue();}
+#endif
+
+
     };
 

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

@@ -1046 +1046 @@
 
         // Prepare render queue for receiving new objects
-        prepareRenderQueue();
+#ifdef GAMETOOLS_ILLUMINATION_MODULE 
+        if (mFindVisibleObjects)
+                prepareRenderQueue();
+#else
+                prepareRenderQueue();
+#endif
+
+
 
     if (mFindVisibleObjects)
@@ -2205 +2212 @@
         return false;
     }
+
+#ifdef GAMETOOLS_ILLUMINATION_MODULE
+        if(!pass->isActive())
+                return false;
+#endif
+
+
 
     return true;

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

@@ -87 +87 @@
         mParent = parent;
         mAnimController = 0;
-        *this = oth;
-                #ifdef GAMETOOLS_ILLUMINATION_MODULE
-                        isVT = false;
-                #endif
+        *this = oth;            
     }
 
@@ -174 +171 @@
             mParent->_dirtyHash();
         }
+
+                #ifdef GAMETOOLS_ILLUMINATION_MODULE
+                        isVT = oth.isVT;
+                #endif
 
         return *this;