Changeset 3238 in orxonox.OLD for orxonox/branches/buerli/src/environment.cc

Timestamp:

Dec 20, 2004, 2:42:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/buerli/src/environment.cc (modified) (5 diffs)

orxonox/branches/buerli/src/environment.cc

@@ -16 +16 @@
 */
 
-#include <iostream>
-#include <GL/glut.h>
-#include <stdlib.h>
-
-#include "data_tank.h"
 
 #include "environment.h"
+#include "stdincl.h"
+#include "world_entity.h"
+#include "vector.h"
 
 using namespace std;
@@ -30 +28 @@
 #define LEVEL_LENGTH 500
 
-Environment::Environment () 
-  : WorldEntity()
+Environment::Environment () : WorldEntity()
 {
 
@@ -60 +57 @@
 Environment::~Environment () {}
 
+void Environment::tick (float time) {}
 
+void Environment::hit (WorldEntity* weapon, Vector loc) {}
+
+void Environment::destroy () {}
+
+void Environment::collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags) {}
+
+void Environment::draw () 
+{
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+  float matrix[4][4];
+  
+  glTranslatef(getPlacement()->r.x,getPlacement()->r.y,getPlacement()->r.z);
+  getPlacement()->w.matrix (matrix);
+  glMultMatrixf ((float*)matrix);
+
+  glBegin(GL_TRIANGLES);
+  glColor3f(1,0,1);
+  glVertex3f(0,0,0.5);
+  glVertex3f(-0.5,0,-1);
+  glVertex3f(0.5,0,-1);
+  
+  glVertex3f(0,0,0.5);
+  glVertex3f(0,0.5,-1);
+  glVertex3f(0,-0.5,-1);
+  glEnd();
+    
+  glBegin(GL_QUADS);
+  glColor3f(1,0,1);
+  glVertex3f(0.5,0.5,-1);
+  glVertex3f(0.5,-0.5,-1);
+  glVertex3f(-0.5,-0.5,-1);
+  glVertex3f(-0.5,0.5,-1);
+  glEnd();
+}
+
+/*
 void Environment::paint()
 {
-  /*
+  
   glPushMatrix();
   //glScalef(0.5, 0.5, 1.0);
@@ -95 +130 @@
   
   glPopMatrix();
-  */
+  
 }
 
@@ -103 +138 @@
 }
 
+*/