Commit 10ba2901 authored by Jan Möbius's avatar Jan Möbius

Removed unused blending flag

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@15943 383ad7c9-94d9-4d36-a494-682f7c89f535
parent b4be74fc
......@@ -145,7 +145,6 @@ glViewer::glViewer( QGraphicsScene* _scene,
QGraphicsWidget(_parent),
glareaGrabbed_(false),
projectionUpdateLocked_(false),
blending_(true),
glScene_(_scene),
glWidget_(_glWidget),
cursorPainter_(0),
......@@ -656,14 +655,13 @@ void glViewer::drawScene_mono()
}
}
ACG::SceneGraph::DrawAction action( properties_.drawMode(), *glstate_ , false);
ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action, *glstate_, properties_.drawMode() );
// First pass
ACG::SceneGraph::DrawAction pass1( properties_.drawMode(), *glstate_ , false);
ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, pass1, *glstate_, properties_.drawMode() );
if( blending_ )
{
ACG::SceneGraph::DrawAction action(properties_.drawMode(), *glstate_, true);
ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, action, *glstate_, properties_.drawMode());
}
// Second Pass for Blending operations
ACG::SceneGraph::DrawAction pass2(properties_.drawMode(), *glstate_, true);
ACG::SceneGraph::traverse_multipass(sceneGraphRoot_, pass2, *glstate_, properties_.drawMode());
if (oM)
{
......
......@@ -286,15 +286,12 @@ public:
/// initialize modelview matrix to identity
void initModelviewMatrix();
// get all Mouse & Key Events for GlWidget
/// get all Mouse & Key Events for GlWidget
void grabGLArea();
// undo grabbing GLArea
/// undo grabbing GLArea
void releaseGLArea();
/// One or two pass Drawing
void drawBlendedObjects(bool _status) { blending_ = _status; }
/// translate the scene and update modelview matrix
void translate(const ACG::Vec3d& trans);
......@@ -543,7 +540,6 @@ private:
ACG::SceneGraph::BaseNode* sceneGraphRoot_;
bool projectionUpdateLocked_;
bool blending_;
// graphics scene used to paint gl context and widgets
QGraphicsScene* glScene_;
......@@ -652,38 +648,35 @@ private:
/// enable/disable stereo mode
virtual void setStereoMode(bool _b);
private:
/// helper called by drawScene() when stereo viewing is active.
void drawScene_stereo();
/// helper called by drawScene_stereo() when opengl stereo viewing is active.
void drawScene_glStereo();
/// helper called by drawScene_stereo() when anaglyph stereo viewing is active.
void drawScene_anaglyphStereo();
/// helper called by drawScene_stereo() when custom anaglyph stereo viewing is active.
void drawScene_customAnaglyphStereo();
/// helper called to initialize/update custom anaglyph stereo
void updateCustomAnaglyphStereo();
/// helper called to cleanup custom anaglyph stereo
void finiCustomAnaglyphStereo();
/// Draws the scene for a philips stereo display ( Header, left color image, right depth map )
void drawScenePhilipsStereo();
/// Updates the scene for a philips stereo display
void updateScenePhilipsStereo();
private:
/// Stereo enabled?
bool stereo_;
// custom anaglyph stuff
int agTexWidth_;
......
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