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

Switched core to translationManipulatorNode

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@3939 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 76329856
...@@ -106,11 +106,11 @@ void BaseObjectData::init() { ...@@ -106,11 +106,11 @@ void BaseObjectData::init() {
std::cerr << "Separator Node already exists. this should not happen!" << std::endl; std::cerr << "Separator Node already exists. this should not happen!" << std::endl;
if ( manipulatorNode_ == 0 ) { if ( manipulatorNode_ == 0 ) {
manipulatorNode_ = new QtManipulatorNode(baseNode(),"NEW ManipulatorNode"); manipulatorNode_ = new QtTranslationManipulatorNode(baseNode(),"NEW ManipulatorNode");
// Bind this manipulator to the current object // Bind this manipulator to the current object
manipulatorNode_->setIdentifier(id()); manipulatorNode_->setIdentifier(id());
manipulatorNode_->set_status( ACG::SceneGraph::ManipulatorNode::HideNode ); manipulatorNode_->set_status( ACG::SceneGraph::TranslationManipulatorNode::HideNode );
} }
else else
std::cerr << "Manipulator Node already exists. this should not happen!" << std::endl; std::cerr << "Manipulator Node already exists. this should not happen!" << std::endl;
...@@ -169,7 +169,7 @@ SeparatorNode* BaseObjectData::baseNode() { ...@@ -169,7 +169,7 @@ SeparatorNode* BaseObjectData::baseNode() {
return separatorNode_; return separatorNode_;
} }
QtManipulatorNode* BaseObjectData::manipulatorNode() { QtTranslationManipulatorNode* BaseObjectData::manipulatorNode() {
return manipulatorNode_; return manipulatorNode_;
} }
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#include <ACG/Scenegraph/SeparatorNode.hh> #include <ACG/Scenegraph/SeparatorNode.hh>
#include <ACG/Scenegraph/ShaderNode.hh> #include <ACG/Scenegraph/ShaderNode.hh>
#include <ACG/Scenegraph/BaseNode.hh> #include <ACG/Scenegraph/BaseNode.hh>
#include <ACG/QtScenegraph/QtManipulatorNode.hh> #include <ACG/QtScenegraph/QtTranslationManipulatorNode.hh>
//== TYPEDEFS ================================================================= //== TYPEDEFS =================================================================
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
/// Materialnode /// Materialnode
typedef ACG::SceneGraph::MaterialNode MaterialNode; typedef ACG::SceneGraph::MaterialNode MaterialNode;
/// ManipulatorNode /// ManipulatorNode
typedef ACG::SceneGraph::QtManipulatorNode QtManipulatorNode; typedef ACG::SceneGraph::QtTranslationManipulatorNode QtTranslationManipulatorNode;
/// Seperator Node /// Seperator Node
typedef ACG::SceneGraph::SeparatorNode SeparatorNode; typedef ACG::SceneGraph::SeparatorNode SeparatorNode;
/// Base Node /// Base Node
...@@ -172,7 +172,7 @@ class DLLEXPORT BaseObjectData : public BaseObject ...@@ -172,7 +172,7 @@ class DLLEXPORT BaseObjectData : public BaseObject
/** get the ManipulatorNode node of this object (Use this node to add custom Nodes to the Object /** get the ManipulatorNode node of this object (Use this node to add custom Nodes to the Object
* which should be transformed with the manipulator of the Object) * which should be transformed with the manipulator of the Object)
*/ */
QtManipulatorNode* manipulatorNode(); QtTranslationManipulatorNode* manipulatorNode();
/** Return pointer to the shader node /** Return pointer to the shader node
* If you want to support shaders, you have to add a shader node into your scenegraph structure * If you want to support shaders, you have to add a shader node into your scenegraph structure
...@@ -208,7 +208,7 @@ class DLLEXPORT BaseObjectData : public BaseObject ...@@ -208,7 +208,7 @@ class DLLEXPORT BaseObjectData : public BaseObject
SeparatorNode* separatorNode_; SeparatorNode* separatorNode_;
/// Manipulator used for this Object /// Manipulator used for this Object
QtManipulatorNode* manipulatorNode_; QtTranslationManipulatorNode* manipulatorNode_;
/// Scenegraph Material Node for the object /// Scenegraph Material Node for the object
MaterialNode* materialNode_; MaterialNode* materialNode_;
......
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