Changeset 948 for OGRE/trunk/ogre_changes/Ogre1.2/OgreMain/src

Timestamp:

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

Author:

szirmay

Message:

 

Location:

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

Files:

• OgreSceneManager.cpp (modified) (2 diffs)
• OgreTextureUnitState.cpp (modified) (2 diffs)

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;