Commit 0755513e authored by Jan Möbius's avatar Jan Möbius

revert drawmode non const change

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12560 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 280973d0
......@@ -82,7 +82,7 @@ boundingBox(Vec3d& /*_bbMin*/, Vec3d& /*_bbMax*/)
DrawModes::DrawMode
QtWidgetNode::
availableDrawModes()
availableDrawModes() const
{
return ( DrawModes::SOLID_FLAT_SHADED );
}
......
......@@ -104,7 +104,7 @@ public:
ACG_CLASSNAME(QtWidgetNode);
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
......
......@@ -151,7 +151,7 @@ public:
/** Return a list of available draw modes for this node: should be OR'ed
from the items of the enum DrawModeIDs. */
virtual DrawModes::DrawMode availableDrawModes() { return DrawModes::NONE; }
virtual DrawModes::DrawMode availableDrawModes() const { return DrawModes::NONE; }
/** Compute the bounding box of this node and update the values
_bbMin and _bbMax accordingly. Do not initialize _bbMin and
......
......@@ -65,7 +65,7 @@ namespace SceneGraph {
DrawModes::DrawMode
BoundingBoxNode::
availableDrawModes()
availableDrawModes() const
{
return DrawModes::WIREFRAME;
}
......
......@@ -96,7 +96,7 @@ public:
ACG_CLASSNAME(BoundingBoxNode);
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// draw lines and normals
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
......
......@@ -83,7 +83,7 @@ CoordFrameNode(BaseNode* _parent, const std::string& _name)
DrawModes::DrawMode
CoordFrameNode::availableDrawModes()
CoordFrameNode::availableDrawModes() const
{
return ( DrawModes::WIREFRAME |
DrawModes::SOLID_FLAT_SHADED );
......
......@@ -93,7 +93,7 @@ public:
/// implement className()
ACG_CLASSNAME(CoordFrameNode);
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
/// drawing the primitive
......
......@@ -79,7 +79,7 @@ boundingBox(Vec3d& /*_bbMin*/, Vec3d& /*_bbMax*/)
DrawModes::DrawMode
CoordsysNode::
availableDrawModes()
availableDrawModes() const
{
return ( DrawModes::POINTS |
DrawModes::POINTS_SHADED |
......
......@@ -111,7 +111,7 @@ public:
ACG_CLASSNAME(CoordsysNode);
/// return available draw modes
ACG::SceneGraph::DrawModes::DrawMode availableDrawModes();
ACG::SceneGraph::DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
......
......@@ -101,7 +101,7 @@ namespace DrawModes {
*
* This constructor creates a DrawMode with the given drawMode index.
* Be CareFull! this constructor can only be used to construct atomic drawmodes!
* The unsigned int will not be handled like an bitset but really as an index.
* The int will not be handled like an bitset but really as an index.
* See the list of draw modes below to check for the right numbers.
* You should use the predefined drawModes or create new ones using the other functions
* and ignore this constructor!
......
......@@ -78,7 +78,7 @@ EnvMapNode::EnvMapNode( BaseNode* _parent,
//----------------------------------------------------------------------------
DrawModes::DrawMode EnvMapNode::availableDrawModes()
DrawModes::DrawMode EnvMapNode::availableDrawModes() const
{
return ACG::SceneGraph::DrawModes::SOLID_ENV_MAPPED;
}
......
......@@ -87,7 +87,7 @@ public:
ACG_CLASSNAME(EnvMapNode);
/// add env mapping
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// set texture
void enter(GLState& _state, const DrawModes::DrawMode& _drawmode);
......
......@@ -123,7 +123,7 @@ boundingBox(Vec3d& _bbMin, Vec3d& _bbMax)
DrawModes::DrawMode
GlutPrimitiveNode::
availableDrawModes()
availableDrawModes() const
{
return ( DrawModes::POINTS |
DrawModes::WIREFRAME |
......
......@@ -204,7 +204,7 @@ public:
ACG_CLASSNAME(GlutPrimitiveNode);
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
......
......@@ -88,7 +88,7 @@ GridNode(BaseNode* _parent, const std::string& _name)
DrawModes::DrawMode
GridNode::availableDrawModes()
GridNode::availableDrawModes() const
{
return ( DrawModes::WIREFRAME |
DrawModes::SOLID_FLAT_SHADED );
......
......@@ -99,7 +99,7 @@ public:
ACG_CLASSNAME(GridNode);
/// return available draw modes
ACG::SceneGraph::DrawModes::DrawMode availableDrawModes();
ACG::SceneGraph::DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
......
......@@ -81,7 +81,7 @@ boundingBox(Vec3d& _bbMin, Vec3d& _bbMax)
DrawModes::DrawMode
LineNode::
availableDrawModes()
availableDrawModes() const
{
return DrawModes::WIREFRAME;
}
......
......@@ -123,7 +123,7 @@ public:
ACG_CLASSNAME(LineNode);
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
......
......@@ -132,7 +132,7 @@ MeshNodeT<Mesh>::
template<class Mesh>
DrawModes::DrawMode
MeshNodeT<Mesh>::
availableDrawModes() {
availableDrawModes() const {
DrawModes::DrawMode drawModes(DrawModes::NONE);
// We can always render points and a wireframe.
......
......@@ -274,7 +274,7 @@ public:
* The drawmodes are constructed based on the mesh properties and the hardware capabilities
* of the system.
*/
ACG::SceneGraph::DrawModes::DrawMode availableDrawModes();
ACG::SceneGraph::DrawModes::DrawMode availableDrawModes() const;
private:
......
......@@ -158,7 +158,7 @@ boundingBox(Vec3d& _bbMin, Vec3d& _bbMax)
template<class Mesh>
DrawModes::DrawMode
MeshNodeT<Mesh>::
availableDrawModes()
availableDrawModes() const
{
DrawModes::DrawMode drawModes(DrawModes::NONE);
......
......@@ -102,7 +102,7 @@ public:
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
/// drawing
......
......@@ -93,7 +93,7 @@ boundingBox(Vec3d& _bbMin, Vec3d& _bbMax)
DrawModes::DrawMode
OBJNode::
availableDrawModes()
availableDrawModes() const
{
return ( DrawModes::POINTS |
DrawModes::WIREFRAME |
......
......@@ -95,7 +95,7 @@ public:
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
......
......@@ -79,7 +79,7 @@ void PlaneNode::boundingBox(Vec3d& _bbMin, Vec3d& _bbMax)
//----------------------------------------------------------------------------
DrawModes::DrawMode
PlaneNode::availableDrawModes()
PlaneNode::availableDrawModes() const
{
return ( DrawModes::POINTS |
DrawModes::POINTS_SHADED |
......
......@@ -86,7 +86,7 @@ class ACGDLLEXPORT PlaneNode : public BaseNode
ACG_CLASSNAME(PlaneNode);
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
......
......@@ -81,7 +81,7 @@ boundingBox(Vec3d& _bbMin, Vec3d& _bbMax)
DrawModes::DrawMode
PointNode::
availableDrawModes()
availableDrawModes() const
{
return ( DrawModes::POINTS |
DrawModes::POINTS_SHADED |
......
......@@ -103,7 +103,7 @@ public:
ACG_CLASSNAME(PointNode);
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
......
......@@ -112,7 +112,7 @@ QuadNode::boundingBox( Vec3d & _bbMin, Vec3d & _bbMax )
DrawModes::DrawMode
QuadNode::
availableDrawModes()
availableDrawModes() const
{
DrawModes::DrawMode drawModes(DrawModes::NONE);
......
......@@ -79,7 +79,7 @@ public:
ACG_CLASSNAME(QuadNode);
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
......
......@@ -396,7 +396,7 @@ setShaderDir( std::string _shaderDir) {
DrawModes::DrawMode
ShaderNode::
availableDrawModes()
availableDrawModes() const
{
DrawModes::DrawMode drawModes(DrawModes::NONE);
......
......@@ -134,7 +134,7 @@ public:
bool hasShader( DrawModes::DrawMode _drawmode, bool _pick = false);
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
private :
// Path to the shaders ( if set ). If empty shaders will not be used.
......
......@@ -104,7 +104,7 @@ SliceNode::boundingBox( Vec3d & _bbMin, Vec3d & _bbMax )
DrawModes::DrawMode
SliceNode::availableDrawModes()
SliceNode::availableDrawModes() const
{
return 0;
return ( DrawModes::POINTS |
......
......@@ -90,7 +90,7 @@ public:
ACG_CLASSNAME( SliceNode );
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
void boundingBox( Vec3d & _bbMin, Vec3d & _bbMax );
......
......@@ -107,7 +107,7 @@ boundingBox(Vec3d& _bbMin, Vec3d& _bbMax)
template <class Mesh, class Mod>
DrawModes::DrawMode
StatusNodeT<Mesh, Mod>::
availableDrawModes()
availableDrawModes() const
{
return (DrawModes::POINTS |
DrawModes::WIREFRAME |
......
......@@ -109,7 +109,7 @@ public:
void updateSelection();
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
void pick(GLState& /* _state */ , PickTarget /* _target */ ) {}
......
......@@ -97,7 +97,7 @@ boundingBox(Vec3d& /*_bbMin*/, Vec3d& /*_bbMax*/)
DrawModes::DrawMode
TextNode::
availableDrawModes()
availableDrawModes() const
{
return ( DrawModes::POINTS |
DrawModes::POINTS_SHADED |
......
......@@ -111,7 +111,7 @@ public:
ACG_CLASSNAME(TextNode);
/// return available draw modes
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
/// update bounding box
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
......
......@@ -112,7 +112,7 @@ TriangleNode::boundingBox( Vec3d & _bbMin, Vec3d & _bbMax )
DrawModes::DrawMode
TriangleNode::
availableDrawModes()
availableDrawModes() const
{
DrawModes::DrawMode drawModes(DrawModes::NONE);
......
......@@ -80,7 +80,7 @@ public:
ACG_CLASSNAME(TriangleNode);
DrawModes::DrawMode availableDrawModes();
DrawModes::DrawMode availableDrawModes() const;
void boundingBox(Vec3d& _bbMin, Vec3d& _bbMax);
void draw(GLState& _state, const DrawModes::DrawMode& _drawMode);
......
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