...
 
Commits (3)
......@@ -82,12 +82,12 @@ public:
ACG_CLASSNAME(StatusNodeView);
void draw(GLState& , const DrawModes::DrawMode& );
void draw(GLState& , const DrawModes::DrawMode& ) override;
void getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawMode& _drawMode , const Material* _mat);
void getRenderObjects(IRenderer* _renderer, GLState& _state , const DrawModes::DrawMode& _drawMode , const Material* _mat) override;
void enter(GLState& _state, const DrawModes::DrawMode& _drawmode);
void leave(GLState& _state, const DrawModes::DrawMode& _drawmode);
void enter(GLState& _state, const DrawModes::DrawMode& _drawmode) override;
void leave(GLState& _state, const DrawModes::DrawMode& _drawmode) override;
private:
......
......@@ -61,30 +61,16 @@
//== INCLUDES =================================================================
#include <OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh>
#include <ACG/Scenegraph/StatusNodesT.hh>
#include <OpenMesh/Core/Mesh/DefaultPolyMesh.hh>
//== TYPEDEFS =================================================================
/** Default traits for the PolyMesh
*/
struct PolyTraits : public OpenMesh::DefaultTraits
{
/// Use double precision points
typedef OpenMesh::Vec3d Point;
/// Use double precision Normals
typedef OpenMesh::Vec3d Normal;
/// Use RGBA Color
typedef OpenMesh::Vec4f Color;
};
typedef OpenMesh::DefaultTraitsDouble PolyTraits;
/// Simple Name for Mesh
typedef OpenMesh::PolyMesh_ArrayKernelT<PolyTraits> PolyMesh;
//== TYPEDEFS FOR SCENEGRAPH ===============================================
typedef OpenMesh::PolyMesh PolyMesh;
//=============================================================================
#endif // POLYMESH_TYPES_HH defined
......
......@@ -61,31 +61,17 @@
//== INCLUDES =================================================================
#include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh>
#include <OpenMesh/Core/Mesh/DefaultTriMesh.hh>
//== TYPEDEFS =================================================================
/** Traits for the Meshes ( Use request ... calls to add other standard properties or add them in the via add_property.. )\n
* Dont add Properties here as they may prevent plugins from loading!!!!
*/
struct TriTraits : public OpenMesh::DefaultTraits
{
/// Use double precision points
typedef OpenMesh::Vec3d Point;
/// Use double precision Normals
typedef OpenMesh::Vec3d Normal;
/// Use RGBA Color
typedef OpenMesh::Vec4f Color;
};
typedef OpenMesh::DefaultTraitsDouble TriTraits;
/// Simple Name for Mesh
typedef OpenMesh::TriMesh_ArrayKernelT<TriTraits> TriMesh;
//== TYPEDEFS FOR SCENEGRAPH ===============================================
typedef OpenMesh::TriMesh TriMesh;
//=============================================================================
#endif // TRIANGLEMESH_TYPES_HH defined
......