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

Too much commited

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@10921 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 2b0e3e94
......@@ -172,7 +172,7 @@ BaseNode::delete_subtree()
//----------------------------------------------------------------------------
void
BaseNode::enterPick(GLState& _state, PickTarget /*_target*/, DrawModes::DrawMode& _drawMode)
BaseNode::enterPick(GLState& _state, PickTarget /*_target*/, DrawModes::DrawMode _drawMode)
{
enter (_state, _drawMode);
}
......@@ -180,7 +180,7 @@ BaseNode::enterPick(GLState& _state, PickTarget /*_target*/, DrawModes::DrawMode
//----------------------------------------------------------------------------
void
BaseNode::leavePick(GLState& _state, PickTarget /*_target*/, DrawModes::DrawMode& _drawMode)
BaseNode::leavePick(GLState& _state, PickTarget /*_target*/, DrawModes::DrawMode _drawMode)
{
leave (_state, _drawMode);
}
......
......@@ -166,22 +166,23 @@ public:
function.
\see MaterialNode
*/
virtual void enter(GLState& /*_state */, DrawModes::DrawMode& /*_drawMode*/ ) {}
virtual void enter(GLState& /*_state */, DrawModes::DrawMode /*_drawMode*/ ) {}
/** Draw this node using the draw modes _drawMode */
virtual void draw(GLState& /* _state */, DrawModes::DrawMode& /* _drawMode */) {}
virtual void draw(GLState& /* _state */, DrawModes::DrawMode /* _drawMode */) {}
/** The leave function is used to restore GL states the have been changed.
This function must restore the status before enter() !
*/
virtual void leave(GLState& /* _state */, DrawModes::DrawMode& /* _drawMode */) {}
virtual void leave(GLState& /* _state */, DrawModes::DrawMode /* _drawMode */) {}
/** This function is called when traversing the scene graph during picking
and arriving at this node. It can be used to store GL states that
will be changed in order to restore then in the leavePick()
function. Its default implementation will call the enter() function.
*/
virtual void enterPick(GLState& _state , PickTarget _target, DrawModes::DrawMode& _drawMode );
virtual void enterPick(GLState& _state , PickTarget _target,
DrawModes::DrawMode _drawMode );
/** Draw the node using the GL picking name stack. The node's ID
will already be on the name stack, so only names identifing e.g. faces
......@@ -193,7 +194,8 @@ public:
This function must restore the status before enterPick() !
Its default implementation will call the leave() function.
*/
virtual void leavePick(GLState& _state, PickTarget _target, DrawModes::DrawMode& _drawMode );
virtual void leavePick(GLState& _state, PickTarget _target,
DrawModes::DrawMode _drawMode );
/** Enable or Disable picking for this node
* ( default: enabled )
......
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