Changeset 447

Timestamp:

12/20/11 13:59:12 (5 months ago)

Author:

Carsten

Message:

CaWE: Refactored class MorphPrimT to never modify the source map primitive it is attached to.

This change makes the CommandMorphT redundant.

Location:

cafu/trunk/CaWE

Files:

• MapCommands/Morph.cpp (deleted)
• MapCommands/Morph.hpp (deleted)
• MorphPrim.cpp (modified) (9 diffs)
• MorphPrim.hpp (modified) (2 diffs)
• ObserverPattern.hpp (modified) (1 diff)
• ToolMorph.cpp (modified) (5 diffs)
• ToolMorph.hpp (modified) (1 diff)

cafu/trunk/CaWE/MorphPrim.cpp

@@ -44 +44 @@
 
 
-MorphPrimT::MorphPrimT(MapPrimitiveT* MapPrim)
+MorphPrimT::MorphPrimT(const MapPrimitiveT* MapPrim)
     : m_MapPrim(MapPrim),
-      m_Modified(false)
-{
-    MapBrushT*       MapBrush=dynamic_cast<MapBrushT*>      (m_MapPrim);
-    MapBezierPatchT* MapPatch=dynamic_cast<MapBezierPatchT*>(m_MapPrim);
+      m_Modified(false),
+      m_RenderBP(NULL)
+{
+    const MapBrushT*       MapBrush=dynamic_cast<const MapBrushT*>      (m_MapPrim);
+    const MapBezierPatchT* MapPatch=dynamic_cast<const MapBezierPatchT*>(m_MapPrim);
 
     wxASSERT(MapBrush!=NULL || MapPatch!=NULL);     // Assert they are not both NULL.
@@ -82 +83 @@
             }
         }
+
+        m_RenderBP=MapPatch->Clone();
     }
 }
@@ -88 +91 @@
 MorphPrimT::~MorphPrimT()
 {
+    delete m_RenderBP;
+    m_RenderBP=NULL;
+
     for (unsigned long VertexNr=0; VertexNr<m_Vertices.Size(); VertexNr++) delete m_Vertices[VertexNr];
     m_Vertices.Clear();
@@ -99 +105 @@
 
 
-bool MorphPrimT::ApplyMorphToMapPrim()
-{
-    MapBrushT*       MapBrush=dynamic_cast<MapBrushT*>      (m_MapPrim);
-    MapBezierPatchT* MapPatch=dynamic_cast<MapBezierPatchT*>(m_MapPrim);
+MapPrimitiveT* MorphPrimT::GetMorphedMapPrim() const
+{
+    const MapBrushT*       MapBrush=dynamic_cast<const MapBrushT*>      (m_MapPrim);
+    const MapBezierPatchT* MapPatch=dynamic_cast<const MapBezierPatchT*>(m_MapPrim);
 
     wxASSERT(MapBrush!=NULL || MapPatch!=NULL);     // Assert they are not both NULL.
     wxASSERT(MapBrush==NULL || MapPatch==NULL);     // Assert they are not both non-NULL.
-
-    m_Modified=false;
 
     if (MapBrush!=NULL)
@@ -116 +120 @@
             HullVertices.PushBack(m_Vertices[VNr]->pos);
 
-        MapBrushT TestBrush(HullVertices, MapBrush->GetFaces()[0].GetMaterial(), Options.general.NewUVsFaceAligned, MapBrush);
-
-        if (!TestBrush.IsValid()) return false;
-
-        // The TestBrush worked fine, now copy the new faces into the Brush.
-        MapBrush->Assign(&TestBrush);
-        return true;
-    }
-
-    if (MapPatch!=NULL)
-    {
-     /* MapPatch->ClearCV();
-
-        for ( unsigned long i = 0 ; i < m_Vertices.Size() ; i++ )
-        {
-            Vector3fT v;
-            MP_VertexT& vertex = m_Vertices[i];
-
-            vertex.GetPosition(v);
-            MapPatch->AddCV(v);
-        } */
-
-        return true;
-    }
-
-    return false;
+        MapBrushT* MorphedBrush=new MapBrushT(HullVertices, MapBrush->GetFaces()[0].GetMaterial(), Options.general.NewUVsFaceAligned, MapBrush);
+
+        if (MorphedBrush->IsValid()) return MorphedBrush;
+
+        delete MorphedBrush;
+        return NULL;
+    }
+
+    if (MapPatch!=NULL && m_RenderBP!=NULL)
+    {
+        return m_RenderBP->Clone();
+    }
+
+    return NULL;
 }
 
@@ -186 +178 @@
 void MorphPrimT::Render(Renderer2DT& Renderer, bool RenderVertexHandles, bool RenderEdgeHandles) const
 {
+    if (m_RenderBP)
+    {
+        m_RenderBP->Render2D(Renderer);
+    }
+
+
     // Draw the outline of the morph primitive.
     Renderer.SetLineType(wxPENSTYLE_SOLID, Renderer2DT::LINE_THIN, wxColour(255, 0, 0));
@@ -287 +285 @@
 void MorphPrimT::Render(Renderer3DT& Renderer, bool RenderVertexHandles, bool RenderEdgeHandles) const
 {
+    if (m_RenderBP)
+    {
+        m_RenderBP->Render3D(Renderer);
+    }
+
+
     for (int Pass=1; Pass<=2; Pass++)
     {
@@ -389 +393 @@
 void MorphPrimT::UpdateBrushFromVertices()
 {
-    if (dynamic_cast<MapBrushT*>(m_MapPrim)==NULL) return;
+    if (dynamic_cast<const MapBrushT*>(m_MapPrim)==NULL) return;
 
     const float Epsilon=0.1f;
@@ -519 +523 @@
 void MorphPrimT::UpdatePatch()
 {
-    MapBezierPatchT* MapPatch=(MapBezierPatchT*)m_MapPrim;
-
-    for (unsigned long y=0; y<MapPatch->GetHeight(); y++)
-    {
-        for (unsigned long x=0; x<MapPatch->GetWidth(); x++)
-        {
-            MapPatch->SetCvPos(x, y, m_Vertices[y*MapPatch->GetWidth()+x]->pos);
-        }
-    }
-}
+    for (unsigned long y=0; y<m_RenderBP->GetHeight(); y++)
+    {
+        for (unsigned long x=0; x<m_RenderBP->GetWidth(); x++)
+        {
+            m_RenderBP->SetCvPos(x, y, m_Vertices[y*m_RenderBP->GetWidth()+x]->pos);
+        }
+    }
+}

cafu/trunk/CaWE/MorphPrim.hpp

@@ -104 +104 @@
     /// 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(const MapPrimitiveT* MapPrim);
 
     ~MorphPrimT();
 
-    MapPrimitiveT* GetMapPrim() const { return m_MapPrim; }
-    bool           IsModified() const { return m_Modified; }
+    const 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 ApplyMorphToMapPrim();
+    /// Returns a newly created instance matching the morphed map primitive, or NULL if reconstruction was not possible.
+    /// It does not reset the modified-flag.
+    MapPrimitiveT* GetMorphedMapPrim() const;
 
     /// Moves the selected handles by Delta.
@@ -147 +147 @@
 
 
-    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.
+    const MapPrimitiveT* m_MapPrim;     ///< The "attached" source/reference map brush / bezier patch.
+    bool                 m_Modified;    ///< Whether the MorphPrimT contains any modifications to the "attached" map brush/bezier patch.
+    MapBezierPatchT*     m_RenderBP;    ///< If m_MapPrim is a Bezier patch, this is the current morphed clone that we use for rendering.
 };
 

cafu/trunk/CaWE/ObserverPattern.hpp

@@ -56 +56 @@
     MEMD_PRIMITIVE_PROPS_CHANGED,   ///< The properties of a map primitve have been modified.
     MEMD_SURFACE_INFO_CHANGED,      ///< The surface info of a map element has changed. Note that surface info changes also include the selection of faces.
-    MEMD_MORPH,                     ///< The vertices of a map primitve have been transformed.
+    MEMD_MORPH,                     ///< The vertices of a map primitive have been transformed. This is actually UNUSED now that \c CommandMorphT has been removed (r447, 2011-12-20).
     MEMD_ASSIGN_PRIM_TO_ENTITY,     ///< A map primitive has been assigned to another entity (the world or any custom entity).
     MEMD_VISIBILITY                 ///< The visibility of a map element has changed.

cafu/trunk/CaWE/ToolMorph.cpp

@@ -37 +37 @@
 #include "MapBezierPatch.hpp"
 #include "ToolOptionsBars.hpp"
-#include "MapCommands/Morph.hpp"
+#include "MapCommands/AddPrim.hpp"
+#include "MapCommands/Delete.hpp"
 
 
@@ -179 +180 @@
     // Set the map elements of all morph primitives back to "visible"
     // and remove all unmodified morph primitives from our list.
-    ArrayT<MapElementT*> UnmodifiedMapElems;
-
-    for (unsigned long MPNr=0; MPNr<m_MorphPrims.Size(); MPNr++)
-    {
-        if (!m_MorphPrims[MPNr]->IsModified())
-        {
-            UnmodifiedMapElems.PushBack(m_MorphPrims[MPNr]->GetMapPrim());
-
-            delete m_MorphPrims[MPNr];
-            m_MorphPrims.RemoveAt(MPNr);
-            MPNr--;
-        }
-    }
-
-    if (m_MorphPrims.Size()>0)
-    {
-        m_IsRecursiveSelfNotify=true;
-        m_MapDoc.GetHistory().SubmitCommand(new CommandMorphT(m_MapDoc, m_MorphPrims));
-        m_IsRecursiveSelfNotify=false;
-
-        // Clear the list of morph primitives, as the remaining instances are now owned by the command.
-        m_MorphPrims.Clear();
-    }
-
-    if (UnmodifiedMapElems.Size()>0)
-    {
-        // Visibility of unmodified map elements is no longer affected by IsHiddenByTool().
-        m_IsRecursiveSelfNotify=true;
-        m_MapDoc.UpdateAllObservers_Modified(UnmodifiedMapElems, MEMD_VISIBILITY);
-        m_IsRecursiveSelfNotify=false;
-    }
-}
-
-
-void ToolMorphT::MorphPrims_TogglePrim(MapPrimitiveT* MapPrim)
+
+    // TODO: Doing it like this is not particularly efficient, but this is going to be refactored anyway.
+    while (m_MorphPrims.Size()>0)
+    {
+        MorphPrims_TogglePrim(m_MorphPrims[0]->GetMapPrim());
+    }
+}
+
+
+void ToolMorphT::MorphPrims_TogglePrim(const MapPrimitiveT* MapPrim)
 {
     // Only needed for observer message.
     ArrayT<MapElementT*> MapElements;
-    MapElements.PushBack(MapPrim);
+    MapElements.PushBack(const_cast<MapPrimitiveT*>(MapPrim));
 
     const int MP_Index=MorphPrims_Find(MapPrim);
@@ -226 +202 @@
 
         m_MorphPrims.RemoveAtAndKeepOrder(MP_Index);
+        wxASSERT(MapPrim == MorphPrim->GetMapPrim());
 
         if (MorphPrim->IsModified())
         {
-            // Only needed for command.
-            ArrayT<MorphPrimT*> MPs;
-            MPs.PushBack(MorphPrim);
-
-            m_IsRecursiveSelfNotify=true;
-            m_MapDoc.GetHistory().SubmitCommand(new CommandMorphT(m_MapDoc, MPs));
-            m_IsRecursiveSelfNotify=false;
-        }
-        else
-        {
-            delete MorphPrim;   // Only delete the MorphPrim if it isn't kept in command.
-        }
+            MapPrimitiveT* MorphedMapPrim=MorphPrim->GetMorphedMapPrim();
+
+            if (MorphedMapPrim)
+            {
+                m_IsRecursiveSelfNotify=true;
+
+                ArrayT<CommandT*> Commands;
+                Commands.PushBack(new CommandDeleteT(m_MapDoc, const_cast<MapPrimitiveT*>(MorphPrim->GetMapPrim())));
+                Commands.PushBack(new CommandAddPrimT(m_MapDoc, MorphedMapPrim, MorphPrim->GetMapPrim()->GetParent()));
+
+                m_MapDoc.GetHistory().SubmitCommand(new CommandMacroT(Commands, "Edit Vertices"));
+
+                m_IsRecursiveSelfNotify=false;
+            }
+        }
+
+        delete MorphPrim;
 
         // Elem is now no longer mentioned in the m_MorphPrims list, and thus no longer affected by IsHiddenByTool().
         m_IsRecursiveSelfNotify=true;
-        m_MapDoc.UpdateAllObservers_Modified(MapElements, MEMD_VISIBILITY);
+        m_MapDoc.UpdateAllObservers_Modified(MapElements, MEMD_VISIBILITY);     // TODO: Is this still needed? The element was *deleted* above, after all (but only if modified, mind'ya).
         m_IsRecursiveSelfNotify=false;
         return;
     }
 
-    if (dynamic_cast<MapBrushT*>(MapPrim)==NULL && dynamic_cast<MapBezierPatchT*>(MapPrim)==NULL) return;
+    if (dynamic_cast<const MapBrushT*>(MapPrim)==NULL && dynamic_cast<const MapBezierPatchT*>(MapPrim)==NULL) return;
 
     MorphPrimT* MorphPrim=new MorphPrimT(MapPrim);
@@ -389 +371 @@
 bool ToolMorphT::IsHiddenByTool(const MapElementT* Elem) const
 {
-    // Only brushes that are currently being morphed are hidden by this tool from normal rendering.
-    return (Elem->GetType()==&MapBrushT::TypeInfo) && (MorphPrims_Find(Elem)>=0);
+    // Elements that are currently being morphed are hidden by this tool from normal rendering.
+    return MorphPrims_Find(Elem) >= 0;
 }
 
@@ -462 +444 @@
     }
 
-    if (dynamic_cast<MapBrushT*>(m_MorphPrims[0]->GetMapPrim())==NULL)
+    if (dynamic_cast<const MapBrushT*>(m_MorphPrims[0]->GetMapPrim())==NULL)
     {
         wxMessageBox("The morph tool can add new vertices only to brushes (not to Bezier patches).\n"

cafu/trunk/CaWE/ToolMorph.hpp

@@ -115 +115 @@
     bool GetMorphHandleAt(ViewWindow3DT& ViewWindow, const wxPoint& Point, MorphHandleT& FoundMH);
 
-    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_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!!
+    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_TogglePrim(const 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);
     void OnEscape(ViewWindowT& ViewWindow);