Changeset 663 for code/branches/FICN/src

Timestamp:

Dec 20, 2007, 8:01:43 PM (17 years ago)

Author:

nicolasc

Message:

fixed auto repeat problem

Location:

code/branches/FICN/src

Files:

• loader/LevelLoader.cc (modified) (1 diff)
• orxonox/Orxonox.cc (modified) (1 diff)
• orxonox/core/ConfigValueContainer.cc (modified) (1 diff)
• orxonox/core/ConfigValueContainer.h (modified) (1 diff)
• orxonox/objects/SpaceshipSteeringObject.cc (modified) (1 diff)

code/branches/FICN/src/loader/LevelLoader.cc

@@ -177 +177 @@
       {
         tNode = 0;
+        //FIXME something is wrong, probably missing ==
         while (tNode = worldElem->IterateChildren(tNode))
         {

code/branches/FICN/src/orxonox/Orxonox.cc

@@ -423 +423 @@
     std::ostringstream windowHndStr;
     OIS::ParamList pl;
+
+    // fixes auto repeat problem
+    #if defined OIS_LINUX_PLATFORM
+    pl.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
+    #endif
+
     RenderWindow *win = ogre_->getRoot()->getAutoCreatedWindow();
-
     win->getCustomAttribute("WINDOW", &windowHnd);
     windowHndStr << windowHnd;

code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc

@@ -27 +27 @@
 
 #include <fstream>
-#include <string>
+// #include <string>
 #include "ConfigValueContainer.h"
 

code/branches/FICN/src/orxonox/core/ConfigValueContainer.h

@@ -74 +74 @@
             /** @returns the value of the type Vector3. @param value This is only needed to determine the right type. */
             inline Ogre::Vector3 getValue(const Ogre::Vector3& value)           { return this->value_vector3_; }
-            /** @returns the value of the type Colour£Value. @param value This is only needed to determine the right type. */
+            /** @returns the value of the type Colour�Value. @param value This is only needed to determine the right type. */
             inline Ogre::ColourValue getValue(const Ogre::ColourValue& value)   { return this->value_colourvalue_; }
 

code/branches/FICN/src/orxonox/objects/SpaceshipSteeringObject.cc

@@ -32 +32 @@
     void SpaceshipSteeringObject::loadParams(TiXmlElement* xmlElem)
     {
-        SpaceshipSteering* steering = orxonox::Orxonox::getSingleton()->getSteeringPointer();
+      SpaceshipSteering* steering = orxonox::Orxonox::getSingleton()->getSteeringPointer();
 
-        if (xmlElem->Attribute("node") && xmlElem->Attribute("forward") && xmlElem->Attribute("rotateupdown") && xmlElem->Attribute("rotaterightleft") && xmlElem->Attribute("looprightleft"))
-        {
-                std::string nodeStr = xmlElem->Attribute("node");
-                std::string forwardStr = xmlElem->Attribute("forward");
-                std::string rotateupdownStr = xmlElem->Attribute("rotateupdown");
-                std::string rotaterightleftStr = xmlElem->Attribute("rotaterightleft");
-                std::string looprightleftStr = xmlElem->Attribute("looprightleft");
+      if (xmlElem->Attribute("node") && xmlElem->Attribute("forward") && xmlElem->Attribute("rotateupdown") && xmlElem->Attribute("rotaterightleft") && xmlElem->Attribute("looprightleft"))
+      {
+        std::string nodeStr = xmlElem->Attribute("node");
+        std::string forwardStr = xmlElem->Attribute("forward");
+        std::string rotateupdownStr = xmlElem->Attribute("rotateupdown");
+        std::string rotaterightleftStr = xmlElem->Attribute("rotaterightleft");
+        std::string looprightleftStr = xmlElem->Attribute("looprightleft");
 
-                float forward, rotateupdown, rotaterightleft, looprightleft;
-                String2Number<float>(forward, forwardStr);
-                String2Number<float>(rotateupdown, rotateupdownStr);
-                String2Number<float>(rotaterightleft, rotaterightleftStr);
-                String2Number<float>(looprightleft, looprightleftStr);
+        float forward, rotateupdown, rotaterightleft, looprightleft;
+        String2Number<float>(forward, forwardStr);
+        String2Number<float>(rotateupdown, rotateupdownStr);
+        String2Number<float>(rotaterightleft, rotaterightleftStr);
+        String2Number<float>(looprightleft, looprightleftStr);
 
-                steering = new SpaceshipSteering(forward, rotateupdown, rotaterightleft, looprightleft);
+        steering = new SpaceshipSteering(forward, rotateupdown, rotaterightleft, looprightleft);
 
-                Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
-                    Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->getChild(nodeStr);
+        Ogre::SceneManager* mgr = orxonox::Orxonox::getSingleton()->getSceneManager();
+        Ogre::SceneNode* sceneNode = (Ogre::SceneNode*)mgr->getRootSceneNode()->getChild(nodeStr);
 
-                steering->addNode(sceneNode);
+        steering->addNode(sceneNode);
 
 
 
 
-                COUT(4) << "Loader: Initialized spaceship steering at node " << nodeStr << " values "<< forward << " " << rotateupdown << " "<< rotaterightleft << " "<< looprightleft << " "<< std::endl << std::endl;
-        }
+        COUT(4) << "Loader: Initialized spaceship steering at node " << nodeStr << " values "<< forward << " " << rotateupdown << " "<< rotaterightleft << " "<< looprightleft << " "<< std::endl << std::endl;
+      }
    }
 }