Changeset 175 for trunk/VUT/Ogre

Timestamp:

07/14/05 20:54:07 (19 years ago)

Author:

mattausch

Message:

added trees

Location:

trunk/VUT/Ogre

Files:

• include/OgrePlatformHierarchyInterface.h (modified) (2 diffs)
• src/OgreOcclusionQueriesQueryManager.cpp (modified) (12 diffs)
• src/OgrePlatformHierarchyInterface.cpp (modified) (4 diffs)
• src/OgreSceneContentGenerator.cpp (modified) (4 diffs)
• src/OgreVisibilityOctreeSceneManager.cpp (modified) (2 diffs)
• src/OgreVisibilityTerrainSceneManager.cpp (modified) (2 diffs)

trunk/VUT/Ogre/include/OgrePlatformHierarchyInterface.h

@@ -75 +75 @@
                 @returns occlusion query for this node
         */
-        GtpVisibility::OcclusionQuery *IssueOcclusionQuery(
+        GtpVisibility::OcclusionQuery *IssueNodeOcclusionQuery(
                 GtpVisibility::HierarchyNode *node, const bool wasVisible);
 
         /** Issue a occlusion query for this mesh.
-                @param node the current mesh
-                @returns occlusion query for this node
+                @param mesh the mesh for which an occlusion query is issued.
+                @returns occlusion query for this mesh.
         */
-        GtpVisibility::OcclusionQuery *IssueOcclusionQuery(GtpVisibility::Mesh *mesh);
+        GtpVisibility::OcclusionQuery *IssueMeshOcclusionQuery(GtpVisibility::Mesh *mesh);
 
         /** If true, the interface finds and renders only objects which are marked as shadow casters.
@@ -106 +106 @@
     bool IsBoundingBoxQuery();
 
-        GtpVisibility::OcclusionQuery *IssueOcclusionQuery(GtpVisibility::Patch *patch);
+        GtpVisibility::OcclusionQuery *IssuePatchOcclusionQuery(GtpVisibility::Patch *patch);
 
 protected:
-        /** Renders geometry 
+        /** Renders the given geometry 
         */
         void RenderGeometry(GtpVisibility::Mesh *geom);
-
-        /** Renders a patch 
+        
+        /** Renders the given patch 
         */
         void RenderPatch(GtpVisibility::Patch *patch);

trunk/VUT/Ogre/src/OgreOcclusionQueriesQueryManager.cpp

@@ -68 +68 @@
 
         //-- render scene with item buffer (i.e., objects with their id as color codes)
+//mItemBufferMode = 0;
         if ((mItemBufferMode && mQueryModes) != 0)
         {
@@ -104 +105 @@
     GtpVisibility::HierarchyNodeList nodeList;
 
-        if (mQueryModes && NODE_VISIBILITY)
+        if (mQueryModes & NODE_VISIBILITY)
         {
                 for (visNodesIt = visNodes->begin(); visNodesIt != visNodesIt_end; ++visNodesIt)
@@ -118 +119 @@
         
         // store geometry of the hierarchy nodes in a geometry list
-        if (mQueryModes && GEOMETRY_VISIBILITY)
+        if (mQueryModes & GEOMETRY_VISIBILITY)
         {       
                 for (visNodesIt = visNodes->begin(); visNodesIt != visNodesIt_end; ++visNodesIt)        
@@ -133 +134 @@
 
         // store patchges of the geometries in a patch list
-        if (mQueryModes && PATCH_VISIBILITY)
+        if (mQueryModes & PATCH_VISIBILITY)
         {
                 for (visNodesIt = visNodes->begin(); visNodesIt != visNodesIt_end; ++visNodesIt)        
@@ -159 +160 @@
         // for relative visibility we need 2 rendering passes
         int n = relativeVisibility ? 2 : 1;
-        
+        if (mItemBufferMode > 0)
+                LogManager::getSingleton().logMessage("item buffer");
+
         for (int i = 0; i < n; ++i)
         {
@@ -166 +169 @@
                 {
                         // TODO: DELETE QUERIES FROM PREVIOUS RENDER
-                        queryList[i].push_back(mHierarchyInterface->IssueOcclusionQuery(*nodeIt, false));
+                        queryList[i].push_back(mHierarchyInterface->IssueNodeOcclusionQuery(*nodeIt, false));
                 }
 
                 //-- queries for geometry: if item buffer, capture only projected visibility
                 if ((mItemBufferMode != GEOMETRY_VISIBILITY) || (i == 1))
-                {
+                {                       
                         for (geometryIt = geometryList.begin(); geometryIt != geometryIt_end; ++geometryIt)
                         {
-                                queryList[i].push_back(mHierarchyInterface->IssueOcclusionQuery(*geometryIt));
+                                queryList[i].push_back(pfHierarchyInterface->IssueMeshOcclusionQuery(*geometryIt));
                         }
                 }
@@ -183 +186 @@
                         for (patchIt = patchList.begin(); patchIt != patchIt_end; ++patchIt)
                         {
-                                queryList[i].push_back(mHierarchyInterface->IssueOcclusionQuery(*patchIt));
+                                queryList[i].push_back(pfHierarchyInterface->IssuePatchOcclusionQuery(*patchIt));
                         }
                 }
@@ -199 +202 @@
 
 
-
         // collect occlusion queries for geometry
         if ((mItemBufferMode == GEOMETRY_VISIBILITY) && relativeVisibility)
@@ -207 +209 @@
                 CollectRelativeGeometryVisibilityForItemBuffer(projQueryIt, &geometryList, visibleGeometry);
         }
-        else
+        else if (mItemBufferMode != GEOMETRY_VISIBILITY)
         {
                 CollectGeometryVisibility(visQueryIt, projQueryIt, &geometryList, visibleGeometry, 
@@ -219 +221 @@
                 CollectRelativePatchVisibilityForItemBuffer(projQueryIt, &patchList, visiblePatches);
         }
-        else
+        else if (mItemBufferMode != PATCH_VISIBILITY)
         {
                 CollectPatchVisibility(visQueryIt, projQueryIt, &patchList, visiblePatches, relativeVisibility);
@@ -244 +246 @@
                 visibleGeometry, visiblePatches, relativeVisibility);
 
-        // remove duplicates (duplicates occur if an object is on the edge of the viewport)
-        // before duplicates can be deleted we have to add up their visibility
+        // adds up their visibility and removes duplicates 
+        // (duplicates occur if an object is on the edge of the viewport)
         RemoveDuplicateNodes(visibleNodes);
         
@@ -258 +260 @@
         }
 }
-//-----------------------------------------------------------------------
+//------j-----------------------------------------------------------------
 void  OcclusionQueriesQueryManager::CollectNodeVisibility(
                                                 GtpVisibility::QueryList::iterator &visQueryIt, 

trunk/VUT/Ogre/src/OgrePlatformHierarchyInterface.cpp

@@ -165 +165 @@
 }
 //-----------------------------------------------------------------------
-GtpVisibility::OcclusionQuery *PlatformHierarchyInterface::IssueOcclusionQuery(
+GtpVisibility::OcclusionQuery *PlatformHierarchyInterface::IssueNodeOcclusionQuery(
         GtpVisibility::HierarchyNode *node, const bool wasVisible) 
 {
@@ -200 +200 @@
 }
 //-----------------------------------------------------------------------
-GtpVisibility::OcclusionQuery *PlatformHierarchyInterface::IssueOcclusionQuery(
+GtpVisibility::OcclusionQuery *PlatformHierarchyInterface::IssuePatchOcclusionQuery(
         GtpVisibility::Patch *patch)
 {
@@ -216 +216 @@
 }
 //-----------------------------------------------------------------------
-GtpVisibility::OcclusionQuery *PlatformHierarchyInterface::IssueOcclusionQuery(
+GtpVisibility::OcclusionQuery *PlatformHierarchyInterface::IssueMeshOcclusionQuery(
         GtpVisibility::Mesh *mesh)
 {
@@ -287 +287 @@
 void PlatformHierarchyInterface::RenderPatch(GtpVisibility::Patch *patch)
 {
-        Pass *pass = patch->getTechnique()->getPass(0);
-        mSceneManager->setPass(pass);
-        mSceneManager->renderSingleObject(patch, pass, false);
+        mSceneManager->_renderSingleRenderable(patch);
 }
 //-----------------------------------------------------------------------

trunk/VUT/Ogre/src/OgreSceneContentGenerator.cpp

@@ -29 +29 @@
 void SceneContentGenerator::GenerateScene(int numObjects, const String &objName)
 {
-        // initialise random generator
-        srand (time(0));
-        
-        Vector3 rotationRatio;
-        Vector3 translationRatio;
-
         int new_size = GetObjectCount() + numObjects;
         int failed_attempts = 0; // counter used to avoid invinite loop
@@ -42 +36 @@
                    (failed_attempts < MAX_FAILED_ATTEMPTS))
         {
-                rotationRatio.x = rand() / (float) RAND_MAX;
-                rotationRatio.y = rand() / (float) RAND_MAX;
-                rotationRatio.z = rand() / (float) RAND_MAX;
-
-                translationRatio.x = rand() / (float) RAND_MAX;
-                translationRatio.y = rand() / (float) RAND_MAX;
-                translationRatio.z = rand() / (float) RAND_MAX;
-
                 // Setup the ray scene query
-                Vector3 rotation = mMinAngle + rotationRatio * (mMaxAngle - mMinAngle);
-                Vector3 position = mMinPos + translationRatio * (mMaxPos - mMinPos);
+                Vector3 rotation = Vector3(Math::RangeRandom(mMinAngle.x, mMaxAngle.x),
+                                                                   Math::RangeRandom(mMinAngle.y, mMaxAngle.y),
+                                                                   Math::RangeRandom(mMinAngle.z, mMaxAngle.z));
+
+                Vector3 position = Vector3(Math::RangeRandom(mMinPos.x, mMaxPos.x),
+                                                                   Math::RangeRandom(mMinPos.y, mMaxPos.y),
+                                                                   Math::RangeRandom(mMinPos.z, mMaxPos.z));
 
                 // failed to generate new object
                 if (!GenerateSceneObject(position, rotation, objName))
-                        ++failed_attempts; 
+                        ++ failed_attempts; 
         }
 }
@@ -68 +59 @@
                 
         Entity *ent = mSceneMgr->createEntity(name, objName + ".mesh");
-                
+        ent->setCastShadows(true);
+
         SceneNode *node = mSceneMgr->getRootSceneNode()->
                 createChildSceneNode(String(name) + "Node", position);
@@ -80 +72 @@
         mSceneNodes.push_back(node);
         mEntities.push_back(ent);
-
+        
         return node;
 }

trunk/VUT/Ogre/src/OgreVisibilityOctreeSceneManager.cpp

@@ -237 +237 @@
 void VisibilityOctreeSceneManager::_renderVisibleObjects()
 {
+        InitDepthPass();          // create material for depth pass
+        InitItemBufferPass(); // create material for item buffer pass
+
         // save ambient light to reset later
         ColourValue savedAmbient = mAmbientLight;
@@ -629 +632 @@
 void VisibilityOctreeSceneManager::InitVisibilityCulling(Camera *cam)
 {
-        InitDepthPass();          // create material for depth pass
-        InitItemBufferPass(); // create material for item buffer pass
-
         // reset culling manager stats
         mVisibilityManager->GetCullingManager()->InitFrame(mVisualizeCulledNodes);

trunk/VUT/Ogre/src/OgreVisibilityTerrainSceneManager.cpp

@@ -240 +240 @@
 void VisibilityTerrainSceneManager::_renderVisibleObjects()
 {
+        InitDepthPass();          // create material for depth pass
+        InitItemBufferPass(); // create material for item buffer pass
+
         // save ambient light to reset later
         ColourValue savedAmbient = mAmbientLight;
@@ -629 +632 @@
 void VisibilityTerrainSceneManager::InitVisibilityCulling(Camera *cam)
 {
-        InitDepthPass();          // create material for depth pass
-        InitItemBufferPass(); // create material for item buffer pass
-
         // reset culling manager stats
         mVisibilityManager->GetCullingManager()->InitFrame(mVisualizeCulledNodes);