Changeset 2492 for code/branches/presentation

Timestamp:

Dec 17, 2008, 12:55:03 AM (16 years ago)

Author:

rgrieder

Message:

Merged overlay branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/core/Template.cc (modified) (1 prop)
• src/core/Template.h (modified) (1 prop)
• src/core/XMLFile.h (modified) (1 prop)
• src/core/XMLIncludes.h (modified) (1 prop)
• src/orxonox/CameraManager.cc (modified) (1 prop)
• src/orxonox/CameraManager.h (modified) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/objects/gametypes/Gametype.cc (modified) (4 diffs)
• src/orxonox/objects/gametypes/Gametype.h (modified) (3 diffs)
• src/orxonox/objects/pickup/Usable.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.h (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.h (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/Quest.cc (modified) (1 prop)
• src/orxonox/objects/quest/Quest.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.h (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.cc (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.h (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)
• src/orxonox/overlays/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/OrxonoxOverlay.cc (modified) (1 diff)
• src/orxonox/overlays/stats (copied) (copied from code/branches/overlay/src/orxonox/overlays/stats)
• src/orxonox/overlays/stats/CMakeLists.txt (added)
• src/orxonox/overlays/stats/CreateLines.cc (copied) (copied from code/branches/overlay/src/orxonox/overlays/stats/CreateLines.cc)
• src/orxonox/overlays/stats/CreateLines.h (copied) (copied from code/branches/overlay/src/orxonox/overlays/stats/CreateLines.h)
• src/orxonox/overlays/stats/Scoreboard.cc (copied) (copied from code/branches/overlay/src/orxonox/overlays/stats/Scoreboard.cc)
• src/orxonox/overlays/stats/Scoreboard.h (copied) (copied from code/branches/overlay/src/orxonox/overlays/stats/Scoreboard.h)
• src/orxonox/overlays/stats/Stats.cc (copied) (copied from code/branches/overlay/src/orxonox/overlays/stats/Stats.cc)
• src/orxonox/overlays/stats/Stats.h (copied) (copied from code/branches/overlay/src/orxonox/overlays/stats/Stats.h)
• src/orxonox/overlays/stats/StatsTest.cc (copied) (copied from code/branches/overlay/src/orxonox/overlays/stats/StatsTest.cc)
• src/orxonox/overlays/stats/StatsTest.h (copied) (copied from code/branches/overlay/src/orxonox/overlays/stats/StatsTest.h)
• src/tolua/tolua-5.1.pkg (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• src/util/MultiType.cc (modified) (1 diff)
• src/util/MultiType.h (modified) (1 diff)
• src/util/SignalHandler.cc (modified) (1 prop)
• src/util/SignalHandler.h (modified) (1 prop)
• visual_studio/vc8/audio.vsprops (modified) (1 prop)
• visual_studio/vc8/base.vsprops (modified) (1 prop)
• visual_studio/vc8/ceguilua.vsprops (modified) (1 prop)
• visual_studio/vc8/core.vsprops (modified) (1 prop)
• visual_studio/vc8/cpptcl.vsprops (modified) (1 prop)
• visual_studio/vc8/debug.vsprops (modified) (1 prop)
• visual_studio/vc8/lua.vsprops (modified) (1 prop)
• visual_studio/vc8/network.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)
• visual_studio/vc8/orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox_vc8.sln (modified) (1 prop)
• visual_studio/vc8/release.vsprops (modified) (1 prop)
• visual_studio/vc8/tinyxml.vcproj (modified) (1 prop)
• visual_studio/vc8/tinyxml.vsprops (modified) (1 prop)
• visual_studio/vc8/tolua.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/util.vsprops (modified) (1 prop)

code/branches/presentation/src/orxonox/OrxonoxPrereqs.h

@@ -201 +201 @@
     class OverlayText;
     class GametypeStatus;
+    class CreateLines;
+    class Scoreboard;
 
     //gui

code/branches/presentation/src/orxonox/objects/gametypes/Gametype.cc

@@ -35 +35 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "core/Loader.h"
+#include "core/XMLFile.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/infos/Bot.h"
@@ -40 +42 @@
 #include "objects/worldentities/SpawnPoint.h"
 #include "objects/worldentities/Camera.h"
+#include "Settings.h"
 
 #include "network/Host.h"
@@ -64 +67 @@
 
         this->addBots(this->numberOfBots_);
+
+        this->statsOverlay_ = 0;
+
+        setConfigValues();
+
+        // load the corresponding score board
+        //this->statsOverlay_ = new XMLFile(Settings::getDataPath() + "overlay/" + this->statsOverlayName_);
+        //Loader::open(statsOverlay_);
+        //this->setGametype(this);
     }
 
@@ -72 +84 @@
         SetConfigValue(bForceSpawn_, false);
         SetConfigValue(numberOfBots_, 0);
+        SetConfigValue(statsOverlayName_, "stats.oxo");
     }
 

code/branches/presentation/src/orxonox/objects/gametypes/Gametype.h

@@ -56 +56 @@
     {
         friend class PlayerInfo;
+        friend class ClassIdentifier<Gametype>;
 
         public:
@@ -101 +102 @@
             void killBots(unsigned int amount = 0);
 
+            inline unsigned int getNumberOfPlayers() const
+                { return this->players_.size(); }
+
+            inline std::string getPlayersName() const
+                { return "StatsBot77"; }
+
+            inline unsigned int getPlayersFrags() const
+                { return 123; }
+
         private:
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
@@ -124 +134 @@
             std::set<SpawnPoint*> spawnpoints_;
             SubclassIdentifier<ControllableEntity> defaultControllableEntity_;
+
+            XMLFile* statsOverlay_;
+
+            // Config Values
+            std::string statsOverlayName_;
     };
 }

code/branches/presentation/src/orxonox/overlays/CMakeLists.txt

@@ -9 +9 @@
 ADD_SOURCE_DIRECTORY(SRC_FILES hud)
 ADD_SOURCE_DIRECTORY(SRC_FILES notifications)
+ADD_SOURCE_DIRECTORY(SRC_FILES stats)
 
 ADD_SOURCE_FILES(SRC_FILES)

code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -88 +88 @@
         setPosition(Vector2(0.0f, 0.0f));
         setRotation(Degree(0.0));
-        setAspectCorrection(true);
+        setAspectCorrection(false);
         setBackgroundMaterial("");
     }

code/branches/presentation/src/util/MultiType.cc

@@ -45 +45 @@
         switch (type)
         {
+            case MT_null:
+                this->reset(); return true;
             case MT_char:
                 return this->convert<char>(); break;

code/branches/presentation/src/util/MultiType.h

@@ -305 +305 @@
 
             /** @brief Current content gets deleted. New type is MT_null */
-            inline void                       reset()                         { if (this->value_) this->value_->reset(); }
-
-            template <typename T> inline void setType()                       { this->assignValue(T());                            } /** @brief Resets the value and changes the internal type to T. */
-            inline void                       setType(const MultiType& other) { this->setType(other.getType());                    } /** @brief Resets the value and changes the internal type to the type of the other MultiType. */
-            inline void                       setType(MT_Type type)           { this->reset(); this->convert(type); this->reset(); } /** @brief Resets the value and changes the internal type to the given type. */
+            inline void                       reset()                         { if (this->value_) delete this->value_; this->value_ = 0; }
+            /** @brief Current content gets overridden with default zero value */
+            inline void                       resetValue()                    { if (this->value_) this->value_->reset(); }
+
+            template <typename T> inline void setType()                       { this->assignValue(T());                                 } /** @brief Resets the value and changes the internal type to T. */
+            inline void                       setType(const MultiType& other) { this->setType(other.getType());                         } /** @brief Resets the value and changes the internal type to the type of the other MultiType. */
+            inline void                       setType(MT_Type type)           { this->reset(); this->convert(type); this->resetValue(); } /** @brief Resets the value and changes the internal type to the given type. */
 
             /** @brief Returns the current type. */

code/branches/presentation/visual_studio/vc8/orxonox.vcproj

@@ -840 +840 @@
                                 </Filter>
                                 <Filter
+                                        Name="stats"
+                                        >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\stats\Stats.cc"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\stats\StatsTest.cc"
+                                                >
+                                        </File>
+                                </Filter>
+                                <Filter
                                         Name="notifications"
                                         >
@@ -1458 +1470 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\overlays\debug\DebugRTRText.h"
+                                                >
+                                        </File>
+                                </Filter>
+                                <Filter
+                                        Name="stats"
+                                        >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\stats\Stats.h"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\stats\StatsTest.h"
                                                 >
                                         </File>