Changeset 316 for trunk/VUT/work

Timestamp:

10/10/05 15:23:32 (19 years ago)

Author:

mattausch

Message:

queries are realized as templates

Location:

trunk/VUT/work

Files:

• README_ONLINE.txt (modified) (1 diff)
• TestCullingTerrain/TerrainFrameListener.cpp (modified) (5 diffs)
• iv/IVFrameListener.cpp (modified) (1 diff)
• ogre_changes/OgreMain/include/OgreRenderSystem.h (modified) (2 diffs)
• ogre_changes/OgreMain/include/OgreSceneManager.h (modified) (5 diffs)
• ogre_changes/OgreMain/src/OgreRenderSystem.cpp (modified) (2 diffs)
• ogre_changes/OgreMain/src/OgreSceneManager.cpp (modified) (2 diffs)
• ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h (modified) (1 diff)
• ogre_changes/Plugins/OctreeSceneManager/include/OgreOctreeSceneManager.h (modified) (1 diff)
• ogre_changes/Plugins/OctreeSceneManager/include/OgreTerrainRenderable.h (modified) (1 diff)
• ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp (modified) (2 diffs)
• ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp (modified) (2 diffs)
• ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp (modified) (1 diff)

trunk/VUT/work/README_ONLINE.txt

@@ -24 +24 @@
    RenderSystem_Direct7
    OgreMain
-   example projects
+   GuiRenderer
+   
+   Also add the flag to the example projects you want to use
 
 5) Add following resources to OGRE_PATH\Samples\Common\bin\Release\resource.cfg:

trunk/VUT/work/TestCullingTerrain/TerrainFrameListener.cpp

@@ -450 +450 @@
         sm->GetVisibilityManager()->SetQueryManager(mQueryManager);
 
-        InfoContainer<GtpVisibility::NodeInfo> visibleNodes;
-        InfoContainer<GtpVisibility::MeshInfo> visibleGeometry;
-        InfoContainer<GtpVisibility::PatchInfo> visiblePatches;
+        GtpVisibility::NodeInfoContainer visibleNodes;
+        GtpVisibility::MeshInfoContainer visibleGeometry;
+        GtpVisibility::PatchInfoContainer visiblePatches;
 
 
@@ -478 +478 @@
         int geomSize = 0, nodesSize = 0, patchSize = 0;
 
-        InfoContainer<GtpVisibility::MeshInfo>::iterator geomIt, geomIt_end = visibleGeometry.end();
+        GtpVisibility::MeshInfoContainer::iterator geomIt, geomIt_end = visibleGeometry.end();
 
         for (geomIt = visibleGeometry.begin(); geomIt != geomIt_end; ++geomIt)
@@ -492 +492 @@
                         
                         std::stringstream d; 
-                        d << "Geometry " << geomSize << " id: " << (*geomIt).GetMesh()->getSubEntity(0)->getId() 
+                        d << "Geometry " << geomSize << " id: " << (*geomIt).GetSource()->getSubEntity(0)->getId() 
                           << " visibility: "  << (*geomIt).GetVisiblePixels() << ", " << (*geomIt).GetProjectedPixels();
                         LogManager::getSingleton().logMessage(d.str());
@@ -498 +498 @@
         }
 
-        InfoContainer<GtpVisibility::NodeInfo>::iterator nodesIt, nodesIt_end = visibleNodes.end();
+        GtpVisibility::NodeInfoContainer::iterator nodesIt, nodesIt_end = visibleNodes.end();
 
         for (nodesIt = visibleNodes.begin(); nodesIt != nodesIt_end; ++nodesIt)
@@ -516 +516 @@
         }
 
-        InfoContainer<GtpVisibility::PatchInfo>::iterator patchIt, patchIt_end = visiblePatches.end();
+        GtpVisibility::PatchInfoContainer::iterator patchIt, patchIt_end = visiblePatches.end();
 
         for (patchIt = visiblePatches.begin(); patchIt != patchIt_end; ++ patchIt)

trunk/VUT/work/iv/IVFrameListener.cpp

@@ -436 +436 @@
                   << "worst frame time: " << mWindow->getWorstFrameTime() << "\n"
                   << "avg. #triangles: " << avgTris << " M\n"
-                  << "#frames: " << mFrameCount < "\n";
+                  << "#frames: " << mFrameCount << "\n";
 
                 LogManager::getSingleton().logMessage(d.str());

trunk/VUT/work/ogre_changes/OgreMain/include/OgreRenderSystem.h

@@ -947 +947 @@
         virtual Real getMaximumDepthInputValue(void) = 0;
 
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-                /** sets colour.
-                */
-                void setColour(int r, int g, int b, int a);
-#endif // GTP_VISIBILITY_MODIFIED_OGRE
-
     protected:
 
@@ -990 +984 @@
 
         bool mInvertVertexWinding;
-
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-                int mColour[4];
-#endif // GTP_VISIBILITY_MODIFIED_OGRE
     };
 }

trunk/VUT/work/ogre_changes/OgreMain/include/OgreSceneManager.h

@@ -136 +136 @@
                 */
                 void _deleteRenderedQueueGroups(int leavePassesInQueue = 0);
-                /** Internal method used by _renderVisibleObjects to deal with renderables
+                /** Wrapper for useRenderableViewProjMde with is an 
+                        Internal method used by _renderVisibleObjects to deal with renderables
             which override the camera's own view / projection materices. 
-                        @remark made public by matt 
-                */
-        void useRenderableViewProjMode(Renderable* pRend);
-                /** Method for setting up the renderstate for a rendering pass.
+                */
+        void useRenderableViewProjModeWrapper(Renderable* pRend); // HACK
+                /** HACK: A public wrapper method for setting up the renderstate for a rendering pass.
             @param
                 pass The Pass details to set.
@@ -149 +149 @@
                         @remark made public by matt
         */
-        virtual Pass* setPass(Pass* pass);
+        virtual Pass* setPassWrapper(Pass* pass);
 
                 /** Renders an Ogre Entity.
@@ -273 +273 @@
         /** Retrieves the internal render queue. */
         virtual RenderQueue* getRenderQueue(void);
-#ifndef GTP_VISIBILITY_MODIFIED_OGRE // made public, is found in the modfified section
+
         /** Internal method for setting up the renderstate for a rendering pass.
             @param
@@ -282 +282 @@
         */
         virtual Pass* setPass(Pass* pass);
-#endif
+
         /// A pass designed to let us render shadow colour on white for texture shadows
         Pass* mShadowCasterPlainBlackPass;
@@ -357 +357 @@
         AnimationList mAnimationsList;
         AnimationStateSet mAnimationStates;
-#ifndef GTP_VISIBILITY_MODIFIED_OGRE // made public, is found in the modfified section
+
         /** Internal method used by _renderVisibleObjects to deal with renderables
             which override the camera's own view / projection materices. */
         void useRenderableViewProjMode(Renderable* pRend);
-#endif
+
         /// Controller flag for determining if we need to set view/proj matrices
         bool mCamChanged;

trunk/VUT/work/ogre_changes/OgreMain/src/OgreRenderSystem.cpp

@@ -63 +63 @@
         // instanciate RenderSystemCapabilities
         mCapabilities = new RenderSystemCapabilities();
-
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-                mColour[0] = mColour[1] = mColour[2] = mColour[3] = 255;
-#endif // GTP_VISIBILITY_MODIFIED_OGRE
     }
 
@@ -420 +416 @@
         }
     }
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        // ------------------------------------------------------------------
-        void RenderSystem::setColour(int r, int g, int b, int a)
-        {
-                mColour[0] = r;
-                mColour[1] = g;
-                mColour[2] = b;
-                mColour[3] = a;
-        }
-#endif //  GTP_VISIBILITY_MODIFIED_OGRE
 }
 

trunk/VUT/work/ogre_changes/OgreMain/src/OgreSceneManager.cpp

@@ -4200 +4200 @@
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
 //-----------------------------------------------------------------------
+Pass* SceneManager::setPassWrapper(Pass* pass)
+{
+        return setPass(pass);
+}
+//-----------------------------------------------------------------------
 void SceneManager::_renderSceneNode(Camera *cam, SceneNode *node, const int leavePassesInQueue)
 {
@@ -4259 +4264 @@
         renderSingleObject(rend, pass, false);
 }
+//-----------------------------------------------------------------------
+void SceneManager::useRenderableViewProjModeWrapper(Renderable* pRend)
+{
+        useRenderableViewProjMode(pRend);
+}
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
 }

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctree.h

@@ -208 +208 @@
         int mDepth;
         
-
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 };

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreOctreeSceneManager.h

@@ -261 +261 @@
 
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        /* the number of nodes in the octree. do not confuse this with the OctreeNode
-        class with is derived from SceneNode.
+        /** The number of nodes in the octree.
+                @remark counts the octree hierarchy nodes in the tree.
         */
-        int mNumOctreeNodes;
+        int mNumOctants;
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/include/OgreTerrainRenderable.h

@@ -49 +49 @@
 
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-#define MAX_RENDERLEVEL_INDEX 15
+#define MAX_RENDERLEVEL_INDEX 15 // maximal different number of render levels, e.g., used for chc
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctree.cpp

@@ -108 +108 @@
         else
                 mDepth = 0;
-
+        // update bounds because we want tight octree
         _updateBounds();
+        
 #endif //GTP_VISIBILITY_MODIFIED_OGRE
     mNumNodes = 0;
@@ -133 +134 @@
 
     mParent = 0;
+
 }
 

trunk/VUT/work/ogre_changes/Plugins/OctreeSceneManager/src/OgreOctreeSceneManager.cpp

@@ -318 +318 @@
 
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        mNumOctreeNodes = 1; // count number of octants
+        mNumOctants = 1; // initialise number of octants in tree
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 
@@ -470 +470 @@
             octant -> mChildren[ x ][ y ][ z ] = new Octree( octant );
 #ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        ++ mNumOctreeNodes;
+                        ++ mNumOctants;
 #endif // GTP_VISIBILITY_MODIFIED_OGRE
 

trunk/VUT/work/ogre_changes/RenderSystems/GL/src/OgreGLRenderSystem.cpp

@@ -2328 +2328 @@
             glDisableVertexAttribArrayARB_ptr(1); // disable weights
         }
-#ifndef GTP_VISIBILITY_MODIFIED_OGRE
-        glColor4f(1,1,1,1);
-#else
-                glColor4ub(mColour[0], mColour[1], mColour[2], mColour[3]);
-#endif  // GTP_VISIBILITY_MODIFIED_OGRE
 
         glSecondaryColor3fEXT_ptr(0.0f, 0.0f, 0.0f);