Changeset 9830 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/static_model_data.h

Timestamp:

Sep 26, 2006, 2:54:38 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: Static Model splitted up into Data and Logic part

File:

• branches/new_class_id/src/lib/graphics/importer/static_model_data.h (modified) (10 diffs)

branches/new_class_id/src/lib/graphics/importer/static_model_data.h

@@ -4 +4 @@
  */
 
-#ifndef _STATIC_MODEL_H
-#define _STATIC_MODEL_H
+#ifndef _STATIC_MODEL_DATA_H
+#define _STATIC_MODEL_DATA_H
 
 #include "model.h"
@@ -11 +11 @@
 #include "material.h"
 #include <vector>
+#include "count_pointer.h"
+
 
 // definition of different modes for setting up Faces
@@ -31 +33 @@
 class ModelFaceElement
 {
- public:
+public:
   ModelFaceElement();
   ~ModelFaceElement();
@@ -45 +47 @@
 class ModelFace
 {
- public:
+public:
   ModelFace();
   ~ModelFace();
@@ -59 +61 @@
 class ModelGroup
 {
- public:
+public:
   ModelGroup();
   ~ModelGroup();
@@ -94 +96 @@
   ObjectListDeclaration(StaticModelData);
   public:
+    typedef CountPointer<StaticModelData> Pointer;
+
+  public:
   StaticModelData(const std::string& modelName = "");
   virtual ~StaticModelData();
 
-  virtual void draw() const;
+  void draw() const;
   void draw(int groupNumber) const;
   void draw(const std::string& groupName) const;
@@ -108 +113 @@
   bool addGroup(const std::string& groupString);
 
+  void setScaleFactor(float scaleFactor) { this->scaleFactor = scaleFactor; };
+
   bool addVertex(const std::string& vertexString);
   bool addVertex(float x, float y, float z);
 
   bool addFace(const std::string& faceString);
-  bool addFace(int faceElemCount, VERTEX_FORMAT type, ...);
+  bool addFace(int faceElemCount, VERTEX_FORMAT type, va_list args);
 
   bool addVertexNormal(const std::string& normalString);
@@ -126 +133 @@
 
 
- protected:
-  void cubeModel();
+  const std::vector<GLfloat>& getVertices() const { return this->vertices; };
+  const std::vector<GLfloat>& getNormals() const { return this->normals; };
+  const std::vector<GLfloat>& getTexCoords() const { return this->vTexture; };
+  const std::vector<sTriangleExt>& getTriangles() const { return this->triangles; };
+  ///! HACK SOLUTION sTriangleExt should be const in the modelInfo.
+  sTriangleExt* getTrianglesExt() { return &this->triangles[0]; };
 
+  float getScaleFactor() const  { return scaleFactor; }
+
+protected:
   Material* findMaterialByName(const std::string& materialName);
 
- protected:
-  float            scaleFactor;     //!< The Factor with which the Model should be scaled. @todo maybe one wants to scale the Model after Initialisation
-
- private:
+private:
   bool buildVertexNormals();
 
@@ -144 +155 @@
   bool cleanup();
 
- private:
+private:
   bool                       finalized;       //!< Sets the Object to be finalized.
+
+  float                      scaleFactor;     //!< The Factor with which the Model should be scaled. @todo maybe one wants to scale the Model after Initialisation
 
   unsigned int               faceCount;       //!< A modelwide Counter for the faces
@@ -162 +175 @@
 };
 
-#endif
+#endif /* _STATIC_MODEL_DATA_H */