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

Fixed some documentation warnings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@14722 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 9a4885c8
......@@ -172,7 +172,7 @@ public:
/** \brief Save generated shader code to text file
*
* @param _filename Where to save
* @param _fileName Where to save
*/
void saveToFile(const char* _fileName);
......@@ -190,7 +190,7 @@ private:
QStringList code_;
/// glsl code imports (with #include)
/// glsl code imports (with \#include )
QStringList imports_;
QString version_;
......
......@@ -77,10 +77,10 @@ namespace SceneGraph {
/** \class TextNode TextNode.hh <ACG/Scenegraph/TextNode.hh>
* TextNode can be used to display a string on quads in OpenGL. This string can be set with
* setText(std::string _text). A TextNode can be attached to a parent node by using the function
* BaseObjectData::addAdditionalNode. The quads can then be set to align to the parent by setting #textMode_
* BaseObjectData::addAdditionalNode. The quads can then be set to align to the parent by setting textMode_
* to OBJECT_ALIGNED via the setRenderingMode(TextMode _textMode) function. Alternatively the quads can be aligned
* to the screen by setting #textMode_ to SCREEN_ALIGNED. The font that is used to display #text_ on the screen is stored
* in #qfont_, which can be set with the setFont(const QFont& _font) function. Finally the quads can be scaled by setting #size_
* to the screen by setting #textMode_ to SCREEN_ALIGNED. The font that is used to display text_ on the screen is stored
* in qfont_, which can be set with the setFont(const QFont& _font) function. Finally the quads can be scaled by setting size_
* via the setSize(unsigned int _size) function.
**/
......@@ -97,8 +97,9 @@ public:
* @param _parent Define the parent Node this node gets attached to
* @param _name Name of this Node
* @param _textMode Define the text rendering style ( see TextNode::TextMode )
* @param _alwaysOnTop Draw text on top of everything else?
*/
TextNode( BaseNode* _parent=0,
TextNode( BaseNode* _parent=0,
std::string _name="<TextNode>",
TextMode _textMode = SCREEN_ALIGNED,
bool _alwaysOnTop = false);
......
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