Changeset 10618 in orxonox.OLD for trunk/src/lib

Timestamp:

Apr 4, 2007, 12:13:53 PM (18 years ago)

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• src/lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• src/lib/collision_reaction (modified) (1 prop)
• src/lib/collision_reaction/cr_engine.h (modified) (1 diff)
• src/lib/collision_reaction/cr_physics_full_walk.cc (modified) (1 diff)
• src/lib/event/key_mapper.cc (modified) (1 diff)
• src/lib/graphics/Makefile.am (modified) (2 diffs)
• src/lib/graphics/glincl.h (copied) (copied from branches/cleanup/src/lib/graphics/glincl.h)
• src/lib/graphics/graphics_engine.cc (modified) (1 diff)
• src/lib/graphics/importer/bsp/bsp_manager.cc (modified) (10 diffs)
• src/lib/graphics/importer/bsp/bsp_manager.h (modified) (1 diff)
• src/lib/graphics/light.h (modified) (1 diff)
• src/lib/graphics/render2D/element_2d.cc (modified) (1 diff)
• src/lib/gui/qt/gui_audio.cc (modified) (1 diff)
• src/lib/gui/qt/gui_control.cc (modified) (1 diff)
• src/lib/gui/qt/gui_general.cc (modified) (1 diff)
• src/lib/gui/qt/gui_video.cc (modified) (1 diff)
• src/lib/lang (modified) (1 prop)
• src/lib/math/curve.h (modified) (3 diffs)
• src/lib/parser/cmdline_parser (modified) (1 prop)
• src/lib/physics/physics_interface.cc (modified) (1 diff)
• src/lib/script_engine (modified) (1 prop)
• src/lib/script_engine/Makefile.am (modified) (1 diff)
• src/lib/script_engine/account.cc (deleted)
• src/lib/script_engine/example.cc (deleted)
• src/lib/script_engine/lunartest2.lua (deleted)
• src/lib/script_engine/object.cc (deleted)
• src/lib/script_engine/script_manager.cc (modified) (1 diff)
• src/lib/shell/shell_input.cc (modified) (2 diffs)
• src/lib/sound/Makefile.am (modified) (1 diff)
• src/lib/sound/alincl.h (copied) (copied from branches/cleanup/src/lib/sound/alincl.h)
• src/lib/sound/ogg_player.cc (modified) (4 diffs)
• src/lib/sound/ogg_player.h (modified) (1 diff)
• src/lib/sound/sound_engine.cc (modified) (1 diff)
• src/lib/sound/sound_engine.h (modified) (1 diff)
• src/lib/util (modified) (1 prop)
• src/lib/util/Makefile.am (modified) (3 diffs)
• src/lib/util/debug_buffer.cc (modified) (2 diffs)
• src/lib/util/filesys/net_link.cc (modified) (3 diffs)
• src/lib/util/filesys/net_link.h (modified) (1 diff)
• src/lib/util/list.h (deleted)
• src/lib/util/loading/game_loader.cc (modified) (1 diff)
• src/lib/util/loading/game_loader.h (modified) (1 diff)
• src/lib/util/threading.cc (deleted)
• src/lib/util/threading.h (deleted)
• src/lib/util/threads (copied) (copied from branches/cleanup/src/lib/util/threads)
• src/lib/util/threads/mutex.h (copied) (copied from branches/cleanup/src/lib/util/threads/mutex.h)
• src/lib/util/threads/mutex_locker.h (copied) (copied from branches/cleanup/src/lib/util/threads/mutex_locker.h)
• src/lib/util/threads/thread.cc (copied) (copied from branches/cleanup/src/lib/util/threads/thread.cc)
• src/lib/util/threads/thread.h (copied) (copied from branches/cleanup/src/lib/util/threads/thread.h)
• src/lib/util/threads/threadincl.h (copied) (copied from branches/cleanup/src/lib/util/threads/threadincl.h)
• src/lib/util/threads/threading.cc (copied) (copied from branches/cleanup/src/lib/util/threads/threading.cc)
• src/lib/util/threads/threading.h (copied) (copied from branches/cleanup/src/lib/util/threads/threading.h)

trunk

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

trunk/src/lib/collision_detection/cd_engine.cc

@@ -22 +22 @@
 #include "model.h"
 #include "world_entity.h"
-#include "terrain.h"
+#include "environments/terrain.h"
 // #include "player.h"
 
@@ -30 +30 @@
 
 #include "bsp/bsp_manager.h"
-#include "bsp_entity.h"
+#include "environments/bsp_entity.h"
 
 

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -629 +629 @@
     PRINTF(5)("s = %f, rA+rB = %f\n", fabs(t.dot(l)), rA+rB);
 
+    //TODO valgrind complains about uninitialised value here
     if( (rA + rB) < fabs(t.dot(l)))
     {

trunk/src/lib/collision_reaction/cr_engine.h

@@ -62 +62 @@
       CR_COLLISION_TYPE_AXIS_Z,            //!< collision on z axis
       CR_COLLISION_TYPE_AXIS_Z_NEG,        //!< collision on negative z axis
+      CR_COLLISION_TYPE_WAY,               //!< collision on the way from last to current position
       CR_COLLISION_TYPE_OBB,               //!< object aligned bounding box collide
 

trunk/src/lib/collision_reaction/cr_physics_full_walk.cc

@@ -163 +163 @@
 
 
+ case CoRe::CREngine::CR_COLLISION_TYPE_WAY:
+          // calulate the height above ground
+          height = collPos.len() - box->halfLength[1];
+
+
+          // object is beneath the plane (ground)
+          //         if(height >= 0.0f && height <= 0.0001f) break ;// Do nothing
+          if( height < 0.0f  )
+          {
+            entity->shiftCoor(Vector(0.0f, -height + 0.5f, 0.0f));
+            entity->setOnGround(true);
+          }
+          // object is already in the wall
+          else if( ce->isInWall())
+          {
+            entity->setAbsCoor(entity->getLastAbsCoor());
+            PRINTF(0)("ground collision: reset pos\n");
+          }
+          else
+          {
+            // entity is not on ground
+            entity->setOnGround(false);
+          }
+          break;
+
+
           /* collision in the Z-AXIS */
         case CoRe::CREngine::CR_COLLISION_TYPE_AXIS_Z:

trunk/src/lib/event/key_mapper.cc

@@ -23 +23 @@
 #include "event_def.h"
 
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "parser/ini_parser/ini_parser.h"
 #include "parser/preferences/preferences.h"

trunk/src/lib/graphics/Makefile.am

@@ -25 +25 @@
 
 noinst_HEADERS =\
+                glincl.h \
                 graphics_engine.h \
                 graphics_effect.h \
@@ -46 +47 @@
 
 
+
 SUBDIRS =       importer \
                 spatial_separation

trunk/src/lib/graphics/graphics_engine.cc

@@ -31 +31 @@
 #include "text.h"
 
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "texture.h"
 

trunk/src/lib/graphics/importer/bsp/bsp_manager.cc

@@ -30 +30 @@
 #include "debug.h"
 #include "material.h"
-#include "camera.h"
+#include "tools/camera.h"
 #include "vertex_array_model.h"
 #include "world_entities/player.h"
@@ -982 +982 @@
   float endDistance = end->dot(node->plane) - node->d;
   float startDistance = start->dot(node->plane) - node->d;
-
-
+  
   if( node->isLeaf) {
     leaf& curLeaf = this->bspFile->leaves[node->leafIndex];
@@ -999 +998 @@
   }
 
-
+  //TODO valgrind complains about uninitialised value here
   if (startDistance >= 0 && endDistance >= 0)     // A
   {   // both points are in front of the plane
@@ -1102 +1101 @@
   this->outputFraction = 1.0f;
 
-
   this->checkCollisionX(worldEntity);
-  this->checkCollisionY(worldEntity);
   this->checkCollisionZ(worldEntity);
+
+  if(!(this->checkCollisionY(worldEntity)))
+  this->checkCollisionWay(worldEntity);
 
 
@@ -1288 +1288 @@
  * check the collision in the x direction (forward, backward)
  */
-void BspManager::checkCollisionX(WorldEntity* entity)
+bool BspManager::checkCollisionX(WorldEntity* entity)
 {
   // Retrieve Bounding box
@@ -1398 +1398 @@
                               SolidFlag);
   }
+
+ return (xCollisionBackward || xCollisionForward);
 }
 
@@ -1404 +1406 @@
  * check the collision in the z direction (up, down)
  */
-void BspManager::checkCollisionY(WorldEntity* entity)
+bool BspManager::checkCollisionY(WorldEntity* entity)
 {
 
@@ -1546 +1548 @@
                               collPos, SolidFlag);
   }
+
+ return (yCollisionUp || yCollisionDown);
 }
 
@@ -1554 +1558 @@
  * check the collision in the z direction (left, right)
  */
-void BspManager::checkCollisionZ(WorldEntity* entity)
+bool BspManager::checkCollisionZ(WorldEntity* entity)
 {
   // Retrieve Bounding box
@@ -1664 +1668 @@
                                collPos , SolidFlag);
   }
+
+ return (zCollisionLeft || zCollisionRight);
+
+}
+
+
+
+
+/**
+ * check wether a collision occured on the way from the last position to the current position
+ */
+bool BspManager::checkCollisionWay(WorldEntity* entity)
+{
+
+
+  
+  plane*            testPlane          = NULL;  //!< the collision test plane
+  Vector            to;
+  Vector            collPos;                    //!< the collision position
+
+  bool              yCollisionUp       = false; //!< flag true if right collision
+  bool              SolidFlag          = false; //!< flag set true if solid
+
+  Vector            from;                   //!< current position of the entity
+  Vector            dirY;                       //!< direction x
+
+  from = entity->getLastAbsCoor();
+  to    = entity->getAbsCoor();
+  collPos = from;
+  dirY =  Vector(0.0, 1.0, 0.0);
+
+
+
+
+  /*   Y Ray up */
+  // init some member variables before collision check
+  this->inputStart = from;
+  this->inputEnd   = to;
+  this->checkCollisionRayN(this->root,0.0f,1.0f, &from, &to );
+
+  if( !this->outputStartsOut )
+  {
+    this->collPlane = new plane;
+    this->collPlane->x = 0.0f;
+    this->collPlane->y = 0.0f;
+    this->collPlane->z = 0.0f;
+    yCollisionUp = true;
+  }
+  else
+  {
+    if( this->outputFraction == 1.0f)
+    {
+      if( this->outputAllSolid )
+      {
+        this->collPlane = new plane;
+        this->collPlane->x = 0.0f;
+        this->collPlane->y = 0.0f;
+        this->collPlane->z = 0.0f;
+        yCollisionUp = true;
+        SolidFlag = true;
+      }
+      else
+      {
+        yCollisionUp = false;
+        collPos = to;
+      }
+    }
+    else
+    {
+      yCollisionUp = true;
+      collPos = from + (to - from) * this->outputFraction;
+      this->out = collPos;        // why this????
+    }
+  }
+  testPlane = this->collPlane;
+
+  // collision registration
+  if( yCollisionUp)
+  {
+    CoRe::CollisionTube::getInstance()->registerCollisionEvent( CoRe::CREngine::CR_COLLISION_TYPE_WAY,
+                              entity, this->parent,
+                              Vector(testPlane->x, testPlane->y, testPlane->z),
+                              collPos, SolidFlag);
+  }
+
+ return yCollisionUp;
 
 }

trunk/src/lib/graphics/importer/bsp/bsp_manager.h

@@ -88 +88 @@
   void  checkCollisionRayN(BspTreeNode * node,float startFraction, float endFraction, Vector* start, Vector* end);
 
-  void checkCollisionX(WorldEntity* entity);
-  void checkCollisionY(WorldEntity* entity);
-  void checkCollisionZ(WorldEntity* entity);
+  bool checkCollisionX(WorldEntity* entity);
+  bool checkCollisionY(WorldEntity* entity);
+  bool checkCollisionZ(WorldEntity* entity);
+  bool checkCollisionWay(WorldEntity* entity);
 
   void  checkCollisionBox(void);

trunk/src/lib/graphics/light.h

@@ -102 +102 @@
   void setAmbientColor(GLfloat r, GLfloat g, GLfloat b);
   // HACK: Assuming r = g = b values
-inline GLfloat getAmbientColor() {  return this->ambientColor[0]; }
+  // SOLVED: nobody uses it anyway
+  // inline GLfloat getAmbientColor() {  return this->ambientColor[0]; }
 
   Light* getLight(int lightNumber) const;

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -24 +24 @@
 #include "state.h"
 #include "p_node.h"
-#include "camera.h"
+#include "tools/camera.h"
 ///////////////////////////
 

trunk/src/lib/gui/qt/gui_audio.cc

@@ -30 +30 @@
 #include <QtGui/QLCDNumber>
 #include "debug.h"
-#include "globals.h"
+#include "orxonox_globals.h"
 
 #include "qt_gui_elements.h"

trunk/src/lib/gui/qt/gui_control.cc

@@ -35 +35 @@
 #include "lib/event/key_names.h"
 
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "debug.h"
 #include "qt_gui_elements.h"

trunk/src/lib/gui/qt/gui_general.cc

@@ -31 +31 @@
 
 #include "debug.h"
-#include "globals.h"
+#include "orxonox_globals.h"
 
 #include "qt_gui_elements.h"

trunk/src/lib/gui/qt/gui_video.cc

@@ -28 +28 @@
 
 #include <QtGui/QLayout>
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "debug.h"
 

trunk/src/lib/math/curve.h

@@ -10 +10 @@
 #define _CURVE_H
 
+#include <list>
 #include "vector.h"
 #include "quaternion.h"
-
-template<class T> class tList;
-template<class T> class tIterator;
 
 //! An Enumerator that defines what sort of Curves are availible
@@ -73 +71 @@
   Curve*                dirCurve;        //!< The derivation-curve of this Curve.
 
-  tList<PathNode>*      nodeList;        //!< A list of all the Nodes of a Curve.
-  tIterator<PathNode>*  nodeIterator;    //!< An iterator that should point to the current Node
+  std::list<PathNode>   nodeList;        //!< A list of all the Nodes of a Curve.
   PathNode*             firstNode;       //!< First node of the curve.
   PathNode*             currentNode;     //!< The node we are working with (the Last node).
@@ -105 +102 @@
 
 
-//! B-Spline
-/**
-   class to handle b-spline in 3d space
-*/
-class BSplieCurve : public Curve
-{
-
-
-};
-
 #endif /* _CURVE_H */

trunk/src/lib/parser/cmdline_parser

@@ -2 +2 @@
 Makefile.in
 .deps
-libORX*
+*.a

@@ -2 +2 @@
 Makefile.in
 .deps
-libORX*
+*.a

trunk/src/lib/physics/physics_interface.cc

@@ -27 +27 @@
 
 #include "string.h"
-#include "stdincl.h"
 
 

trunk/src/lib/script_engine/Makefile.am

@@ -28 +28 @@
                 script_method.h \
                 executor_lua_state.h
-
-
-
-
-check_PROGRAMS = example
-example_DEPENDENCIES = \
-                $(MAINSRCDIR)/world_entities/libORXwe.a \
-                $(libORXlibs_a_LIBRARIES_) \
-                $(MAINSRCDIR)/util/libORXutils.a
-example_LDADD = \
-                $(MAINSRCDIR)/util/libORXutils.a \
-                $(libORXlibs_a_LIBRARIES_) \
-                libORXscript.a -L../../../extern_libs @LUA_LIBS@ \
-                $(MAINSRCDIR)/world_entities/libORXwe.a \
-                $(libORXlibs_a_LIBRARIES_) \
-                $(MAINSRCDIR)/util/libORXutils.a
-
-example_SOURCES= \
-                example.cc \
-                \
-                ../util/executor/executor_lua.cc

trunk/src/lib/script_engine/script_manager.cc

@@ -25 +25 @@
 
 #include "script.h"
-#include "script_trigger.h"
+#include "tools/script_trigger.h"
 #include "luaincl.h"
 #include "loading/load_param_xml.h"

trunk/src/lib/shell/shell_input.cc

@@ -24 +24 @@
 #include "compiler.h"
 #include "key_names.h"
+
+#include "game_world.h"
+#include "state.h"
 
 
@@ -284 +287 @@
   {
     if (this->delayed > 0.0)
-      this->delayed -= dt;
+    {
+      StoryEntity* storyEntity = State::getCurrentStoryEntity();
+      float speed = 1;
+      if ( storyEntity && storyEntity->isA( GameWorld::staticClassID() ) )
+      {
+        speed = ((GameWorld*)storyEntity)->getSpeed();
+      }
+      this->delayed -= dt / speed;
+    }
     else if (this->pressedKey != SDLK_FIRST )
     {

trunk/src/lib/sound/Makefile.am

@@ -11 +11 @@
                         ogg_player.cc
 
-noinst_HEADERS = sound_engine.h \
-                 sound_source.h \
-                 sound_buffer.h \
-                 sound_buffer_data.h \
-                 resource_sound_buffer.h \
-                 ogg_player.h
+noinst_HEADERS = \
+                alincl.h \
+                sound_engine.h \
+                sound_source.h \
+                sound_buffer.h \
+                sound_buffer_data.h \
+                resource_sound_buffer.h \
+                ogg_player.h

trunk/src/lib/sound/ogg_player.cc

@@ -79 +79 @@
   bool OggPlayer::open(const std::string& fileName)
   {
-    OrxThread::MutexLock musicLock(&this->musicMutex);
+    OrxThread::MutexLocker musicLock(&this->musicMutex);
     // release old Ogg-File (if loaded)
     if (this->state & OggPlayer::FileOpened)
@@ -212 +212 @@
     if (this->state & OggPlayer::FileOpened)
     {
-      OrxThread::MutexLock musicLock(&this->musicMutex);
+      OrxThread::MutexLocker musicLock(&this->musicMutex);
       ov_time_seek(&this->oggStream, timeCode);
     }
@@ -263 +263 @@
     {
       {
-        OrxThread::MutexLock musicLock(&ogg->musicMutex);
+        OrxThread::MutexLocker musicLock(&ogg->musicMutex);
         ogg->update();
       }
@@ -286 +286 @@
     this->state |= OggPlayer::Playing;
 
-    OrxThread::MutexLock musicLock(&this->musicMutex);
+    OrxThread::MutexLocker musicLock(&this->musicMutex);
     if(!this->stream(this->buffers[0]) || !this->stream(this->buffers[1]))
     {

trunk/src/lib/sound/ogg_player.h

@@ -13 +13 @@
 #include <ogg/ogg.h>
 #include <vorbis/vorbisfile.h>
-#include "util/threading.h"
+#include "util/threads/mutex_locker.h"
 
 struct File;

trunk/src/lib/sound/sound_engine.cc

@@ -24 +24 @@
 #include "debug.h"
 #include "parser/preferences/preferences.h"
-#include "globals.h"
+#include "orxonox_globals.h"
 #include "resource_sound_buffer.h"
 

trunk/src/lib/sound/sound_engine.h

@@ -15 +15 @@
 #include <list>
 #include <stack>
-#include "threading.h"
+#include "threads/mutex.h"
 
 #define SOUND_DOPPLER_FACTOR       0.001          //!< A factor for the audible doppler effect

trunk/src/lib/util/Makefile.am

@@ -29 +29 @@
                 filesys/net_link.cc \
                 \
-                threading.cc \
+                threads/thread.cc \
                 timer.cc
 
@@ -63 +63 @@
                 filesys/net_link.h \
                 \
-                threading.h \
+                threads/threading.h \
+                threads/thread.h \
+                threads/mutex.h \
+                threads/mutex_locker.h \
+                \
                 timer.h \
                 \
@@ -77 +81 @@
                 loading/dynamic_loader.h \
                 \
-                count_pointer.h \
-                list.h
+                count_pointer.h

trunk/src/lib/util/debug_buffer.cc

@@ -20 +20 @@
 #include "debug.h"
 #include "compiler.h"
-#include "threading.h"
+#include "threads/mutex_locker.h"
 
 /**
@@ -64 +64 @@
   static OrxThread::Mutex DebugBuffer__bufferMutex;
 
-  OrxThread::MutexLock bufferLock(&DebugBuffer__bufferMutex);
+  OrxThread::MutexLocker bufferLock(&DebugBuffer__bufferMutex);
 
   va_list arguments;

trunk/src/lib/util/filesys/net_link.cc

@@ -17 +17 @@
 #include "debug.h"
 
+#include "threads/mutex_locker.h"
 
 #ifdef __OSX__
@@ -45 +46 @@
 int NetLink::openupInBrowser(void* url)
 {
-  OrxThread::MutexLock lock(&NetLink::_mutex);
+  OrxThread::MutexLocker lock(&NetLink::_mutex);
 
   std::string URL = *(std::string*)url;
@@ -69 +70 @@
 void NetLink::setDefaultBrowser(const std::string& browserName)
 {
-  OrxThread::MutexLock lock(&NetLink::_mutex);
+  OrxThread::MutexLocker lock(&NetLink::_mutex);
   NetLink::_defaultBrowser = browserName;
 }

trunk/src/lib/util/filesys/net_link.h

@@ -19 +19 @@
 #include <list>
 
-#include "threading.h"
+#include "threads/mutex.h"
 
 //! NetLink is a File and Link executer for Internet Links

trunk/src/lib/util/loading/game_loader.cc

@@ -23 +23 @@
 #include "debug.h"
 #include "campaign.h"
+#include "compiler.h"
 
 #include "key_mapper.h"

trunk/src/lib/util/loading/game_loader.h

@@ -9 +9 @@
 //#include "stdincl.h"
 #include "story_def.h"
-#include "comincl.h"
 #include "event_listener.h"
 

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -2 +2 @@
 Makefile.in
 .deps
-libORX*
+*.a