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

Fixed documentation warnings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14237 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 2bea19d0
......@@ -90,18 +90,20 @@ public:
enum CoordsysMode
{
POSITION, // Draws the Coordsys at the coordsys origin
SCREENPOS // Draws the Coordsys at the upper right position on the screen
POSITION, ///< Draws the Coordsys at the coordsys origin
SCREENPOS ///< Draws the Coordsys at the upper right position on the screen
};
/** default constructor
* @param _parent Define the parent Node this node gets attached to
* @param _name Name of this Node
* @param _name Name of this Node
* @param _mode upper right of the screen or position based
* @param _projectionMode Draw an orthogonal coordinate system or also enable projection mode
*/
CoordsysNode(
BaseNode* _parent = 0,
std::string _name = "<TextNode>",
CoordsysMode _mode = SCREENPOS,
std::string _name = "<TextNode>",
CoordsysMode _mode = SCREENPOS,
ProjectionMode _projectionMode = PERSPECTIVE_PROJECTION);
/// destructor
......
......@@ -117,15 +117,18 @@ public:
void disableShader (DrawModes::DrawMode _drawmode);
/** Sets a Shader for the given draw mode
* @param _drawmode Set the drawmode for which the shader should be activated
* @param _vertexShader filename of the Vertex Shader within the shader directory
* @param _fragmentShader filename of the Fragment Shader within the shader directory
* @param _drawmode Set the drawmode for which the shader should be activated
* @param _vertexShader filename of the Vertex Shader within the shader directory
* @param _fragmentShader filename of the Fragment Shader within the shader directory
* @param _pickVertexShader Vertex shader during picking
* @param _pickFragmentShader Fragment shader during picking
*/
void setShader( DrawModes::DrawMode _drawmode ,
std::string _vertexShader,
std::string _fragmentShader,
std::string _pickVertexShader = "",
std::string _pickFragmentShader = "");
std::string _vertexShader,
std::string _fragmentShader,
std::string _pickVertexShader = "",
std::string _pickFragmentShader = "");
/// Get the shader for the given drawMode
GLSL::PtrProgram getShader( DrawModes::DrawMode _drawmode, bool _pick = false);
......
......@@ -76,7 +76,7 @@ namespace SceneGraph {
//== CLASS DEFINITION =========================================================
/** \class TranslationTranslationManipulatorNode TranslationTranslationManipulatorNode.hh <ACG/Scenegraph/TranslationTranslationManipulatorNode.hh>
/** \class TranslationManipulatorNode TranslationManipulatorNode.hh <ACG/Scenegraph/TranslationManipulatorNode.hh>
Use a manipulator to translate and scale the children of this node.
*/
......@@ -169,7 +169,7 @@ public:
/** \brief Enable or disable manipulator handles for specific orientations
*
* This enum defines which rotation axis rings will be visible and available for picking.
* The modes can be combined. ( e.g. ACG::SceneGraph::TranslationManipulatorNode::X_AXIS|ACG::SceneGraph::TranslationManipulatorNode::Y_AXIS )
* The modes can be combined.
*
* @param _active The activated axis
*/
......
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