Commit e8bbcd8e authored by Kenneth Vanhoey's avatar Kenneth Vanhoey

Added missing template arguments

parent ac3c8969
......@@ -230,8 +230,8 @@ public:
m_approxindex_normal(-1),
m_attrindex_normal(-1)
{
halfEdgeInfo = m.template addAttribute<HalfEdgeInfo, DART>("halfEdgeInfo") ;
m_quadric = m.template addAttribute<Utils::QuadricNd<REAL,9>, VERTEX>("hQEMextNormal-quadric") ;
halfEdgeInfo = m.template addAttribute<HalfEdgeInfo, DART, MAP>("halfEdgeInfo") ;
m_quadric = m.template addAttribute<Utils::QuadricNd<REAL,9>, VERTEX, MAP>("hQEMextNormal-quadric") ;
}
~HalfEdgeSelector_QEMextColorNormal()
{
......
......@@ -619,7 +619,7 @@ bool HalfEdgeSelector_QEMextColorNormal<PFP>::init()
++ok ;
m_approxindex_color = approxindex ;
m_attrindex_color = attrindex ;
m_color = m.template getAttribute<typename PFP::VEC3, VERTEX>("color") ;
m_color = m.template getAttribute<typename PFP::VEC3, VERTEX, MAP>("color") ;
assert(m_color.isValid() || !"EdgeSelector_QEMextColor: color attribute is not valid") ;
if (!saved)
{
......@@ -632,7 +632,7 @@ bool HalfEdgeSelector_QEMextColorNormal<PFP>::init()
++ok ;
m_approxindex_normal = approxindex ;
m_attrindex_normal = attrindex ;
m_normal = m.template getAttribute<typename PFP::VEC3, VERTEX>("normal") ;
m_normal = m.template getAttribute<typename PFP::VEC3, VERTEX, MAP>("normal") ;
assert(m_normal.isValid() || !"EdgeSelector_QEMextColorNormal: normal attribute is not valid") ;
if (!saved)
{
......
......@@ -89,7 +89,7 @@ public:
ProgressiveMesh(
MAP& map, DartMarker<MAP>& inactive,
Algo::Surface::Decimation::Selector<PFP>* selector, std::vector<Algo::Surface::Decimation::ApproximatorGen<PFP>*>& approximators,
VertexAttribute<VEC3,MAP_IMPL>& position) ;
VertexAttribute<VEC3, MAP>& position) ;
~ProgressiveMesh() ;
bool initOk() { return m_initOk ; }
......
......@@ -139,7 +139,7 @@ template <typename PFP>
ProgressiveMesh<PFP>::ProgressiveMesh(
MAP& map, DartMarker<MAP>& inactive,
Algo::Surface::Decimation::Selector<PFP>* selector, std::vector<Algo::Surface::Decimation::ApproximatorGen<PFP>*>& approximators,
VertexAttribute<VEC3,MAP_IMPL>& position
VertexAttribute<VEC3,MAP>& position
) :
m_map(map), m_selector(selector), m_approximators(approximators), position(position), inactiveMarker(inactive)
{
......@@ -281,7 +281,7 @@ void ProgressiveMesh<PFP>::coarsen()
edgeCollapse(vs) ; // collapse edge
Algo::Topo::setOrbitEmbedding<VERTEX>(m_map, d2,s->getApproxV()) ;
Algo::Topo::setOrbitEmbedding<VERTEX>(m_map, d2, vs->getApproxV()) ;
Algo::Topo::setOrbitEmbedding<EDGE>(m_map, d2, vs->getApproxE1()) ;
Algo::Topo::setOrbitEmbedding<EDGE>(m_map, dd2, vs->getApproxE2()) ;
......
......@@ -70,7 +70,7 @@ public:
*/
template<typename PFP, unsigned int ORBIT, typename T>
void updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboData, typename PFP::MAP& map,
const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& positions, const AttributeHandler<T,ORBIT, typename PFP::MAP::IMPL>& dataPerXXX) ;
const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, const AttributeHandler<T,ORBIT, typename PFP::MAP>& dataPerXXX) ;
/**
* draw
......
......@@ -50,7 +50,7 @@ m_nbTris(0)
template<typename PFP, unsigned int ORBIT, typename T>
void
DataPerFaceRender::updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboData, typename PFP::MAP& map,
const VertexAttribute<typename PFP::VEC3, typename PFP::MAP::IMPL>& positions, const AttributeHandler<T,ORBIT, typename PFP::MAP::IMPL>& dataPerXXX)
const VertexAttribute<typename PFP::VEC3, typename PFP::MAP>& positions, const AttributeHandler<T,ORBIT, typename PFP::MAP>& dataPerXXX)
{
typedef typename PFP::VEC3 VEC3;
typedef typename PFP::REAL REAL;
......
......@@ -206,9 +206,9 @@ template <typename MAP_IMPL>
template <typename T, unsigned int ORBIT, typename MAP>
inline AttributeHandler<T ,ORBIT, MAP> MapCommon<MAP_IMPL>::checkAttribute(const std::string& nameAttr)
{
AttributeHandler<T, ORBIT, MAP> att = this->getAttribute<T,ORBIT>(nameAttr);
AttributeHandler<T, ORBIT, MAP> att = this->getAttribute<T,ORBIT,MAP>(nameAttr);
if (!att.isValid())
att = this->addAttribute<T, ORBIT>(nameAttr);
att = this->addAttribute<T, ORBIT, MAP>(nameAttr);
return att;
}
......
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