Changeset 318 for trunk/VUT/Ogre

Timestamp:

10/11/05 19:25:27 (19 years ago)

Author:

mattausch

Message:

VisibilityInfo?: query sort operators as templates
X3dExporter: Fixed polygon wire frame, bsp splits, and bsp split planes visualization
ViewCellBsp?: Added rays to split criteria (not finished yet)
OgreOctreeSceneManager?: fixed error (mNumOctants instead of mNumOctrees)

File:

• trunk/VUT/Ogre/src/OgreOcclusionQueriesQueryManager.cpp (modified) (7 diffs)

trunk/VUT/Ogre/src/OgreOcclusionQueriesQueryManager.cpp

@@ -7 +7 @@
 
 namespace Ogre {
-
-//-----------------------------------------------------------------------
-bool nodeinfo_eq(const GtpVisibility::NodeInfo &a, const GtpVisibility::NodeInfo &b)
-{
-        return a.GetSource() == b.GetSource();
-} 
-bool nodeinfo_lt(const GtpVisibility::NodeInfo &a, const GtpVisibility::NodeInfo &b)
-{
-        return a.GetSource() < b.GetSource();
-}
-bool meshinfo_eq(const GtpVisibility::MeshInfo &a, const GtpVisibility::MeshInfo &b)
-{
-        return a.GetSource() == b.GetSource();
-} 
-bool meshinfo_lt(const GtpVisibility::MeshInfo &a, const GtpVisibility::MeshInfo &b)
-{       
-        return a.GetSource() < b.GetSource();
-}
-bool patchinfo_eq(const GtpVisibility::PatchInfo &a, const GtpVisibility::PatchInfo &b)
-{
-        return a.GetSource() == b.GetSource();
-} 
-bool patchinfo_lt(const GtpVisibility::PatchInfo &a, const GtpVisibility::PatchInfo &b)
-{
-        return a.GetSource() < b.GetSource();
-}
 
 //----------------------------------------------------------------------- 
@@ -408 +382 @@
                                         GtpVisibility::NodeInfoContainer *visibleNodes)
 {
-        sort(visibleNodes->begin(), visibleNodes->end(), nodeinfo_lt);
+        stable_sort(visibleNodes->begin(), visibleNodes->end()/*, nodeinfo_lt*/);
 
         GtpVisibility::NodeInfoContainer::iterator visibleNodesIt,
@@ -429 +403 @@
         
         // physically delete duplicates
-        visibleNodes->erase(std::unique(visibleNodes->begin(), visibleNodes->end(), nodeinfo_eq),
+        visibleNodes->erase(std::unique(visibleNodes->begin(), visibleNodes->end()),
                                                 visibleNodes->end());
 }
@@ -436 +410 @@
                                 GtpVisibility::MeshInfoContainer *visibleGeometry)
 {
-        sort(visibleGeometry->begin(), visibleGeometry->end(), meshinfo_lt);
+        stable_sort(visibleGeometry->begin(), visibleGeometry->end());
         
         GtpVisibility::MeshInfoContainer::iterator visibleGeomIt,
@@ -457 +431 @@
 
         // physically delete duplicates
-        visibleGeometry->erase(std::unique(visibleGeometry->begin(), visibleGeometry->end(), meshinfo_eq), 
+        visibleGeometry->erase(std::unique(visibleGeometry->begin(), visibleGeometry->end()), 
                                                    visibleGeometry->end());
 }
@@ -464 +438 @@
                                 GtpVisibility::PatchInfoContainer *visiblePatches)
 {
-        sort(visiblePatches->begin(), visiblePatches->end(), patchinfo_lt);
+        stable_sort(visiblePatches->begin(), visiblePatches->end());
         
         GtpVisibility::PatchInfoContainer::iterator visiblePatchIt,
@@ -485 +459 @@
 
         // physically delete duplicates
-        visiblePatches->erase(std::unique(visiblePatches->begin(), visiblePatches->end(), patchinfo_eq), 
+        visiblePatches->erase(std::unique(visiblePatches->begin(), visiblePatches->end()), 
                                                   visiblePatches->end());
 }