Changeset 444

Timestamp:

12/17/11 22:02:59 (5 months ago)

Author:

Carsten

Message:

Fixed bugs aplenty:

• Libs: When CollisionModelStaticTs were created from degenerate mesh input as it can occur with certain forms of Bezier patches, it sometimes caused the well-formed triangles to be disregarded as well.
• CaWE: When the command history cuts the command queue due to memory constraints, it now keeps the ID of the latest deleted command that suggested saving the map file, not the one that is shown to the user.
• CaWE: Renamed MapBezierPatchT::CreateConvexEndcap() to MapBezierPatchT::CreateQuarterDisc() and much simplified its code.
• CaWE: Using the Morph tool does no longer cause a crash when Undo or Redo is used.
• Other minor tweaks.

Location:

cafu/trunk

Files:

• CaWE/CaWE.dia (modified) (previous)
• CaWE/CommandHistory.cpp (modified) (6 diffs)
• CaWE/CommandHistory.hpp (modified) (1 diff)
• CaWE/MapBezierPatch.cpp (modified) (4 diffs)
• CaWE/MapBezierPatch.hpp (modified) (1 diff)
• CaWE/ToolMorph.cpp (modified) (3 diffs)
• CaWE/ToolNewBezierPatch.cpp (modified) (7 diffs)
• Libs/ClipSys/CollisionModel_static.cpp (modified) (3 diffs)
• Libs/Math3D/BezierPatch.hpp (modified) (1 diff)

cafu/trunk/CaWE/CommandHistory.cpp

@@ -36 +36 @@
         public:
 
-        RecursionCheckerT(bool& IsActive) : m_IsActive(IsActive) { wxASSERT(!m_IsActive); m_IsActive=true; }
-        ~RecursionCheckerT() { m_IsActive=false; }
+        RecursionCheckerT(bool& IsRecCall) : m_IsRecCall(IsRecCall) { wxASSERT(!m_IsRecCall); m_IsRecCall=true; }
+        ~RecursionCheckerT() { m_IsRecCall=false; }
 
 
         private:
 
-        bool& m_IsActive;
+        bool& m_IsRecCall;
     };
 }
@@ -49 +49 @@
 CommandHistoryT::CommandHistoryT()
     : m_CurrentIndex(-1),
-      m_Debug_IsActive(false),
+      m_IsRecursiveCall(false),
       m_InvalidCommandID(0)
 {
@@ -99 +99 @@
     if (m_CurrentIndex<0) return;
     wxASSERT(m_CurrentIndex<(int)m_Commands.Size());
-    RecursionCheckerT RecCheck(m_Debug_IsActive);
+    RecursionCheckerT RecCheck(m_IsRecursiveCall);
 
     // Undo all commands from the invisible commands list and delete them.
@@ -131 +131 @@
     if (m_CurrentIndex+1>=int(m_Commands.Size())) return;
     wxASSERT(m_CurrentIndex<(int)m_Commands.Size()-1);
-    RecursionCheckerT RecCheck(m_Debug_IsActive);
+    RecursionCheckerT RecCheck(m_IsRecursiveCall);
 
     // Undo all commands from the invisible commands list and delete them.
@@ -161 +161 @@
 bool CommandHistoryT::SubmitCommand(CommandT* Command)
 {
-    RecursionCheckerT RecCheck(m_Debug_IsActive);
+    RecursionCheckerT RecCheck(m_IsRecursiveCall);
 
     if (!Command->IsDone() && !Command->Do())
@@ -172 +172 @@
     while (int(m_Commands.Size())>Options.general.UndoLevels)
     {
-        if (m_Commands[0]->ShowInHistory()) m_InvalidCommandID=m_Commands[0]->GetID();
+        if (m_Commands[0]->SuggestsSave()) m_InvalidCommandID=m_Commands[0]->GetID();
 
         delete m_Commands[0];

cafu/trunk/CaWE/CommandHistory.hpp

@@ -49 +49 @@
     ArrayT<CommandT*> m_InvisCommands;    ///< Stores all commands not visible in the history until a visible command is added to the history (then they are moved into the normal history).
     int               m_CurrentIndex;     ///< The index of the last done command: all commands in <code>m_Commands[0 ... m_CurrentIndex]</code> are "done" (available for undo), any commands following them are "undone" (available for redo). If m_CurrentIndex is -1, there are no "done" commands at all.
-    bool              m_Debug_IsActive;   ///< In order to facilitate debugging, this member helps with detecting recursive calls to our functions. For example, when we call a commands CommandT::Undo() method, does it erroneously cause a recursive call back to SubmitCommand()?
+    bool              m_IsRecursiveCall;  ///< In order to facilitate debugging, this member helps with detecting recursive calls to our functions. For example, when we call a commands CommandT::Undo() method, does it erroneously cause a "recursive" call back to SubmitCommand()?
 
     /// The command id returned when there is no current command (when the current index is -1).

cafu/trunk/CaWE/MapBezierPatch.cpp

@@ -492 +492 @@
 
 
-MapBezierPatchT* MapBezierPatchT::CreateConvexEndcap(EditorMaterialI* Material_, cf::SceneGraph::LightMapManT& LMM_, const Vector3fT& min, const Vector3fT& max, int SubdivsHorz_, int SubdivsVert_, EndCapPosE pos)
+MapBezierPatchT* MapBezierPatchT::CreateQuarterDisc(EditorMaterialI* Material_, cf::SceneGraph::LightMapManT& LMM_, const Vector3fT& min, const Vector3fT& max, int SubdivsHorz_, int SubdivsVert_, EndCapPosE pos, bool Inverted)
 {
     MapBezierPatchT* BP=new MapBezierPatchT(Material_, LMM_, SubdivsHorz_, SubdivsVert_);
@@ -498 +498 @@
     BP->SetSize(3, 3);
 
-    Vector3fT source;              // Source point (where most of the vertices are moved to, to build an endcap).
-    wxPoint   sourceVertices[6];   // Array of the control vertices that are moved to the sourcepoint.
-    wxPoint   outlineVertices[3];  // Array of remaining control vertices, that build up the outline of the endcap.
-    Vector3fT outlinePositions[3]; // Array of the positions for the outline vertices.
-
-    // Initialize source points z-coordinate since its the same for all endcaps.
-    source.z=max.z;
-
-    // Initialize outline points z-coordinate since its the same for all endcaps and outline points.
-    for (int i=0; i<3; i++)
-    {
-        outlinePositions[i].z=max.z;
-    }
-
-    // Choose source point and fill arrays, depending on endcap position parameter.
     switch (pos)
     {
         case TOP_RIGHT:
-            source.x=min.x; source.y=min.y;
-
-            sourceVertices[0]=wxPoint(0,2);
-            sourceVertices[1]=wxPoint(1,2);
-            sourceVertices[2]=wxPoint(2,2);
-            sourceVertices[3]=wxPoint(0,1);
-            sourceVertices[4]=wxPoint(1,1);
-            sourceVertices[5]=wxPoint(2,1);
-
-            outlineVertices[0]=wxPoint(0,0);
-            outlineVertices[1]=wxPoint(1,0);
-            outlineVertices[2]=wxPoint(2,0);
-
-            outlinePositions[0].x=min.x; outlinePositions[0].y=max.y;
-            outlinePositions[1].x=max.x; outlinePositions[1].y=max.y;
-            outlinePositions[2].x=max.x; outlinePositions[2].y=min.y;
-
+        {
+            const Vector3fT Center=Vector3fT(min.x, min.y, max.z);
+
+            BP->SetCvPos(2 /*0*/, 2,                     Vector3fT(min.x, max.y, max.z));
+            BP->SetCvPos(1 /*1*/, 2, Inverted ? Center : Vector3fT(max.x, max.y, max.z));
+            BP->SetCvPos(0 /*2*/, 2,                     Vector3fT(max.x, min.y, max.z));
+
+            BP->SetCvPos(0, 1, Center);
+            BP->SetCvPos(1, 1, Center);
+            BP->SetCvPos(2, 1, Center);
+
+            BP->SetCvPos(0, 0, Center);
+            BP->SetCvPos(1, 0, Center);
+            BP->SetCvPos(2, 0, Center);
             break;
+        }
 
         case TOP_LEFT:
-            source.x=max.x; source.y=min.y;
-
-            sourceVertices[0]=wxPoint(1,0);
-            sourceVertices[1]=wxPoint(1,1);
-            sourceVertices[2]=wxPoint(1,2);
-            sourceVertices[3]=wxPoint(2,0);
-            sourceVertices[4]=wxPoint(2,1);
-            sourceVertices[5]=wxPoint(2,2);
-
-            outlineVertices[0]=wxPoint(0,0);
-            outlineVertices[1]=wxPoint(0,1);
-            outlineVertices[2]=wxPoint(0,2);
-
-            outlinePositions[0].x=max.x; outlinePositions[0].y=max.y;
-            outlinePositions[1].x=min.x; outlinePositions[1].y=max.y;
-            outlinePositions[2].x=min.x; outlinePositions[2].y=min.y;
-
+        {
+            const Vector3fT Center=Vector3fT(max.x, min.y, max.z);
+
+            BP->SetCvPos(2 /*0*/, 2,                     Vector3fT(min.x, min.y, max.z));
+            BP->SetCvPos(1 /*1*/, 2, Inverted ? Center : Vector3fT(min.x, max.y, max.z));
+            BP->SetCvPos(0 /*2*/, 2,                     Vector3fT(max.x, max.y, max.z));
+
+            BP->SetCvPos(0, 1, Center);
+            BP->SetCvPos(1, 1, Center);
+            BP->SetCvPos(2, 1, Center);
+
+            BP->SetCvPos(0, 0, Center);
+            BP->SetCvPos(1, 0, Center);
+            BP->SetCvPos(2, 0, Center);
             break;
+        }
 
         case BOTTOM_RIGHT:
-            source.x=min.x; source.y=max.y;
-
-            sourceVertices[0]=wxPoint(0,0);
-            sourceVertices[1]=wxPoint(0,1);
-            sourceVertices[2]=wxPoint(0,2);
-            sourceVertices[3]=wxPoint(1,0);
-            sourceVertices[4]=wxPoint(1,1);
-            sourceVertices[5]=wxPoint(1,2);
-
-            outlineVertices[0]=wxPoint(2,0);
-            outlineVertices[1]=wxPoint(2,1);
-            outlineVertices[2]=wxPoint(2,2);
-
-            outlinePositions[0].x=max.x; outlinePositions[0].y=max.y;
-            outlinePositions[1].x=max.x; outlinePositions[1].y=min.y;
-            outlinePositions[2].x=min.x; outlinePositions[2].y=min.y;
-
+        {
+            const Vector3fT Center=Vector3fT(min.x, max.y, max.z);
+
+            BP->SetCvPos(0, 2, Center);
+            BP->SetCvPos(1, 2, Center);
+            BP->SetCvPos(2, 2, Center);
+
+            BP->SetCvPos(0, 1, Center);
+            BP->SetCvPos(1, 1, Center);
+            BP->SetCvPos(2, 1, Center);
+
+            BP->SetCvPos(2 /*0*/, 0,                     Vector3fT(min.x, min.y, max.z));
+            BP->SetCvPos(1 /*1*/, 0, Inverted ? Center : Vector3fT(max.x, min.y, max.z));
+            BP->SetCvPos(0 /*2*/, 0,                     Vector3fT(max.x, max.y, max.z));
             break;
-
-        default:    // Also handles case BOTTOM_LEFT.
-            source.x=max.x; source.y=max.y;
-
-            sourceVertices[0]=wxPoint(0,0);
-            sourceVertices[1]=wxPoint(1,0);
-            sourceVertices[2]=wxPoint(2,0);
-            sourceVertices[3]=wxPoint(0,1);
-            sourceVertices[4]=wxPoint(1,1);
-            sourceVertices[5]=wxPoint(2,1);
-
-            outlineVertices[0]=wxPoint(0,2);
-            outlineVertices[1]=wxPoint(1,2);
-            outlineVertices[2]=wxPoint(2,2);
-
-            outlinePositions[0].x=min.x; outlinePositions[0].y=max.y;
-            outlinePositions[1].x=min.x; outlinePositions[1].y=min.y;
-            outlinePositions[2].x=max.x; outlinePositions[2].y=min.y;
-
+        }
+
+        case BOTTOM_LEFT:
+        {
+            const Vector3fT Center=Vector3fT(max.x, max.y, max.z);
+
+            BP->SetCvPos(0, 2, Center);
+            BP->SetCvPos(1, 2, Center);
+            BP->SetCvPos(2, 2, Center);
+
+            BP->SetCvPos(0, 1, Center);
+            BP->SetCvPos(1, 1, Center);
+            BP->SetCvPos(2, 1, Center);
+
+            BP->SetCvPos(2 /*0*/, 0,                     Vector3fT(min.x, max.y, max.z));
+            BP->SetCvPos(1 /*1*/, 0, Inverted ? Center : Vector3fT(min.x, min.y, max.z));
+            BP->SetCvPos(0 /*2*/, 0,                     Vector3fT(max.x, min.y, max.z));
             break;
-    }
-
-
-    // Set source control vertices to source position.
-    for (int i=0; i<6; i++)
-    {
-        BP->SetCvPos(sourceVertices[i].x, sourceVertices[i].y, source);
-    }
-
-    // Set outline control vertices to their positions.
-    for (int i=0; i<3; i++)
-    {
-        BP->SetCvPos(outlineVertices[i].x, outlineVertices[i].y, outlinePositions[i]);
+        }
     }
 
@@ -618 +582 @@
 MapBezierPatchT* MapBezierPatchT::CreateConcaveEndcap(EditorMaterialI* Material_, cf::SceneGraph::LightMapManT& LMM_, const Vector3fT& min, const Vector3fT& max, int SubdivsHorz_, int SubdivsVert_, EndCapPosE pos)
 {
-    MapBezierPatchT* BP=new MapBezierPatchT(Material_, LMM_, SubdivsHorz_, SubdivsVert_);
-
-    BP->SetSize(3, 3);
-
-    Vector3fT source;              // Source point (where most of the vertices are moved to, to build an endcap).
-    wxPoint   sourceVertices[7];   // Array of the control vertices that are moved to the sourcepoint.
-    wxPoint   outlineVertices[2];  // Array of remaining control vertices, that build up the outline of the endcap.
-    Vector3fT outlinePositions[2]; // Array of the positions for the outline vertices.
-
-    // Initialize source points z-coordinate since its the same for all endcaps.
-    source.z=max.z;
-
-    // Initialize outline points z-coordinate since its the same for all endcaps and outline points.
-    for (int i=0; i<2; i++)
-    {
-        outlinePositions[i].z=max.z;
-    }
-
-    // Choose source point and fill arrays, depending on endcap position parameter.
+    // TODO: This method should be removed entirely.
+    // Instead, the user code should call CreateQuarterDisc() with Inverted=true.
     switch (pos)
     {
-        case TOP_RIGHT:
-            source.x=max.x; source.y=max.y;
-
-            sourceVertices[0]=wxPoint(0,0);
-            sourceVertices[1]=wxPoint(1,0);
-            sourceVertices[2]=wxPoint(2,0);
-            sourceVertices[3]=wxPoint(0,1);
-            sourceVertices[4]=wxPoint(1,1);
-            sourceVertices[5]=wxPoint(2,1);
-            sourceVertices[6]=wxPoint(1,2);
-
-            outlineVertices[0]=wxPoint(0,2);
-            outlineVertices[1]=wxPoint(2,2);
-
-            outlinePositions[0].x=min.x; outlinePositions[0].y=max.y;
-            outlinePositions[1].x=max.x; outlinePositions[1].y=min.y;
-
-            break;
-
-        case TOP_LEFT:
-            source.x=min.x; source.y=max.y;
-
-            sourceVertices[0]=wxPoint(0,0);
-            sourceVertices[1]=wxPoint(1,0);
-            sourceVertices[2]=wxPoint(2,0);
-            sourceVertices[3]=wxPoint(0,1);
-            sourceVertices[4]=wxPoint(1,1);
-            sourceVertices[5]=wxPoint(2,1);
-            sourceVertices[6]=wxPoint(1,2);
-
-            outlineVertices[0]=wxPoint(0,2);
-            outlineVertices[1]=wxPoint(2,2);
-
-            outlinePositions[0].x=min.x; outlinePositions[0].y=min.y;
-            outlinePositions[1].x=max.x; outlinePositions[1].y=max.y;
-
-            break;
-
-        case BOTTOM_RIGHT:
-            source.x=max.x; source.y=min.y;
-
-            sourceVertices[0]=wxPoint(1,0);
-            sourceVertices[1]=wxPoint(0,1);
-            sourceVertices[2]=wxPoint(1,1);
-            sourceVertices[3]=wxPoint(2,1);
-            sourceVertices[4]=wxPoint(0,2);
-            sourceVertices[5]=wxPoint(1,2);
-            sourceVertices[6]=wxPoint(2,2);
-
-            outlineVertices[0]=wxPoint(0,0);
-            outlineVertices[1]=wxPoint(2,0);
-
-            outlinePositions[0].x=min.x; outlinePositions[0].y=min.y;
-            outlinePositions[1].x=max.x; outlinePositions[1].y=max.y;
-
-            break;
-
-        default:    // Also handles case BOTTOM_LEFT.
-            source.x=min.x; source.y=min.y;
-
-            sourceVertices[0]=wxPoint(1,0);
-            sourceVertices[1]=wxPoint(0,1);
-            sourceVertices[2]=wxPoint(1,1);
-            sourceVertices[3]=wxPoint(2,1);
-            sourceVertices[4]=wxPoint(0,2);
-            sourceVertices[5]=wxPoint(1,2);
-            sourceVertices[6]=wxPoint(2,2);
-
-            outlineVertices[0]=wxPoint(0,0);
-            outlineVertices[1]=wxPoint(2,0);
-
-            outlinePositions[0].x=min.x; outlinePositions[0].y=max.y;
-            outlinePositions[1].x=max.x; outlinePositions[1].y=min.y;
-
-            break;
-    }
-
-
-    // Set source control vertices to source point.
-    for (int i=0; i<7; i++)
-    {
-        BP->SetCvPos(sourceVertices[i].x, sourceVertices[i].y, source);
-    }
-
-    // Set outline control vertices to their positions.
-    for (int i=0; i<2; i++)
-    {
-        BP->SetCvPos(outlineVertices[i].x, outlineVertices[i].y, outlinePositions[i]);
-    }
-
-    BP->SurfaceInfo.TexCoordGenMode=MatFit;
-    BP->UpdateTextureSpace();
-
-    return BP;
+        case TOP_RIGHT:    pos=BOTTOM_LEFT;  break;
+        case TOP_LEFT:     pos=BOTTOM_RIGHT; break;
+        case BOTTOM_RIGHT: pos=TOP_LEFT;     break;
+        case BOTTOM_LEFT:  pos=TOP_RIGHT;    break;
+    }
+
+    return CreateQuarterDisc(Material_, LMM_, min, max, SubdivsHorz_, SubdivsVert_, pos, true);
 }
 
@@ -1141 +1001 @@
         ArrayT<Vector3dT> CoordsOnly;
 
+        // wxLogDebug("%s: Vertices of CollisionBP, width %lu, height %lu:", __FUNCTION__, CollisionBP.Width, CollisionBP.Height);
         for (unsigned long VertexNr=0; VertexNr<CollisionBP.Mesh.Size(); VertexNr++)
+        {
             CoordsOnly.PushBack(CollisionBP.Mesh[VertexNr].Coord.AsVectorOfDouble());
+            // wxLogDebug("    %2lu: %s", VertexNr, convertToString(CoordsOnly[VertexNr]));
+        }
 
         // We cannot use our own Material->GetMaterial() here, because it might clip nothing (ClipFlags==0)

cafu/trunk/CaWE/MapBezierPatch.hpp

@@ -92 +92 @@
 
     // Endcaps for bezier patches.
-    static MapBezierPatchT* CreateConvexEndcap(EditorMaterialI* Material_, cf::SceneGraph::LightMapManT& LMM_, const Vector3fT& min, const Vector3fT& max, int SubdivsHorz_=-1, int SubdivsVert_=-1, EndCapPosE pos=TOP_RIGHT);
+    static MapBezierPatchT* CreateQuarterDisc(EditorMaterialI* Material_, cf::SceneGraph::LightMapManT& LMM_, const Vector3fT& min, const Vector3fT& max, int SubdivsHorz_=-1, int SubdivsVert_=-1, EndCapPosE pos=TOP_RIGHT, bool Inverted=false);
     static MapBezierPatchT* CreateConcaveEndcap(EditorMaterialI* Material_, cf::SceneGraph::LightMapManT& LMM_, const Vector3fT& min, const Vector3fT& max, int SubdivsHorz_=-1, int SubdivsVert_=-1, EndCapPosE pos=TOP_RIGHT);
 

cafu/trunk/CaWE/ToolMorph.cpp

@@ -40 +40 @@
 
 
-#if defined(_WIN32) && defined(_MSC_VER)
-    #if (_MSC_VER<1300)
-        #define for if (false) ; else for
-    #endif
-#endif
-
-
 /*** Begin of TypeSys related definitions for this class. ***/
 
@@ -467 +460 @@
     {
         wxMessageBox("The morph tool can add new vertices only to brushes (not to Bezier patches).\n"
-                     "(The resolution of Bezier patches can be changed with the Bezier patches tool.)", "Object being morphed is not a brush.");
+                     "(The number of subdivisions of Bezier patches can be changed in the Properties dialog.)", "Item being morphed is not a brush.");
         return;
     }
@@ -1011 +1004 @@
     if (!IsActiveTool() || m_IsRecursiveSelfNotify) return;
 
-    // Adapt the "selection" of this tool to the selection of the document.
-    MorphPrims_CommitAndClear();
-
-    // For each brush or bezier patch in the documents selection, create a related instance here.
-    for (unsigned long SelNr=0; SelNr<NewSelection.Size(); SelNr++)
-        MorphPrims_ToggleElem(NewSelection[SelNr]);
+    // An external event caused a selection change, such as the user clicking "Undo".
+    //
+    //   - What we can *not* do is calling MorphPrims_CommitAndClear(), because that
+    //     would attempt to submit another command to the command history while the
+    //     command history is attempting to run the "Undo".
+    //
+    //   - Technically, it would be possible to do nothing: A change in selection
+    //     does not require any alterations of our tool state, the user can continue
+    //     to morph the objects that he previously begun to morph.
+    //
+    //   - Although the user might lose some morph work, probably the least confusion
+    //     action is to just discard and clear the tool state.
+    //
+    for (unsigned long MPNr=0; MPNr<m_MorphPrims.Size(); MPNr++)
+        delete m_MorphPrims[MPNr];
+    m_MorphPrims.Overwrite();
+
+    m_ToolMan.UpdateAllObservers(this, UPDATE_SOON);
+    m_DragState=DragNothing;
 }
 

cafu/trunk/CaWE/ToolNewBezierPatch.cpp

@@ -341 +341 @@
                     if (Convex)
                     {
-                        MapBezierPatchT* EndCap=MapBezierPatchT::CreateConvexEndcap(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, pos);
+                        MapBezierPatchT* EndCap=MapBezierPatchT::CreateQuarterDisc(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, pos);
                         if (j==1) EndCap->InvertPatch(); // Invert bottom endcaps, so their faces are visible to the outside.
                         m_NewBPs.PushBack(EndCap);
@@ -396 +396 @@
                     if (Convex)
                     {
-                        MapBezierPatchT* EndCap=MapBezierPatchT::CreateConvexEndcap(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, pos);
+                        MapBezierPatchT* EndCap=MapBezierPatchT::CreateQuarterDisc(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, pos);
                         if (j==1) EndCap->InvertPatch(); // Invert bottom endcaps, so their faces are visible to the outside.
                         m_NewBPs.PushBack(EndCap);
@@ -419 +419 @@
                 Vector3fT  tmp_max=PatchBB.Max;
 
-                m_NewBPs.PushBack(MapBezierPatchT::CreateConvexEndcap(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, MapBezierPatchT::BOTTOM_RIGHT));
+                m_NewBPs.PushBack(MapBezierPatchT::CreateQuarterDisc(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, MapBezierPatchT::BOTTOM_RIGHT));
 
                 // Endcaps are always created at max.z, so max.z has to be min.z to create bottom endcap.
                 tmp_max.z=PatchBB.Min.z;
 
-                MapBezierPatchT* EndCap=MapBezierPatchT::CreateConvexEndcap(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, MapBezierPatchT::BOTTOM_RIGHT);
+                MapBezierPatchT* EndCap=MapBezierPatchT::CreateQuarterDisc(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, MapBezierPatchT::BOTTOM_RIGHT);
                 EndCap->InvertPatch(); // Invert bottom endcap, so its face is visible to the outside.
                 m_NewBPs.PushBack(EndCap);
@@ -468 +468 @@
                 if (Convex)
                 {
-                    MapBezierPatchT* EndCap=MapBezierPatchT::CreateConvexEndcap(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, pos);
+                    MapBezierPatchT* EndCap=MapBezierPatchT::CreateQuarterDisc(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, pos);
                     EndCap->InvertPatch(); // Invert convex endcaps, so their faces are visible to the outside.
                     m_NewBPs.PushBack(EndCap);
@@ -494 +494 @@
                 if (Convex)
                 {
-                    MapBezierPatchT* EndCap=MapBezierPatchT::CreateConvexEndcap(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, pos);
+                    MapBezierPatchT* EndCap=MapBezierPatchT::CreateQuarterDisc(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, pos);
                     EndCap->InvertPatch(); // Invert convex endcaps, so their faces are visible to the outside.
 
@@ -569 +569 @@
                 if (Convex)
                 {
-                    MapBezierPatchT* EndCap=MapBezierPatchT::CreateConvexEndcap(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, pos);
+                    MapBezierPatchT* EndCap=MapBezierPatchT::CreateQuarterDisc(Material, LMM, tmp_min, tmp_max, SubdivsHorz, SubdivsVert, pos);
                     EndCap->InvertPatch(); // Invert bottom endcaps, so their faces are visible to the outside.
                     m_NewBPs.PushBack(EndCap);
@@ -587 +587 @@
 
         case 8:
-            m_NewBPs.PushBack(MapBezierPatchT::CreateConvexEndcap(Material, LMM, PatchBB.Min, PatchBB.Max, SubdivsHorz, SubdivsVert));
+            m_NewBPs.PushBack(MapBezierPatchT::CreateQuarterDisc(Material, LMM, PatchBB.Min, PatchBB.Max, SubdivsHorz, SubdivsVert));
             break;
 

cafu/trunk/Libs/ClipSys/CollisionModel_static.cpp

@@ -1782 +1782 @@
                     Plane3dT Plane(v1, v2, v3, 0.1);
 
-                    if (fabs(Plane.GetDistance(v4))<MapT::RoundEpsilon)
+                    // If v1 to v4 form a rectangle, create a single quad instead of two triangles.
+                    // Note that this test is somewhat limited, but it covers the most important cases and is a lot
+                    // less expensive than generally checking if v1 to v4 form a planar, convex, non-degenerate polygon...
+                    if ((v1+v3-v2).IsEqual(v4, 0.01))
                     {
-                        // Great, v1 to v4 are all in a common plane, so we can create a quad instead of two triangles!
                         m_Polygons.PushBack(PolygonT(this, Patch.Material, A, B, C, D));
                         continue;
@@ -1856 +1858 @@
                     Plane3dT Plane(v1, v2, v3, 0.1);
 
-                    if (fabs(Plane.GetDistance(v4))<MapT::RoundEpsilon)
+                    // If v1 to v4 form a rectangle, create a single quad instead of two triangles.
+                    // Note that this test is somewhat limited, but it covers the most important cases and is a lot
+                    // less expensive than generally checking if v1 to v4 form a planar, convex, non-degenerate polygon...
+                    if ((v1+v3-v2).IsEqual(v4, 0.01))
                     {
-                        // Great, v1 to v4 are all in a common plane, so we can create a quad instead of two triangles!
                         m_Polygons.PushBack(PolygonT(this, Terrain.Material, A, B, C, D));
                         continue;
@@ -1963 +1967 @@
                 Plane3dT Plane(v1, v2, v3, 0.1);
 
-                if (fabs(Plane.GetDistance(v4))<MapT::RoundEpsilon)
+                // If v1 to v4 form a rectangle, create a single quad instead of two triangles.
+                // Note that this test is somewhat limited, but it covers the most important cases and is a lot
+                // less expensive than generally checking if v1 to v4 form a planar, convex, non-degenerate polygon...
+                if ((v1+v3-v2).IsEqual(v4, 0.01))
                 {
-                    // Great, v1 to v4 are all in a common plane, so we can create a quad instead of two triangles!
                     m_Polygons.PushBack(PolygonT(this, Material, A, B, C, D));
                     continue;

cafu/trunk/Libs/Math3D/BezierPatch.hpp

@@ -150 +150 @@
             bool        ComputeTangentSpaceInSubPatch(unsigned long sp_i, unsigned long sp_j, const T s, const T t, Vector3T<T> Axes[3]) const;
         };
-
-
-        /// The collision mesh of a bezier patch.
-        template<class T>
-        class CollisionMeshT
-        {
-            public:
-
-            /// Constructor.
-            CollisionMeshT(unsigned long Width, unsigned long Height, const ArrayT< Vector3T<T> >& Coords);
-        };
     }
 }