Changeset 893 for code/branches/input/src

Timestamp:

Mar 13, 2008, 4:15:41 PM (17 years ago)

Author:

rgrieder

Message:

• merged trunk into input

Location:

code/branches/input/src

Files:

• orxonox/OrxonoxPlatform.h (modified) (1 diff)
• orxonox/OrxonoxStableHeaders.h (modified) (1 diff)
• orxonox/core/ClassTreeMask.cc (modified) (6 diffs)
• orxonox/core/Identifier.h (modified) (1 diff)
• orxonox/objects/Tickable.cc (modified) (1 diff)
• orxonox/tools/Timer.cc (modified) (1 diff)
• util/Math.h (modified) (1 diff)
• util/MultiTypeMath.h (modified) (1 diff)
• util/MultiTypePrimitive.h (modified) (1 diff)
• util/MultiTypeString.h (modified) (1 diff)
• util/XMLIncludes.h (modified) (1 diff)
• util/tinyxml/TinyXMLPrereqs.h (deleted)

code/branches/input/src/orxonox/OrxonoxPlatform.h

@@ -251 +251 @@
 #endif
 
+
+// Create a logical xor operator
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#  define XOR ^
+#elif ORXONOX_COMPILER == ORXONOX_COMPILER_GCC
+#  define XOR xor
+#else
+#  define XOR ^
+#endif
+
 } /* namespace orxonox */
 

code/branches/input/src/orxonox/OrxonoxStableHeaders.h

@@ -87 +87 @@
 #include "util/String2Number.h"
 #include "util/Tokenizer.h"
+#include "util/Multitype.h"
+#include "util/MultiTypeMath.h"
+#include "util/MultiTypePrimitive.h"
+#include "util/MultiTypeString.h"
+#include "util/substring.h"
+#include "util/XMLIncludes.h"
+
 #include "util/tinyxml/ticpp.h"
 #include "util/tinyxml/tinyxml.h"

code/branches/input/src/orxonox/core/ClassTreeMask.cc

@@ -592 +592 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) or other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) || other.isIncluded(subclass), false, false);
         }
 
@@ -599 +599 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) or other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) || other.isIncluded(subclass), false, false);
         }
 
@@ -623 +623 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) and other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) && other.isIncluded(subclass), false, false);
         }
 
@@ -630 +630 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) and other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) && other.isIncluded(subclass), false, false);
         }
 
@@ -737 +737 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) xor other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) XOR other.isIncluded(subclass), false, false);
         }
 
@@ -744 +744 @@
         {
             const Identifier* subclass = it->getClass();
-            newmask.add(subclass, this->isIncluded(subclass) xor other.isIncluded(subclass), false, false);
+            newmask.add(subclass, this->isIncluded(subclass) XOR other.isIncluded(subclass), false, false);
         }
 

code/branches/input/src/orxonox/core/Identifier.h

@@ -206 +206 @@
     };
 
-    std::ostream& operator<<(std::ostream& out, const std::list<const Identifier*>& list);
+    _CoreExport std::ostream& operator<<(std::ostream& out, const std::list<const Identifier*>& list);
 
 

code/branches/input/src/orxonox/objects/Tickable.cc

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   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:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+
 #include "core/CoreIncludes.h"
 #include "Tickable.h"

code/branches/input/src/orxonox/tools/Timer.cc

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   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:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
+#include "OrxonoxStableHeaders.h"
+
 #include "core/CoreIncludes.h"
 #include "Timer.h"

code/branches/input/src/util/Math.h

@@ -147 +147 @@
 
 #endif /* _Math_H__ */
+

code/branches/input/src/util/MultiTypeMath.h

@@ -153 +153 @@
 };
 
-std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm);
+_UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm);
 
 #endif /* _MultiTypeMath_H__ */

code/branches/input/src/util/MultiTypePrimitive.h

@@ -175 +175 @@
 };
 
-std::ostream& operator<<(std::ostream& out, const MultiTypePrimitive& mtp);
+_UtilExport std::ostream& operator<<(std::ostream& out, const MultiTypePrimitive& mtp);
 
 #endif /* _MultiTypePrimitive_H__ */

code/branches/input/src/util/MultiTypeString.h

@@ -109 +109 @@
 };
 
-std::ostream& operator<<(std::ostream& out, MultiTypeString& mts);
+_UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeString& mts);
 
 #endif /* _MultiTypeString_H__ */

code/branches/input/src/util/XMLIncludes.h

@@ -1 @@
-#include "util/tinyxml/TinyXMLPrereqs.h"
+//-----------------------------------------------------------------------
+// Forward declarations
+//-----------------------------------------------------------------------
+
+class TiXmlString;
+class TiXmlOutStream;
+class TiXmlNode;
+class TiXmlHandle;
+class TiXmlDocument;
+class TiXmlElement;
+class TiXmlComment;
+class TiXmlUnknown;
+class TiXmlAttribute;
+class TiXmlText;
+class TiXmlDeclaration;
+class TiXmlParsingData;
+
+namespace ticpp
+{
+    class Document;
+    class Element;
+    class Declaration;
+    class StylesheetReference;
+    class Text;
+    class Comment;
+    class Attribute;
+}
 
 namespace orxonox