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

Dennis: Allow-to-create-a-gl-state-without-any-gl-updates

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@6110 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 16d8de31
......@@ -63,8 +63,8 @@ const float GLState::default_shininess(100.0);
//-----------------------------------------------------------------------------
GLState::GLState()
: updateGL_(true),
GLState::GLState(bool _updateGL)
: updateGL_(_updateGL),
blending_(false),
msSinceLastRedraw_ (1)
{
......
......@@ -83,7 +83,7 @@ class ACGDLLEXPORT GLState
public:
/// Default constructor
GLState();
GLState(bool _updateGL = true);
/// destructor
~GLState() {}
......
......@@ -239,11 +239,9 @@ public:
BoundingBoxAction() :
bbMin_( FLT_MAX, FLT_MAX, FLT_MAX),
bbMax_(-FLT_MAX, -FLT_MAX, -FLT_MAX)
{
state_.set_updateGL(false);
state_.reset_modelview();
}
bbMax_(-FLT_MAX, -FLT_MAX, -FLT_MAX),
state_(false)
{ }
bool operator()(BaseNode* _node)
{
......
Supports Markdown
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