Changeset 7125 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Feb 12, 2006, 6:06:26 PM (18 years ago)

Author:

bensch

Message:

try fix

Location:

trunk/src/world_entities

Files:

• effects/explosion.h (modified) (1 diff)
• environments/water.cc (modified) (2 diffs)
• environments/water.h (modified) (2 diffs)
• skybox.cc (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (1 diff)
• world_entity.cc (modified) (2 diffs)

trunk/src/world_entities/effects/explosion.h

@@ -33 +33 @@
 
     static SpriteParticles*    explosionParticles;
-    BoxEmitter*           emitter;
+    BoxEmitter*                emitter;
 };
 

trunk/src/world_entities/environments/water.cc

@@ -55 +55 @@
 
   this->rebuildGrid();
-  this->waterMaterial = new Material();
   this->waterShader = (Shader*)ResourceManager::getInstance()->load("shaders/water.vert", SHADER, RP_GAME, "shaders/water.frag");
 
@@ -65 +64 @@
 {
   delete this->grid;
-  delete this->waterMaterial;
 }
 

trunk/src/world_entities/environments/water.h

@@ -12 +12 @@
 /* INCLUDES */
 #include "world_entity.h"
+#include "material.h"
+
 
 /* FORWARD DECLARATION */
-class Material;
 class Grid;
 class Shader;
@@ -53 +54 @@
     float           cohesion;        //!< Cohesion.
 
-    Material*       waterMaterial;
+    Material        waterMaterial;
     Shader*         waterShader;
     float           height;          //!< The hight of the Water

trunk/src/world_entities/skybox.cc

@@ -104 +104 @@
 {
   PRINTF(5)("Deleting SkyBox\n");
-  this->setModel(NULL); //< so that WorldEntity does not try to delete it again.
   for (int i = 0; i < 6; i++)
   {

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -226 +226 @@
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
 
-  State::getCameraNode()->setParentSoft(&this->cameraNode);
-  State::getCameraNode()->setRelCoorSoft(-10, 0,0);
-  State::getCameraTargetNode()->setParentSoft(&this->cameraNode);
+  if (State::getCameraNode != NULL)
+  {
+    State::getCameraNode()->setParentSoft(&this->cameraNode);
+    State::getCameraNode()->setRelCoorSoft(-10, 0,0);
+    State::getCameraTargetNode()->setParentSoft(&this->cameraNode);
+  }
 }
 

trunk/src/world_entities/world_entity.cc

@@ -74 +74 @@
 WorldEntity::~WorldEntity ()
 {
+  State::getObjectManager()->toList(this, OM_INIT);
+
+  // Delete the model (unregister it with the ResourceManager)
+  for (unsigned int i = 0; i < this->models.size(); i++)
+    this->setModel(NULL, i);
+
   // Delete the obbTree
   if( this->obbTree != NULL)
@@ -81 +87 @@
     delete this->healthWidget;
 
-  // Delete the model (unregister it with the ResourceManager)
-  for (unsigned int i = 0; i < this->models.size(); i++)
-    this->setModel(NULL, i);
-
-  State::getObjectManager()->toList(this, OM_INIT);
 }