Changeset 1555

Timestamp:

Jun 6, 2008, 9:05:27 PM (16 years ago)

Author:

landauf

Message:

• ParticleInterface uses Orxonox::getTimeFactor to make particle effects independend of gamespeed (but there's still a drawback with thrusters)
• reduced OIS includes in input-related classes, changed OIS search and include to avoid conflicts with other versions of OIS (for example in Ogre). not yet tested on tardis.

Location:

code/trunk

Files:

• CMakeLists.txt (modified) (3 diffs)
• cmake/FindOIS.cmake (deleted)
• src/CMakeLists.txt (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (1 diff)
• src/core/Script.cc (modified) (1 diff)
• src/core/input/InputInterfaces.h (modified) (5 diffs)
• src/core/input/InputManager.cc (modified) (3 diffs)
• src/core/input/InputManager.h (modified) (1 diff)
• src/ois/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/tools/ParticleInterface.cc (modified) (3 diffs)

code/trunk/CMakeLists.txt

@@ -63 +63 @@
 #Performs the search and sets the variables
 FIND_PACKAGE(OGRE)
-#FIND_PACKAGE(OIS)
 # FIND_PACKAGE(CEGUI)
 # FIND_PACKAGE(CEGUI_OGRE)
 FIND_PACKAGE(ENet)
 FIND_PACKAGE(Boost REQUIRED thread filesystem)
-#FIND_PACKAGE(Boost REQUIRED filesystem)
 FIND_PACKAGE(OpenAL)
 FIND_PACKAGE(ALUT)
@@ -80 +78 @@
 LINK_DIRECTORIES(
   ${OGRE_LIB_DIR}
-#  ${OIS_LIB_DIR}
 #  ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR}
   ${ENet_LIBRARY}
@@ -91 +88 @@
 INCLUDE_DIRECTORIES(
   ${OGRE_INCLUDE_DIR}
-#  ${OIS_INCLUDE_DIR}
 #  ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR}
   ${ENet_INCLUDE_DIR}

code/trunk/src/CMakeLists.txt

@@ -1 +1 @@
 INCLUDE_DIRECTORIES(.)
+INCLUDE_DIRECTORIES(..)
 INCLUDE_DIRECTORIES(orxonox)
 INCLUDE_DIRECTORIES(tolua)
-INCLUDE_DIRECTORIES(ois)
 
 ADD_SUBDIRECTORY(cpptcl)

code/trunk/src/core/CMakeLists.txt

@@ -65 +65 @@
   ${OGRE_LIBRARIES}
   cpptcl
+  ois_orxonox
   tinyxml
   tolualib
-  ois
   util
   ${Boost_thread_LIBRARIES}

code/trunk/src/core/Script.cc

@@ -39 +39 @@
 }
 
-#include "tolua++.h"
+#include "tolua/tolua++.h"
 #include "tolua/tolua_bind.h"
 

code/trunk/src/core/input/InputInterfaces.h

@@ -37 +37 @@
 #include "core/CorePrereqs.h"
 
-#include "ois/OIS.h"
+#include "src/ois/OISKeyboard.h"
+#include "src/ois/OISMouse.h"
+#include "src/ois/OISJoystick.h"
 #include "util/Math.h"
 
@@ -47 +49 @@
     enum Enum
     {
-      Unassigned    = OIS::KC_UNASSIGNED,  
-      Escape        = OIS::KC_ESCAPE,      
-      NumRow1       = OIS::KC_1,           
-      NumRow2       = OIS::KC_2,           
-      NumRow3       = OIS::KC_3,           
-      NumRow4       = OIS::KC_4,           
-      NumRow5       = OIS::KC_5,           
-      NumRow6       = OIS::KC_6,           
-      NumRow7       = OIS::KC_7,           
-      NumRow8       = OIS::KC_8,           
-      NumRow9       = OIS::KC_9,           
-      NumRow0       = OIS::KC_0,           
+      Unassigned    = OIS::KC_UNASSIGNED,
+      Escape        = OIS::KC_ESCAPE,
+      NumRow1       = OIS::KC_1,
+      NumRow2       = OIS::KC_2,
+      NumRow3       = OIS::KC_3,
+      NumRow4       = OIS::KC_4,
+      NumRow5       = OIS::KC_5,
+      NumRow6       = OIS::KC_6,
+      NumRow7       = OIS::KC_7,
+      NumRow8       = OIS::KC_8,
+      NumRow9       = OIS::KC_9,
+      NumRow0       = OIS::KC_0,
       Minus         = OIS::KC_MINUS,           // - on main keyboard
-      Equals        = OIS::KC_EQUALS,      
+      Equals        = OIS::KC_EQUALS,
       Back          = OIS::KC_BACK,            // backspace
-      Tab           = OIS::KC_TAB,         
-      Q             = OIS::KC_Q,           
-      W             = OIS::KC_W,           
-      E             = OIS::KC_E,           
-      R             = OIS::KC_R,           
-      T             = OIS::KC_T,           
-      Y             = OIS::KC_Y,           
-      U             = OIS::KC_U,           
-      I             = OIS::KC_I,           
-      O             = OIS::KC_O,           
-      P             = OIS::KC_P,           
-      LeftBracket   = OIS::KC_LBRACKET,    
-      RightBracket  = OIS::KC_RBRACKET,    
+      Tab           = OIS::KC_TAB,
+      Q             = OIS::KC_Q,
+      W             = OIS::KC_W,
+      E             = OIS::KC_E,
+      R             = OIS::KC_R,
+      T             = OIS::KC_T,
+      Y             = OIS::KC_Y,
+      U             = OIS::KC_U,
+      I             = OIS::KC_I,
+      O             = OIS::KC_O,
+      P             = OIS::KC_P,
+      LeftBracket   = OIS::KC_LBRACKET,
+      RightBracket  = OIS::KC_RBRACKET,
       Return        = OIS::KC_RETURN,          // Enter on main keyboard
-      LeftControl   = OIS::KC_LCONTROL,    
-      A             = OIS::KC_A,           
-      S             = OIS::KC_S,           
-      D             = OIS::KC_D,           
-      F             = OIS::KC_F,           
-      G             = OIS::KC_G,           
-      H             = OIS::KC_H,           
-      J             = OIS::KC_J,           
-      K             = OIS::KC_K,           
-      L             = OIS::KC_L,           
-      Semicolon     = OIS::KC_SEMICOLON,   
-      Apostrophe    = OIS::KC_APOSTROPHE,  
+      LeftControl   = OIS::KC_LCONTROL,
+      A             = OIS::KC_A,
+      S             = OIS::KC_S,
+      D             = OIS::KC_D,
+      F             = OIS::KC_F,
+      G             = OIS::KC_G,
+      H             = OIS::KC_H,
+      J             = OIS::KC_J,
+      K             = OIS::KC_K,
+      L             = OIS::KC_L,
+      Semicolon     = OIS::KC_SEMICOLON,
+      Apostrophe    = OIS::KC_APOSTROPHE,
       Grave         = OIS::KC_GRAVE,           // accent
-      LeftShift     = OIS::KC_LSHIFT,      
-      Backslash     = OIS::KC_BACKSLASH,   
-      Z             = OIS::KC_Z,           
-      X             = OIS::KC_X,           
-      C             = OIS::KC_C,           
-      V             = OIS::KC_V,           
-      B             = OIS::KC_B,           
-      N             = OIS::KC_N,           
-      M             = OIS::KC_M,           
-      Comma         = OIS::KC_COMMA,       
+      LeftShift     = OIS::KC_LSHIFT,
+      Backslash     = OIS::KC_BACKSLASH,
+      Z             = OIS::KC_Z,
+      X             = OIS::KC_X,
+      C             = OIS::KC_C,
+      V             = OIS::KC_V,
+      B             = OIS::KC_B,
+      N             = OIS::KC_N,
+      M             = OIS::KC_M,
+      Comma         = OIS::KC_COMMA,
       Period        = OIS::KC_PERIOD,          // . on main keyboard
       Slash         = OIS::KC_SLASH,           // / on main keyboard
-      RightShift    = OIS::KC_RSHIFT,      
+      RightShift    = OIS::KC_RSHIFT,
       Multiply      = OIS::KC_MULTIPLY,        // * on numeric keypad
       LeftAlt       = OIS::KC_LMENU,           // left Alt
-      Space         = OIS::KC_SPACE,       
-      CapsLock      = OIS::KC_CAPITAL,     
-      F1            = OIS::KC_F1,          
-      F2            = OIS::KC_F2,          
-      F3            = OIS::KC_F3,          
-      F4            = OIS::KC_F4,          
-      F5            = OIS::KC_F5,          
-      F6            = OIS::KC_F6,          
-      F7            = OIS::KC_F7,          
-      F8            = OIS::KC_F8,          
-      F9            = OIS::KC_F9,          
-      F10           = OIS::KC_F10,         
-      Numlock       = OIS::KC_NUMLOCK,     
+      Space         = OIS::KC_SPACE,
+      CapsLock      = OIS::KC_CAPITAL,
+      F1            = OIS::KC_F1,
+      F2            = OIS::KC_F2,
+      F3            = OIS::KC_F3,
+      F4            = OIS::KC_F4,
+      F5            = OIS::KC_F5,
+      F6            = OIS::KC_F6,
+      F7            = OIS::KC_F7,
+      F8            = OIS::KC_F8,
+      F9            = OIS::KC_F9,
+      F10           = OIS::KC_F10,
+      Numlock       = OIS::KC_NUMLOCK,
       Scrolllock    = OIS::KC_SCROLL,          // Scroll Lock
-      Numpad7       = OIS::KC_NUMPAD7,     
-      Numpad8       = OIS::KC_NUMPAD8,     
-      Numpad9       = OIS::KC_NUMPAD9,     
+      Numpad7       = OIS::KC_NUMPAD7,
+      Numpad8       = OIS::KC_NUMPAD8,
+      Numpad9       = OIS::KC_NUMPAD9,
       NumpadSubtract= OIS::KC_SUBTRACT,        // - on numeric keypad
-      Numpad4       = OIS::KC_NUMPAD4,     
-      Numpad5       = OIS::KC_NUMPAD5,     
-      Numpad6       = OIS::KC_NUMPAD6,     
+      Numpad4       = OIS::KC_NUMPAD4,
+      Numpad5       = OIS::KC_NUMPAD5,
+      Numpad6       = OIS::KC_NUMPAD6,
       NumpadAdd     = OIS::KC_ADD,             // + on numeric keypad
-      Numpad1       = OIS::KC_NUMPAD1,     
-      Numpad2       = OIS::KC_NUMPAD2,     
-      Numpad3       = OIS::KC_NUMPAD3,     
-      Numpad0       = OIS::KC_NUMPAD0,     
+      Numpad1       = OIS::KC_NUMPAD1,
+      Numpad2       = OIS::KC_NUMPAD2,
+      Numpad3       = OIS::KC_NUMPAD3,
+      Numpad0       = OIS::KC_NUMPAD0,
       NumpadPeriod  = OIS::KC_DECIMAL,         // . on numeric keypad
       LessThan      = OIS::KC_OEM_102,         // < > | on UK/Germany keyboards
-      F11           = OIS::KC_F11,         
-      F12           = OIS::KC_F12,         
+      F11           = OIS::KC_F11,
+      F12           = OIS::KC_F12,
       F13           = OIS::KC_F13,             //                     (NEC PC98)
       F14           = OIS::KC_F14,             //                     (NEC PC98)
@@ -154 +156 @@
       NextTrack     = OIS::KC_NEXTTRACK,       // Next Track
       NumpadEnter   = OIS::KC_NUMPADENTER,     // Enter on numeric keypad
-      RightControl  = OIS::KC_RCONTROL,    
+      RightControl  = OIS::KC_RCONTROL,
       Mute          = OIS::KC_MUTE,            // Mute
       Calculator    = OIS::KC_CALCULATOR,      // Calculator
@@ -164 +166 @@
       NumpadComma   = OIS::KC_NUMPADCOMMA,     // , on numeric keypad (NEC PC98)
       Divide        = OIS::KC_DIVIDE,          // / on numeric keypad
-      SYSRQ         = OIS::KC_SYSRQ,       
+      SYSRQ         = OIS::KC_SYSRQ,
       RightAlt      = OIS::KC_RMENU,           // right Alt
       Pause         = OIS::KC_PAUSE,           // Pause
@@ -254 +256 @@
                 std::vector<Vector3> mVectors;
   };*/
-  
+
   /**
   * Helper struct to determine which handlers of an object (can implement

code/trunk/src/core/input/InputManager.cc

@@ -36 +36 @@
 
 #include <limits.h>
+
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -42 +43 @@
 #include "core/ConsoleCommand.h"
 #include "core/Shell.h"               // hack!
+
 #include "InputBuffer.h"
 #include "KeyBinder.h"
 #include "KeyDetector.h"
 #include "CalibratorCallback.h"
+
+#include "src/ois/OISException.h"
+#include "src/ois/OISInputManager.h"
 
 namespace orxonox
@@ -650 +655 @@
       activeHandlers_[iHandler].first->tickInput(dt, activeHandlers_[iHandler].second);
   }
-    
+
   void InputManager::_completeCalibration()
   {

code/trunk/src/core/input/InputManager.h

@@ -41 +41 @@
 #include <vector>
 
-#include "ois/OIS.h"
 #include "util/Math.h"
 #include "core/OrxonoxClass.h"

code/trunk/src/ois/CMakeLists.txt

@@ +1 @@
+INCLUDE_DIRECTORIES(.)
+
 SET( OIS_SRC_FILES
   OISEffect.cpp
@@ -36 +38 @@
 ENDIF (WIN32)
 
-ADD_LIBRARY( ois SHARED ${OIS_SRC_FILES} )
+ADD_LIBRARY( ois_orxonox SHARED ${OIS_SRC_FILES} )
 
 IF(WIN32)
   LINK_DIRECTORIES(${DirectX_LIB_DIR})
-  TARGET_LINK_LIBRARIES( ois
+  TARGET_LINK_LIBRARIES( ois_orxonox
     dxguid
     dinput8

code/trunk/src/orxonox/CMakeLists.txt

@@ -78 +78 @@
   tinyxml
   tolualib
-  ois
+  ois_orxonox
   util
   core

code/trunk/src/orxonox/tools/ParticleInterface.cc

@@ -39 +39 @@
 
 #include "GraphicsEngine.h"
+#include "Orxonox.h"
 #include "util/Convert.h"
 
@@ -50 +51 @@
     this->sceneNode_ = 0;
     this->particleSystem_ = GraphicsEngine::getSingleton().getSceneManager()->createParticleSystem("particles" + getConvertedValue<unsigned int, std::string>(ParticleInterface::counter_s++), templateName);
+    this->particleSystem_->setSpeedFactor(Orxonox::getSingleton()->getTimeFactor());
   }
 
@@ -138 +140 @@
   void ParticleInterface::setSpeedFactor(float factor)
   {
-    this->particleSystem_->setSpeedFactor(factor);
+    this->particleSystem_->setSpeedFactor(Orxonox::getSingleton()->getTimeFactor() * factor);
   }
   float ParticleInterface::getSpeedFactor() const