Changeset 3236 in orxonox.OLD

Timestamp:

Dec 20, 2004, 1:39:51 AM (19 years ago)

Author:

patrick

Message:

/orxonox/trunk: unstable - problems getting collision to compile

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (5 diffs)
• camera.cc (modified) (5 diffs)
• camera.h (modified) (1 diff)
• command_node.cc (modified) (3 diffs)
• command_node.h (modified) (1 diff)
• environment.cc (modified) (1 diff)
• player.h (modified) (1 diff)
• world.h (modified) (1 diff)

orxonox/trunk/src/Makefile.am

@@ -10 +10 @@
                  world.cc \
                  player.cc \
+                 collision.cc \
                  data_tank.cc \
                  world_entity.cc \
                  vector.cc \
                  camera.cc \
-                 collision.cc \
                  command_node.cc \
                  ini_parser.cc \
@@ -31 +31 @@
 noinst_HEADERS = ability.h \
                  data_tank.h \
+                 collision.h \
                  npc.h \
                  stdincl.h \
@@ -45 +46 @@
                  power_up.h \
                  vector.h \
-                 collision.h \
                  keynames.h \
                  proto_class.h \

orxonox/trunk/src/Makefile.in

@@ -54 +54 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_orxonox_OBJECTS = orxonox.$(OBJEXT) world.$(OBJEXT) \
-        player.$(OBJEXT) data_tank.$(OBJEXT) world_entity.$(OBJEXT) \
-        vector.$(OBJEXT) camera.$(OBJEXT) collision.$(OBJEXT) \
+        player.$(OBJEXT) collision.$(OBJEXT) data_tank.$(OBJEXT) \
+        world_entity.$(OBJEXT) vector.$(OBJEXT) camera.$(OBJEXT) \
         command_node.$(OBJEXT) ini_parser.$(OBJEXT) keynames.$(OBJEXT) \
         track.$(OBJEXT) base_entity.$(OBJEXT) game_loader.$(OBJEXT) \
@@ -117 +117 @@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DOXYGEN = @DOXYGEN@
-DOXYGEN_FALSE = @DOXYGEN_FALSE@
-DOXYGEN_TRUE = @DOXYGEN_TRUE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -199 +196 @@
                  world.cc \
                  player.cc \
+                 collision.cc \
                  data_tank.cc \
                  world_entity.cc \
                  vector.cc \
                  camera.cc \
-                 collision.cc \
                  command_node.cc \
                  ini_parser.cc \
@@ -220 +217 @@
 noinst_HEADERS = ability.h \
                  data_tank.h \
+                 collision.h \
                  npc.h \
                  stdincl.h \
@@ -234 +232 @@
                  power_up.h \
                  vector.h \
-                 collision.h \
                  keynames.h \
                  proto_class.h \

orxonox/trunk/src/camera.cc

@@ -42 +42 @@
   this->t = 0.0;
 
-  this->actual_place.r.x = 0.0;
-  this->actual_place.r.y = 10.0;
-  this->actual_place.r.z = -5.0;
+  this->actualPlace.r.x = 0.0;
+  this->actualPlace.r.y = 10.0;
+  this->actualPlace.r.z = -5.0;
 }
 
@@ -66 +66 @@
     {this->t += deltaT;}
   //printf("time is: t=%f\n", t );
-  update_desired_place();
+  updateDesiredPlace();
   jump(NULL);
 }
@@ -89 +89 @@
         if( bound != NULL)
           {
-            bound->get_lookat (&lookat);
+            bound->getLookat (&lookat);
             orx->getWorld()->calcCameraPos (&lookat, &plFocus);
             Quaternion *fr;
@@ -169 +169 @@
         if(bound != null)
           {
-            Placement *plBound = bound->get_placement();
+            Placement *plBound = bound->getPlacement();
             Vector vDirection(0.0, 0.0, 1.0);
             Vector eclipticOffset(0.0, 0.0, 5.0);
@@ -237 +237 @@
   // rotation
   float matrix[4][4];
-  actual_place.w.conjugate().matrix (matrix);
+  actualPlace.w.conjugate().matrix (matrix);
   /* orientation and */
   glMultMatrixf ((float*)matrix);
   /*  translation */
-  glTranslatef (-actual_place.r.x, -actual_place.r.y,- actual_place.r.z);
+  glTranslatef (-actualPlace.r.x, -actualPlace.r.y,- actualPlace.r.z);
 //Placement *plBound = bound->get_placement();
 

orxonox/trunk/src/camera.h

@@ -26 +26 @@
  private:
   WorldEntity* bound;           //!< the WorldEntity the Camera is bound to
-  Placement actual_place;               //!< the Camera's current position
+  Placement actualPlace;                //!< the Camera's current position
   Placement desiredPlace;        //!< where the Camera should be according to calculations
   World* world;

orxonox/trunk/src/command_node.cc

@@ -54 +54 @@
   this->bEnabled = true;
   this->world = NULL;
-  this->load_bindings (filename);
+  this->loadBindings (filename);
 }
 
@@ -139 +139 @@
   int* index;
   
-  while( parser.next_var (namebuf, valuebuf) != -1)
-    {
-      index = name_to_index (namebuf);
+  while( parser.nextVar (namebuf, valuebuf) != -1)
+    {
+      index = nameToIndex (namebuf);
       switch( index[0])
         {
@@ -208 +208 @@
 }
 
-void CommandNode::process_local ()
+void CommandNode::processLocal ()
 {
   SDL_Event event;

orxonox/trunk/src/command_node.h

@@ -61 +61 @@
   void reset ();
   void enable (bool bEnabled);
-  void load_bindings (char* filename);
+  void loadBindings (char* filename);
   void bind (WorldEntity* entity);
   void unbind (WorldEntity* entity);

orxonox/trunk/src/environment.cc

@@ -71 +71 @@
   float matrix[4][4];
   
-  glTranslatef(get_placement()->r.x,get_placement()->r.y,get_placement()->r.z);
-  get_placement()->w.matrix (matrix);
+  glTranslatef(getPlacement()->r.x,getPlacement()->r.y,getPlacement()->r.z);
+  getPlacement()->w.matrix (matrix);
   glMultMatrixf ((float*)matrix);
 

orxonox/trunk/src/player.h

@@ -19 +19 @@
   ~Player();
   
-  virtual void post_spawn();
+  virtual void postSpawn();
   virtual void tick(float time);
   virtual void hit(WorldEntity* weapon, Vector loc);

orxonox/trunk/src/world.h

@@ -85 +85 @@
 };
 
-/**
-    \brief spawn a new WorldEntity at a Location
-    \param loc: the Location where the Entity should be spawned
-    \param owner: a pointer to the parent of the Entity
-    \return a pointer to the new WorldEntity or NULL if there was an error
-    
-    You can use this function to spawn any derivation of WorldEntity you want, just specify the desired
-    class within the template specification brackets. Do not attempt to spawn any classes that have NOT been
-    derived from WorldEntity, you won't even be able to compile the code. Note that this version of spawn()
-    works with both free and bound WorldEntities.
-*/ 
-template<typename T> T* World::spawn(Location* loc = NULL, WorldEntity* owner = NULL)
-{
-  Location zeroloc;
-  T* entity = new T();
-  entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
-  if( loc == NULL)
-    {
-      zeroloc.dist = 0;
-      zeroloc.part = 0;
-      zeroloc.pos = Vector();
-      zeroloc.rot = Quaternion();
-      loc = &zeroloc;
-    }
-  entity->init (loc, owner);
-  if (entity->bFree)
-    {
-      track[loc->part].map_coords( loc, entity->get_placement());
-    }
-  entity->post_spawn ();
-  return entity;
-}
-
-/**
-    \brief spawn a new WorldEntity at a Placement
-    \param lplc: the placement where the Entity should be spawned
-    \param owner: a pointer to the parent of the Entity
-    \return a pointer to the new WorldEntity or NULL if there was an error
-    
-    You can use this function to spawn any FREE derivation of WorldEntity you want, just specify the desired
-    class within the template specification brackets. Do not attempt to spawn any classes that have NOT been
-    derived from WorldEntity, you won't even be able to compile the code. Note that this version of spawn()
-    works with free WorldEntities only, you will provoke an error message if you try to spawn a bound Entity with 
-    a Placement.
-*/ 
-template<typename T> T* World::spawn(Placement* plc, WorldEntity* owner = NULL)
-{
-  T* entity = new T();
-  entities->add ((WorldEntity*)entity, LIST_ADD_NEXT);
-  entity->init (plc, owner);
-  if (!entity->bFree)
-    {
-      printf("Can't spawn unfree entity with placement\n"); 
-      entities->remove( (WorldEntity*)entity, LIST_FIND_FW);
-      return NULL;
-    }
-  entity->post_spawn ();
-  return entity;
-}
-
 #endif /* _WORLD_H */