Changeset 4977 in orxonox.OLD for orxonox/trunk/src/story_entities/world.cc

Timestamp:

Aug 10, 2005, 11:26:59 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: removed the WorldInterface, as its job is already been taken by state.h
also removed some totally obsolete but very cool functions of NPC

File:

• orxonox/trunk/src/story_entities/world.cc (modified) (5 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -20 +20 @@
 #include "world.h"
 
-#include "orxonox.h"
 
 #include "state.h"
@@ -75 +74 @@
 using namespace std;
 
-WorldInterface* WorldInterface::singletonRef = 0;
-
-
-/**
- *  private constructor because of singleton
-*/
-WorldInterface::WorldInterface()
-{
-  this->worldIsInitialized = false;
-  this->worldReference = NULL;
-}
-
-/**
- *  public deconstructor
-*/
-WorldInterface::~WorldInterface()
-{
-  this->singletonRef = NULL;
-  this->worldIsInitialized = false;
-  this->worldReference = NULL;
-}
-
-/**
- *  gets the singleton instance
- * @returns singleton instance
-*/
-WorldInterface* WorldInterface::getInstance()
-{
-  if( singletonRef == NULL)
-    singletonRef = new WorldInterface();
-  return singletonRef;
-}
-
-
-/**
- *  initializes the interface
- * @param reference to the world
-
-   if the worldinterface is not initilizes, there wont be any
-   useable interface
-*/
-void WorldInterface::init(World* world)
-{
-  this->worldReference = world;
-  if( world != NULL)
-    {
-      this->worldIsInitialized = true;
-      PRINTF(3)("WorldInterface up and running\n");
-    }
-}
-
-
-/**
- *  gets the entity list from the world
- * @return entity list
-*/
-tList<WorldEntity>* WorldInterface::getEntityList()
-{
-  if( this->worldIsInitialized)
-    return this->worldReference->getEntities();
-  PRINT(1)("tried to use the WorldInterface before it has been initizlized! this can result in SEGFAULTs!\n");
-  return NULL;
-}
 
 CREATE_FACTORY(World);
@@ -183 +119 @@
   ParticleEngine::getInstance()->debug();
 
-  delete WorldInterface::getInstance();
   delete this->entities;
   State::setWorldEntityList(NULL);
@@ -266 +201 @@
 
   /* init the world interface */
-  WorldInterface* wi = WorldInterface::getInstance();
-  wi->init(this);
 
   LightManager::getInstance();
@@ -677 +610 @@
         EventHandler::getInstance()->subscribe(this->pilotNode, ES_GAME, EV_MOUSE_MOTION);
 
-        // bind input
-        Orxonox *orx = Orxonox::getInstance ();
-        //orx->getLocalInput()->bind (this->pilotNode);
-
         /*
         PNode* tn = TrackManager::getInstance()->getTrackNode();