Changeset 6084 for code/trunk

Timestamp:

Nov 18, 2009, 11:13:47 AM (15 years ago)

Author:

rgrieder

Message:

• Fixed typing error in a cmake file causing a rebuild of the compilations every time CMake was run
• Found spelling mistakes in InputManager.h
• Found tabs in Test.cc

Location:

code/trunk

Files:

• cmake/SourceFileUtilities.cmake (modified) (1 diff)
• src/libraries/core/input/InputManager.h (modified) (5 diffs)
• src/orxonox/Test.cc (modified) (3 diffs)

code/trunk/cmake/SourceFileUtilities.cmake

@@ -53 +53 @@
           SET(_include_string "${_include_string}#include \"${_file2}\"\n")
         ENDFOREACH(_file2)
-        IF(EXISTS )
+        IF(EXISTS ${_compilation_file})
           FILE(READ ${_compilation_file} _include_string_file)
         ENDIF()

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

@@ -47 +47 @@
         Manages the input devices (mouse, keyboard, joy sticks) and the input states.
 
-        Every input device has its own wrapper class which does the actualy input event
+        Every input device has its own wrapper class which does the actually input event
         distribution. The InputManager only creates reloads (on request) those devices.
 
@@ -58 +58 @@
           in the InputDevices themselves.
         - The devices_ vector always has at least two elements: Keyboard (first) and mouse.
-          You best access them intenally with InputDeviceEnumerator::Keyboard/Mouse
+          You best access them internally with InputDeviceEnumerator::Keyboard/Mouse
           The first joy stick is accessed with InputDeviceEnumerator::FirstJoyStick.
         - Keyboard construction is mandatory , mouse and joy sticks are not.
@@ -94 +94 @@
 
             Any InpuStates changes (destroy, enter, leave) and happens here. If a reload request
-            was submitted while updating, the request wil be postponed until the next update call.
+            was submitted while updating, the request will be postponed until the next update call.
         */
         void update(const Clock& time);
@@ -135 +135 @@
         @brief
             Activates a specific input state.
-            It might not be actually activated if the priority is too low!
+            It might not actually be activated if the priority is too low!
         @return
             False if name was not found, true otherwise.
@@ -172 +172 @@
         InputManager(const InputManager&);
 
-        // Intenal methods
+        // Internal methods
         void loadDevices();
         void loadMouse();

code/trunk/src/orxonox/Test.cc

@@ -36 +36 @@
 namespace orxonox
 {
-        CreateFactory ( Test );
+    CreateFactory ( Test );
   
   SetConsoleCommand(Test, printV1, true).accessLevel(AccessLevel::User);
@@ -56 +56 @@
   Test* Test::instance_ = 0;
 
-        Test::Test(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
-        {
+    Test::Test(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
+    {
     assert(instance_==0);
     instance_=this;
-                RegisterObject ( Test );
+        RegisterObject ( Test );
     setConfigValues();
     registerVariables();
-                setSyncMode(0x3);
-        }
+        setSyncMode(0x3);
+    }
 
-        Test::~Test()
-        {
+    Test::~Test()
+    {
     instance_=0;
-        }
+    }
 
-        void Test::setConfigValues()
-        {
-                SetConfigValue ( u1, 1 )/*.callback ( this, &Test::checkV1 )*/;
+    void Test::setConfigValues()
+    {
+        SetConfigValue ( u1, 1 )/*.callback ( this, &Test::checkV1 )*/;
     SetConfigValue ( u2, 2 )/*.callback ( this, &Test::checkV2 )*/;
     SetConfigValue ( u3, 3 )/*.callback ( this, &Test::checkV3 )*/;
@@ -82 +82 @@
     SetConfigValue ( s3, 3 )/*.callback ( this, &Test::checkV3 )*/;
     SetConfigValue ( s4, 4 )/*.callback ( this, &Test::checkV4 )*/;
-        }
+    }