Changeset 202 for trunk/VUT

Timestamp:

08/07/05 16:51:06 (19 years ago)

Author:

mattausch

Message:

stable

Location:

trunk/VUT

Files:

• GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj (modified) (3 diffs)
• GtpVisibilityPreprocessor/src/ViewCellBSP.h (modified) (1 diff)
• GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (3 diffs)
• Ogre/include/OgreVisibilityOctreeSceneManager.h (modified) (1 diff)
• Ogre/include/OgreVisibilityTerrainSceneManager.h (modified) (3 diffs)
• Ogre/src/OgreVisibilityOctreeSceneManager.cpp (modified) (5 diffs)
• Ogre/src/OgreVisibilityTerrainSceneManager.cpp (modified) (7 diffs)
• scripts/GtpVisibility.suo (modified) (previous)

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -62 +62 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\support;..\support\zlib\include;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\Qt&quot;;..\include"
+                                AdditionalIncludeDirectories="..\support;..\support\devil\include;..\support\zlib\include;&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\Qt&quot;;..\include"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
                                 RuntimeLibrary="2"
+                                RuntimeTypeInfo="TRUE"
                                 UsePrecompiledHeader="0"
                                 WarningLevel="3"
@@ -73 +74 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="xerces-c_2.lib zdll.lib zziplib.lib"
-                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;&quot;$(QTDIR)\lib&quot;"/>
+                                AdditionalDependencies="xerces-c_2.lib zdll.lib zziplib.lib devil.lib"
+                                AdditionalLibraryDirectories="..\support\xercesc\lib\;..\support\zlib\lib\;..\support\devil\lib;&quot;$(QTDIR)\lib&quot;"/>
                         <Tool
                                 Name="VCMIDLTool"/>
@@ -234 +235 @@
                         </File>
                         <File
+                                RelativePath="..\src\ViewCell.h">
+                        </File>
+                        <File
                                 RelativePath="..\src\ViewCellBsp.cpp">
                         </File>

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBSP.h

@@ -38 +38 @@
   {   
   public:
-          BSPInterior(Plane3 *plane): mPlane(plane) {}
+          BSPInterior(Plane3 plane): mPlane(plane) {}
           /** @return false since it is an interior node */
           bool IsLeaf() const;

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -5 +5 @@
 #include "ViewCell.h"
 #include <stack>
+
 //namespace GtpVisibilityPreprocessor {
 /****************************************************************/
@@ -84 +85 @@
                 BSPNode *node = SubdivideNode(dynamic_cast<BSPLeaf *>(data.mNode),
                                                                           data.mParent,
-                                                                      data.mParent,
-                                                                          data.mDepth,
+                                                                          &data.mViewCell,
+                                                                      data.mDepth,
                                                                           backPolys,
                                                                           frontPolys);
@@ -118 +119 @@
         // add the new nodes to the tree + select subdivision plane
         Plane3 *plane = SelectPlane(viewCell);
-        BSPInterior *node = new BSPInterior(&plane); // ERROR!!
+        BSPInterior *node = new BSPInterior(*plane); // ERROR!!
   
 

trunk/VUT/Ogre/include/OgreVisibilityOctreeSceneManager.h

@@ -142 +142 @@
         /// flag for passes which should not be deleted from queue during first traversal
         int mLeavePassesInQueue;
-        ShadowTechnique mSavedShadowTechnique;
+        
 
         /// if transparent object are considered for item buffer visibility

trunk/VUT/Ogre/include/OgreVisibilityTerrainSceneManager.h

@@ -89 +89 @@
         void endFrame();
 
+        void renderAdditiveStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup);
+        void renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup);
 
 protected:
@@ -146 +148 @@
         /// flag for passes which should not be deleted from queue during first traversal
         int mLeavePassesInQueue;
-        ShadowTechnique mSavedShadowTechnique;
 
         /// if transparent object are considered for item buffer visibility
@@ -152 +153 @@
         /// Always execute the vertex program of a pass, e.g., for the depth pass or item buffer
         bool mExecuteVertexProgramForAllPasses;
+
+        bool mIsHierarchicalCulling;
 };
 

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -32 +32 @@
 mEnableDepthWrite(true),
 mSkipTransparents(false),
-mSavedShadowTechnique(SHADOWTYPE_NONE),
 mRenderTransparentsForItemBuffer(true),
 mExecuteVertexProgramForAllPasses(true),
@@ -318 +317 @@
 
                 mLeavePassesInQueue = 0;
-                mShadowTechnique = mSavedShadowTechnique;
-
 
                 // add visible nodes found by the visibility culling algorithm
@@ -639 +636 @@
         mVisibilityManager->GetCullingManager()->InitFrame(mVisualizeCulledNodes);
 
-        // save shadow technique. It will be reset after hierarchical culling
-        mSavedShadowTechnique = mShadowTechnique;
-
-        // render standard solids without shadows during hierarchical culling pass
-        /*if ((mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE) ||
-            (mShadowTechnique == SHADOWTYPE_STENCIL_MODULATIVE))
-        {       
-                mShadowTechnique = SHADOWTYPE_NONE;
-        }*/
-
         // set depth pass flag before rendering
         mRenderDepthPass = mUseDepthPass;
@@ -670 +657 @@
         if (!mUseDepthPass && !mUseItemBuffer)
         {
-                if (mSavedShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
+                if (mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
                 {
                         // TODO: remove this pass because it should be processed during hierarchical culling
@@ -684 +671 @@
                 }
         
-                if (mSavedShadowTechnique == SHADOWTYPE_STENCIL_MODULATIVE)
+                if (mShadowTechnique == SHADOWTYPE_STENCIL_MODULATIVE)
                 {
                         mLeavePassesInQueue |= RenderPriorityGroup::SOLID_PASSES_NOSHADOW;

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -31 +31 @@
 mEnableDepthWrite(true),
 mSkipTransparents(false),
-mSavedShadowTechnique(SHADOWTYPE_NONE),
 mRenderTransparentsForItemBuffer(true),
-mExecuteVertexProgramForAllPasses(true)
+mExecuteVertexProgramForAllPasses(true),
+mIsHierarchicalCulling(false)
 {
         mHierarchyInterface = new OctreeHierarchyInterface(this, mDestRenderSystem);
@@ -319 +319 @@
                 mSkipTransparents = false;
                 mLeavePassesInQueue = 0;
-                mShadowTechnique = mSavedShadowTechnique;
                 
 
@@ -640 +639 @@
         mVisibilityManager->GetCullingManager()->InitFrame(mVisualizeCulledNodes);
 
-        // save shadow technique. It will be reset after hierarchical culling
-        mSavedShadowTechnique = mShadowTechnique;
-
-        // render standard solids without shadows during hierarchical culling pass
-        if ((mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE) ||
-            (mShadowTechnique == SHADOWTYPE_STENCIL_MODULATIVE))
-        {       
-                mShadowTechnique = SHADOWTYPE_NONE;
-        }
-
         // set depth pass flag before rendering
         mRenderDepthPass = mUseDepthPass;
@@ -666 +655 @@
         mLeavePassesInQueue = 0;
 
-        if (!mUseDepthPass || !mUseItemBuffer)
-        {
-                if (mSavedShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
+        if (!mUseDepthPass && !mUseItemBuffer)
+        {
+                if (mShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
                 {
                         // TODO: remove this pass because it should be processed during hierarchical culling
-                        //mLeavePassesInQueue |= RenderPriorityGroup::SOLID_PASSES;
-                        mLeavePassesInQueue |= RenderPriorityGroup::SOLID_PASSES_NOSHADOW;
+                        //mLeavePassesInQueue |= RenderPriorityGroup::SOLID_PASSES_NOSHADOW;
 
                         mLeavePassesInQueue |= RenderPriorityGroup::SOLID_PASSES_DECAL;
@@ -682 +670 @@
                 }
         
-                if (mSavedShadowTechnique == SHADOWTYPE_STENCIL_MODULATIVE)
+                if (mShadowTechnique == SHADOWTYPE_STENCIL_MODULATIVE)
                 {
                         mLeavePassesInQueue |= RenderPriorityGroup::SOLID_PASSES_NOSHADOW;
@@ -722 +710 @@
 }
 //-----------------------------------------------------------------------
-/*void VisibilityTerrainSceneManager::renderBasicQueueGroupObjects(RenderQueueGroup* pGroup)
-{
-    // Basic render loop: Iterate through priorities
-    RenderQueueGroup::PriorityMapIterator groupIt = pGroup->getIterator();
-
-    while (groupIt.hasMoreElements())
-    {
-        RenderPriorityGroup* pPriorityGrp = groupIt.getNext();
-
-        // Sort the queue first
-        pPriorityGrp->sort(mCameraInProgress);
-
-                // Do solids
-                // TODO: render other solid passes for shadows
-        renderObjects(pPriorityGrp->_getSolidPassesNoShadows(), true);
-
-                // do solid passes no shadows if addititive stencil shadows
-                if (mSavedShadowTechnique == SHADOWTYPE_STENCIL_ADDITIVE)
-                        renderObjects(pPriorityGrp->_getSolidPassesNoShadows(), true);
-                
-        // Do transparents
-        renderObjects(pPriorityGrp->_getTransparentPasses(), true);
-
-
-    }// for each priority
-}
-*/
-//-----------------------------------------------------------------------
 Entity* VisibilityTerrainSceneManager::createEntity(const String& entityName, 
                                                                                                         const String& meshName)
@@ -765 +725 @@
         return ent;
 }
+//-----------------------------------------------------------------------
+void VisibilityTerrainSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
+{
+        // only render solid passes during hierarchical culling
+        if (mIsHierarchicalCulling)
+        {
+                RenderQueueGroup::PriorityMapIterator groupIt = pGroup->getIterator();
+            LightList lightList;
+
+                while (groupIt.hasMoreElements())
+                {
+                        RenderPriorityGroup* pPriorityGrp = groupIt.getNext();
+
+                        // Sort the queue first
+                        pPriorityGrp->sort(mCameraInProgress);
+
+                        // Clear light list
+                        lightList.clear();
+
+                        // Render all the ambient passes first, no light iteration, no lights
+                        mIlluminationStage = IRS_AMBIENT;
+
+                        OctreeSceneManager::renderObjects(pPriorityGrp->_getSolidPasses(), false, &lightList);
+                        // Also render any objects which have receive shadows disabled
+                        OctreeSceneManager::renderObjects(pPriorityGrp->_getSolidPassesNoShadow(), true);
+                }
+        }
+        else
+        {
+                OctreeSceneManager::renderAdditiveStencilShadowedQueueGroupObjects(pGroup);
+        }
+}
+//-----------------------------------------------------------------------
+void VisibilityTerrainSceneManager::renderModulativeStencilShadowedQueueGroupObjects(RenderQueueGroup* pGroup)
+{
+   if (mIsHierarchicalCulling)
+   {
+           // Iterate through priorities
+           RenderQueueGroup::PriorityMapIterator groupIt = pGroup->getIterator();
+
+           while (groupIt.hasMoreElements())
+           {
+                   RenderPriorityGroup* pPriorityGrp = groupIt.getNext();
+
+                   // Sort the queue first
+                   pPriorityGrp->sort(mCameraInProgress);
+
+                   // Do (shadowable) solids
+                   OctreeSceneManager::renderObjects(pPriorityGrp->_getSolidPasses(), true);
+           }
+   }
+   else
+   {
+           SceneManager::renderModulativeStencilShadowedQueueGroupObjects(pGroup);
+   }
+}
 } // namespace Ogre