Changeset 7369 in orxonox.OLD for trunk

Timestamp:

Apr 25, 2006, 11:46:21 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some minor movement and renaming

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (3 diffs)
• game_world_data.cc (modified) (4 diffs)
• game_world_data.h (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -52 +52 @@
 #include "shell.h"
 
-#include "animation_player.h"
-#include "animation3d.h"
-
 #include "ogg_player.h"
 #include "shader.h"
+
+#include "animation_player.h"
 
 #include "game_rules.h"
@@ -125 +124 @@
   State::setCurrentStoryEntity(dynamic_cast<StoryEntity*>(this));
   this->dataTank->init();
+
+  /* initialize some engines and graphical elements */
+  AnimationPlayer::getInstance();
+  PhysicsEngine::getInstance();
+
 }
 
@@ -179 +183 @@
 ErrorMessage GameWorld::unloadData()
 {
+  PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
+
+  this->dataTank->unloadData();
+
   delete this->shell;
-  PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
-
-  this->dataTank->unloadData();
+  this->shell = NULL;
+  delete AnimationPlayer::getInstance();
+  delete PhysicsEngine::getInstance();
 
   State::setCurrentStoryEntity(NULL);

trunk/src/story_entities/game_world_data.cc

@@ -28 +28 @@
 #include "util/loading/game_loader.h"
 
-#include "p_node.h"
 #include "world_entity.h"
 #include "player.h"
 #include "camera.h"
-#include "environment.h"
-#include "terrain.h"
-#include "test_entity.h"
 #include "terrain.h"
 #include "skybox.h"
@@ -58 +54 @@
 #include "glmenu_imagescreen.h"
 
-#include "animation_player.h"
-#include "animation3d.h"
-
 #include "game_rules.h"
 
@@ -114 +107 @@
 
   GraphicsEngine::getInstance()->displayFPS(true);
-
-  /* initialize some graphics engines and graphical elements */
-  AnimationPlayer::getInstance();
-  PhysicsEngine::getInstance();
 }
 
@@ -339 +328 @@
   /* delete some garphics and scene eingines */
   delete LightManager::getInstance();
-  delete AnimationPlayer::getInstance();
-  delete PhysicsEngine::getInstance();
 
   if (this->music != NULL)

trunk/src/story_entities/game_world_data.h

@@ -19 +19 @@
 class GLMenuImageScreen;
 
-class TiXmlElement;
 class OggPlayer;
 class GameRules;