Changeset 2115 in orxonox.OLD

Timestamp:

Jul 13, 2004, 10:49:20 AM (20 years ago)

Author:

chris

Message:

orxonox/branches/chris: Managed to apply all that rotating and translating so that you now actually see the debug player following the track. You can even steer the spaceship via the keys now… unfortunately the coordinate transformations are still a mess. Even though mapping from Locations to Placements seems to work in general, applying the finetuned position and rotation still messes up the whole damn thing…

Location:

orxonox/branches/chris/src

Files:

• camera.cc (modified) (1 diff)
• camera.h (modified) (1 diff)
• command_node.cc (modified) (2 diffs)
• orxonox.cc (modified) (1 diff)
• player.cc (modified) (3 diffs)
• track.cc (modified) (2 diffs)
• world.cc (modified) (1 diff)

orxonox/branches/chris/src/camera.cc

@@ -87 +87 @@
                 // TO DO: implement options for frustum generation
         glFrustum( -1.0,1.0,-1.0,1.0,1.5,250.0);
-        glRotatef(h,1,0,0);
-        glRotatef(h/2,0,1,0);
-        glRotatef(h/4,0,0,1);
-        h += 3;
-//      glRotatef(90,0,0,1);
+//Vector up(0,0,1);
+//Vector dir(1,0,0);
+//Quaternion q(dir,up);
+//float matrix[4][4];
+//q.conjugate().matrix (matrix);
+//glMultMatrixf ((float*)matrix);
+//glTranslatef (10,0,-5);
+//
+//dir = Vector(-1,-1,0);
+//q = Quaternion( dir, up);
+//glMatrixMode (GL_MODELVIEW);
+//glLoadIdentity ();
+//q.matrix (matrix);
+//glMultMatrixf ((float*)matrix);
+//glTranslatef (2,2,0);
+//
+//glBegin(GL_TRIANGLES);
+//glColor3f(1,0,0);
+//glVertex3f(0,0,0.5);
+//glColor3f(0,1,0);
+//glVertex3f(-0.5,0,-1);
+//glColor3f(0,0,1);
+//glVertex3f(0.5,0,-1);
+//glEnd();      
+
         // rotation
   float matrix[4][4];

orxonox/branches/chris/src/camera.h

@@ -26 +26 @@
         void update_desired_place ();
         
-        float h;
-        
  public:
   Camera ();

orxonox/branches/chris/src/command_node.cc

@@ -194 +194 @@
 void CommandNode::relay (Command* cmd)
 {
-perror("CommandNode|relay()");
+printf("CommandNode|relay()\n");
         List<WorldEntity>* plist = bound;
         
@@ -204 +204 @@
         while( (plist = plist->get_next()) != NULL)
         {
-                (plist->get_object())->command (cmd);
+                plist->get_object()->command (cmd);
         }
 }

orxonox/branches/chris/src/orxonox.cc

@@ -253 +253 @@
                 return true;
         }
+        return false;
 }
 

orxonox/branches/chris/src/player.cc

@@ -61 +61 @@
 void Player::command (Command* cmd)
 {
+        printf("Player|recieved command [%s]\n", cmd->cmd);
         if( !strcmp( cmd->cmd, "up")) bUp = !cmd->bUp;
         else if( !strcmp( cmd->cmd, "down")) bDown = !cmd->bUp;
@@ -71 +72 @@
 {
         glMatrixMode(GL_MODELVIEW);
+        glLoadIdentity();
         float matrix[4][4];
-  get_placement()->w.matrix (matrix);
-  glLoadMatrixf ((float*)matrix);
 
         glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
+  get_placement()->w.matrix (matrix);
+  glMultMatrixf ((float*)matrix);
         
         glBegin(GL_TRIANGLES);
         glColor3f(1,0,0);
-        glVertex3f(0,0,0);
+        glVertex3f(0,0,0.5);
         glColor3f(0,1,0);
-        glVertex3f(-1,-0.5,0);
+        glVertex3f(-0.5,0,-1);
         glColor3f(0,0,1);
-        glVertex3f(-1,+0.5,0);
+        glVertex3f(0.5,0,-1);
         glEnd();
         
@@ -123 +125 @@
         
         velocity = velocity + (accel * time);
+        printf("Player|velocity %f/%f/%f\n", velocity.x, velocity.y, velocity.z);
 }
 

orxonox/branches/chris/src/track.cc

@@ -50 +50 @@
         
         camplc->r = trace.r + (trace.a * ((lookat->dist-10.0) / l)) + Vector(0,0,5.0);
-        camplc->w = Quaternion((trace.r + (trace.a * ((lookat->dist) / l)) - camplc->r), Vector(0,0,1));
+        camplc->w = Quaternion(Vector(0,0,0) - ((trace.r + (trace.a * ((lookat->dist) / l)) - camplc->r)), Vector(0,0,1));
         
 }
@@ -69 +69 @@
         Quaternion dir(trace.a, Vector(0,0,1));
         
-        plc->r = trace.r + (trace.a * ((loc->dist) / l)) + dir.apply(loc->pos);
+        plc->r = trace.r + (trace.a * ((loc->dist) / l)) + /*dir.apply*/(loc->pos);
         plc->w = dir * loc->rot;
         

orxonox/branches/chris/src/world.cc

@@ -94 +94 @@
         glLoadIdentity();
         glBegin(GL_LINES);
-        glColor3f(1,0,0);
-/*      for( float x = -128.0; x < 128.0; x += 5.0)
-        {
-                for( float y = -128.0; y < 128.0; y += 5.0)
-                {
+        for( float x = -128.0; x < 128.0; x += 25.0)
+        {
+                for( float y = -128.0; y < 128.0; y += 25.0)
+                {
+                        glColor3f(1,0,0);
                         glVertex3f(x,y,-128.0);
+                        glVertex3f(x,y,0.0);
+                        glColor3f(0.5,0,0);
+                        glVertex3f(x,y,0.0);
                         glVertex3f(x,y,128.0);
                 }
         }
-        glColor3f(0,1,0);
-        for( float y = -128.0; y < 128.0; y += 5.0)
-        {
-                for( float z = -128.0; z < 128.0; z += 5.0)
-                {
+        for( float y = -128.0; y < 128.0; y += 25.0)
+        {
+                for( float z = -128.0; z < 128.0; z += 25.0)
+                {
+                        glColor3f(0,1,0);
                         glVertex3f(-128.0,y,z);
+                        glVertex3f(0.0,y,z);
+                        glColor3f(0,0.5,0);
+                        glVertex3f(0.0,y,z);
                         glVertex3f(128.0,y,z);
                 }
         }
-        glColor3f(0,0,1);
-        for( float x = -128.0; x < 128.0; x += 5.0)
-        {
-                for( float z = -128.0; z < 128.0; z += 5.0)
-                {
+        for( float x = -128.0; x < 128.0; x += 25.0)
+        {
+                for( float z = -128.0; z < 128.0; z += 25.0)
+                {
+                        glColor3f(0,0,1);
                         glVertex3f(x,-128.0,z);
+                        glVertex3f(x,0.0,z);
+                        glColor3f(0,0,0.5);
+                        glVertex3f(x,0.0,z);
                         glVertex3f(x,128.0,z);
                 }
-        }*/
+        }
         //draw track
         glColor3f(0,1,1);