Changeset 1494 for code/branches/network/src/orxonox/console

Timestamp:

May 31, 2008, 11:24:44 PM (17 years ago)

Author:

rgrieder

Message:

• set the svn:eol-style property to all files so, that where ever you check out, you'll get the right line endings (had to change every file with mixed endings to windows in order to set the property)

Location:

code/branches/network/src/orxonox/console

Files:

• InGameConsole.cc (modified) (1 prop)
• InGameConsole.h (modified) (3 diffs, 1 prop)

code/branches/network/src/orxonox/console/InGameConsole.h

@@ -1 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Felix Schulthess
- *   Co-authors:
- *      Fabian 'x3n' Landau
- *
- */
-
-#ifndef _InGameConsole_H__
-#define _InGameConsole_H__
-
+/* *   ORXONOX - the hottest 3D action shooter ever to exist *                    > www.orxonox.net < * * *   License notice: * *   This program is free software; you can redistribute it and/or *   modify it under the terms of the GNU General Public License *   as published by the Free Software Foundation; either version 2 *   of the License, or (at your option) any later version. * *   This program is distributed in the hope that it will be useful, *   but WITHOUT ANY WARRANTY; without even the implied warranty of *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the *   GNU General Public License for more details. * *   You should have received a copy of the GNU General Public License *   along with this program; if not, write to the Free Software *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. * *   Author: *      Felix Schulthess *   Co-authors: *      Fabian 'x3n' Landau * */#ifndef _InGameConsole_H__#define _InGameConsole_H__
 
 #include "OrxonoxPrereqs.h"
@@ -38 +8 @@
 #include "core/Tickable.h"
 #include "core/Shell.h"
-
-
-namespace orxonox
-{
+namespace orxonox{
     class _OrxonoxExport InGameConsole : public TickableReal, public ShellListener
     {
-        public:
-            static InGameConsole& getInstance();
-
-            void setConfigValues();
-            void tick(float dt);
-
+        public:            static InGameConsole& getInstance();            void setConfigValues();            void tick(float dt);
             void activate();
-            void deactivate();
-            void resize();
-
-            static void openConsole();
-            static void closeConsole();
+            void deactivate();            void resize();            static void openConsole();            static void closeConsole();
 
         private:
-            InGameConsole();
-            InGameConsole(const InGameConsole& other);
-            ~InGameConsole();
-
-            virtual void linesChanged();
-            virtual void onlyLastLineChanged();
-            virtual void lineAdded();
-            virtual void inputChanged();
-            virtual void cursorChanged();
-            virtual void exit();
-
-            void init();
-            void shiftLines();
-            void colourLine(int colourcode, int index);
+            InGameConsole();            InGameConsole(const InGameConsole& other);            ~InGameConsole();            virtual void linesChanged();            virtual void onlyLastLineChanged();            virtual void lineAdded();            virtual void inputChanged();            virtual void cursorChanged();            virtual void exit();            void init();            void shiftLines();            void colourLine(int colourcode, int index);
             void setCursorPosition(int pos);
             void print(const std::string& text, int index, bool alwaysShift = false);
             static Ogre::UTFString convert2UTF(std::string s);
-
-            static float REL_WIDTH;
-            static float REL_HEIGHT;
-            static float BLINK;
-
-            int windowW_;
-            int windowH_;
-            int desiredTextWidth_;
-            unsigned int maxCharsPerLine_;
-            unsigned int numLinesShifted_;
+            static float REL_WIDTH;            static float REL_HEIGHT;            static float BLINK;            int windowW_;
+            int windowH_;            int desiredTextWidth_;            unsigned int maxCharsPerLine_;            unsigned int numLinesShifted_;
             int scroll_;
             float scrollTimer_;
-            float cursor_;
-            unsigned int inputWindowStart_;
-            char cursorSymbol_;
+            float cursor_;            unsigned int inputWindowStart_;            char cursorSymbol_;
             bool active_;
             bool bShowCursor_;
@@ -100 +35 @@
             Ogre::BorderPanelOverlayElement* consoleOverlayBorder_;
             Ogre::TextAreaOverlayElement** consoleOverlayTextAreas_;
-    };
-}
-
-#endif /* _InGameConsole_H__ */
+    };}#endif /* _InGameConsole_H__ */