Changeset 10466 in orxonox.OLD

Timestamp:

Jan 28, 2007, 10:27:14 PM (17 years ago)

Author:

patrick

Message:

better implementation, scalable in both dim

Location:

trunk/src/world_entities

Files:

• scrolling_screen.cc (modified) (3 diffs)
• scrolling_screen.h (modified) (1 diff)

trunk/src/world_entities/scrolling_screen.cc

@@ -75 +75 @@
   this->offset = 0.0;
 
+  this->xSize = 0.;
+  this->ySize = 0.;
   this->mode = SCSC_VIEW;
 }
@@ -91 +93 @@
   LoadParam(root, "setHeight", this, ScrollingScreen, setViewHeight);
 
-  LoadParam(root, "setSize", this, ScrollingScreen, setSize);
+  LoadParam(root, "setSizeX", this, ScrollingScreen, setSizeX);
+  LoadParam(root, "setSizeY", this, ScrollingScreen, setSizeY);
 
   LoadParam(root, "texture", this, ScrollingScreen, setTexture);
@@ -186 +189 @@
   float resize = (1. - (this->viewHeight + this->offset));
 
-  float view = this->ySize * this->ratio;
+  float x,y;
+  if( this->xSize != 0.)
+  {
+    x = this->xSize;
+    y = x * this->ratio;
+  }
+  else
+  {
+    y = this->ySize;
+    x = y * this->ratio;
+  }
+
+  float dx;
+  // we are above/below
+  if( 1 - (offset + ratio) < 0)
+  {
+
+  }
 
   glBegin(GL_QUADS);
-
     // unten links
     glTexCoord2f(0., this->offset + ratio);
-    glVertex3f(0., -view*0.5, -this->ySize*0.5);
+    glVertex3f(0., -x*0.5, -y*0.5);
 
     // unten rechts
     glTexCoord2f(1., this->offset + ratio);
-    glVertex3f(0., -view*0.5, this->ySize*0.5);
+    glVertex3f(0., -x*0.5, y*0.5);
 
     // oben rechts
     glTexCoord2f(1., this->offset);
-    glVertex3f(0., view*0.5, this->ySize*0.5);
+    glVertex3f(0., x*0.5, y*0.5);
 
     // oben links
     glTexCoord2f(0., this->offset);
-    glVertex3f(0., view*0.5, -this->ySize*0.5);
+    glVertex3f(0., x*0.5, -y*0.5);
 
   glEnd();

trunk/src/world_entities/scrolling_screen.h

@@ -35 +35 @@
   void setSpeed(float speed) { this->scrollingSpeed = speed; }
   void setViewHeight(float height) { this->viewHeight = height; }
-  void setSize(float xSize, float ySize) { this->xSize = xSize; this->ySize = ySize; }
+  void setSizeY(float ySize) { this->ySize = ySize; }
+  void setSizeX(float xSize) { this->xSize = xSize; }
 
   virtual void tick (float time);