Changeset 6769 in orxonox.OLD for trunk/src

Timestamp:

Jan 26, 2006, 2:09:53 PM (19 years ago)

Author:

bensch

Message:

trunk: vertexArrayModel with TexCoords

Location:

trunk/src/lib

Files:

• event/event_handler.cc (modified) (1 diff)
• graphics/importer/material.h (modified) (2 diffs)
• graphics/importer/vertex_array_model.cc (modified) (2 diffs)
• graphics/importer/vertex_array_model.h (modified) (3 diffs)

trunk/src/lib/event/event_handler.cc

@@ -262 +262 @@
     SDL_WM_GrabInput(SDL_GRAB_OFF);
   else
-    SDL_WM_GrabInput(SDL_GRAB_ON);
+    ;//    SDL_WM_GrabInput(SDL_GRAB_ON);
 }
 

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

@@ -18 +18 @@
 #endif
 
+#include "texture.h"
+
 // FORWARD DECLARATIONS //
-class Texture;
 
 //! Class to handle Materials.
@@ -51 +52 @@
   void setSpecularMap(const char* sMap, GLenum target = GL_TEXTURE_2D);
   void setBump(const char* bump);
+  GLuint getDiffuseTexture() const { return (this->diffuseTexture)? this->diffuseTexture->getTexture() : 0; };
 
   static void addTexturePath(const char* pathName);

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

@@ -208 +208 @@
 void VertexArrayModel::addTexCoor(float u, float v)
 {
-  this->texCoords.push_back(u);
-  this->texCoords.push_back(v);
+  this->texCoords.push_back(Vector2D(u,v));
   this->pModelInfo.numTexCoor++;
 }
@@ -358 +357 @@
             this->vertices.size(),
             this->normals.size(),
-            this->texCoords.size()/2,
+            this->texCoords.size(),
             this->colors.size() );
   for (GLuint i = 1; i < this->stripes.size(); ++i)

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

@@ -10 +10 @@
 
 #include "glincl.h"
+#include "vector2D.h"
 
 #include <vector>
@@ -53 +54 @@
   Vector& vertex(unsigned int i) { return this->vertices[i]; };
   Vector& normal(unsigned int i) { return this->normals[i]; };
-  //Vector& texCoord(unsigned int i) { return this->texCoord[i]; };
+  Vector2D& texCoord(unsigned int i) { return this->texCoords[i]; };
   Vector& color(unsigned int i) { return this->colors[i]; };
   GLuint  index(unsigned int i) { return this->indices[i]; };
@@ -68 +69 @@
   std::vector<Vector>        vertices;        //!< The Array that handles the Vertices.
   std::vector<Vector>        normals;         //!< The Array that handles the Normals.
-  std::vector<float>         texCoords;       //!< The Array that handles the VertexTextureCoordinates.
+  std::vector<Vector2D>      texCoords;       //!< The Array that handles the VertexTextureCoordinates.
   std::vector<Vector>        colors;          //!< The Array that handles Colors.