Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6084


Ignore:
Timestamp:
Nov 18, 2009, 11:13:47 AM (14 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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/SourceFileUtilities.cmake

    r5963 r6084  
    5353          SET(_include_string "${_include_string}#include \"${_file2}\"\n")
    5454        ENDFOREACH(_file2)
    55         IF(EXISTS )
     55        IF(EXISTS ${_compilation_file})
    5656          FILE(READ ${_compilation_file} _include_string_file)
    5757        ENDIF()
  • code/trunk/src/libraries/core/input/InputManager.h

    r5929 r6084  
    4747        Manages the input devices (mouse, keyboard, joy sticks) and the input states.
    4848
    49         Every input device has its own wrapper class which does the actualy input event
     49        Every input device has its own wrapper class which does the actually input event
    5050        distribution. The InputManager only creates reloads (on request) those devices.
    5151
     
    5858          in the InputDevices themselves.
    5959        - The devices_ vector always has at least two elements: Keyboard (first) and mouse.
    60           You best access them intenally with InputDeviceEnumerator::Keyboard/Mouse
     60          You best access them internally with InputDeviceEnumerator::Keyboard/Mouse
    6161          The first joy stick is accessed with InputDeviceEnumerator::FirstJoyStick.
    6262        - Keyboard construction is mandatory , mouse and joy sticks are not.
     
    9494
    9595            Any InpuStates changes (destroy, enter, leave) and happens here. If a reload request
    96             was submitted while updating, the request wil be postponed until the next update call.
     96            was submitted while updating, the request will be postponed until the next update call.
    9797        */
    9898        void update(const Clock& time);
     
    135135        @brief
    136136            Activates a specific input state.
    137             It might not be actually activated if the priority is too low!
     137            It might not actually be activated if the priority is too low!
    138138        @return
    139139            False if name was not found, true otherwise.
     
    172172        InputManager(const InputManager&);
    173173
    174         // Intenal methods
     174        // Internal methods
    175175        void loadDevices();
    176176        void loadMouse();
  • code/trunk/src/orxonox/Test.cc

    r5929 r6084  
    3636namespace orxonox
    3737{
    38         CreateFactory ( Test );
     38    CreateFactory ( Test );
    3939 
    4040  SetConsoleCommand(Test, printV1, true).accessLevel(AccessLevel::User);
     
    5656  Test* Test::instance_ = 0;
    5757
    58         Test::Test(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
    59         {
     58    Test::Test(BaseObject* creator) : BaseObject(creator), Synchronisable(creator)
     59    {
    6060    assert(instance_==0);
    6161    instance_=this;
    62                 RegisterObject ( Test );
     62        RegisterObject ( Test );
    6363    setConfigValues();
    6464    registerVariables();
    65                 setSyncMode(0x3);
    66         }
     65        setSyncMode(0x3);
     66    }
    6767
    68         Test::~Test()
    69         {
     68    Test::~Test()
     69    {
    7070    instance_=0;
    71         }
     71    }
    7272
    73         void Test::setConfigValues()
    74         {
    75                 SetConfigValue ( u1, 1 )/*.callback ( this, &Test::checkV1 )*/;
     73    void Test::setConfigValues()
     74    {
     75        SetConfigValue ( u1, 1 )/*.callback ( this, &Test::checkV1 )*/;
    7676    SetConfigValue ( u2, 2 )/*.callback ( this, &Test::checkV2 )*/;
    7777    SetConfigValue ( u3, 3 )/*.callback ( this, &Test::checkV3 )*/;
     
    8282    SetConfigValue ( s3, 3 )/*.callback ( this, &Test::checkV3 )*/;
    8383    SetConfigValue ( s4, 4 )/*.callback ( this, &Test::checkV4 )*/;
    84         }
     84    }
    8585
    8686
Note: See TracChangeset for help on using the changeset viewer.