Changeset 446 for cafu/trunk

Timestamp:

12/19/11 11:28:57 (5 months ago)

Author:

Carsten

Message:

CaWE: In MorphPrimT, replace member MapElementT* m_MapElem with more appropriate MapPrimitiveT* m_MapPrim.

Location:

cafu/trunk/CaWE

Files:

• MapCommands/Morph.cpp (modified) (5 diffs)
• MapCommands/Morph.hpp (modified) (2 diffs)
• MorphPrim.cpp (modified) (6 diffs)
• MorphPrim.hpp (modified) (4 diffs)
• ToolMorph.cpp (modified) (11 diffs)
• ToolMorph.hpp (modified) (1 diff)

cafu/trunk/CaWE/MapCommands/Morph.cpp

@@ -23 +23 @@
 
 #include "../MapDocument.hpp"
-#include "../MapElement.hpp"
+#include "../MapPrimitive.hpp"
 #include "../MorphPrim.hpp"
 
@@ -33 +33 @@
 {
     for (unsigned long i=0; i<MorphPrims.Size(); i++)
-        m_OldStates.PushBack(MorphPrims[i]->GetElem()->Clone());
+        m_OldStates.PushBack(MorphPrims[i]->GetMapPrim()->Clone());
 }
 
@@ -59 +59 @@
     for (unsigned long i=0; i<m_MorphPrims.Size(); i++)
     {
-        MorphPrimT*  MorphPrim=m_MorphPrims[i];
-        MapElementT* MapElem  =m_MorphPrims[i]->GetElem();
+        MorphPrimT*    MorphPrim=m_MorphPrims[i];
+        MapPrimitiveT* MapPrim  =m_MorphPrims[i]->GetMapPrim();
 
-        OldBounds.PushBack(MapElem->GetBB());
+        OldBounds.PushBack(MapPrim->GetBB());
 
-        if (!MorphPrim->ApplyMorphToMapElem())
+        if (!MorphPrim->ApplyMorphToMapPrim())
         {
             // Note that we cannot veto ("return;") here, not even in case of conversion failure.
@@ -71 +71 @@
         }
 
-        UpdateObjects.PushBack(MapElem);
+        UpdateObjects.PushBack(MapPrim);
     }
 
@@ -92 +92 @@
     for (unsigned long i=0; i<m_MorphPrims.Size(); i++)
     {
-        MapElementT* MapElem=m_MorphPrims[i]->GetElem();
+        MapPrimitiveT* MapPrim=m_MorphPrims[i]->GetMapPrim();
 
-        OldBounds.PushBack(MapElem->GetBB());
+        OldBounds.PushBack(MapPrim->GetBB());
 
-        MapElem->Assign(m_OldStates[i]);
+        MapPrim->Assign(m_OldStates[i]);
 
-        UpdateObjects.PushBack(MapElem);
+        UpdateObjects.PushBack(MapPrim);
     }
 

cafu/trunk/CaWE/MapCommands/Morph.hpp

@@ -27 +27 @@
 
 class MapDocumentT;
-class MapElementT;
+class MapPrimitiveT;
 class MorphPrimT;
 
@@ -48 +48 @@
     MapDocumentT&             m_MapDoc;
     const ArrayT<MorphPrimT*> m_MorphPrims;
-    ArrayT<MapElementT*>      m_OldStates;
+    ArrayT<MapPrimitiveT*>    m_OldStates;
 };
 

cafu/trunk/CaWE/MorphPrim.cpp

@@ -33 +33 @@
 #include "Math3D/Polygon.hpp"
 
-#if defined(_WIN32) && defined(_MSC_VER)
-    #if (_MSC_VER<1300)
-        #define for if (false) ; else for
-    #endif
-#endif
-
 
 MP_EdgeT::MP_EdgeT()
@@ -50 +44 @@
 
 
-MorphPrimT::MorphPrimT(MapElementT* MapElem)
-    : m_MapElem(MapElem),
+MorphPrimT::MorphPrimT(MapPrimitiveT* MapPrim)
+    : m_MapPrim(MapPrim),
       m_Modified(false)
 {
-    MapBrushT*       MapBrush=dynamic_cast<MapBrushT*>      (m_MapElem);
-    MapBezierPatchT* MapPatch=dynamic_cast<MapBezierPatchT*>(m_MapElem);
+    MapBrushT*       MapBrush=dynamic_cast<MapBrushT*>      (m_MapPrim);
+    MapBezierPatchT* MapPatch=dynamic_cast<MapBezierPatchT*>(m_MapPrim);
 
     wxASSERT(MapBrush!=NULL || MapPatch!=NULL);     // Assert they are not both NULL.
@@ -105 +99 @@
 
 
-bool MorphPrimT::ApplyMorphToMapElem()
-{
-    MapBrushT*       MapBrush=dynamic_cast<MapBrushT*>      (m_MapElem);
-    MapBezierPatchT* MapPatch=dynamic_cast<MapBezierPatchT*>(m_MapElem);
+bool MorphPrimT::ApplyMorphToMapPrim()
+{
+    MapBrushT*       MapBrush=dynamic_cast<MapBrushT*>      (m_MapPrim);
+    MapBezierPatchT* MapPatch=dynamic_cast<MapBezierPatchT*>(m_MapPrim);
 
     wxASSERT(MapBrush!=NULL || MapPatch!=NULL);     // Assert they are not both NULL.
@@ -388 +382 @@
     m_Modified=true;
 
-    if (m_MapElem->GetType()==&MapBezierPatchT::TypeInfo) UpdatePatch();
-    if (m_MapElem->GetType()==      &MapBrushT::TypeInfo) UpdateBrushFromVertices();
+    if (m_MapPrim->GetType()==&MapBezierPatchT::TypeInfo) UpdatePatch();
+    if (m_MapPrim->GetType()==      &MapBrushT::TypeInfo) UpdateBrushFromVertices();
 }
 
@@ -395 +389 @@
 void MorphPrimT::UpdateBrushFromVertices()
 {
-    if (dynamic_cast<MapBrushT*>(m_MapElem)==NULL) return;
+    if (dynamic_cast<MapBrushT*>(m_MapPrim)==NULL) return;
 
     const float Epsilon=0.1f;
@@ -525 +519 @@
 void MorphPrimT::UpdatePatch()
 {
-    MapBezierPatchT* MapPatch=(MapBezierPatchT*)m_MapElem;
+    MapBezierPatchT* MapPatch=(MapBezierPatchT*)m_MapPrim;
 
     for (unsigned long y=0; y<MapPatch->GetHeight(); y++)

cafu/trunk/CaWE/MorphPrim.hpp

@@ -29 +29 @@
 class MapBezierPatchT;
 class MapBrushT;
-class MapElementT;
+class MapPrimitiveT;
 class Renderer2DT;
 class Renderer3DT;
@@ -101 +101 @@
 
     /// The constructor.
-    /// @param MapElem   The original brush or bezier patch that this MorphPrimT is associated with / attached to.
-    /// Note that this MorphPrimT does not become the "owner" of the MapElem pointer, e.g. it does not attempt to delete it in its dtor.
-    /// That also means that this MorphPrimT should not live longer than the MapElem object.
-    MorphPrimT(MapElementT* MapElem);
+    /// @param MapPrim   The original brush or bezier patch that this MorphPrimT is associated with / attached to.
+    /// Note that this MorphPrimT does not become the "owner" of the MapPrim pointer, e.g. it does not attempt to delete it in its dtor.
+    /// That also means that this MorphPrimT should not live longer than the MapPrim object.
+    MorphPrimT(MapPrimitiveT* MapPrim);
 
     ~MorphPrimT();
 
-    MapElementT* GetElem() const { return m_MapElem; }
-    bool         IsModified() const { return m_Modified; }
+    MapPrimitiveT* GetMapPrim() const { return m_MapPrim; }
+    bool           IsModified() const { return m_Modified; }
 
     /// Updates the associated map element by applying the morphed geometry to it.
     /// @returns if the update was successful.
-    bool ApplyMorphToMapElem();
+    bool ApplyMorphToMapPrim();
 
     /// Moves the selected handles by Delta.
@@ -135 +135 @@
     /// After a change of (or in) the m_Vertices array, this method computes the convex hull over them
     /// and updates (or rather, recomputes) all other member variables (the m_Edges and m_Faces).
-    /// This method should only be called if the m_MapElem member is of type MapBrushT,
+    /// This method should only be called if the m_MapPrim member is of type MapBrushT,
     /// because it also modifies the m_Vertices array, which is not desired for the MapBezierPatchT type.
     void UpdateBrushFromVertices();
@@ -147 +147 @@
 
 
-    MapElementT*        m_MapElem;  ///< The "attached" map brush / bezier patch.
+    MapPrimitiveT*      m_MapPrim;  ///< The "attached" map brush / bezier patch.
     bool                m_Modified; ///< Whether the MorphPrimT contains any modifications to the "attached" map brush/bezier patch.
 };

cafu/trunk/CaWE/ToolMorph.cpp

@@ -143 +143 @@
         // For each brush or bezier patch in the documents selection, create a related instance here.
         for (unsigned long SelNr=0; SelNr<m_MapDoc.GetSelection().Size(); SelNr++)
-            MorphPrims_ToggleElem(m_MapDoc.GetSelection()[SelNr]);
+        {
+            MapPrimitiveT* MapPrim=dynamic_cast<MapPrimitiveT*>(m_MapDoc.GetSelection()[SelNr]);
+
+            if (MapPrim)
+                MorphPrims_TogglePrim(MapPrim);
+        }
     }
 }
@@ -163 +168 @@
 {
     for (unsigned long MPNr=0; MPNr<m_MorphPrims.Size(); MPNr++)
-        if (m_MorphPrims[MPNr]->GetElem()==Elem)
+        if (m_MorphPrims[MPNr]->GetMapPrim()==Elem)
             return MPNr;
 
@@ -180 +185 @@
         if (!m_MorphPrims[MPNr]->IsModified())
         {
-            UnmodifiedMapElems.PushBack(m_MorphPrims[MPNr]->GetElem());
+            UnmodifiedMapElems.PushBack(m_MorphPrims[MPNr]->GetMapPrim());
 
             delete m_MorphPrims[MPNr];
@@ -208 +213 @@
 
 
-void ToolMorphT::MorphPrims_ToggleElem(MapElementT* Elem)
+void ToolMorphT::MorphPrims_TogglePrim(MapPrimitiveT* MapPrim)
 {
     // Only needed for observer message.
     ArrayT<MapElementT*> MapElements;
-    MapElements.PushBack(Elem);
-
-    const int MP_Index=MorphPrims_Find(Elem);
+    MapElements.PushBack(MapPrim);
+
+    const int MP_Index=MorphPrims_Find(MapPrim);
 
     if (MP_Index>=0)
@@ -244 +249 @@
     }
 
-    if (dynamic_cast<MapBrushT*>(Elem)==NULL && dynamic_cast<MapBezierPatchT*>(Elem)==NULL) return;
-
-    MorphPrimT* MorphPrim=new MorphPrimT(Elem);
+    if (dynamic_cast<MapBrushT*>(MapPrim)==NULL && dynamic_cast<MapBezierPatchT*>(MapPrim)==NULL) return;
+
+    MorphPrimT* MorphPrim=new MorphPrimT(MapPrim);
     m_MorphPrims.PushBack(MorphPrim);
 
@@ -457 +462 @@
     }
 
-    if (dynamic_cast<MapBrushT*>(m_MorphPrims[0]->GetElem())==NULL)
+    if (dynamic_cast<MapBrushT*>(m_MorphPrims[0]->GetMapPrim())==NULL)
     {
         wxMessageBox("The morph tool can add new vertices only to brushes (not to Bezier patches).\n"
@@ -617 +622 @@
     for (unsigned long HitNr=0; HitNr<HitElems.Size(); HitNr++)
     {
-        if (HitElems[HitNr]->GetType()==&MapBrushT::TypeInfo || HitElems[HitNr]->GetType()==&MapBezierPatchT::TypeInfo)
+        MapPrimitiveT* HitPrim=dynamic_cast<MapPrimitiveT*>(HitElems[HitNr]);
+
+        if (HitPrim && (HitPrim->GetType()==&MapBrushT::TypeInfo || HitPrim->GetType()==&MapBezierPatchT::TypeInfo))
         {
             if (!ME.ControlDown()) MorphPrims_CommitAndClear();
-            MorphPrims_ToggleElem(HitElems[HitNr]);
+            MorphPrims_TogglePrim(HitPrim);
 
             m_ToolMan.UpdateAllObservers(this, UPDATE_NOW);
@@ -885 +892 @@
     if (HitElems.Size()>0)      // Only consider the nearest hit, if any.
     {
-        if (HitElems[0].Object->GetType()==&MapBrushT::TypeInfo || HitElems[0].Object->GetType()==&MapBezierPatchT::TypeInfo)
+        MapPrimitiveT* HitPrim=dynamic_cast<MapPrimitiveT*>(HitElems[0].Object);
+
+        if (HitPrim && (HitPrim->GetType()==&MapBrushT::TypeInfo || HitPrim->GetType()==&MapBezierPatchT::TypeInfo))
         {
             if (!ME.ControlDown()) MorphPrims_CommitAndClear();
-            MorphPrims_ToggleElem(HitElems[0].Object);
+            MorphPrims_TogglePrim(HitPrim);
 
             m_ToolMan.UpdateAllObservers(this, UPDATE_NOW);
@@ -1032 +1041 @@
     for (unsigned long i=0; i<MapElements.Size(); i++)
     {
+        MapPrimitiveT* MapPrim=dynamic_cast<MapPrimitiveT*>(MapElements[i]);
+
+        if (!MapPrim) continue;
+
         for (unsigned long j=0; j<m_MorphPrims.Size(); j++)
         {
-            if (MapElements[i]==m_MorphPrims[j]->GetElem())
+            if (MapPrim==m_MorphPrims[j]->GetMapPrim())
             {
                 // Remove this morph primitive from our list.
@@ -1057 +1070 @@
     for (unsigned long i=0; i<MapElements.Size(); i++)
     {
+        MapPrimitiveT* MapPrim=dynamic_cast<MapPrimitiveT*>(MapElements[i]);
+
+        if (!MapPrim) continue;
+
         for (unsigned long j=0; j<m_MorphPrims.Size(); j++)
         {
-            if (MapElements[i]==m_MorphPrims[j]->GetElem())
+            if (MapPrim==m_MorphPrims[j]->GetMapPrim())
             {
                 // Update the morph primitive of this map element, discarding all prior changes, if any.
                 delete m_MorphPrims[j];
-                m_MorphPrims[j]=new MorphPrimT(MapElements[i]);
+                m_MorphPrims[j]=new MorphPrimT(MapPrim);
 
                 // Object has been found so we can safely break the inner loop and check the next object.
@@ -1082 +1099 @@
     for (unsigned long i=0; i<MapElements.Size(); i++)
     {
+        MapPrimitiveT* MapPrim=dynamic_cast<MapPrimitiveT*>(MapElements[i]);
+
+        if (!MapPrim) continue;
+
         for (unsigned long j=0; j<m_MorphPrims.Size(); j++)
         {
-            if (MapElements[i]==m_MorphPrims[j]->GetElem())
+            if (MapPrim==m_MorphPrims[j]->GetMapPrim())
             {
                 // Update the morph primitive of this map element, discarding all prior changes, if any.
                 delete m_MorphPrims[j];
-                m_MorphPrims[j]=new MorphPrimT(MapElements[i]);
+                m_MorphPrims[j]=new MorphPrimT(MapPrim);
 
                 // Object has been found so we can safely break the inner loop and check the next object.

cafu/trunk/CaWE/ToolMorph.hpp

@@ -117 +117 @@
     int  MorphPrims_Find(const MapElementT* Elem) const;    ///< Returns the array index number of the MorphPrimT for the given Elem, -1 if there is none.
     void MorphPrims_CommitAndClear();                       ///< Commits all morphs in m_MorphPrims to their true map elements and resets the morph tool back to empty.
-    void MorphPrims_ToggleElem(MapElementT* Elem);          ///< Toggles the membership of Elem in the m_MorphPrims array.
+    void MorphPrims_TogglePrim(MapPrimitiveT* MapPrim);     ///< Toggles the membership of MapPrim in the m_MorphPrims array.
     void MoveSelectedHandles(const Vector3fT& Delta);       ///< WARNING: This method *DESTROYS* all handle pointers into any of the m_MorphPrims!!
     void NudgeSelectedHandles(const AxesInfoT& AxesInfo, const wxKeyEvent& KE);