Changeset 10460 in orxonox.OLD for trunk

Timestamp:

Jan 28, 2007, 9:26:08 PM (18 years ago)

Author:

patrick

Message:

some texture attributes, camera target fix

Location:

trunk/src

Files:

• lib/graphics/importer/texture.h (modified) (1 diff)
• lib/graphics/importer/texture_data.cc (modified) (3 diffs)
• lib/graphics/importer/texture_data.h (modified) (2 diffs)
• world_entities/camera.cc (modified) (3 diffs)
• world_entities/scrolling_screen.cc (modified) (3 diffs)
• world_entities/scrolling_screen.h (modified) (1 diff)

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

@@ -55 +55 @@
   static GLuint loadTexToGL (const SDL_Surface* surface, GLenum target = GL_TEXTURE_2D);
 
+  float getHeight() { return this->data->getHeight(); }
+  float getWidth() { return this->data->getWidth(); }
+
 protected:
   bool setSurface(SDL_Surface* newSurface) { return this->data->setSurface(newSurface); };

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

@@ -21 +21 @@
 #include "compiler.h"
 
-#include "sdlincl.h"
 
 /**
@@ -31 +30 @@
   this->texture = 0;
   this->image = NULL;
+  this->height = 0.;
+  this->width = 0.;
 }
 
@@ -56 +57 @@
 bool TextureData::loadSurface(SDL_Surface* surface, GLenum target)
 {
+  if( surface != NULL)
+  {
+    this->height = surface->h;
+    this->width = surface->w;
+  }
+
   if (Texture::getTextureEnableState())
   {

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

@@ -11 +11 @@
 #include "glincl.h"
 #include "count_pointer.h"
+#include "sdlincl.h"
+
 
 /* Forward Declaration */
@@ -38 +40 @@
     bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; return this->bAlpha; };
     bool setTexture(GLuint texture);
+    float getHeight() { return this->height;}
+    float getWidth() { return this->width; }
 
   private:
+    float            height;             //!< height of tex
+    float            width;              //!< width of tex
     GLuint           texture;            //!< The Texture-ID of opengl from this Texture.
     bool             bAlpha;             //!< if the texture has an alpha channel.

trunk/src/world_entities/camera.cc

@@ -24 +24 @@
 #include "track/track.h"
 #include "script_class.h"
+#include "state.h"
 
 
@@ -100 +101 @@
   //add to track
   if(this->entityTrack)
-  {
     this->setParent(this->entityTrack->getTrackNode());
-    this->setRelCoor(0,0,0);
-  }
 }
 
@@ -112 +110 @@
 void Camera::lookAt(PNode* target)
 {
+  State::setCamera(this, dynamic_cast<CameraTarget*>(target));
   this->target->setParentSoft(target,0.2);
 }

trunk/src/world_entities/scrolling_screen.cc

@@ -102 +102 @@
 void ScrollingScreen::setTexture(const std::string& texture)
 {
-  this->material->setDiffuseMap( texture);
+  this->material->setDiffuseMap(texture);
+
+  Texture t = this->material->diffuseTexture();
+  this->ratio = t.getWidth() / t.getHeight();
 }
 
@@ -126 +129 @@
   this->material->select();
 
-  float resize = -(1. - (this->viewHeight + this->offset));
-  if( resize < 0.)
-    resize = 1.;
-  else resize = 1 - resize;
-
-  float texRes = 1 - resize;
+  float resize = (1. - (this->viewHeight + this->offset));
+  if( resize > 0.)
+    resize = 0.;
+
+
+  float texRes = 1- resize;
 
 
   glBegin(GL_QUADS);
 
-    glTexCoord2f(this->offset, 0.);
+    // unten links
+    glTexCoord2f(0., 1.);
     glVertex3f(0., -this->xSize*0.5, -this->ySize*0.5);
 
-    glTexCoord2f(this->offset, 1.);
+    // unten rechts
+    glTexCoord2f(1., 1.);
     glVertex3f(0., -this->xSize*0.5, this->ySize*0.5);
 
-    glTexCoord2f(this->offset + this->viewHeight - texRes, 1.);
-    glVertex3f(0., this->xSize*0.5 - (resize*this->xSize*0.5), this->ySize*0.5);
-
-    glTexCoord2f(this->offset + this->viewHeight - texRes, 0.);
-    glVertex3f(0., this->xSize*0.5 - (resize*this->xSize*0.5), -this->ySize*0.5);
+    // oben rechts
+    glTexCoord2f(1., 0.);
+    glVertex3f(0., this->xSize*0.5, this->ySize*0.5);
+
+    // oben links
+    glTexCoord2f(0., 0.);
+    glVertex3f(0., this->xSize*0.5, -this->ySize*0.5);
 
   glEnd();
@@ -173 +180 @@
 
     Vector ddir = dir.cross( cam->getAbsDirV());
-    Quaternion q(ddir, cam->getAbsDirV());
+    Quaternion q(ddir, cam->getAbsDirY());
     this->setAbsDir( q);
 

trunk/src/world_entities/scrolling_screen.h

@@ -44 +44 @@
   float           viewHeight;
   float           offset;
+  float           ratio;
 
   float           xSize;