Changeset 288 for code

Timestamp:

Nov 27, 2007, 11:49:42 PM (17 years ago)

Author:

rgrieder

Message:

• added Chai's HUD overlay
• abstracted debugOverlay —> TestOverlay
• added overlay media files
• cleaned up RunManager a little bit
• omitted using ogre's Singleton template
• added useful CMake structure
• some more things

Location:

code/branches/main_reto_vs05

Files:

• bin/Debug (modified) (1 prop)
• bin/Debug/Plugins.cfg (modified) (1 diff)
• bin/Debug/resources.cfg (modified) (1 diff)
• bin/Release (modified) (1 prop)
• bin/Release/Plugins.cfg (modified) (1 diff)
• bin/Release/resources.cfg (modified) (1 diff)
• media/materials/scripts/Ogre.material (modified) (1 diff)
• media/materials/scripts/Ogre.material.asdf (added)
• media/materials/scripts/smoke.material (added)
• media/materials/textures/smoke.png (added)
• media/materials/textures/smokecolors.png (added)
• media/overlay (added)
• media/overlay/BasicOgreGuiTemplates.inc (added)
• media/overlay/Compositor.overlay (added)
• media/overlay/DP3.overlay (added)
• media/overlay/EnergyBackground.png (added)
• media/overlay/EnergyDistrBackground.png (added)
• media/overlay/Example-CubeMapping.overlay (added)
• media/overlay/Example-DynTex.overlay (added)
• media/overlay/Example-Water.overlay (added)
• media/overlay/MapBackGround.png (added)
• media/overlay/MyShip.png (added)
• media/overlay/OrxonoxBlack.png (added)
• media/overlay/OrxonoxHUD.overlay (added)
• media/overlay/OrxonoxHUD1.1.overlay (added)
• media/overlay/OrxonoxHUD1.2.overlay (added)
• media/overlay/OrxonoxORANGE.png (added)
• media/overlay/OrxonoxRED.png (added)
• media/overlay/PrimalWeaponBackground.png (added)
• media/overlay/PrimarBackground.png (added)
• media/overlay/PrimarChoice.png (added)
• media/overlay/PrimarSample.png (added)
• media/overlay/Racket.png (added)
• media/overlay/RacketBackground.png (added)
• media/overlay/RacketBackground.pxi (added)
• media/overlay/RacketGrid.png (added)
• media/overlay/RedPoint.png (added)
• media/overlay/Shadows.overlay (added)
• media/overlay/ShildLeftBottom.png (added)
• media/overlay/ShildLeftTop.png (added)
• media/overlay/ShildRightBottom.png (added)
• media/overlay/ShildRightTop.png (added)
• media/overlay/TargetBackground.png (added)
• media/overlay/TimeBackground.png (added)
• media/overlay/backGround.png (added)
• media/overlay/clock.png (added)
• media/overlay/gun.png (added)
• media/overlay/man.png (added)
• media/overlay/shot.png (added)
• media/overlay/superegg.png (added)
• media/packs/models.zip (added)
• media/particle (added)
• media/particle/Example-Water.particle (added)
• media/particle/Example.particle (added)
• media/particle/emitted_emitter.particle (added)
• media/particle/smoke.particle (added)
• scripts/weapon_framework.vcproj (modified) (5 diffs)
• src/Lighting.h (added)
• src/camera_manager.cc (deleted)
• src/camera_manager.h (deleted)
• src/hud (added)
• src/hud/hud_overlay.cc (added)
• src/hud/hud_overlay.h (added)
• src/hud/test_overlay.cc (added)
• src/hud/test_overlay.h (added)
• src/main.cc (modified) (4 diffs)
• src/orxonox.cc (modified) (2 diffs)
• src/orxonox_prerequisites.h (modified) (1 diff)
• src/orxonox_ship.cc (modified) (2 diffs)
• src/run_manager.cc (modified) (16 diffs)
• src/run_manager.h (modified) (6 diffs)
• src/weapon/barrel_gun.cc (modified) (2 diffs)
• src/weapon/base_weapon.cc (moved) (moved from code/branches/main_reto_vs05/src/weapon/base_weapon.cpp) (2 diffs)
• src/weapon/weapon.h (deleted)

code/branches/main_reto_vs05/bin/Debug

@@ -17 +17 @@
 Ogre.log
 weapon_framework.exe
+obs_dlls

@@ -17 +17 @@
 Ogre.log
 weapon_framework.exe
+obs_dlls

code/branches/main_reto_vs05/bin/Debug/Plugins.cfg

@@ -8 +8 @@
 Plugin=RenderSystem_GL_d
 Plugin=Plugin_ParticleFX_d
-Plugin=Plugin_BSPSceneManager_d
-Plugin=Plugin_OctreeSceneManager_d
-Plugin=Plugin_CgProgramManager_d
+#Plugin=Plugin_BSPSceneManager_d
+#Plugin=Plugin_OctreeSceneManager_d
+#Plugin=Plugin_CgProgramManager_d
 
 

code/branches/main_reto_vs05/bin/Debug/resources.cfg

@@ -8 +8 @@
 FileSystem=../../media
 FileSystem=../../media/fonts
+FileSystem=../../media/gui
 FileSystem=../../media/materials/scripts
 FileSystem=../../media/materials/textures
 FileSystem=../../media/models
-FileSystem=../../media/gui
+FileSystem=../../media/overlay
+FileSystem=../../media/particle
 Zip=../../media/packs/cubemap.zip
 Zip=../../media/packs/skybox.zip
+Zip=../../media/packs/models.zip

code/branches/main_reto_vs05/bin/Release

@@ -16 +16 @@
 Ogre.log
 weapon_framework.exe
+obs_dlls

@@ -16 +16 @@
 Ogre.log
 weapon_framework.exe
+obs_dlls

code/branches/main_reto_vs05/bin/Release/Plugins.cfg

@@ -8 +8 @@
 Plugin=RenderSystem_GL
 Plugin=Plugin_ParticleFX
-Plugin=Plugin_BSPSceneManager
-Plugin=Plugin_OctreeSceneManager
-Plugin=Plugin_CgProgramManager
+#Plugin=Plugin_BSPSceneManager
+#Plugin=Plugin_OctreeSceneManager
+#Plugin=Plugin_CgProgramManager
 
 

code/branches/main_reto_vs05/bin/Release/resources.cfg

@@ -8 +8 @@
 FileSystem=../../media
 FileSystem=../../media/fonts
+FileSystem=../../media/gui
 FileSystem=../../media/materials/scripts
 FileSystem=../../media/materials/textures
 FileSystem=../../media/models
-FileSystem=../../media/gui
+FileSystem=../../media/overlay
+FileSystem=../../media/particle
 Zip=../../media/packs/cubemap.zip
 Zip=../../media/packs/skybox.zip
+Zip=../../media/packs/models.zip

code/branches/main_reto_vs05/media/materials/scripts/Ogre.material

@@ -118 +118 @@
         }
 }
+
+
+
+material Orxonox/SuperEgg
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture superegg.png
+                        }
+                }
+        }
+}
+
+material Orxonox/Shot
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture shot.png
+                        }
+                }
+        }
+}
+
+
+material Orxonox/Red
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        depth_check off
+                        scene_blend 0.5 0.5
+                        ambient 0 0 0 0.5
+
+                        texture_unit
+                        {
+                                texture OrxonoxRED.png
+                        }
+                }
+        }
+}
+
+
+material Orxonox/Black
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        depth_check off
+                        scene_blend 0.5 0.5
+                        ambient 0 0 0 0.5
+
+                        texture_unit
+                        {
+                                texture OrxonoxBlack.png
+                        }
+                }
+        }
+}
+
+
+material Orxonox/BackGround
+{
+        technique
+        {
+                pass
+                {
+
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+                        texture_unit
+                        {
+                                texture backGround.png
+                        }
+                }
+        }
+}
+
+material Orxonox/EnergyBackground
+{
+        technique
+        {
+                pass
+                {
+
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+                        texture_unit
+                        {
+                                texture EnergyBackground.png
+                        }
+                }
+        }
+}
+
+material Orxonox/Clock
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture clock.png
+                        }
+                }
+        }
+}
+
+material Orxonox/Gun
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture gun.png
+                        }
+                }
+        }
+}
+
+material Orxonox/Man
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture man.png
+                        }
+                }
+        }
+}
+
+material Orxonox/MapBackGround
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture MapBackGround.png
+                        }
+                }
+        }
+}
+
+material Orxonox/MyShip
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture MyShip.png
+                        }
+                }
+        }
+}
+
+material Orxonox/RacketBackground
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture RacketBackground.png
+                        }
+                }
+        }
+}
+
+
+material Orxonox/TargetBackground
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture TargetBackground.png
+                        }
+                }
+        }
+}
+
+material Orxonox/PrimarBackground
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture PrimarBackground.png
+                        }
+                }
+        }
+}
+
+material Orxonox/PrimarSample
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture PrimarSample.png
+                        }
+                }
+        }
+}
+
+material Orxonox/PrimarChoice
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture PrimarChoice.png
+                        }
+                }
+        }
+}
+
+material Orxonox/RedPoint
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture RedPoint.png
+                        }
+                }
+        }
+}
+
+material Orxonox/EnergyDistrBackground
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture EnergyDistrBackground.png
+                        }
+                }
+        }
+}
+
+material Orxonox/ShildLeftTop
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture ShildLeftTop.png
+                        }
+                }
+        }
+}
+
+material Orxonox/ShildRightTop
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture ShildRightTop.png
+                        }
+                }
+        }
+}
+
+material Orxonox/ShildLeftBottom
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture ShildLeftBottom.png
+                        }
+                }
+        }
+}
+
+material Orxonox/ShildRightBottom
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture ShildRightBottom.png
+                        }
+                }
+        }
+}
+
+material Orxonox/TimeBackground
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend alpha_blend
+                        depth_check off
+
+                        texture_unit
+                        {
+                                texture TimeBackground.png
+                        }
+                }
+        }
+}
+

code/branches/main_reto_vs05/scripts/weapon_framework.vcproj

@@ -184 +184 @@
                         >
                         <File
-                                RelativePath="..\src\camera_manager.cc"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\inertial_node.cc"
                                 >
@@ -227 +223 @@
                                 </File>
                                 <File
-                                        RelativePath="..\src\weapon\base_weapon.cpp"
+                                        RelativePath="..\src\weapon\base_weapon.cc"
                                         >
                                 </File>
@@ -280 +276 @@
                                 <File
                                         RelativePath="..\src\class_hierarchy\test3.cc"
+                                        >
+                                </File>
+                        </Filter>
+                        <Filter
+                                Name="hud"
+                                >
+                                <File
+                                        RelativePath="..\src\hud\hud_overlay.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\hud\test_overlay.cc"
                                         >
                                 </File>
@@ -290 +298 @@
                         >
                         <File
-                                RelativePath="..\src\camera_manager.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\src\inertial_node.h"
                                 >
@@ -398 +402 @@
                                 <File
                                         RelativePath="..\src\class_hierarchy\test3.h"
+                                        >
+                                </File>
+                        </Filter>
+                        <Filter
+                                Name="hud"
+                                >
+                                <File
+                                        RelativePath="..\src\hud\hud_overlay.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\src\hud\test_overlay.h"
                                         >
                                 </File>

code/branches/main_reto_vs05/src/main.cc

@@ -26 +26 @@
  */
 
+//#define WITH_HIERARCHY
+
 #include "OgrePlatform.h"
 #include "OgreException.h"
@@ -31 +33 @@
 #include "orxonox.h"
 
+#ifdef WITH_HIERARCHY
 #include "class_hierarchy/BaseObject.h"
 #include "class_hierarchy/Test.h"
@@ -36 +39 @@
 #include "class_hierarchy/test2.h"
 #include "class_hierarchy/test3.h"
+#endif
 
 
@@ -50 +54 @@
 #endif 
   {
-#if 1
+#ifndef WITH_HIERARCHY
     try {
       // create an orxonox application and run it

code/branches/main_reto_vs05/src/orxonox.cc

@@ -99 +99 @@
           ogre_->initialise();
 
-          runMgr_ = new RunManager(ogre_);
+    runMgr_ = RunManager::createSingleton();
+    runMgr_->initialise(ogre_);
 
           return true;
@@ -113 +114 @@
                   delete timer_;
           if (runMgr_)
-                  delete runMgr_;
+      RunManager::destroySingleton();
           if (ogre_)
                   delete ogre_;

code/branches/main_reto_vs05/src/orxonox_prerequisites.h

@@ -52 +52 @@
   }
 
+
+  namespace hud {
+    
+    class HUDOverlay;
+    class TestOverlay;
+
+  }
+
 }
 

code/branches/main_reto_vs05/src/orxonox_ship.cc

@@ -32 +32 @@
 #include "OgreEntity.h"
 #include "OgreSceneManager.h"
+#include "OgreParticleSystem.h"
 
 #include "inertial_node.h"
@@ -127 +128 @@
     railGunStation_->selectWeapon(0);
 
+    // create some nice effects
+
+    ParticleSystem *particles = RunManager::getSingletonPtr()
+      ->getSceneManagerPtr()->createParticleSystem("asdf", "Examples/Smoke");
+
+    fishNode->getSceneNode()->attachObject(particles);
+
+
+
+
           return true;
   }

code/branches/main_reto_vs05/src/run_manager.cc

@@ -26 +26 @@
 
 
-#include "Ogre.h"
-//#include "OgreRoot.h"
-//#include "OgreSceneManager.h"
-//#include "OgreSceneNode.h"
-//#include "OgreCamera.h"
-//#include "OgreViewport.h"
-//#include "OgreRenderWindow.h"
-//#include "OgreOverlay.h"
-//#include "OgreOverlayManager.h"
-//#include "OgreOverlayElement.h"
-//#include "OgreTextureManager.h"
-//#include "OgreMaterialManager.h"
-//#include "OgreLogManager.h"
-//#include "OgreVector3.h"
-//#include "OgreStringConverter.h"
-//#include "OgreWindowEventUtilities.h"
+#include "OgreVector3.h"
+#include "OgreStringConverter.h"
+#include "OgreRoot.h"
+#include "OgreSceneManager.h"
+#include "OgreSceneNode.h"
+#include "OgreCamera.h"
+#include "OgreViewport.h"
+#include "OgreRenderWindow.h"
+#include "OgreTextureManager.h"
+#include "OgreMaterialManager.h"
+#include "OgreLogManager.h"
+#include "OgreWindowEventUtilities.h"
 
 //Use this define to signify OIS will be used as a DLL
@@ -51 +47 @@
 #include "orxonox_scene.h"
 #include "orxonox_ship.h"
-#include "camera_manager.h"
 #include "inertial_node.h"
 
@@ -58 +53 @@
 #include "weapon/base_weapon.h"
 
+#include "hud/hud_overlay.h"
+#include "hud/test_overlay.h"
+
 #include "run_manager.h"
 
-namespace Ogre {
-  using namespace orxonox;
-  template<> RunManager* Singleton<RunManager>::ms_Singleton = 0;
-}
 
 namespace orxonox {
   using namespace Ogre;
   using namespace weapon;
+  using namespace hud;
 
   /**
@@ -82 +77 @@
   */
 
-  RunManager* RunManager::getSingletonPtr(void)
-  {
-      return ms_Singleton;
-  }
-  RunManager& RunManager::getSingleton(void)
-  {  
-      assert( ms_Singleton );  return ( *ms_Singleton );  
-  }
-
-
-  /**
-  * Contructor only needs the render window and the Root object which are both
-  * the OgreControl object.
-  * Right now the constructor does all the initialisation work. This could also
-  * be done in a new method "initialize()", for whatever purpose.
-  * 
-  * 
+
+  RunManager* RunManager::singletonPtr_s = NULL;
+
+
+  /**
+  * Contructor only needs the Root object.
+  */
+  RunManager::RunManager()
+        : ogre_(NULL), window_(NULL), screenShotCounter_(0),
+        timeUntilNextToggle_(0), mouseSensitivity_(0.003), inputManager_(0),
+        mouse_(0), keyboard_(0), joystick_(0), statsOn_(true)
+  {
+  }
+
+  /**
   * @param ogre_ The OgreControl object holding the render window and the Root
   */
-  RunManager::RunManager(OgreControl * ogre)
-        : ogre_(ogre), window_(ogre->getRenderWindow()), //leftButtonDown_(false),
-        statsOn_(true), screenShotCounter_(0), timeUntilNextToggle_(0),
-        filtering_(TFO_BILINEAR), aniso_(1), sceneDetailIndex_(0),
-        mouseSensitivity_(0.003),
-        debugOverlay_(0), inputManager_(0), mouse_(0), keyboard_(0), joystick_(0)
-  {
+  void RunManager::initialise(OgreControl *ogre)
+    {
+    ogre_ = ogre;
+    window_ = ogre->getRenderWindow();
+
     // SETTING UP THE SCENE
 
@@ -126 +117 @@
 
     // Create a space ship object and its SceneNode.
-    // Some ideas about the steering: The ship should only receive events like
-    // up, down, left, right, roll left, roll right, move down, move up, etc).
-    // Multiple interpretations of these commands would make the game more
-    // but it also makes AI steering more difficult, since for every type of
-    // steering, new methods have to be written.
-    // --> clearly define how a space ship can fly (rolling?, conservation of
-    // impuls?, direct mouse sight steeering?, etc.)
     // It should also be considered, that the ship should provide another Node
     // for a camera to be attached (otherwise the spaceship in front of the
-    // would be very static, never moving at all).
+    // ship would be very static, never moving at all).
 
     // Construct a new spaceship and give it the node
@@ -145 +129 @@
 
     // load all resources and create the entities by calling the initialise()
-    // methods for each object (don't initialise in the constructor!).
+    // methods for each object (no constructor initialisations!).
     backgroundScene_->initialise();
     playerShip_->initialise();
@@ -151 +135 @@
 
     // CAMERA AND VIEWPORT
-    // TODO: create a camera manager. It should be able to change its position
-    // around the space ship (predefined states would be nice too). And it should
-    // also be able to switch between different locations (like ship, spactator,
-    // certain fixed positions (e.g. finish line, etc.)). These are just ideas.
 
     // create camera and viewport
@@ -160 +140 @@
     createViewports();
 
+    // create HUD
+    hud_ = new hud::TestOverlay(window_);
+    hud_->show();
+
 
     // Set default mipmap level (NB some APIs ignore this)
     TextureManager::getSingleton().setDefaultNumMipmaps(5);
 
-    
 
     // HUMAN INTERFACE
 
-    using namespace OIS;
-
-    debugOverlay_ = OverlayManager::getSingleton()
-      .getByName("Core/DebugOverlay");
+    using namespace OIS;    
 
     LogManager::getSingletonPtr()->logMessage("*** Initializing OIS ***");
@@ -201 +181 @@
     windowResized(window_);
 
-    showDebugOverlay(true);
+    //showDebugOverlay(true);
 
     // REGISTER THIS OBJECT AS A WINDOW EVENT LISTENER IN OGRE
@@ -225 +205 @@
     if (bulletManager_)
       delete bulletManager_;
-  }
-
-
-  /**
-  * Method to compute anyting between 2 frames.
+    if (hud_)
+      delete hud_;
+  }
+
+
+  /**
+  * Method to compute anything between 2 frames.
   * 
   * Everything that needs to be computed during the games happens right here.
@@ -250 +232 @@
 
 
-    // Update the 'HUD'
-    updateStats();
+    // Update the HUD
+    hud_->setDebugText(" | Speed = "
+      + StringConverter::toString(playerShip_->getSpeed())
+      + " | Left Ammo = "
+      + StringConverter::toString(playerShip_
+      ->getMainWeapon()->getAmmoState())
+      + " | Ammo stock = "
+      + StringConverter::toString(playerShip_->getAmmoStock()));
+
+    hud_->tick(time, deltaTime);
 
     // update the bullet positions
@@ -404 +394 @@
     {
       statsOn_ = !statsOn_;
-      showDebugOverlay(statsOn_);
-      timeUntilNextToggle_ = 1;
-    }
-
-    if( keyboard_->isKeyDown(KC_T) && timeUntilNextToggle_ <= 0 )
-    {
-      switch(filtering_)
-      {
-      case TFO_BILINEAR:
-        filtering_ = TFO_TRILINEAR;
-        aniso_ = 1;
-        break;
-      case TFO_TRILINEAR:
-        filtering_ = TFO_ANISOTROPIC;
-        aniso_ = 8;
-        break;
-      case TFO_ANISOTROPIC:
-        filtering_ = TFO_BILINEAR;
-        aniso_ = 1;
-        break;
-      default: break;
-      }
-      MaterialManager::getSingleton().setDefaultTextureFiltering(filtering_);
-      MaterialManager::getSingleton().setDefaultAnisotropy(aniso_);
-
-      showDebugOverlay(statsOn_);
       timeUntilNextToggle_ = 1;
     }
@@ -439 +403 @@
       window_->writeContentsToFile(ss.str());
       timeUntilNextToggle_ = 0.5;
-      debugText_ = "Saved: " + ss.str();
-    }
-
-    if(keyboard_->isKeyDown(KC_R) && timeUntilNextToggle_ <=0)
-    {
-      sceneDetailIndex_ = (sceneDetailIndex_+1)%3 ;
-      switch(sceneDetailIndex_) {
-          case 0 : camera_->setPolygonMode(PM_SOLID); break;
-          case 1 : camera_->setPolygonMode(PM_WIREFRAME); break;
-          case 2 : camera_->setPolygonMode(PM_POINTS); break;
-      }
-      timeUntilNextToggle_ = 0.5;
-    }
-
-    static bool displayCameraDetails = false;
-    if(keyboard_->isKeyDown(KC_P) && timeUntilNextToggle_ <= 0)
-    {
-      displayCameraDetails = !displayCameraDetails;
-      timeUntilNextToggle_ = 0.5;
-      if (!displayCameraDetails)
-        debugText_ = "";
-    }
-
-    // Print camera details
-    if(displayCameraDetails)
-      debugText_ = " | Speed = "
-            + StringConverter::toString(playerShip_->getSpeed())
-            + " | Left Ammo = "
-            + StringConverter::toString(playerShip_
-            ->getMainWeapon()->getAmmoState())
-            + " | Ammo stock = "
-            + StringConverter::toString(playerShip_->getAmmoStock());
-    // debugText_ = "P: " + StringConverter::toString(camera_
-    //      ->getDerivedPosition()) + " " + "O: "
-    //      + StringConverter::toString(camera_->getDerivedOrientation());
+    }
 
     // Return true to continue rendering
@@ -507 +437 @@
 
   /**
-  * Show the debug overlay of desired.
+  * Show an overlay desired.
   * @param show Whether or not to show the debug overlay
   */
   void RunManager::showDebugOverlay(bool show)
   {
-    if (debugOverlay_)
+    if (hud_)
     {
       if (show)
-        debugOverlay_->show();
+        hud_->show();
       else
-        debugOverlay_->hide();
-    }
-  }
-
-
-  /**
-  * Show stats (e.g. FPS) in the left lower corner of the screen.
-  * Copied from the ExampleFrameListener.h in the Ogre SDK
-  */
-  void RunManager::updateStats(void)
-  {
-    static String currFps = "Current FPS: ";
-    static String avgFps = "Average FPS: ";
-    static String bestFps = "Best FPS: ";
-    static String worstFps = "Worst FPS: ";
-    static String tris = "Triangle Count: ";
-    static String batches = "Batch Count: ";
-
-    // update stats when necessary
-    try {
-      OverlayElement* guiAvg = OverlayManager::getSingleton()
-        .getOverlayElement("Core/AverageFps");
-      OverlayElement* guiCurr = OverlayManager::getSingleton()
-        .getOverlayElement("Core/CurrFps");
-      OverlayElement* guiBest = OverlayManager::getSingleton()
-        .getOverlayElement("Core/BestFps");
-      OverlayElement* guiWorst = OverlayManager::getSingleton()
-        .getOverlayElement("Core/WorstFps");
-
-      const RenderTarget::FrameStats& stats = window_->getStatistics();
-      guiAvg->setCaption(avgFps + StringConverter::toString(stats.avgFPS));
-      guiCurr->setCaption(currFps + StringConverter::toString(stats.lastFPS));
-      guiBest->setCaption(bestFps + StringConverter::toString(stats.bestFPS)
-        +" "+StringConverter::toString(stats.bestFrameTime)+" ms");
-      guiWorst->setCaption(worstFps + StringConverter::toString(stats.worstFPS)
-        +" "+StringConverter::toString(stats.worstFrameTime)+" ms");
-
-      OverlayElement* guiTris = OverlayManager::getSingleton()
-        .getOverlayElement("Core/NumTris");
-      guiTris->setCaption(tris + StringConverter::toString(stats.triangleCount));
-
-      OverlayElement* guiBatches = OverlayManager::getSingleton()
-        .getOverlayElement("Core/NumBatches");
-      guiBatches->setCaption(batches
-        + StringConverter::toString(stats.batchCount));
-
-      OverlayElement* guiDbg = OverlayManager::getSingleton()
-        .getOverlayElement("Core/DebugText");
-      guiDbg->setCaption(debugText_);
-    }
-    catch(...) { /* ignore */ }
-  }
-
+        hud_->hide();
+    }
+  }
 
 
   /**
   * Simple camera creator.
-  * playerShip_Node->attachObject(camera_) should no be here! This is what the camera
-  * manager is for. Right now, this method should do just fine, setting the
-  * cam behind the ship.
-  */
-  void RunManager::createCamera(void)
+  * playerShip_Node->attachObject(camera_) should not be here! This is what
+  * the camera manager is for. Right now, this method should do just fine,
+  * setting the cam behind the ship.
+  */
+  void RunManager::createCamera()
   {
     camera_ = sceneMgr_->createCamera("PlayerCam");
@@ -589 +469 @@
   /**
   * Simple viewport creator.
-  * TODO: fully understand the concept of viewports concerning orxnox.
-  * E.g. do we need splitscreen mode?
   * For now the viewport uses the entire render window and is based on the one
   * camera created so far.
   */
-  void RunManager::createViewports(void)
+  void RunManager::createViewports()
   {
     // Create one viewport, entire window
@@ -605 +483 @@
   }
 
+
+  RunManager* RunManager::createSingleton()
+  {
+    if (singletonPtr_s)
+      return NULL;
+    singletonPtr_s = new RunManager();
+    return singletonPtr_s;
+  }
+
+  void RunManager::destroySingleton()
+  {
+    if (singletonPtr_s)
+      delete singletonPtr_s;
+  }
+
+
+  RunManager& RunManager::getSingleton()
+  {
+    return *singletonPtr_s;
+  }
+
+  RunManager* RunManager::getSingletonPtr()
+  {
+    return singletonPtr_s;
+  }
+
 }

code/branches/main_reto_vs05/src/run_manager.h

@@ -32 +32 @@
 #include "OgrePrerequisites.h"
 #include "OgreWindowEventUtilities.h"
-#include "OgreTextureManager.h"
-#include "OgreSingleton.h"
+//#include "OgreTextureManager.h"
 
 #include <OIS/OISPrereqs.h>
@@ -44 +43 @@
   // let the class inherit from WindowEventListener in order for the RunMgr
   // to act as the central point of all the calcuations in Orxonox
-  class RunManager : public Ogre::WindowEventListener,
-                     public Ogre::Singleton<RunManager>
+  class RunManager : public Ogre::WindowEventListener
   {
   public:
-    RunManager(OgreControl*);
-
     virtual ~RunManager();
-    //void initialise(OgreControl*);
+    
+    void initialise(OgreControl*);
 
     bool tick(unsigned long, Ogre::Real);
@@ -65 +62 @@
     int getNumberOfAmmos();
 
+    static RunManager* createSingleton();
+
+    static void destroySingleton();
+
     static RunManager& getSingleton(void);
 
@@ -71 +72 @@
 
   protected:
+    RunManager();
+
           void createCamera(void);
 
@@ -93 +96 @@
           /** OUTPUT **/
 
-          void updateStats(void);
-
           void showDebugOverlay(bool);
 
   protected:
+    // directly Ogre related fields
           Ogre::SceneManager *sceneMgr_;
           Ogre::RenderWindow *window_;
           Ogre::Camera       *camera_;
+
+
+    // self made orxonox fields
           OgreControl  *ogre_;
           OrxonoxScene *backgroundScene_;
           OrxonoxShip  *playerShip_;
+    hud::TestOverlay *hud_;
 
+    // Bullet manager
+    weapon::BulletManager *bulletManager_;
+
+    const Ogre::Real mouseSensitivity_;
+
+          // previously elapsed render time
+          unsigned long totalTime_;
+
+
+    // fields from the example framework
           bool statsOn_;
-          std::string debugText_;
 
           unsigned int screenShotCounter_;
           // just to stop toggles flipping too fast
           Ogre::Real timeUntilNextToggle_;
-          //bool leftButtonDown_;
-          Ogre::TextureFilterOptions filtering_;
-          int aniso_;
-
-          int sceneDetailIndex_;
-          Ogre::Overlay* debugOverlay_;
 
           //OIS Input devices
@@ -124 +133 @@
           OIS::JoyStick* joystick_;
 
-    const Ogre::Real mouseSensitivity_;
-
-    // Bullet array
-          /*Bullet **bullets_;
-          int bulletsSize_;
-          int bulletsIndex_;*/
-    weapon::BulletManager *bulletManager_;
-
-          // previously elapsed render time
-          unsigned long totalTime_;
+    // singleton pointer
+    static RunManager *singletonPtr_s;
 
   };

code/branches/main_reto_vs05/src/weapon/barrel_gun.cc

@@ -95 +95 @@
   void BarrelGun::primaryFiring(unsigned int time)
   {
-    if (time > 1000/primaryFiringRate_)
+    if (time > (unsigned int)1000/primaryFiringRate_)
     {
       currentState_ = IDLE;
@@ -133 +133 @@
   void BarrelGun::secondaryFiring(unsigned int time)
   {
-    if (time > 1000/secondaryFiringRate_)
+    if (time > (unsigned int)1000/secondaryFiringRate_)
       currentState_ = IDLE;
   }

code/branches/main_reto_vs05/src/weapon/base_weapon.cc

@@ -98 +98 @@
     }
 
-    switch (currentState_)
+    if (currentState_ != IDLE)
     {
-    case IDLE:
+      switch (currentState_)
+      {
+      case PRIMARY_FIRE:
+        primaryFiring((unsigned int)(time - actionStartTime_));
+        break;
+
+      case SECONDARY_FIRE:
+        secondaryFiring((unsigned int)(time - actionStartTime_));
+        break;
+
+      case RELOADING:
+        break;
+
+      case CHANGING_AMMO:
+        break;
+      }
+    }
+
+    if (currentState_ == IDLE)
+    {
       // first, process next action
       if (nextAction_ != NOTHING)
@@ -142 +161 @@
         }
       }
-
-      break;
-
-    case PRIMARY_FIRE:
-      primaryFiring((unsigned int)(time - actionStartTime_));
-      break;
-
-    case SECONDARY_FIRE:
-      secondaryFiring((unsigned int)(time - actionStartTime_));
-      break;
-
-    case RELOADING:
-      break;
-
-    case CHANGING_AMMO:
-      break;
     }
 

@@ -17 +17 @@
 Ogre.log
 weapon_framework.exe
+obs_dlls

@@ -16 +16 @@
 Ogre.log
 weapon_framework.exe
+obs_dlls