Commit d58716fa authored by untereiner's avatar untereiner

compilation fixes

parent de969bc3
...@@ -900,7 +900,7 @@ bool importMesh(typename PFP::MAP& map, MeshTablesVolume<PFP>& mtv) ...@@ -900,7 +900,7 @@ bool importMesh(typename PFP::MAP& map, MeshTablesVolume<PFP>& mtv)
else if(degD == degGD) else if(degD == degGD)
{ {
map.sewVolumes(d, good_dart, false); map.sewVolumes(d, good_dart, false);
m.unmarkOrbit<FACE>(d); m.template unmarkOrbit<FACE>(d);
} }
// else if(degD > 3 && degGD > 3) // else if(degD > 3 && degGD > 3)
// { // {
......
...@@ -49,6 +49,7 @@ template <typename PFP> ...@@ -49,6 +49,7 @@ template <typename PFP>
class EarTriangulation class EarTriangulation
{ {
typedef typename PFP::MAP MAP ; typedef typename PFP::MAP MAP ;
typedef typename PFP::MAP::IMPL MAP_IMPL ;
typedef typename PFP::VEC3 VEC3 ; typedef typename PFP::VEC3 VEC3 ;
protected: protected:
...@@ -82,11 +83,11 @@ protected: ...@@ -82,11 +83,11 @@ protected:
}; };
protected: protected:
typename PFP::MAP& m_map; MAP& m_map;
VertexAutoAttribute<EarAttr> m_dartEars; VertexAutoAttribute<EarAttr, MAP_IMPL> m_dartEars;
VertexAttribute<VEC3> m_position; VertexAttribute<VEC3, MAP_IMPL> m_position;
std::vector<Dart> m_resTets; std::vector<Dart> m_resTets;
......
...@@ -797,7 +797,6 @@ std::vector<Dart> swapGen3To2Optimized(typename PFP::MAP& map, Dart d) ...@@ -797,7 +797,6 @@ std::vector<Dart> swapGen3To2Optimized(typename PFP::MAP& map, Dart d)
// { // {
// Tetrahedralization::swap2To2<PFP>(map, d); // Tetrahedralization::swap2To2<PFP>(map, d);
// } // }
}
template <typename PFP> template <typename PFP>
void swapGen2To3(typename PFP::MAP& map, Dart d) void swapGen2To3(typename PFP::MAP& map, Dart d)
......
...@@ -118,6 +118,7 @@ template <typename PFP> ...@@ -118,6 +118,7 @@ template <typename PFP>
class Cylinder : public Tiling<PFP> class Cylinder : public Tiling<PFP>
{ {
typedef typename PFP::MAP MAP; typedef typename PFP::MAP MAP;
typedef typename PFP::MAP::IMPL MAP_IMPL;
typedef typename PFP::VEC3 VEC3; typedef typename PFP::VEC3 VEC3;
private: private:
...@@ -157,21 +158,21 @@ public: ...@@ -157,21 +158,21 @@ public:
* @param top_radius * @param top_radius
* @param height * @param height
*/ */
void embedIntoCylinder(VertexAttribute<VEC3>& position, float bottom_radius, float top_radius, float height); void embedIntoCylinder(VertexAttribute<VEC3, MAP_IMPL>& position, float bottom_radius, float top_radius, float height);
//! Embed a topological sphere //! Embed a topological sphere
/*! @param position Attribute used to store vertices positions /*! @param position Attribute used to store vertices positions
* @param radius * @param radius
* @param height * @param height
*/ */
void embedIntoSphere(VertexAttribute<VEC3>& position, float radius); void embedIntoSphere(VertexAttribute<VEC3, MAP_IMPL>& position, float radius);
//! Embed a topological cone //! Embed a topological cone
/*! @param position Attribute used to store vertices positions /*! @param position Attribute used to store vertices positions
* @param radius * @param radius
* @param height * @param height
*/ */
void embedIntoCone(VertexAttribute<VEC3>& position, float radius, float height); void embedIntoCone(VertexAttribute<VEC3, MAP_IMPL>& position, float radius, float height);
//@} //@}
/*! @name Topological Operators /*! @name Topological Operators
...@@ -209,6 +210,7 @@ template <typename PFP> ...@@ -209,6 +210,7 @@ template <typename PFP>
class Cube : public Cylinder<PFP> class Cube : public Cylinder<PFP>
{ {
typedef typename PFP::MAP MAP; typedef typename PFP::MAP MAP;
typedef typename PFP::MAP::IMPL MAP_IMPL;
typedef typename PFP::VEC3 VEC3; typedef typename PFP::VEC3 VEC3;
public: public:
...@@ -229,7 +231,7 @@ public: ...@@ -229,7 +231,7 @@ public:
* @param y * @param y
* @param z * @param z
*/ */
void embedIntoCube(VertexAttribute<VEC3>& position, float x, float y, float z); void embedIntoCube(VertexAttribute<VEC3, MAP_IMPL>& position, float x, float y, float z);
//@} //@}
protected: protected:
...@@ -254,6 +256,7 @@ template <typename PFP> ...@@ -254,6 +256,7 @@ template <typename PFP>
class Tore : public Cylinder<PFP> class Tore : public Cylinder<PFP>
{ {
typedef typename PFP::MAP MAP; typedef typename PFP::MAP MAP;
typedef typename PFP::MAP::IMPL MAP_IMPL;
typedef typename PFP::VEC3 VEC3; typedef typename PFP::VEC3 VEC3;
public: public:
...@@ -273,7 +276,7 @@ public: ...@@ -273,7 +276,7 @@ public:
* @param big_radius * @param big_radius
* @param small_radius * @param small_radius
*/ */
void embedIntoTore(VertexAttribute<VEC3>& position, float big_radius, float small_radius); void embedIntoTore(VertexAttribute<VEC3, MAP_IMPL>& position, float big_radius, float small_radius);
//@} //@}
/*! @name Topological Operators /*! @name Topological Operators
......
...@@ -120,7 +120,7 @@ void Grid<PFP>::embedIntoGrid(VertexAttribute<VEC3, MAP_IMPL>& position, float x ...@@ -120,7 +120,7 @@ void Grid<PFP>::embedIntoGrid(VertexAttribute<VEC3, MAP_IMPL>& position, float x
} }
template <typename PFP> template <typename PFP>
void Grid<PFP>::embedIntoTwistedStrip(VertexAttribute<VEC3>& position, float radius_min, float radius_max, float turns) void Grid<PFP>::embedIntoTwistedStrip(VertexAttribute<VEC3, MAP_IMPL>& position, float radius_min, float radius_max, float turns)
{ {
float alpha = float(2.0*M_PI/this->m_ny); float alpha = float(2.0*M_PI/this->m_ny);
float beta = turns/float(this->m_ny); float beta = turns/float(this->m_ny);
...@@ -142,7 +142,7 @@ void Grid<PFP>::embedIntoTwistedStrip(VertexAttribute<VEC3>& position, float rad ...@@ -142,7 +142,7 @@ void Grid<PFP>::embedIntoTwistedStrip(VertexAttribute<VEC3>& position, float rad
} }
template <typename PFP> template <typename PFP>
void Grid<PFP>::embedIntoHelicoid(VertexAttribute<VEC3>& position, float radius_min, float radius_max, float maxHeight, float nbTurn, int orient) void Grid<PFP>::embedIntoHelicoid(VertexAttribute<VEC3, MAP_IMPL>& position, float radius_min, float radius_max, float maxHeight, float nbTurn, int orient)
{ {
float alpha = float(2.0*M_PI/this->m_nx)*nbTurn; float alpha = float(2.0*M_PI/this->m_nx)*nbTurn;
float hS = maxHeight/this->m_nx; float hS = maxHeight/this->m_nx;
...@@ -301,7 +301,7 @@ void Cylinder<PFP>::triangleBottom() ...@@ -301,7 +301,7 @@ void Cylinder<PFP>::triangleBottom()
} }
template <typename PFP> template <typename PFP>
void Cylinder<PFP>::embedIntoCylinder(VertexAttribute<VEC3>& position, float bottom_radius, float top_radius, float height) void Cylinder<PFP>::embedIntoCylinder(VertexAttribute<VEC3, MAP_IMPL>& position, float bottom_radius, float top_radius, float height)
{ {
float alpha = float(2.0*M_PI/this->m_nx); float alpha = float(2.0*M_PI/this->m_nx);
float dz = height/float(this->m_nz); float dz = height/float(this->m_nz);
...@@ -335,7 +335,7 @@ void Cylinder<PFP>::embedIntoCylinder(VertexAttribute<VEC3>& position, float bot ...@@ -335,7 +335,7 @@ void Cylinder<PFP>::embedIntoCylinder(VertexAttribute<VEC3>& position, float bot
} }
template <typename PFP> template <typename PFP>
void Cylinder<PFP>::embedIntoSphere(VertexAttribute<VEC3>& position, float radius) void Cylinder<PFP>::embedIntoSphere(VertexAttribute<VEC3, MAP_IMPL>& position, float radius)
{ {
float alpha = float(2.0*M_PI/this->m_nx); float alpha = float(2.0*M_PI/this->m_nx);
float beta = float(M_PI/(this->m_nz+2)); float beta = float(M_PI/(this->m_nz+2));
...@@ -370,7 +370,7 @@ void Cylinder<PFP>::embedIntoSphere(VertexAttribute<VEC3>& position, float radiu ...@@ -370,7 +370,7 @@ void Cylinder<PFP>::embedIntoSphere(VertexAttribute<VEC3>& position, float radiu
} }
template <typename PFP> template <typename PFP>
void Cylinder<PFP>::embedIntoCone(VertexAttribute<VEC3>& position, float radius, float height) void Cylinder<PFP>::embedIntoCone(VertexAttribute<VEC3, MAP_IMPL>& position, float radius, float height)
{ {
if(m_top_closed && m_top_triangulated) if(m_top_closed && m_top_triangulated)
{ {
...@@ -503,7 +503,7 @@ void Cube<PFP>::cube(unsigned int x, unsigned int y, unsigned int z) ...@@ -503,7 +503,7 @@ void Cube<PFP>::cube(unsigned int x, unsigned int y, unsigned int z)
} }
template <typename PFP> template <typename PFP>
void Cube<PFP>::embedIntoCube(VertexAttribute<VEC3>& position, float sx, float sy, float sz) void Cube<PFP>::embedIntoCube(VertexAttribute<VEC3, MAP_IMPL>& position, float sx, float sy, float sz)
{ {
float dz = sz/float(this->m_nz); float dz = sz/float(this->m_nz);
float dy = sy/float(this->m_ny); float dy = sy/float(this->m_ny);
...@@ -583,7 +583,7 @@ void Tore<PFP>::tore(unsigned int n, unsigned int m) ...@@ -583,7 +583,7 @@ void Tore<PFP>::tore(unsigned int n, unsigned int m)
} }
template <typename PFP> template <typename PFP>
void Tore<PFP>::embedIntoTore(VertexAttribute<VEC3>& position, float big_radius, float small_radius) void Tore<PFP>::embedIntoTore(VertexAttribute<VEC3, MAP_IMPL>& position, float big_radius, float small_radius)
{ {
float alpha = float(2.0*M_PI/this->m_nx); float alpha = float(2.0*M_PI/this->m_nx);
float beta = float(2.0*M_PI/this->m_ny); float beta = float(2.0*M_PI/this->m_ny);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment