Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4546 in orxonox.OLD


Ignore:
Timestamp:
Jun 7, 2005, 11:50:01 PM (19 years ago)
Author:
patrick
Message:

orxonox/trunk: implemented some test functions, that don't work untils now: some link error when compiling the collision_detection/framework

Location:
orxonox/trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/lib/collision_detection/cd_engine.cc

    r4519 r4546  
    1717
    1818#include "cd_engine.h"
     19#include "obb_tree.h"
     20#include "debug.h"
    1921
    2022using namespace std;
    … …  
    4446
    4547}
     48
     49
     50void CDEngine::debug()
     51{
     52  PRINT(0)("\n=============================| CDEngine::debug() |===\n");
     53  PRINT(0)("=  CDEngine: Spawning Tree Start\n");
     54
     55  PRINT(0)("=  CDEngine: Spawning Tree: Finished\n");
     56  PRINT(0)("=======================================================\n");     
     57
     58}

  • orxonox/trunk/src/lib/collision_detection/cd_engine.h

    r4541 r4546  
    3434  virtual ~CDEngine(void);
    3535  /** \returns a Pointer to the only object of this Class */
    36   inline static CDEngine* getInstance(void) { if (!singletonRef) singletonRef = new CDEngine();  return singletonRef; };
     36  static CDEngine* getInstance(void) { if (!singletonRef) singletonRef = new CDEngine(); return singletonRef; }
    3737  void init();
    3838
    … …  
    4747
    4848  void checkCollisions();
     49
     50  void debug();
    4951
    5052 private:

  • orxonox/trunk/src/lib/collision_detection/obb_tree.cc

    r4542 r4546  
    1818#include "obb_tree.h"
    1919#include "obb.h"
     20#include "debug.h"
    2021
    2122using namespace std;
    … …  
    6667void OBBTree::drawBVBlended(int currentDepth, const int depth) const
    6768{}
     69
     70
     71void OBBTree::debug()
     72{
     73  PRINT(0)("\n==============================| OBBTree::debug() |===\n");
     74  PRINT(0)("=  Spawning Tree: Start\n");
     75  this->spawnBVTree(1);
     76  PRINT(0)("=  Spawning Tree: Finished\n");
     77  PRINT(0)("=======================================================\n");     
     78
     79}

  • orxonox/trunk/src/lib/collision_detection/obb_tree.h

    r4531 r4546  
    2828  virtual void drawBVBlended(int currentDepth, const int depth) const;
    2929
     30  void debug();
     31
    3032 private:
    3133

  • orxonox/trunk/src/subprojects/collision_detection/collision_detection.cc

    r4530 r4546  
    2121#include "stdlibincl.h"
    2222
     23#include "cd_engine.h"
    2324
    2425void Framework::moduleInit(int argc, char** argv)
    2526{
     27  CDEngine::getInstance();
     28 
    2629}
     30
    2731
    2832void Framework::moduleEventHandler(SDL_Event* event)
    … …  
    3943}
    4044
     45
    4146void Framework::moduleTick(float dt)
    4247{
    4348}
     49
    4450
    4551void Framework::moduleDraw() const
    … …  
    5460  PRINT(0)("\n");
    5561}
     62
    5663
    5764void Framework::moduleInitGui(int argc, char** argv)

  • orxonox/trunk/src/subprojects/framework.h

    r4519 r4546  
    1111#endif
    1212
    13 #define DATA_DIRECTORY "~/svn/data/"
     13#define DATA_DIRECTORY "~/orxonox/repos/trunk/data/"
    1414#define MOUSE_BUTTON_COUNT 8
    1515
Note: See TracChangeset for help on using the changeset viewer.