Commit 886fb554 authored by Kenneth Vanhoey's avatar Kenneth Vanhoey

Small modification in ColorPerFaceRender (template argument has been

reduced to the only ORBIT instead of the AttributeHandler<ORBIT> class).
parent 3e67b53f
......@@ -25,6 +25,7 @@
#ifndef _COLOR_PER_FACE_RENDER
#define _COLOR_PER_FACE_RENDER
#include <GL/glew.h>
#include "Topology/generic/dart.h"
#include "Topology/generic/attributeHandler.h"
......@@ -46,7 +47,7 @@ namespace GL2
{
/**
* Class that update VBO to allow the rendering of per face color rendering
* Class that update VBO to allow the rendering of per face colors
* Use with ColorPerVertexShader
*/
class ColorPerFaceRender
......@@ -69,9 +70,9 @@ public:
* @param colorPerXXX attribute of color (per face, per vertex per face, per what you want)
* @param good selector
*/
template<typename PFP, typename ATTRIB>
template<typename PFP, unsigned int ORBIT>
void updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboColor, typename PFP::MAP& map,
const VertexAttribute<typename PFP::VEC3>& positions, const ATTRIB& colorPerXXX, const FunctorSelect& good = allDarts) ;
const VertexAttribute<typename PFP::VEC3>& positions, const AttributeHandler<typename PFP::VEC3,ORBIT>& colorPerXXX, const FunctorSelect& good = allDarts) ;
/**
* update drawing buffers
......@@ -84,9 +85,9 @@ public:
* @param colorPerXXX attribute of color (per face, per vertex per face, per what you want)
* @param good selector
*/
template<typename PFP, typename ATTRIB>
void updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboNormals, Utils::VBO& vboColor, typename PFP::MAP& map,
const VertexAttribute<typename PFP::VEC3>& positions, const VertexAttribute<typename PFP::VEC3>& normals, const ATTRIB& colorPerXXX, const FunctorSelect& good = allDarts) ;
template<typename PFP, unsigned int ORBIT>
void updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboNormal, Utils::VBO& vboColor, typename PFP::MAP& map,
const VertexAttribute<typename PFP::VEC3>& positions, const VertexAttribute<typename PFP::VEC3>& normals, const AttributeHandler<typename PFP::VEC3,ORBIT>& colorPerXXX, const FunctorSelect& good = allDarts) ;
/**
......
......@@ -49,9 +49,9 @@ m_nbTris(0)
template<typename PFP, typename ATTRIB>
template<typename PFP, unsigned int ORBIT>
void ColorPerFaceRender::updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboColor, typename PFP::MAP& map,
const VertexAttribute<typename PFP::VEC3>& positions, const ATTRIB& colorPerXXX, const FunctorSelect& good)
const VertexAttribute<typename PFP::VEC3>& positions, const AttributeHandler<typename PFP::VEC3,ORBIT>& colorPerXXX, const FunctorSelect& good)
{
typedef typename PFP::VEC3 VEC3;
typedef typename PFP::REAL REAL;
......@@ -98,11 +98,10 @@ void ColorPerFaceRender::updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboColor
vboColor.releasePtr();
}
template<typename PFP, typename ATTRIB>
template<typename PFP, unsigned int ORBIT>
void ColorPerFaceRender::updateVBO(Utils::VBO& vboPosition, Utils::VBO& vboNormal, Utils::VBO& vboColor, typename PFP::MAP& map,
const VertexAttribute<typename PFP::VEC3>& positions, const VertexAttribute<typename PFP::VEC3>& normals,
const ATTRIB& colorPerXXX, const FunctorSelect& good)
const VertexAttribute<typename PFP::VEC3>& positions, const VertexAttribute<typename PFP::VEC3>& normals,
const AttributeHandler<typename PFP::VEC3,ORBIT>& colorPerXXX, const FunctorSelect& good)
{
typedef typename PFP::VEC3 VEC3;
typedef typename PFP::REAL REAL;
......
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