Changeset 10464 in orxonox.OLD for trunk

Timestamp:

Jan 28, 2007, 10:07:20 PM (18 years ago)

Author:

patrick

Message:

more on scrolling stuff

Location:

trunk/src/world_entities

Files:

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

trunk/src/world_entities/cameraman.h

@@ -53 +53 @@
     float getCurrCameraCoorY();
     float getCurrCameraCoorZ();
+    const Camera* getCurrentCam() { return this->currentCam; }
     bool cameraIsInVector(Camera* camera);
 

trunk/src/world_entities/scrolling_screen.cc

@@ -23 +23 @@
 #include "material.h"
 #include "state.h"
-// #include "camera.h"
+#include "cameraman.h"
+#include "camera.h"
 
 ObjectListDefinition(ScrollingScreen);
@@ -73 +74 @@
   this->transparency = 1.0;
   this->offset = 0.0;
+
+  this->mode = SCSC_VIEW;
 }
 
@@ -112 +115 @@
 
 void ScrollingScreen::draw() const
+{
+
+  if( this->mode == SCSC_FULL)
+    this->drawFull();
+  else
+    this->drawView();
+}
+
+void ScrollingScreen::drawFull() const
 {
   glPushAttrib(GL_ENABLE_BIT);
@@ -129 +141 @@
   this->material->select();
 
-  float resize = (1. - (this->viewHeight + this->offset));
-  if( resize > 0.)
-    resize = 0.;
-
-
-  float texRes = 1- resize;
-
 
   glBegin(GL_QUADS);
@@ -161 +166 @@
 }
 
+void ScrollingScreen::drawView() const
+{
+  glPushAttrib(GL_ENABLE_BIT);
+  glDisable(GL_LIGHTING);
+  glDisable(GL_FOG);
+  glEnable(GL_BLEND);
+
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  /* translate */
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+
+  this->material->select();
+
+  float resize = (1. - (this->viewHeight + this->offset));
+
+  float view = this->ySize * this->ratio;
+
+  glBegin(GL_QUADS);
+
+    // unten links
+    glTexCoord2f(0., 1.);
+    glVertex3f(0., -view*0.5, -this->ySize*0.5);
+
+    // unten rechts
+    glTexCoord2f(ratio, 1.);
+    glVertex3f(0., -view*0.5, this->ySize*0.5);
+
+    // oben rechts
+    glTexCoord2f(ratio, 0.);
+    glVertex3f(0., view*0.5, this->ySize*0.5);
+
+    // oben links
+    glTexCoord2f(0., 0.);
+    glVertex3f(0., view*0.5, -this->ySize*0.5);
+
+  glEnd();
+
+  glPopAttrib();
+  glPopMatrix();
+}
+
+
 /**
  *
@@ -166 +218 @@
 void ScrollingScreen::tick (float time)
 {
-  if( State::getCameraNode() != NULL && State::getCameraTargetNode() != NULL)
-  {
-    PNode* cam = State::getCameraNode();
-    PNode* tar = State::getCameraTargetNode();
+
+    CameraMan* cm = State::getCameraman();
+    const Camera* cam = cm->getCurrentCam();
+    PNode* tar = cam->getTargetNode();
 
     Vector dir = tar->getAbsCoor() - cam->getAbsCoor();
-    dir.normalize();
+    dir = dir.getNormalized();
 
     float offset = 4.;
@@ -197 +249 @@
 //     }
 
-  }
+
 }
 

trunk/src/world_entities/scrolling_screen.h

@@ -19 +19 @@
   virtual ~ScrollingScreen();
 
+  typedef enum ScScMode
+  {
+     SCSC_FULL  = 0,
+     SCSC_VIEW
+  };
+
   void init();
   virtual void loadParams(const TiXmlElement* root);
@@ -34 +40 @@
 
   virtual void draw() const;
+  void drawFull() const;
+  void drawView() const;
+
 
 private:
@@ -49 +58 @@
   float           ySize;
 
+  int             mode;
 
 };