Commit 9a9bfc9a authored by Ellen Dekkers's avatar Ellen Dekkers
Browse files

MeshObject use envMap Node instead of texturenode

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5989 383ad7c9-94d9-4d36-a494-682f7c89f535
parent de05fddb
...@@ -228,7 +228,7 @@ ...@@ -228,7 +228,7 @@
if ( materialNode() == NULL) if ( materialNode() == NULL)
std::cerr << "Error when creating Mesh Object! materialNode is NULL!" << std::endl; std::cerr << "Error when creating Mesh Object! materialNode is NULL!" << std::endl;
textureNode_ = new TextureNode(materialNode(),"NEW TextureNode for ", true, GL_LINEAR_MIPMAP_LINEAR ); textureNode_ = new ACG::SceneGraph::EnvMapNode(materialNode(),"NEW TextureNode for ", true, GL_LINEAR_MIPMAP_LINEAR );
shaderNode_ = new ACG::SceneGraph::ShaderNode(textureNode() , "NEW ShaderNode for "); shaderNode_ = new ACG::SceneGraph::ShaderNode(textureNode() , "NEW ShaderNode for ");
...@@ -398,7 +398,7 @@ ...@@ -398,7 +398,7 @@
* @return Pointer to the texture node * @return Pointer to the texture node
*/ */
template < class MeshT , DataType objectDataType > template < class MeshT , DataType objectDataType >
TextureNode* MeshObject< MeshT , objectDataType >::textureNode() { ACG::SceneGraph::EnvMapNode* MeshObject< MeshT , objectDataType >::textureNode() {
return textureNode_; return textureNode_;
} }
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include <OpenMesh/Core/IO/MeshIO.hh> #include <OpenMesh/Core/IO/MeshIO.hh>
#include <ACG/Scenegraph/SeparatorNode.hh> #include <ACG/Scenegraph/SeparatorNode.hh>
#include <ACG/Scenegraph/TextureNode.hh> #include <ACG/Scenegraph/EnvMapNode.hh>
#include <ACG/Scenegraph/ShaderNode.hh> #include <ACG/Scenegraph/ShaderNode.hh>
#include <ACG/Scenegraph/StatusNodesT.hh> #include <ACG/Scenegraph/StatusNodesT.hh>
...@@ -168,7 +168,7 @@ class DLLEXPORTONLY MeshObject : public BaseObjectData { ...@@ -168,7 +168,7 @@ class DLLEXPORTONLY MeshObject : public BaseObjectData {
public: public:
/// Get the TextureNode of the current mesh /// Get the TextureNode of the current mesh
TextureNode* textureNode(); ACG::SceneGraph::EnvMapNode* textureNode();
/// Return pointer to the shader node /// Return pointer to the shader node
ACG::SceneGraph::ShaderNode* shaderNode(); ACG::SceneGraph::ShaderNode* shaderNode();
...@@ -214,7 +214,7 @@ class DLLEXPORTONLY MeshObject : public BaseObjectData { ...@@ -214,7 +214,7 @@ class DLLEXPORTONLY MeshObject : public BaseObjectData {
ACG::SceneGraph::TriStripNodeT<MeshT>* meshNode_; ACG::SceneGraph::TriStripNodeT<MeshT>* meshNode_;
/// Scenegraph TextureNode /// Scenegraph TextureNode
TextureNode* textureNode_; ACG::SceneGraph::EnvMapNode* textureNode_;
/// Scenegraph ShaderNode /// Scenegraph ShaderNode
ACG::SceneGraph::ShaderNode* shaderNode_; ACG::SceneGraph::ShaderNode* shaderNode_;
......
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