Changeset 682 for code/branches/FICN/src/orxonox
- Timestamp:
- Dec 25, 2007, 10:37:29 PM (16 years ago)
- Location:
- code/branches/FICN/src/orxonox
- Files:
-
- 2 added
- 21 edited
-
Orxonox.h (modified) (2 diffs)
-
OrxonoxPlatform.h (added)
-
OrxonoxPrereqs.h (modified) (6 diffs)
-
core/ArgReader.h (modified) (2 diffs)
-
core/ClassFactory.h (modified) (1 diff)
-
core/ConfigValueContainer.cc (modified) (1 diff)
-
core/ConfigValueContainer.h (modified) (3 diffs)
-
core/CoreIncludes.h (modified) (2 diffs)
-
core/CorePrereqs.h (added)
-
core/Debug.h (modified) (1 diff)
-
core/DebugLevel.cc (modified) (1 diff)
-
core/DebugLevel.h (modified) (2 diffs)
-
core/Error.h (modified) (1 diff)
-
core/Factory.cc (modified) (1 diff)
-
core/Factory.h (modified) (4 diffs)
-
core/Identifier.h (modified) (3 diffs)
-
core/IdentifierList.h (modified) (3 diffs)
-
core/Iterator.h (modified) (1 diff)
-
core/MetaObjectList.h (modified) (2 diffs)
-
core/ObjectList.h (modified) (2 diffs)
-
core/OrxonoxClass.h (modified) (3 diffs)
-
core/SignalHandler.cc (modified) (1 diff)
-
core/SignalHandler.h (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FICN/src/orxonox/Orxonox.h
r673 r682 12 12 13 13 #include "OrxonoxPrereqs.h" 14 #include "loader/LoaderPrereqs.h" 14 15 #include "GraphicsEngine.h" 15 16 … … 25 26 PRESENTATION 26 27 }; 27 28 class OrxListener;29 28 30 29 class Orxonox -
code/branches/FICN/src/orxonox/OrxonoxPrereqs.h
r673 r682 20 20 * 21 21 * Author: 22 * Reto Grieder , (C) 200722 * Reto Grieder 23 23 * Co-authors: 24 24 * ... … … 27 27 28 28 /** 29 @file OrxonoxPrereq. cc30 @brief Contains all the necessary forward declarations for all classes , structs and enums.29 @file OrxonoxPrereq.h 30 @brief Contains all the necessary forward declarations for all classes and structs. 31 31 */ 32 32 … … 34 34 #define _OrxonoxPrereqs_H__ 35 35 36 // hack for the usleep/Sleep problem 37 #ifdef WIN32 38 #include <windows.h> 39 #define usleep(x) Sleep((x)/1000) 40 #else 41 #include <unistd.h> 42 #endif 36 #include "OrxonoxPlatform.h" 43 37 44 38 // classes that have not yet been put into a namespace 45 39 class InputManager; 46 class SignalHandler;47 40 class SpaceShipSteering; 48 template <class T>49 class String2Number;50 41 51 42 namespace orxonox { … … 54 45 class BaseObject; 55 46 class Camera; 56 template <class T>57 class ClassFactory;58 47 class Entity; 59 48 class GraphicsEngine; … … 75 64 class WorldEntity; 76 65 77 // from core library78 class ArgReader;79 class BaseFactory;80 class BaseMetaObjectListElement;81 template <class T>82 class ClassFactory;83 template <class T>84 class ClassIdentifier;85 class ConfigValueContainer;86 class DebugLevel;87 class Error;88 class Factory;89 class Identifier;90 class IdentifierList;91 class IdentifierListElement;92 template <class T>93 class Iterator;94 class MetaObjectList;95 template <class T>96 class MetaObjectListElement;97 template <class T>98 class ObjectList;99 template <class T>100 class ObjectListElement;101 class OrxonoxClass;102 template <class T>103 class SubclassIdentifier;104 105 66 class AmmunitionDump; 106 67 class Bullet; … … 120 81 namespace hud { 121 82 class HUD; 122 }123 124 namespace loader {125 class LevelLoader;126 83 } 127 84 -
code/branches/FICN/src/orxonox/core/ArgReader.h
r673 r682 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Benjamin Knecht <beni_at_orxonox.net> 23 * Co-authors: 24 * ... 25 * 26 */ 27 1 28 /** 2 29 @file Argreader.h … … 10 37 #include <string> 11 38 39 #include "CorePrereqs.h" 40 12 41 namespace orxonox { 13 42 14 class ArgReader43 class _CoreExport ArgReader 15 44 { 16 45 public: -
code/branches/FICN/src/orxonox/core/ClassFactory.h
r677 r682 36 36 #define _ClassFactory_H__ 37 37 38 #include <string> 39 40 #include "CorePrereqs.h" 41 42 #include "Factory.h" 38 43 #include "Identifier.h" 39 44 #include "Debug.h" -
code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc
r677 r682 27 27 28 28 #include <fstream> 29 #include "ConfigValueContainer.h" 29 30 30 #include "../../misc/Tokenizer.h" 31 31 #include "../../misc/String2Number.h" 32 #include "ConfigValueContainer.h" 32 33 33 34 #define CONFIGFILEPATH "orxonox.ini" -
code/branches/FICN/src/orxonox/core/ConfigValueContainer.h
r673 r682 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Fabian 'x3n' Landau 23 * Co-authors: 24 * ... 25 * 26 */ 27 1 28 /*! 2 29 @file ConfigValueContainer.h … … 18 45 #include <string> 19 46 #include <list> 47 48 #include "CorePrereqs.h" 20 49 21 50 #include "OgreVector2.h" … … 41 70 If there is no section, the section and the entry are added to the end of the config-file. 42 71 */ 43 class ConfigValueContainer72 class _CoreExport ConfigValueContainer 44 73 { 45 74 public: -
code/branches/FICN/src/orxonox/core/CoreIncludes.h
r677 r682 26 26 */ 27 27 28 #ifndef _CoreIncludes_H__29 #define _CoreIncludes_H__30 31 28 /** 32 29 @file CoreIncludes.h … … 39 36 the of the class implementation, so it gets executed before main(). 40 37 */ 38 39 #ifndef _CoreIncludes_H__ 40 #define _CoreIncludes_H__ 41 42 #include "CorePrereqs.h" 41 43 42 44 // All needed header-files -
code/branches/FICN/src/orxonox/core/Debug.h
r670 r682 37 37 38 38 #include <stdio.h> 39 40 int getSoftDebugLevel(); 39 #include <iostream> 40 41 #include "CorePrereqs.h" 42 43 extern "C" _CoreExport int getSoftDebugLevel(); 41 44 42 45 // DEFINE ERROR MODES -
code/branches/FICN/src/orxonox/core/DebugLevel.cc
r670 r682 27 27 28 28 #include "CoreIncludes.h" 29 #include "Debug.h" 29 30 #include "DebugLevel.h" 30 #include "Debug.h"31 31 32 32 namespace orxonox -
code/branches/FICN/src/orxonox/core/DebugLevel.h
r673 r682 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Fabian 'x3n' Landau 23 * Co-authors: 24 * ... 25 * 26 */ 27 1 28 #ifndef _DebugLevel_H__ 2 29 #define _DebugLevel_H__ 30 31 #include "CorePrereqs.h" 3 32 4 33 #include "OrxonoxClass.h" … … 6 35 namespace orxonox 7 36 { 8 class DebugLevel : public OrxonoxClass37 class _CoreExport DebugLevel : public OrxonoxClass 9 38 { 10 39 public: -
code/branches/FICN/src/orxonox/core/Error.h
r673 r682 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Fabian 'x3n' Landau 23 * Co-authors: 24 * ... 25 * 26 */ 27 1 28 #ifndef _Error_H__ 2 29 #define _Error_H__ 3 30 4 #include <iostream>5 31 #include <string> 32 33 #include "CorePrereqs.h" 6 34 7 35 namespace orxonox 8 36 { 9 class Error37 class _CoreExport Error 10 38 { 11 39 public: -
code/branches/FICN/src/orxonox/core/Factory.cc
r677 r682 31 31 */ 32 32 33 #include "Factory.h"34 33 #include "Identifier.h" 35 34 #include "Debug.h" 36 35 #include "../objects/BaseObject.h" 36 #include "Factory.h" 37 37 38 38 namespace orxonox -
code/branches/FICN/src/orxonox/core/Factory.h
r673 r682 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Fabian 'x3n' Landau 23 * Co-authors: 24 * ... 25 * 26 */ 27 1 28 /*! 2 29 @file Factory.h … … 20 47 #include <string> 21 48 49 #include "CorePrereqs.h" 50 22 51 namespace orxonox 23 52 { 24 53 class BaseObject; // Forward declaration 25 class Identifier; // Forward declaration26 54 27 55 // ############################### … … 29 57 // ############################### 30 58 //! The Factory is used to map the name or the network ID of a class with its Identifier. 31 class Factory59 class _CoreExport Factory 32 60 { 33 61 public: … … 53 81 // ############################### 54 82 //! Base-class of ClassFactory. Has to be defined separate because of circular dependencies. 55 class BaseFactory83 class _CoreExport BaseFactory 56 84 { 57 85 public: -
code/branches/FICN/src/orxonox/core/Identifier.h
r677 r682 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Fabian 'x3n' Landau 23 * Co-authors: 24 * ... 25 * 26 */ 27 1 28 /*! 2 29 @file Identifier.h … … 25 52 #define _Identifier_H__ 26 53 27 #include < iostream>54 #include <string> 28 55 #include <map> 29 56 57 #include "CorePrereqs.h" 58 59 #include "ObjectList.h" 30 60 #include "IdentifierList.h" 31 #include "ObjectList.h"32 61 #include "Factory.h" 33 #include "ConfigValueContainer.h"34 62 #include "Debug.h" 63 // These two files would actually be need, but they would produce 64 // circular dependencies. Anyway, it does compile without them 65 //#include "OrxonoxClass.h" 66 //#include "MetaObjectList.h" 35 67 36 68 namespace orxonox … … 56 88 You can't directly create an Identifier, it's just the base-class for ClassIdentifier. 57 89 */ 58 class Identifier90 class _CoreExport Identifier 59 91 { 60 92 template <class T> -
code/branches/FICN/src/orxonox/core/IdentifierList.h
r673 r682 1 #ifndef _IdentifierList_H__ 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Fabian 'x3n' Landau 23 * Co-authors: 24 * ... 25 * 26 */ 27 2 28 /*! 3 29 @file IdentifierList.h … … 8 34 */ 9 35 36 #ifndef _IdentifierList_H__ 10 37 #define _IdentifierList_H__ 11 38 12 39 #include <string> 13 40 41 #include "CorePrereqs.h" 42 14 43 namespace orxonox 15 44 { 16 class Identifier; // Forward declaration17 18 45 //! The list-element of the IdentifierList 19 46 class IdentifierListElement … … 27 54 28 55 //! The IdentifierList contains Identifiers 29 class IdentifierList56 class _CoreExport IdentifierList 30 57 { 31 58 public: -
code/branches/FICN/src/orxonox/core/Iterator.h
r677 r682 46 46 #define _Iterator_H__ 47 47 48 #include "CorePrereqs.h" 49 50 #include "ObjectList.h" 48 51 #include "Debug.h" 49 52 -
code/branches/FICN/src/orxonox/core/MetaObjectList.h
r677 r682 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Fabian 'x3n' Landau 23 * Co-authors: 24 * ... 25 * 26 */ 27 1 28 /*! 2 29 @file MetaObjectList.h … … 10 37 #ifndef _MetaObjectList_H__ 11 38 #define _MetaObjectList_H__ 39 40 #include "CorePrereqs.h" 12 41 13 42 #include "ObjectList.h" -
code/branches/FICN/src/orxonox/core/ObjectList.h
r673 r682 38 38 #define _ObjectList_H__ 39 39 40 #include "CorePrereqs.h" 41 40 42 namespace orxonox 41 43 { 42 class OrxonoxClass; // Forward declaration43 44 44 // ############################### 45 45 // ### ObjectListElement ### … … 73 73 // ### ObjectList ### 74 74 // ############################### 75 template <class T>76 class Iterator; // Forward declaration77 78 75 //! The ObjectList contains all objects of a given class. 79 76 /** -
code/branches/FICN/src/orxonox/core/OrxonoxClass.h
r673 r682 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Fabian 'x3n' Landau 23 * Co-authors: 24 * ... 25 * 26 */ 27 1 28 /*! 2 29 @file OrxonoxClass.h … … 10 37 #define _OrxonoxClass_H__ 11 38 39 #include <string> 40 41 #include "CorePrereqs.h" 42 43 #include "MetaObjectList.h" 12 44 #include "Identifier.h" 13 #include "IdentifierList.h"14 #include "ObjectList.h"15 #include "MetaObjectList.h"16 45 17 46 namespace orxonox … … 22 51 OrxonoxClass is needed to create the class-hierarchy at startup and to store the Identifier and the MetaObjectList. 23 52 */ 24 class OrxonoxClass53 class _CoreExport OrxonoxClass 25 54 { 26 55 public: -
code/branches/FICN/src/orxonox/core/SignalHandler.cc
r670 r682 28 28 #include <assert.h> 29 29 30 #include "Debug.h" 30 31 #include "SignalHandler.h" 31 #include "Debug.h"32 32 33 33 SignalHandler * SignalHandler::singletonRef = NULL; -
code/branches/FICN/src/orxonox/core/SignalHandler.h
r673 r682 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Christoph Renner 23 * Co-authors: 24 * ... 25 * 26 */ 27 1 28 /*! 2 29 * @file SignalHandler.h … … 8 35 #include <list> 9 36 #include <string> 37 38 #include "CorePrereqs.h" 10 39 11 40 typedef int (*SignalCallback)( void * someData ); … … 58 87 59 88 #else /* if defined __WIN32__ */ 60 class SignalHandler 89 90 class _CoreExport SignalHandler 61 91 { 62 92 public:
Note: See TracChangeset
for help on using the changeset viewer.
