Changeset 3309 in orxonox.OLD

Timestamp:

Dec 30, 2004, 1:51:59 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: added a second worldentity just to test the lists - working but not drawing since there is no model loaded. including second object (importer) results in SEGFAULT

Location:

orxonox/branches/parenting/src

Files:

• environment.cc (modified) (2 diffs)
• player.cc (modified) (5 diffs)
• player.h (modified) (2 diffs)
• world.cc (modified) (4 diffs)
• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (3 diffs)

orxonox/branches/parenting/src/environment.cc

@@ -21 +21 @@
 #include "world_entity.h"
 #include "vector.h"
+#include "importer/object.h"
 
 using namespace std;
 
 
-//Sorry Bensch
-#define LEVEL_LENGTH 500
 
 Environment::Environment () : WorldEntity()
 {
-
-  /*
-  //Sorry Bensch: x,y = 10
-  for (int x = 0; x < 50; x++)
-    {
-      for (int y = 0; y < 50; y++)
-        {
-          mountainTest[x][y] =0;
-                                                 
-        }
-    }
-  //Sorry Bensch: x,y = 9
-  for (int x = 1; x < LEVEL_LENGTH; x++)
-    {
-      for (int y = 1; y < LEVEL_LENGTH; y++)
-        {
-          //mountainTest[x][y] = (float)random() / 900000000;
-          mountainTest[x][y] = (float)(random() % 4);                                       
-        }
-    }
-  */
+  //this->model = new Object("reaplow.obj");
 }
 
 
 
-Environment::~Environment () {}
+Environment::~Environment () 
+{
+  //delete this->model;
+}
 
 void Environment::tick (float time) {}
@@ -70 +52 @@
   glLoadIdentity();
   float matrix[4][4];
-
+  
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+  //rotate
   this->getAbsDir ().matrix (matrix);
+  glMultMatrixf((float*)matrix);
   
-
-  //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();
+  glMatrixMode(GL_MODELVIEW);
+  // this->model->draw();
 }
 
-/*
-void Environment::paint()
-{
-  
-  glPushMatrix();
-  //glScalef(0.5, 0.5, 1.0);
-  //glTranslatef(xCor, yCor, zCor);
-  glTranslatef( -16.0, -2.0, 0.0);
-  
-  glColor3f(0.0, 1.0, 0.0);
-  
-  glBegin(GL_LINES);
-  for (int x = 0; x < LEVEL_LENGTH; x += 1)
-    {
-      for (int y = 0; y < 190; y += 1)
-        {
-          glVertex3f((float)(2*x), (float)(2*y), mountainTest[x][y]);
-          glVertex3f((float)(2*x), (float)(2*(y+1)), mountainTest[x][y+1]);
-        }
-    }
-  glEnd();
-  
-  
-  glBegin(GL_LINES);
-  for (int y = 0; y < LEVEL_LENGTH; y += 1)
-    {
-      for (int x = 0; x < 90; x += 1)
-        {
-          glVertex3f((float)(2*x), (float)(2*y), mountainTest[x][y]);
-          glVertex3f((float)(2*(x+1)), (float)(2*y), mountainTest[x+1][y]);
-        }
-    }
-  glEnd();
-  
-  glPopMatrix();
-  
-}
-
-void Environment::drawEnvironment() 
-{
-
-}
-
-*/

orxonox/branches/parenting/src/player.cc

@@ -19 +19 @@
 #include "stdincl.h"
 #include "collision.h"
+#include "importer/object.h"
 
 using namespace std;
@@ -26 +27 @@
 {
 
-  this->obj = new Object("reaplow.obj");
+  this->model = new Object("reaplow.obj");
   /*
   objectList = glGenLists(1);
@@ -56 +57 @@
 Player::~Player ()
 {
-  delete this->obj;
+  delete this->model;
 }
 
@@ -104 +105 @@
   
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  printf("Player::draw() - (%f, %f, %f)\n", this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
   //rotate
   this->getAbsDir ().matrix (matrix);
@@ -110 +110 @@
   
   glMatrixMode(GL_MODELVIEW);
-  obj->draw();
+  this->model->draw();
   // glCallList(objectList);
 }

orxonox/branches/parenting/src/player.h

@@ -8 +8 @@
 
 #include "world_entity.h"
-#include "importer/object.h"
+
+class Object;
 
 //! Basic controllable WorldEntity
@@ -38 +39 @@
   float acceleration;
   GLuint objectList;
-  Object* obj;
   
   void move(float time);

orxonox/branches/parenting/src/world.cc

@@ -51 +51 @@
 /** 
     \brief remove the World from memory
+    
+    delete everything explicitly, that isn't contained in the parenting tree!
+    things contained in the tree are deleted automaticaly
 */
 World::~World ()
@@ -60 +63 @@
   this->localCamera->destroy();
 
+  this->nullParent->destroy ();
+
+  /*
   WorldEntity* entity = entities->enumerate();  
   while( entity != NULL ) 
@@ -67 +73 @@
     }
   this->entities->destroy();
+  */
 
   /* FIX the parent list has to be cleared - not possible if we got the old list also*/
-  //this->nullParent->destroy ();
-
-  delete this->entities;
-  delete this->localCamera;
+
+
+  //delete this->entities;
+  //delete this->localCamera;
   /* this->localPlayer hasn't to be deleted explicitly, it is 
      contained in entities*/
@@ -170 +177 @@
             
 
-            Vector* es = new Vector (20, 0, 10);
+            Vector* es = new Vector (50, 0, 5);
             Quaternion* qs = new Quaternion ();
             WorldEntity* env = new Environment();
+            env->setName ("env");
             this->spawn(env, es, qs);
 

orxonox/branches/parenting/src/world_entity.cc

@@ -39 +39 @@
   this->bDraw = true;
   collisioncluster = NULL;
-  owner = NULL;
 }
 

orxonox/branches/parenting/src/world_entity.h

@@ -11 +11 @@
 
 class CollisionCluster;
+class Object;
 
 //! Basic class from which all interactive stuff in the world is derived from
@@ -20 +21 @@
   WorldEntity (bool isFree = false);
   virtual ~WorldEntity ();
+
+  Object* model;
   
   //PNode* pNode;
@@ -49 +52 @@
   bool bCollide;
   bool bDraw;
-  
-  WorldEntity* owner;
+
+  //PN WorldEntity* owner;
   CollisionCluster* collisioncluster;
   //PN Placement place;