Commit e7ba5a93 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed drawmode signature

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12597 383ad7c9-94d9-4d36-a494-682f7c89f535
parent dc58c8eb
......@@ -95,10 +95,10 @@ public:
typedef float Pointsize;
typedef ACG::Vec3uc Color;
typedef std::vector<Point> PointVector;
typedef std::vector<Normal> NormalVector;
typedef std::vector<Point> PointVector;
typedef std::vector<Normal> NormalVector;
typedef std::vector<Pointsize> PointsizeVector;
typedef std::vector<Color> ColorVector;
typedef std::vector<Color> ColorVector;
//----------------------------------------------------------------
......@@ -126,7 +126,9 @@ public:
ACG_CLASSNAME( SplatCloudNode );
/// return available draw modes
inline DrawModes::DrawMode availableDrawModes() { return splatsDrawMode_ | dotsDrawMode_ | pointsDrawMode_; }
inline DrawModes::DrawMode availableDrawModes() const {
return splatsDrawMode_ | dotsDrawMode_ | pointsDrawMode_;
}
/// update bounding box
void boundingBox( ACG::Vec3d &_bbMin, ACG::Vec3d &_bbMax );
......@@ -196,20 +198,20 @@ private:
DrawModes::DrawMode pointsDrawMode_;
// ---- data vectors ----
PointVector points_;
NormalVector normals_;
PointVector points_;
NormalVector normals_;
PointsizeVector pointsizes_;
ColorVector colors_;
ColorVector colors_;
// ---- default values ----
/// the default values will be used when the specific array is not present
Normal defaultNormal_;
Pointsize defaultPointsize_;
Color defaultColor_;
Color defaultColor_;
// ---- vertex buffer object ----
GLuint vboGlId_;
bool vboValid_;
bool vboValid_;
void createVBO();
void destroyVBO();
......
......@@ -392,14 +392,13 @@ void SplatCloudObject::init( SplatCloudNode *_node )
std::cerr << "Error when creating SplatCloud Object! materialNode is NULL!" << std::endl;
// create new scenegraph nodes
shaderNode_ = new ShaderNode( materialNode(), "NEW ShaderNode for" );
shaderNode_ = new ShaderNode( materialNode(), "NEW ShaderNode for" );
splatCloudNode_ = new SplatCloudNode( shaderNode_, "NEW SplatCloudNode" );
// load shaders
reloadShaders();
// set initial drawmode of shader- and splatcloud-node
ACG::SceneGraph::DrawModes::DrawMode initialDrawMode = ACG::SceneGraph::DrawModes::getDrawMode( "Points" );
if( initialDrawMode == ACG::SceneGraph::DrawModes::NONE )
......
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