Changeset 578

Timestamp:

07/02/08 12:31:31 (5 months ago)

Author:

phill

Message:

o More GCCisms.

Files:

• trunk/libx42make/batcher.h (modified) (1 diff)
• trunk/libx42make/topology-split.cpp (modified) (1 diff)

trunk/libx42make/batcher.h

@@ -115 +115 @@
-
-private:
+
+        friend struct TriCmp;
+
-        struct Tri
-        {

trunk/libx42make/topology-split.cpp

@@ -235 +235 @@
-}
-
+struct TriCmp
+{
+        bool operator () ( uint ia, uint ib )
+        {
+                const TopologicalSplitter::Tri &a = owner->triangles[ia];
+                const TopologicalSplitter::Tri &b = owner->triangles[ib];
+
+                if( a.addInfs > b.addInfs )
+                        return true;
+                if( a.addInfs < b.addInfs )
+                        return false;
+
+                return a.addVerts > b.addVerts;
+        }
+        
+        TriCmp( const TopologicalSplitter *owner )
+                : owner( owner )
+        {
+        }
+
+private:
+        const TopologicalSplitter *owner;
+};
+
-void TopologicalSplitter::AddAdjacencySet( uint startingTri )
-{
-        struct TriCmp
-        {
-                bool operator () ( uint ia, uint ib )
-                {
-                        const Tri &a = owner->triangles[ia];
-                        const Tri &b = owner->triangles[ib];
-
-                        if( a.addInfs > b.addInfs )
-                                return true;
-                        if( a.addInfs < b.addInfs )
-                                return false;
-
-                        return a.addVerts > b.addVerts;
-                }
-                
-                TriCmp( const TopologicalSplitter *owner )
-                        : owner( owner )
-                {
-                }
-
-        private:
-                const TopologicalSplitter *owner;
-        };
-
-        std::vector< uint > toVisit, nextVisit;
-        toVisit.push_back( startingTri );