Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1535 for code/trunk/src/core


Ignore:
Timestamp:
Jun 4, 2008, 8:54:43 PM (17 years ago)
Author:
rgrieder
Message:

merged input branch back to trunk

Location:
code/trunk/src/core
Files:
11 deleted
8 edited
20 copied

Legend:

Unmodified
Added
Removed

  • code/trunk/src/core/CMakeLists.txt

    r1505 r1535  
    44  ConfigFileManager.cc
    55  ConfigValueContainer.cc
    6   CoreSettings.cc
     6  Core.cc
    77  Error.cc
    88  Executor.cc
    … …  
    1010  Identifier.cc
    1111  IdentifierDistributor.cc
    12   InputManager.cc
    13   KeyBinder.cc
    1412  OutputBuffer.cc
    15   InputBuffer.cc
    1613  Shell.cc
    1714  CommandExecutor.cc
    … …  
    3027  SignalHandler.cc
    3128  TclBind.cc
    32   Tickable.cc
    3329  XMLPort.cc
    3430  TclThreadManager.cc
    3531  IRC.cc
     32
     33  input/Button.cc
     34  input/CalibratorCallback.cc
     35  input/HalfAxis.cc
     36  input/InputBuffer.cc
     37  input/InputCommands.cc
     38  input/InputManager.cc
     39  input/KeyBinder.cc
     40  input/KeyDetector.cc
     41
    3642  tolua/tolua_bind.cc
    3743)

  • code/trunk/src/core/CorePrereqs.h

    r1505 r1535  
    112112  class ConfigValueContainer;
    113113  class ConsoleCommand;
    114   class CoreSettings;
     114  class Core;
    115115  class Error;
    116116  class Executor;
    … …  
    162162  // input
    163163  //class GUIInputHandler;
    164   class Calibrator;
     164  class BaseCommand;
     165  class BufferedParamCommand;
     166  class Button;
    165167  class CalibratorCallback;
     168  class HalfAxis;
    166169  class InputBuffer;
    167   class InputBufferListener;
    168170  class InputManager;
    169171  class JoyStickHandler;
     172  class MouseHandler;
    170173  class KeyBinder;
    171174  class KeyDetector;
    172   class MouseHandler;
    173 
     175  class KeyHandler;
     176  class ParamCommand;
     177  class SimpleCommand;
    174178}
    175179

  • code/trunk/src/core/Language.cc

    r1505 r1535  
    3636#include <fstream>
    3737
    38 #include "CoreSettings.h"
     38#include "Core.h"
    3939
    4040#include "Debug.h"
    … …  
    245245    void Language::readTranslatedLanguageFile()
    246246    {
    247         COUT(4) << "Read translated language file (" << CoreSettings::getLanguage() << ")." << std::endl;
     247        COUT(4) << "Read translated language file (" << Core::getLanguage() << ")." << std::endl;
    248248
    249249        // Open the file
    250250        std::ifstream file;
    251         file.open(getFileName(CoreSettings::getLanguage()).c_str(), std::fstream::in);
     251        file.open(getFileName(Core::getLanguage()).c_str(), std::fstream::in);
    252252
    253253        if (!file.is_open())
    254254        {
    255255            COUT(1) << "An error occurred in Language.cc:" << std::endl;
    256             COUT(1) << "Error: Couldn't open file " << getFileName(CoreSettings::getLanguage()) << " to read the translated language entries!" << std::endl;
    257             CoreSettings::resetLanguage();
     256            COUT(1) << "Error: Couldn't open file " << getFileName(Core::getLanguage()) << " to read the translated language entries!" << std::endl;
     257            Core::resetLanguage();
    258258            COUT(3) << "Info: Reset language to " << this->defaultLanguage_ << "." << std::endl;
    259259            return;
    … …  
    286286                else
    287287                {
    288                     COUT(2) << "Warning: Invalid language entry \"" << lineString << "\" in " << getFileName(CoreSettings::getLanguage()) << std::endl;
     288                    COUT(2) << "Warning: Invalid language entry \"" << lineString << "\" in " << getFileName(Core::getLanguage()) << std::endl;
    289289                }
    290290            }

  • code/trunk/src/core/Language.h

    r1505 r1535  
    113113    class _CoreExport Language
    114114    {
    115         friend class CoreSettings;
     115        friend class Core;
    116116
    117117        public:

  • code/trunk/src/core/OutputHandler.cc

    r1505 r1535  
    3333
    3434#include "OutputHandler.h"
    35 #include "CoreSettings.h"
     35#include "Core.h"
    3636#include "ConsoleCommand.h"
    3737#include "Shell.h"
    … …  
    8383    int OutputHandler::getSoftDebugLevel(OutputHandler::OutputDevice device)
    8484    {
    85         return CoreSettings::getSoftDebugLevel(device);
     85        return Core::getSoftDebugLevel(device);
    8686    }
    8787

  • code/trunk/src/core/Shell.cc

    r1505 r1535  
    3131#include "CoreIncludes.h"
    3232#include "ConfigValueIncludes.h"
    33 #include "CoreSettings.h"
     33#include "Core.h"
    3434#include "ConsoleCommand.h"
    35 #include "InputInterfaces.h"
     35#include "input/InputInterfaces.h"
    3636
    3737#define SHELL_UPDATE_LISTENERS(function) \
    … …  
    6767    Shell& Shell::createShell()
    6868    {
    69         int level = CoreSettings::getSoftDebugLevel(OutputHandler::LD_Shell);
    70         CoreSettings::setSoftDebugLevel(OutputHandler::LD_Shell, -1);
     69        int level = Core::getSoftDebugLevel(OutputHandler::LD_Shell);
     70        Core::setSoftDebugLevel(OutputHandler::LD_Shell, -1);
    7171        static Shell instance;
    72         CoreSettings::setSoftDebugLevel(OutputHandler::LD_Shell, level);
     72        Core::setSoftDebugLevel(OutputHandler::LD_Shell, level);
    7373        return instance;
    7474    }

  • code/trunk/src/core/Shell.h

    r1505 r1535  
    3636
    3737#include "OrxonoxClass.h"
    38 #include "InputBuffer.h"
     38#include "input/InputBuffer.h"
    3939#include "OutputBuffer.h"
    4040

  • code/trunk/src/core/TclThreadManager.h

    r1505 r1535  
    3030#define _TclThreadManager_H__
    3131
     32#include "CorePrereqs.h"
     33
    3234#include <queue>
    3335#include <map>
    … …  
    3840#include <boost/thread/thread.hpp>
    3941
    40 #include "CorePrereqs.h"
    41 #include "Tickable.h"
    4242#include "cpptcl/CppTcl.h"
     43#include "core/OrxonoxClass.h"
    4344
    4445namespace orxonox
    … …  
    6869    };
    6970
    70     class _CoreExport TclThreadManager : public Tickable
     71    class _CoreExport TclThreadManager : public OrxonoxClass
    7172    {
    7273        public:
Note: See TracChangeset for help on using the changeset viewer.