Changeset 6446 in orxonox.OLD

Timestamp:

Jan 9, 2006, 12:05:57 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: added grid class

Location:

trunk/src

Files:

• lib/graphics/importer/Makefile.am (modified) (3 diffs)
• lib/graphics/importer/grid.cc (copied) (copied from trunk/src/proto/proto_class.cc) (3 diffs)
• lib/graphics/importer/grid.h (copied) (copied from trunk/src/proto/proto_class.h) (2 diffs)
• util/hud.cc (modified) (1 diff)

trunk/src/lib/graphics/importer/Makefile.am

@@ -6 +6 @@
 libORXimporter_a_SOURCES = model.cc \
                            vertex_array_model.cc \
+                           grid.cc \
                            static_model.cc \
                            objModel.cc \
@@ -21 +22 @@
                  tc.h \
                  vertex_array_model.h \
+                 grid.h \
                  static_model.h \
                  objModel.h \
@@ -30 +32 @@
                  height_map.h \
                  anorms.h \
-                 anormtab.h 
+                 anormtab.h

trunk/src/lib/graphics/importer/grid.cc

@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
 
-#include "proto_class.h"
+#include "grid.h"
 
 using namespace std;
@@ -25 +25 @@
  * @todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass ()
+Grid::Grid(float sizeX, float sizeY, unsigned int rows, unsigned int columns)
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
 
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
+  GLuint i, j;
+  for (i = 0; i < rows; i++)
+  {
+    for (j = 0; j < columns; j++)
+    {
+      this->addVertex((float)i - (float)sizeY/2.0, 0.0, (float)j - (float)sizeX/2.0);
+      this->addNormal(0.0, 1, 0.0);
+      this->addTexCoor((float)i/(float)columns, (float)j/(float)rows);
+      this->addColor((float)i/20.0, 0.0, (float)j/20.0);
+    }
+  }
 
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
+  for (i = 0; i < rows-1; i++)
+  {
+    for (j = 0; j < columns; j++)
+    {
+      this->addIndice( rows*i + j );
+      this->addIndice( rows*(i+1) + j );
+    }
+    this->newStripe();
+  }
+
+  this->_rows = rows;
+  this->_columns = columns;
+  this->_sizeX = sizeX;
+  this->_sizeY = sizeY;
 }
 
@@ -45 +60 @@
  * standard deconstructor
 */
-ProtoClass::~ProtoClass ()
+Grid::~Grid ()
 {
   // delete what has to be deleted here

trunk/src/lib/graphics/importer/grid.h

@@ -1 +1 @@
 /*!
- * @file proto_class.h
+ * @file grid.h
  * @brief Definition of ...
 */
 
-#ifndef _PROTO_CLASS_H
-#define _PROTO_CLASS_H
+#ifndef _GRID_H
+#define _GRID_H
 
-#include "base_object.h"
+#include "vertex_array_model.h"
 
 // FORWARD DECLARATION
@@ -14 +14 @@
 
 //! A class for ...
-class ProtoClass : public BaseObject {
+class Grid : public VertexArrayModel
+{
 
- public:
-  ProtoClass();
-  virtual ~ProtoClass();
+public:
+  Grid(float sizeX, float sizeY, unsigned int resolutionX, unsigned int resolutionY);
+  virtual ~Grid();
 
+  void setSizeX(float sizeX) { this->_sizeX = sizeX; };
+  void setSizeY(float sizeY) { this->_sizeY = sizeY; };
 
- private:
+  float sizeX() const { return this->_sizeX; };
+  float sizeY() const { return this->_sizeY; };
+  unsigned int rows() const { return this->_rows; };
+  unsigned int columns() const { return this->_columns; };
 
+  float& height(unsigned int row, unsigned int column);
+
+private:
+  float             _sizeX;
+  float             _sizeY;
+
+  unsigned int      _rows;
+  unsigned int      _columns;
 };
 
-#endif /* _PROTO_CLASS_H */
+#endif /* _GRID_H */

trunk/src/util/hud.cc

@@ -168 +168 @@
       (*weaponWidget)->setAbsCoor2D((pos-.008)*this->resX, .75*this->resY);
     }
-
   }
-
 }