Changeset 890
- Timestamp:
- Mar 13, 2008, 3:52:29 PM (17 years ago)
- Location:
- code/trunk
- Files:
-
- 2 added
- 1 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/orxonox/OrxonoxPlatform.h
r790 r890 251 251 #endif 252 252 253 254 // Create a logical xor operator 255 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC 256 # define XOR ^ 257 #elif ORXONOX_COMPILER == ORXONOX_COMPILER_GCC 258 # define XOR xor 259 #else 260 # define XOR ^ 261 #endif 262 253 263 } /* namespace orxonox */ 254 264 -
code/trunk/src/orxonox/OrxonoxStableHeaders.h
r871 r890 87 87 #include "util/String2Number.h" 88 88 #include "util/Tokenizer.h" 89 #include "util/Multitype.h" 90 #include "util/MultiTypeMath.h" 91 #include "util/MultiTypePrimitive.h" 92 #include "util/MultiTypeString.h" 93 #include "util/substring.h" 94 #include "util/XMLIncludes.h" 95 89 96 #include "util/tinyxml/ticpp.h" 90 97 #include "util/tinyxml/tinyxml.h" -
code/trunk/src/orxonox/core/ClassTreeMask.cc
r871 r890 592 592 { 593 593 const Identifier* subclass = it->getClass(); 594 newmask.add(subclass, this->isIncluded(subclass) orother.isIncluded(subclass), false, false);594 newmask.add(subclass, this->isIncluded(subclass) || other.isIncluded(subclass), false, false); 595 595 } 596 596 … … 599 599 { 600 600 const Identifier* subclass = it->getClass(); 601 newmask.add(subclass, this->isIncluded(subclass) orother.isIncluded(subclass), false, false);601 newmask.add(subclass, this->isIncluded(subclass) || other.isIncluded(subclass), false, false); 602 602 } 603 603 … … 623 623 { 624 624 const Identifier* subclass = it->getClass(); 625 newmask.add(subclass, this->isIncluded(subclass) andother.isIncluded(subclass), false, false);625 newmask.add(subclass, this->isIncluded(subclass) && other.isIncluded(subclass), false, false); 626 626 } 627 627 … … 630 630 { 631 631 const Identifier* subclass = it->getClass(); 632 newmask.add(subclass, this->isIncluded(subclass) andother.isIncluded(subclass), false, false);632 newmask.add(subclass, this->isIncluded(subclass) && other.isIncluded(subclass), false, false); 633 633 } 634 634 … … 737 737 { 738 738 const Identifier* subclass = it->getClass(); 739 newmask.add(subclass, this->isIncluded(subclass) xorother.isIncluded(subclass), false, false);739 newmask.add(subclass, this->isIncluded(subclass) XOR other.isIncluded(subclass), false, false); 740 740 } 741 741 … … 744 744 { 745 745 const Identifier* subclass = it->getClass(); 746 newmask.add(subclass, this->isIncluded(subclass) xorother.isIncluded(subclass), false, false);746 newmask.add(subclass, this->isIncluded(subclass) XOR other.isIncluded(subclass), false, false); 747 747 } 748 748 -
code/trunk/src/orxonox/core/Identifier.h
r871 r890 206 206 }; 207 207 208 std::ostream& operator<<(std::ostream& out, const std::list<const Identifier*>& list);208 _CoreExport std::ostream& operator<<(std::ostream& out, const std::list<const Identifier*>& list); 209 209 210 210 -
code/trunk/src/orxonox/objects/Tickable.cc
r871 r890 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 28 #include "OrxonoxStableHeaders.h" 29 1 30 #include "core/CoreIncludes.h" 2 31 #include "Tickable.h" -
code/trunk/src/orxonox/tools/Timer.cc
r871 r890 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 28 #include "OrxonoxStableHeaders.h" 29 1 30 #include "core/CoreIncludes.h" 2 31 #include "Timer.h" -
code/trunk/src/util/MultiTypeMath.h
r871 r890 153 153 }; 154 154 155 std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm);155 _UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm); 156 156 157 157 #endif /* _MultiTypeMath_H__ */ -
code/trunk/src/util/MultiTypePrimitive.h
r871 r890 175 175 }; 176 176 177 std::ostream& operator<<(std::ostream& out, const MultiTypePrimitive& mtp);177 _UtilExport std::ostream& operator<<(std::ostream& out, const MultiTypePrimitive& mtp); 178 178 179 179 #endif /* _MultiTypePrimitive_H__ */ -
code/trunk/src/util/MultiTypeString.h
r871 r890 109 109 }; 110 110 111 std::ostream& operator<<(std::ostream& out, MultiTypeString& mts);111 _UtilExport std::ostream& operator<<(std::ostream& out, MultiTypeString& mts); 112 112 113 113 #endif /* _MultiTypeString_H__ */ -
code/trunk/src/util/XMLIncludes.h
r871 r890 1 #include "util/tinyxml/TinyXMLPrereqs.h" 1 //----------------------------------------------------------------------- 2 // Forward declarations 3 //----------------------------------------------------------------------- 4 5 class TiXmlString; 6 class TiXmlOutStream; 7 class TiXmlNode; 8 class TiXmlHandle; 9 class TiXmlDocument; 10 class TiXmlElement; 11 class TiXmlComment; 12 class TiXmlUnknown; 13 class TiXmlAttribute; 14 class TiXmlText; 15 class TiXmlDeclaration; 16 class TiXmlParsingData; 17 18 namespace ticpp 19 { 20 class Document; 21 class Element; 22 class Declaration; 23 class StylesheetReference; 24 class Text; 25 class Comment; 26 class Attribute; 27 } 2 28 3 29 namespace orxonox -
code/trunk/visual_studio/base_properties.vsprops
r790 r890 11 11 PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;BOOST_ALL_DYN_LINK" 12 12 WarningLevel="3" 13 DisableSpecificWarnings="4267; 4244; 4251 "13 DisableSpecificWarnings="4267; 4244; 4251;4522" 14 14 /> 15 15 <Tool -
code/trunk/visual_studio/orxonox_vc8.sln
r886 r890 18 18 ProjectSection(ProjectDependencies) = postProject 19 19 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 20 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 20 21 EndProjectSection 21 22 EndProject … … 45 46 EndProjectSection 46 47 ProjectSection(ProjectDependencies) = postProject 47 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497}48 48 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68} 49 49 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC} 50 50 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86} 51 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F} 52 {4733BD1A-E04C-458D-8BFB-5010250EA497} = {4733BD1A-E04C-458D-8BFB-5010250EA497} 51 53 EndProjectSection 52 54 EndProject 53 55 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "util", "vc8\util.vcproj", "{2240ECD7-2F48-4431-8E1B-25466A384CCC}" 56 ProjectSection(WebsiteProperties) = preProject 57 Debug.AspNetCompiler.Debug = "True" 58 Release.AspNetCompiler.Debug = "False" 59 EndProjectSection 60 EndProject 61 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tixml", "vc8\tixml.vcproj", "{F101C2F0-1CB9-4A57-827B-6C399A99B28F}" 54 62 ProjectSection(WebsiteProperties) = preProject 55 63 Debug.AspNetCompiler.Debug = "True" … … 109 117 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.Release|Win32.ActiveCfg = Release|Win32 110 118 {2240ECD7-2F48-4431-8E1B-25466A384CCC}.Release|Win32.Build.0 = Release|Win32 119 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Debug|Win32.ActiveCfg = Debug|Win32 120 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Debug|Win32.Build.0 = Debug|Win32 121 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Release_SSE|Win32.ActiveCfg = Release_SSE|Win32 122 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Release_SSE|Win32.Build.0 = Release_SSE|Win32 123 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Release_SSE2|Win32.ActiveCfg = Release_SSE2|Win32 124 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Release_SSE2|Win32.Build.0 = Release_SSE2|Win32 125 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Release|Win32.ActiveCfg = Release|Win32 126 {F101C2F0-1CB9-4A57-827B-6C399A99B28F}.Release|Win32.Build.0 = Release|Win32 111 127 EndGlobalSection 112 128 GlobalSection(SolutionProperties) = preSolution -
code/trunk/visual_studio/util_properties.vsprops
r790 r890 6 6 InheritedPropertySheets=".\directory_properties.vsprops" 7 7 > 8 <Tool 9 Name="VCCLCompilerTool" 10 PreprocessorDefinitions="UTIL_SHARED_BUILD" 11 /> 12 <Tool 13 Name="VCLinkerTool" 14 AdditionalDependencies="OgreMain$(CS).lib" 15 /> 8 16 </VisualStudioPropertySheet> -
code/trunk/visual_studio/vc8/core.vcproj
r790 r890 281 281 </File> 282 282 <File 283 RelativePath="..\..\src\orxonox\core\ClassTreeMask.cc" 284 > 285 </File> 286 <File 283 287 RelativePath="..\..\src\orxonox\core\ConfigValueContainer.cc" 284 288 > … … 293 297 </File> 294 298 <File 299 RelativePath="..\..\src\orxonox\core\Executor.cc" 300 > 301 </File> 302 <File 295 303 RelativePath="..\..\src\orxonox\core\Factory.cc" 296 304 > … … 301 309 </File> 302 310 <File 303 RelativePath="..\..\src\orxonox\core\Identifier List.cc"311 RelativePath="..\..\src\orxonox\core\IdentifierDistributor.cc" 304 312 > 305 313 </File> … … 309 317 </File> 310 318 <File 319 RelativePath="..\..\src\orxonox\core\Loader.cc" 320 > 321 </File> 322 <File 311 323 RelativePath="..\..\src\orxonox\core\MetaObjectList.cc" 312 324 > … … 322 334 <File 323 335 RelativePath="..\..\src\orxonox\core\SignalHandler.cc" 336 > 337 </File> 338 <File 339 RelativePath="..\..\src\orxonox\core\XMLPort.cc" 324 340 > 325 341 </File> … … 343 359 </File> 344 360 <File 361 RelativePath="..\..\src\orxonox\core\ClassManager.h" 362 > 363 </File> 364 <File 365 RelativePath="..\..\src\orxonox\core\ClassTreeMask.h" 366 > 367 </File> 368 <File 345 369 RelativePath="..\..\src\orxonox\core\ConfigValueContainer.h" 346 370 > … … 367 391 </File> 368 392 <File 393 RelativePath="..\..\src\orxonox\core\Executor.h" 394 > 395 </File> 396 <File 369 397 RelativePath="..\..\src\orxonox\core\Factory.h" 370 398 > 371 399 </File> 372 400 <File 401 RelativePath="..\..\src\orxonox\core\Functor.h" 402 > 403 </File> 404 <File 373 405 RelativePath="..\..\src\orxonox\core\Identifier.h" 374 406 > 375 407 </File> 376 408 <File 377 RelativePath="..\..\src\orxonox\core\Identifier List.h"409 RelativePath="..\..\src\orxonox\core\IdentifierDistributor.h" 378 410 > 379 411 </File> … … 387 419 </File> 388 420 <File 421 RelativePath="..\..\src\orxonox\core\Level.h" 422 > 423 </File> 424 <File 425 RelativePath="..\..\src\orxonox\core\Loader.h" 426 > 427 </File> 428 <File 389 429 RelativePath="..\..\src\orxonox\core\MetaObjectList.h" 390 430 > … … 404 444 <File 405 445 RelativePath="..\..\src\orxonox\core\SignalHandler.h" 446 > 447 </File> 448 <File 449 RelativePath="..\..\src\orxonox\core\XMLPort.h" 406 450 > 407 451 </File> -
code/trunk/visual_studio/vc8/orxonox.vcproj
r790 r890 572 572 </File> 573 573 <File 574 RelativePath="..\..\src\orxonox\objects\Tickable.cc" 575 > 576 </File> 577 <File 574 578 RelativePath="..\..\src\orxonox\objects\WorldEntity.cc" 575 579 > … … 625 629 <File 626 630 RelativePath="..\..\src\orxonox\tools\Mesh.cc" 631 > 632 </File> 633 <File 634 RelativePath="..\..\src\orxonox\tools\Timer.cc" 627 635 > 628 636 </File> -
code/trunk/visual_studio/vc8/util.vcproj
r790 r890 18 18 <Configuration 19 19 Name="Debug|Win32" 20 ConfigurationType=" 4"20 ConfigurationType="2" 21 21 InheritedPropertySheets="$(SolutionDir)base_properties_debug.vsprops;..\util_properties.vsprops" 22 22 CharacterSet="1" … … 50 50 /> 51 51 <Tool 52 Name="VCLi brarianTool"52 Name="VCLinkerTool" 53 53 /> 54 54 <Tool … … 56 56 /> 57 57 <Tool 58 Name="VCManifestTool" 59 /> 60 <Tool 58 61 Name="VCXDCMakeTool" 59 62 /> … … 63 66 <Tool 64 67 Name="VCFxCopTool" 68 /> 69 <Tool 70 Name="VCAppVerifierTool" 71 /> 72 <Tool 73 Name="VCWebDeploymentTool" 65 74 /> 66 75 <Tool … … 70 79 <Configuration 71 80 Name="Release|Win32" 72 ConfigurationType=" 4"81 ConfigurationType="2" 73 82 InheritedPropertySheets="$(SolutionDir)base_properties_release.vsprops;..\util_properties.vsprops" 74 83 CharacterSet="1" … … 103 112 /> 104 113 <Tool 105 Name="VCLi brarianTool"114 Name="VCLinkerTool" 106 115 /> 107 116 <Tool … … 109 118 /> 110 119 <Tool 120 Name="VCManifestTool" 121 /> 122 <Tool 111 123 Name="VCXDCMakeTool" 112 124 /> … … 116 128 <Tool 117 129 Name="VCFxCopTool" 130 /> 131 <Tool 132 Name="VCAppVerifierTool" 133 /> 134 <Tool 135 Name="VCWebDeploymentTool" 118 136 /> 119 137 <Tool … … 123 141 <Configuration 124 142 Name="Release_SSE|Win32" 125 ConfigurationType=" 4"143 ConfigurationType="2" 126 144 InheritedPropertySheets="..\base_properties_release_sse.vsprops;..\util_properties.vsprops" 127 145 CharacterSet="1" … … 156 174 /> 157 175 <Tool 158 Name="VCLi brarianTool"176 Name="VCLinkerTool" 159 177 /> 160 178 <Tool … … 162 180 /> 163 181 <Tool 182 Name="VCManifestTool" 183 /> 184 <Tool 164 185 Name="VCXDCMakeTool" 165 186 /> … … 169 190 <Tool 170 191 Name="VCFxCopTool" 192 /> 193 <Tool 194 Name="VCAppVerifierTool" 195 /> 196 <Tool 197 Name="VCWebDeploymentTool" 171 198 /> 172 199 <Tool … … 176 203 <Configuration 177 204 Name="Release_SSE2|Win32" 178 ConfigurationType=" 4"205 ConfigurationType="2" 179 206 InheritedPropertySheets="..\base_properties_release_sse2.vsprops;..\util_properties.vsprops" 180 207 CharacterSet="1" … … 209 236 /> 210 237 <Tool 211 Name="VCLi brarianTool"238 Name="VCLinkerTool" 212 239 /> 213 240 <Tool … … 215 242 /> 216 243 <Tool 244 Name="VCManifestTool" 245 /> 246 <Tool 217 247 Name="VCXDCMakeTool" 218 248 /> … … 222 252 <Tool 223 253 Name="VCFxCopTool" 254 /> 255 <Tool 256 Name="VCAppVerifierTool" 257 /> 258 <Tool 259 Name="VCWebDeploymentTool" 224 260 /> 225 261 <Tool … … 237 273 > 238 274 <File 275 RelativePath="..\..\src\util\Math.cc" 276 > 277 </File> 278 <File 279 RelativePath="..\..\src\util\MultiTypeMath.cc" 280 > 281 </File> 282 <File 283 RelativePath="..\..\src\util\MultiTypePrimitive.cc" 284 > 285 </File> 286 <File 287 RelativePath="..\..\src\util\MultiTypeString.cc" 288 > 289 </File> 290 <File 291 RelativePath="..\..\src\util\String.cc" 292 > 293 </File> 294 <File 239 295 RelativePath="..\..\src\util\substring.cc" 240 296 > 241 297 </File> 242 <Filter243 Name="tinyxml"244 >245 <File246 RelativePath="..\..\src\util\tinyxml\ticpp.cc"247 >248 </File>249 <File250 RelativePath="..\..\src\util\tinyxml\tinystr.cc"251 >252 </File>253 <File254 RelativePath="..\..\src\util\tinyxml\tinyxml.cc"255 >256 </File>257 <File258 RelativePath="..\..\src\util\tinyxml\tinyxmlerror.cc"259 >260 </File>261 <File262 RelativePath="..\..\src\util\tinyxml\tinyxmlparser.cc"263 >264 </File>265 </Filter>266 298 </Filter> 267 299 <Filter … … 279 311 </File> 280 312 <File 313 RelativePath="..\..\src\util\MultiType.h" 314 > 315 </File> 316 <File 317 RelativePath="..\..\src\util\MultiTypeMath.h" 318 > 319 </File> 320 <File 321 RelativePath="..\..\src\util\MultiTypePrimitive.h" 322 > 323 </File> 324 <File 325 RelativePath="..\..\src\util\MultiTypeString.h" 326 > 327 </File> 328 <File 281 329 RelativePath="..\..\src\util\Sleep.h" 282 330 > 283 331 </File> 284 332 <File 333 RelativePath="..\..\src\util\String.h" 334 > 335 </File> 336 <File 285 337 RelativePath="..\..\src\util\String2Number.h" 286 338 > … … 294 346 > 295 347 </File> 296 <Filter 297 Name="tinyxml" 298 > 299 <File 300 RelativePath="..\..\src\util\tinyxml\ticpp.h" 301 > 302 </File> 303 <File 304 RelativePath="..\..\src\util\tinyxml\ticpprc.h" 305 > 306 </File> 307 <File 308 RelativePath="..\..\src\util\tinyxml\tinystr.h" 309 > 310 </File> 311 <File 312 RelativePath="..\..\src\util\tinyxml\tinyxml.h" 313 > 314 </File> 315 <File 316 RelativePath="..\..\src\util\tinyxml\TinyXMLPrereqs.h" 317 > 318 </File> 319 </Filter> 348 <File 349 RelativePath="..\..\src\util\UtilPrereqs.h" 350 > 351 </File> 352 <File 353 RelativePath="..\..\src\util\XMLIncludes.h" 354 > 355 </File> 320 356 </Filter> 321 357 </Files>
Note: See TracChangeset
for help on using the changeset viewer.