Changeset 945
- Timestamp:
- Mar 27, 2008, 10:13:19 PM (16 years ago)
- Location:
- code/branches/input
- Files:
-
- 2 added
- 2 deleted
- 13 edited
-
src/audio/AudioPrereqs.h (modified) (1 diff)
-
src/network/NetworkPrereqs.h (modified) (2 diffs)
-
src/orxonox/Orxonox.cc (modified) (3 diffs)
-
src/orxonox/OrxonoxPrereqs.h (modified) (3 diffs)
-
src/orxonox/core/ArgReader.cc (deleted)
-
src/orxonox/core/ArgReader.h (deleted)
-
src/orxonox/core/CMakeLists.txt (modified) (1 diff)
-
src/orxonox/core/CorePrereqs.h (modified) (3 diffs)
-
src/util/ArgReader.cc (added)
-
src/util/ArgReader.h (added)
-
src/util/CMakeLists.txt (modified) (1 diff)
-
src/util/UtilPrereqs.h (modified) (2 diffs)
-
visual_studio/vc8/audio.vcproj (modified) (1 diff)
-
visual_studio/vc8/core.vcproj (modified) (2 diffs)
-
visual_studio/vc8/network.vcproj (modified) (1 diff)
-
visual_studio/vc8/orxonox.vcproj (modified) (6 diffs)
-
visual_studio/vc8/util.vcproj (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
code/branches/input/src/audio/AudioPrereqs.h
r790 r945 27 27 28 28 /** 29 @file AudioPrereqs.h30 @brief Contains all the necessary forward declarations for all classes, structs and enums.31 29 @file 30 @brief Contains all the necessary forward declarations for all classes and structs. 31 */ 32 32 33 33 #ifndef _AudioPrereqs_H__ -
code/branches/input/src/network/NetworkPrereqs.h
r888 r945 27 27 28 28 /** 29 @file NetworkPrereqs.h30 @brief Contains all the necessary forward declarations for all classes, structs and enums.31 29 @file 30 @brief Contains all the necessary forward declarations for all classes and structs. 31 */ 32 32 33 33 #ifndef _NetworkPrereqs_H__ … … 84 84 struct PacketEnvelope; 85 85 struct QueueItem; 86 struct sync hData;86 struct syncData; 87 87 struct synchronisableVariable; 88 88 } -
code/branches/input/src/orxonox/Orxonox.cc
r934 r945 50 50 //misc 51 51 //#include "util/Sleep.h" 52 #include "util/ArgReader.h" 52 53 53 54 // audio … … 61 62 62 63 // objects 63 #include "core/ArgReader.h"64 64 #include "core/Debug.h" 65 65 #include "core/Factory.h" … … 174 174 std::string mode; 175 175 176 ArgReader ar = ArgReader(argc, argv);176 ArgReader ar(argc, argv); 177 177 ar.checkArgument("mode", mode, false); 178 178 ar.checkArgument("data", this->dataPath_, false); -
code/branches/input/src/orxonox/OrxonoxPrereqs.h
r922 r945 27 27 28 28 /** 29 @file OrxonoxPrereqs.h30 @brief Contains all the necessary forward declarations for all classes and structs.31 29 @file 30 @brief Contains all the necessary forward declarations for all classes and structs. 31 */ 32 32 33 33 #ifndef _OrxonoxPrereqs_H__ … … 59 59 //----------------------------------------------------------------------- 60 60 61 // classes that have not yet been put into a namespace62 class InputManager;63 class SpaceShipSteering;64 65 61 namespace orxonox { 66 class Ambient;67 class BaseObject;68 class Camera;69 62 class GraphicsEngine; 70 63 struct InputEvent; 71 64 class InputEventListener; 72 65 class InputHandler; 73 class Mesh; 66 class Orxonox; 67 68 // objects 69 class Ambient; 70 class Camera; 71 class Explosion; 72 class Fighter; 74 73 class Model; 75 74 class NPC; 76 class OrxListener; 77 class Orxonox; 75 class Projectile; 78 76 class Skybox; 79 77 class SpaceShip; 80 class Tickable;81 class TickFrameListener;82 template <class T>83 class Timer;84 class TimerBase;85 class TimerFrameListener;86 78 class WorldEntity; 87 79 … … 93 85 class WeaponStation; 94 86 87 // tools 88 class BillboardSet; 89 class Light; 90 class Mesh; 91 template <class T> 92 class Timer; 93 class TimerBase; 94 95 // particle 95 96 class ParticleInterface; 97 98 // hud 96 99 class HUD; 97 100 } -
code/branches/input/src/orxonox/core/CMakeLists.txt
r919 r945 9 9 Error.cc 10 10 SignalHandler.cc 11 ArgReader.cc12 11 DebugLevel.cc 13 12 OutputHandler.cc -
code/branches/input/src/orxonox/core/CorePrereqs.h
r871 r945 27 27 28 28 /** 29 @file CorePrereq.h30 @brief Contains all the necessary forward declarations for all classes, structs and enums.29 @file 30 @brief Contains all the necessary forward declarations for all classes and structs. 31 31 */ 32 32 … … 67 67 typedef std::string LanguageEntryLabel; 68 68 69 class ArgReader;70 69 class BaseFactory; 71 70 class BaseMetaObjectListElement; 71 class BaseObject; 72 72 template <class T> 73 73 class ClassFactory; … … 103 103 template <class T> 104 104 class SubclassIdentifier; 105 class Tickable; 105 106 template <class T, class O> 106 107 class XMLPortClassObjectContainer; -
code/branches/input/src/util/CMakeLists.txt
r871 r945 4 4 5 5 SET (UTIL_SRC_FILES 6 ArgReader.cc 6 7 Math.cc 7 8 String.cc -
code/branches/input/src/util/UtilPrereqs.h
r871 r945 27 27 28 28 /** 29 @file UtilPrereq.h30 @brief Contains all the necessary forward declarations for all classes, structs and enums.31 29 @file 30 @brief Contains all the necessary forward declarations for all classes and structs. 31 */ 32 32 33 33 #ifndef _UtilPrereqs_H__ … … 59 59 // Forward declarations 60 60 //----------------------------------------------------------------------- 61 class ArgReader; 61 62 class Convert; 62 63 template <typename FromType, typename ToType> -
code/branches/input/visual_studio/vc8/audio.vcproj
r790 r945 273 273 > 274 274 <File 275 RelativePath="..\..\src\audio\_AudioObject.cc"276 >277 <FileConfiguration278 Name="Debug|Win32"279 ExcludedFromBuild="true"280 >281 <Tool282 Name="VCCLCompilerTool"283 />284 </FileConfiguration>285 <FileConfiguration286 Name="Release|Win32"287 ExcludedFromBuild="true"288 >289 <Tool290 Name="VCCLCompilerTool"291 />292 </FileConfiguration>293 <FileConfiguration294 Name="Release_SSE|Win32"295 ExcludedFromBuild="true"296 >297 <Tool298 Name="VCCLCompilerTool"299 />300 </FileConfiguration>301 <FileConfiguration302 Name="Release_SSE2|Win32"303 ExcludedFromBuild="true"304 >305 <Tool306 Name="VCCLCompilerTool"307 />308 </FileConfiguration>309 </File>310 <File311 275 RelativePath="..\..\src\audio\AudioBuffer.cc" 312 276 > -
code/branches/input/visual_studio/vc8/core.vcproj
r917 r945 273 273 > 274 274 <File 275 RelativePath="..\..\src\orxonox\core\ArgReader.cc"276 >277 </File>278 <File279 275 RelativePath="..\..\src\orxonox\core\BaseObject.cc" 280 276 > … … 351 347 > 352 348 <File 353 RelativePath="..\..\src\orxonox\core\ArgReader.h"354 >355 </File>356 <File357 349 RelativePath="..\..\src\orxonox\core\BaseObject.h" 358 350 > -
code/branches/input/visual_studio/vc8/network.vcproj
r790 r945 481 481 </File> 482 482 <File 483 RelativePath="..\..\src\network\PacketBufferTestExt.cc"484 >485 <FileConfiguration486 Name="Debug|Win32"487 ExcludedFromBuild="true"488 >489 <Tool490 Name="VCCLCompilerTool"491 />492 </FileConfiguration>493 <FileConfiguration494 Name="Release|Win32"495 ExcludedFromBuild="true"496 >497 <Tool498 Name="VCCLCompilerTool"499 />500 </FileConfiguration>501 <FileConfiguration502 Name="Release_SSE|Win32"503 ExcludedFromBuild="true"504 >505 <Tool506 Name="VCCLCompilerTool"507 />508 </FileConfiguration>509 <FileConfiguration510 Name="Release_SSE2|Win32"511 ExcludedFromBuild="true"512 >513 <Tool514 Name="VCCLCompilerTool"515 />516 </FileConfiguration>517 </File>518 <File519 483 RelativePath="..\..\src\network\PacketDecoder.cc" 520 484 > -
code/branches/input/visual_studio/vc8/orxonox.vcproj
r922 r945 293 293 </File> 294 294 <File 295 RelativePath="..\..\src\orxonox\InputManager.cc"296 >297 <FileConfiguration298 Name="Debug|Win32"299 ExcludedFromBuild="true"300 >301 <Tool302 Name="VCCLCompilerTool"303 />304 </FileConfiguration>305 </File>306 <File307 295 RelativePath="..\..\src\orxonox\Main.cc" 308 296 > … … 348 336 </FileConfiguration> 349 337 </File> 350 <File351 RelativePath="..\..\src\orxonox\SpaceshipSteering.cc"352 >353 <FileConfiguration354 Name="Debug|Win32"355 ExcludedFromBuild="true"356 >357 <Tool358 Name="VCCLCompilerTool"359 />360 </FileConfiguration>361 <FileConfiguration362 Name="Release|Win32"363 ExcludedFromBuild="true"364 >365 <Tool366 Name="VCCLCompilerTool"367 />368 </FileConfiguration>369 <FileConfiguration370 Name="Release_SSE|Win32"371 ExcludedFromBuild="true"372 >373 <Tool374 Name="VCCLCompilerTool"375 />376 </FileConfiguration>377 <FileConfiguration378 Name="Release_SSE2|Win32"379 ExcludedFromBuild="true"380 >381 <Tool382 Name="VCCLCompilerTool"383 />384 </FileConfiguration>385 </File>386 338 <Filter 387 339 Name="hud" … … 430 382 RelativePath="..\..\src\orxonox\objects\SpaceShip.cc" 431 383 > 432 </File>433 <File434 RelativePath="..\..\src\orxonox\objects\SpaceshipSteeringObject.cc"435 >436 <FileConfiguration437 Name="Debug|Win32"438 ExcludedFromBuild="true"439 >440 <Tool441 Name="VCCLCompilerTool"442 />443 </FileConfiguration>444 <FileConfiguration445 Name="Release|Win32"446 ExcludedFromBuild="true"447 >448 <Tool449 Name="VCCLCompilerTool"450 />451 </FileConfiguration>452 <FileConfiguration453 Name="Release_SSE|Win32"454 ExcludedFromBuild="true"455 >456 <Tool457 Name="VCCLCompilerTool"458 />459 </FileConfiguration>460 <FileConfiguration461 Name="Release_SSE2|Win32"462 ExcludedFromBuild="true"463 >464 <Tool465 Name="VCCLCompilerTool"466 />467 </FileConfiguration>468 </File>469 <File470 RelativePath="..\..\src\orxonox\objects\test1.cc"471 >472 <FileConfiguration473 Name="Debug|Win32"474 ExcludedFromBuild="true"475 >476 <Tool477 Name="VCCLCompilerTool"478 UsePrecompiledHeader="0"479 />480 </FileConfiguration>481 <FileConfiguration482 Name="Release|Win32"483 ExcludedFromBuild="true"484 >485 <Tool486 Name="VCCLCompilerTool"487 UsePrecompiledHeader="0"488 />489 </FileConfiguration>490 <FileConfiguration491 Name="Release_SSE|Win32"492 ExcludedFromBuild="true"493 >494 <Tool495 Name="VCCLCompilerTool"496 UsePrecompiledHeader="0"497 />498 </FileConfiguration>499 <FileConfiguration500 Name="Release_SSE2|Win32"501 ExcludedFromBuild="true"502 >503 <Tool504 Name="VCCLCompilerTool"505 UsePrecompiledHeader="0"506 />507 </FileConfiguration>508 </File>509 <File510 RelativePath="..\..\src\orxonox\objects\test2.cc"511 >512 <FileConfiguration513 Name="Debug|Win32"514 ExcludedFromBuild="true"515 >516 <Tool517 Name="VCCLCompilerTool"518 UsePrecompiledHeader="0"519 />520 </FileConfiguration>521 <FileConfiguration522 Name="Release|Win32"523 ExcludedFromBuild="true"524 >525 <Tool526 Name="VCCLCompilerTool"527 UsePrecompiledHeader="0"528 />529 </FileConfiguration>530 <FileConfiguration531 Name="Release_SSE|Win32"532 ExcludedFromBuild="true"533 >534 <Tool535 Name="VCCLCompilerTool"536 UsePrecompiledHeader="0"537 />538 </FileConfiguration>539 <FileConfiguration540 Name="Release_SSE2|Win32"541 ExcludedFromBuild="true"542 >543 <Tool544 Name="VCCLCompilerTool"545 UsePrecompiledHeader="0"546 />547 </FileConfiguration>548 </File>549 <File550 RelativePath="..\..\src\orxonox\objects\test3.cc"551 >552 <FileConfiguration553 Name="Debug|Win32"554 ExcludedFromBuild="true"555 >556 <Tool557 Name="VCCLCompilerTool"558 UsePrecompiledHeader="0"559 />560 </FileConfiguration>561 <FileConfiguration562 Name="Release|Win32"563 ExcludedFromBuild="true"564 >565 <Tool566 Name="VCCLCompilerTool"567 UsePrecompiledHeader="0"568 />569 </FileConfiguration>570 <FileConfiguration571 Name="Release_SSE|Win32"572 ExcludedFromBuild="true"573 >574 <Tool575 Name="VCCLCompilerTool"576 UsePrecompiledHeader="0"577 />578 </FileConfiguration>579 <FileConfiguration580 Name="Release_SSE2|Win32"581 ExcludedFromBuild="true"582 >583 <Tool584 Name="VCCLCompilerTool"585 UsePrecompiledHeader="0"586 />587 </FileConfiguration>588 384 </File> 589 385 <File … … 671 467 </File> 672 468 <File 673 RelativePath="..\..\src\orxonox\InputManager.h"674 >675 </File>676 <File677 469 RelativePath="..\..\src\orxonox\Orxonox.h" 678 470 > … … 690 482 > 691 483 </File> 692 <File693 RelativePath="..\..\src\orxonox\SpaceshipSteering.h"694 >695 </File>696 484 <Filter 697 485 Name="hud" … … 739 527 <File 740 528 RelativePath="..\..\src\orxonox\objects\SpaceShip.h" 741 >742 </File>743 <File744 RelativePath="..\..\src\orxonox\objects\SpaceshipSteeringObject.h"745 >746 </File>747 <File748 RelativePath="..\..\src\orxonox\objects\Test.h"749 >750 </File>751 <File752 RelativePath="..\..\src\orxonox\objects\test1.h"753 >754 </File>755 <File756 RelativePath="..\..\src\orxonox\objects\test2.h"757 >758 </File>759 <File760 RelativePath="..\..\src\orxonox\objects\test3.h"761 529 > 762 530 </File> -
code/branches/input/visual_studio/vc8/util.vcproj
r917 r945 273 273 > 274 274 <File 275 RelativePath="..\..\src\util\ArgReader.cc" 276 > 277 </File> 278 <File 275 279 RelativePath="..\..\src\util\Math.cc" 276 280 > … … 293 297 </File> 294 298 <File 295 RelativePath="..\..\src\util\ substring.cc"299 RelativePath="..\..\src\util\SubString.cc" 296 300 > 297 301 </File> … … 303 307 > 304 308 <File 309 RelativePath="..\..\src\util\ArgReader.h" 310 > 311 </File> 312 <File 305 313 RelativePath="..\..\src\util\Convert.h" 306 314 > … … 339 347 </File> 340 348 <File 341 RelativePath="..\..\src\util\ substring.h"349 RelativePath="..\..\src\util\SubString.h" 342 350 > 343 351 </File>
Note: See TracChangeset
for help on using the changeset viewer.
