Now with configuration

Author: ptxmac

CMakeLists.txt

@@ -36,7 +36,7 @@ SET( PROJECT_SOURCES
   Modules/Dragon/Dragon.cpp
   Modules/Dragon/Tube.cpp
 
-  HUD/DragonHUD.cpp
+#  HUD/DragonHUD.cpp
 )
 
 # Include needed to use SDL under Mac OS X
@@ -63,15 +63,15 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME}
   OpenEngine_Geometry
   # Extension dependencies
   Extensions_GenericHandlers
-  Extensions_HUD
+  #Extensions_HUD
   Extensions_OBJResource
   Extensions_RAWResource
   Extensions_SDLImage
   Extensions_OpenGLRenderer
   Extensions_SDL
-  Extensions_CairoResource
-  Extensions_VorbisResource
-  Extensions_OpenALSoundSystem
-  Extensions_MusicPlayer
-  Extensions_GLUT
+#  Extensions_CairoResource
+ # Extensions_VorbisResource
+#  Extensions_OpenALSoundSystem
+  #Extensions_MusicPlayer
+  #Extensions_GLUT
 )

Config.h

@@ -0,0 +1,2 @@
+//#define DRAGON_SOUND
+//#define DRAGON_HUD

KeyHandler.cpp

@@ -7,6 +7,8 @@
 // See the GNU General Public License for more details (see LICENSE). 
 //--------------------------------------------------------------------
 
+#include "Config.h"
+
 #include "KeyHandler.h"
 
 #include "Modules/Boid/BoidsSystem.h"
@@ -18,7 +20,9 @@
 #include <Logging/Logger.h>
 #include <Devices/IMouse.h>
 #include <Math/Vector.h>
+#ifdef DRAGON_SOUND
 #include <Sound/MusicPlayer.h>
+#endif
 #include <Scene/RenderStateNode.h>
 
 
@@ -35,7 +39,9 @@ KeyHandler::KeyHandler(FollowCamera& camera,
                        BoidsSystem* boidssystem,
                        TimeModifier& timeModifier,
                        GameState& gamestate,
+#ifdef DRAGON_SOUND    
                        MusicPlayer& musicplayer,
+#endif
                        IFrame& frame,
                        RenderStateNode* rn)
     : camera(camera)
@@ -62,8 +68,8 @@ KeyHandler::KeyHandler(FollowCamera& camera,
   done = pause = false;
   rotChunkMouse = 0.05;
   moveChunkMouse = 0.0015;
-  rotChunkKeyboard = 0.2; //rotChunkMouse*200;
-  moveChunkKeyboard = 2; //moveChunkMouse*400;
+  rotChunkKeyboard = 0.05; //rotChunkMouse*200;
+  moveChunkKeyboard = 1; //moveChunkMouse*400;
   warping = false;
 
   ResetCamera();
@@ -127,7 +133,7 @@ void KeyHandler::Handle(ProcessEventArg arg) {
 
     // handle joystick.
 
-    float move_factor = 2.5;
+    float move_factor = 1.0;
 
     if (up)
 	MoveForward(up*move_factor);
@@ -185,21 +191,27 @@ void KeyHandler::HandleDown(Key key) {
     case KEY_9:
         boidssystem->IncNumberOfShownBoids();
         break;
-    case KEY_a:
+    case KEY_LEFT:
         MoveLeft(moveChunkKeyboard);
         break;
-    case KEY_d:
+    case KEY_RIGHT:
         MoveRight(moveChunkKeyboard);
         break;
-    case KEY_w:
+    case KEY_UP:
         MoveForward(moveChunkKeyboard);
         break;
-    case KEY_s:
+    case KEY_DOWN:
         MoveBack(moveChunkKeyboard);
         break;
-    case KEY_z:
-        rn->ToggleOption(RenderStateNode::LIGHTING);
-        rn->ToggleOption(RenderStateNode::WIREFRAME);
+    case KEY_z:       
+        rn->EnableOption(RenderStateNode::WIREFRAME);
+        break;
+    case KEY_x:
+        rn->DisableOption(RenderStateNode::WIREFRAME);
+        break;
+
+    case KEY_j:
+        rn->EnableOption(RenderStateNode::HARD_NORMAL);
         break;
 	/*
     case KEY_z:
@@ -239,12 +251,14 @@ void KeyHandler::HandleDown(Key key) {
     case KEY_q:
         dragon->ChargeFireball();
         break;
+#ifdef DRAGON_SOUND
     case KEY_COMMA:
         musicplayer.SetGain(musicplayer.GetGain()-gainStep);
         break;
     case KEY_PERIOD:
         musicplayer.SetGain(musicplayer.GetGain()+gainStep);
         break;
+#endif
 
 //     case KEY_F1:
 //         //inputgrabber->rotateViewAbsolute( 30, 5, 50, 1.0 );
@@ -274,14 +288,14 @@ void KeyHandler::HandleDown(Key key) {
 //         break;
     case KEY_n: //KEY_F11
          if (done) return;
-         timeFactor -= 0.1;
+         timeFactor -= 0.01;
 	 if (timeFactor < 0.0) timeFactor = 0.0;
          timeModifier.SetFactor(timeFactor);
 	 logger.info << "time factor: " << timeFactor << logger.end;
          break;
      case KEY_m: //KEY_F12
          if (done) return;
-         timeFactor += 0.1;
+         timeFactor += 0.01;
 	 if (timeFactor > 100.0) timeFactor = 100.0;
          timeModifier.SetFactor(timeFactor);
 	 logger.info << "time factor: " << timeFactor << logger.end;
@@ -298,16 +312,16 @@ void KeyHandler::HandleDown(Key key) {
     case KEY_END:
         //inputgrabber->decMultiplier();
         break;
-    case KEY_UP:
+    case KEY_w:
         RotateUp(moveChunkKeyboard);
         break;
-    case KEY_DOWN:
+    case KEY_s:
         RotateDown(moveChunkKeyboard);
         break;
-    case KEY_LEFT:
+    case KEY_a:
         RotateLeft(rotChunkKeyboard);
         break;
-    case KEY_RIGHT:
+    case KEY_d:
         RotateRight(rotChunkKeyboard);
         break;
     default:

KeyHandler.h

@@ -104,7 +104,9 @@ class KeyHandler : public IListener<ProcessEventArg>,
                BoidsSystem* boidssystem,
                TimeModifier& timeModifer,
                GameState& gamestate,
+#ifdef DRAGON_SOUND    
                MusicPlayer& musicplayer,
+#endif
                IFrame& frame,
                RenderStateNode* rn);
     ~KeyHandler();

Modules/Boid/Boid.cpp

@@ -25,7 +25,9 @@
 // extensions
 #include <ParticleSystem/ParticleSystem.h>
 #include <Renderers/TextureLoader.h>
+#ifdef DRAGON_SOUND    
 #include <Sound/IMonoSound.h>
+#endif 
 
 using OpenEngine::Math::PI;
 using OpenEngine::Scene::TransformationNode;
@@ -34,14 +36,20 @@ using std::max;
 
 Boid::Boid(HeightMap* heightMap, OscSurface* oscsurface, BoidsSystem* boidssystem,
            Vector<3,float> position, Vector<3,float> forward,
-           Vector<3,float> velocity, Vector<3,float> color, IMonoSound& voice,
+           Vector<3,float> velocity, Vector<3,float> color, 
+#ifdef DRAGON_SOUND    
+           IMonoSound& voice,
+#endif 
            OpenEngine::ParticleSystem::ParticleSystem& oeparticlesystem,
            OpenEngine::Renderers::TextureLoader& texloader,
            ISceneNode* particleRoot):
 
-    particleRoot(particleRoot),
-    oeparticlesystem(oeparticlesystem),
-    voice(voice) {
+           particleRoot(particleRoot),
+           oeparticlesystem(oeparticlesystem)
+#ifdef DRAGON_SOUND    
+           , voice(voice) 
+#endif
+           {
 
     this->heightMap = heightMap;
     this->oscsurface = oscsurface;
@@ -79,7 +87,8 @@ Boid::Boid(HeightMap* heightMap, OscSurface* oscsurface, BoidsSystem* boidssyste
 
 Boid::~Boid(){
     // @todo how to handle deallocation of the particle renderer?
-    particleRoot->RemoveNode(boidfire->GetSceneNode());
+    if (particleRoot != NULL)
+        particleRoot->RemoveNode(boidfire->GetSceneNode());
     delete boidfire->GetSceneNode();
     delete boidfire;
     delete fireTrans;
@@ -226,8 +235,9 @@ void Boid::updatePhysics( double timeDelta ) {
 void Boid::updateLocomotion( double timeDelta ) {
     TransformationNode* tn = boidfire->GetTransformationNode();
     if (tn) tn->SetPosition(position);
+#ifdef DRAGON_SOUND    
     voice.SetPosition(position);
-
+#endif
     Vector<3,float> normal = heightMap->NormalAt(position);
     if (airborn && drowning) normal = Vector<3,float>(0,1,0);
 
@@ -281,7 +291,9 @@ void Boid::updateLocomotion( double timeDelta ) {
     }
     if (hot>1 && life>0) {
         if (!burning) {
+#ifdef DRAGON_SOUND    
             voice.Play();
+#endif
             boidfire->SetActive(true);
         }
         burning = true;
@@ -326,6 +338,9 @@ void Boid::HandleFire(Vector<3,float> firePosition, float fireStrength) {
 
     // Get burned
     float fireDist = (firePosition-position).GetLength();
+
+
+
     if (fireDist<4.0) {
         burned += (4.0/fireDist)*fireStrength;
     }

Modules/Boid/Boid.h

@@ -1,6 +1,8 @@
 #ifndef _BOID_H_
 #define _BOID_H_
 
+#include "../../Config.h"
+
 //include templated classes only
 #include <Math/Vector.h>
 
@@ -27,19 +29,24 @@ namespace OpenEngine {
 using OpenEngine::Scene::ISceneNode;
 using OpenEngine::Scene::TransformationNode;
 
+#ifdef DRAGON_SOUND    
 namespace OpenEngine {
     namespace Sound {
         class IMonoSound;
     }
 }
 
 using namespace OpenEngine::Sound;
+#endif
 
 class Boid {
 public:
     Boid(HeightMap* heightMap, OscSurface* oscsurface, BoidsSystem* boidssystem, 
          Vector<3,float> position, Vector<3,float> forward,
-         Vector<3,float> velocity, Vector<3,float> color, IMonoSound& voice,
+         Vector<3,float> velocity, Vector<3,float> color,
+#ifdef DRAGON_SOUND
+         IMonoSound& voice,
+#endif
          OpenEngine::ParticleSystem::ParticleSystem& oeparticlesystem,
          OpenEngine::Renderers::TextureLoader& texloader,
          ISceneNode* particleRoot);
@@ -70,9 +77,9 @@ class Boid {
 
     Vector<3,float> color;
     bool airborn;
-
+#ifdef DRAGON_SOUND    
     IMonoSound& voice;
-
+#endif
     void draw2(  bool shadow );
 
     // accumulated variables. to accumulate force for all boids before applying it
@@ -84,7 +91,7 @@ class Boid {
 
     // Vehicle model:
     void updatePhysics( double timeDelta );
-    double mass, max_force, max_speed;
+    float mass, max_force, max_speed;
     Vector<3,float> position, velocity, forward, up, left;
 
     // Additional physics: