ported bobtoolz

[xonotic/netradiant.git] / radiant / patch.h

diff --git a/radiant/patch.h b/radiant/patch.h
index 614a4eb27e35a47924422b21954c8194739ced5c..bea33119a85263539951c213b7b11b4c88c0f351 100644 (file)
--- a/radiant/patch.h
+++ b/radiant/patch.h
@@ -34,6 +34,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "nameable.h"
 #include "ifilter.h"
 #include "imap.h"
 #include "nameable.h"
 #include "ifilter.h"
 #include "imap.h"

+#include "ipatch.h"

 #include "cullable.h"
 #include "renderable.h"
 #include "editable.h"
 #include "cullable.h"
 #include "renderable.h"
 #include "editable.h"


@@ -136,13 +137,6 @@ inline VertexPointer vertexpointer_arbitrarymeshvertex(const ArbitraryMeshVertex
   return VertexPointer(VertexPointer::pointer(&array->vertex), sizeof(ArbitraryMeshVertex));
 }
 
   return VertexPointer(VertexPointer::pointer(&array->vertex), sizeof(ArbitraryMeshVertex));
 }
 

-class PatchControl
-{
-public:
-  Vector3 m_vertex;
-  Vector2 m_texcoord;
-};
-

 typedef PatchControl* PatchControlIter;
 typedef const PatchControl* PatchControlConstIter;
 
 typedef PatchControl* PatchControlIter;
 typedef const PatchControl* PatchControlConstIter;
 


@@ -193,6 +187,10 @@ inline void PatchControlArray_invert(Array<PatchControl>& ctrl, std::size_t widt
 class PatchTesselation
 {
 public:
 class PatchTesselation
 {
 public:

+  PatchTesselation()
+    : m_numStrips(0), m_lenStrips(0), m_nArrayWidth(0), m_nArrayHeight(0)
+  {
+  }

   Array<ArbitraryMeshVertex> m_vertices;
   Array<RenderIndex> m_indices;
   std::size_t m_numStrips;
   Array<ArbitraryMeshVertex> m_vertices;
   Array<RenderIndex> m_indices;
   std::size_t m_numStrips;


@@ -747,6 +745,7 @@ public:
     evaluateTransform();
     UpdateCachedData();
   }
     evaluateTransform();
     UpdateCachedData();
   }

+  bool isValid() const;

 
   void snapto(float snap)
   {
 
   void snapto(float snap)
   {


@@ -940,6 +939,10 @@ public:
     return m_ctrl.data() + m_ctrl.size();
   }
 
     return m_ctrl.data() + m_ctrl.size();
   }
 

+  PatchControlArray& getControlPoints()
+  {
+    return m_ctrl;
+  }

   PatchControlArray& getControlPointsTransformed()
   {
     return m_ctrlTransformed;
   PatchControlArray& getControlPointsTransformed()
   {
     return m_ctrlTransformed;