Changeset 8434 for code/branches/dockingsystem2

Timestamp:

May 9, 2011, 4:26:37 PM (14 years ago)

Author:

sven

Message:

Added simple GUI for docking..

Location:

code/branches/dockingsystem2

Files:

• data/gui/layouts/DockingDialog.layout (added)
• data/gui/scripts/DockingDialog.lua (added)
• data/levels/docking.oxw (modified) (4 diffs)
• src/modules/docking/CMakeLists.txt (modified) (1 diff)
• src/modules/docking/Dock.cc (modified) (8 diffs)
• src/modules/docking/Dock.h (modified) (3 diffs)

code/branches/dockingsystem2/data/levels/docking.oxw

@@ -27 +27 @@
     <Light type="directional" position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
 
+
+
     <?lua for i = 1, 10, 1 do ?>
-      <SpawnPoint position="<?lua print(math.random() * 500 - 250) ?>,<?lua print(math.random() * 500 - 250) ?>,<?lua print(math.random() * 500 - 250) ?>" lookat="0,0,0" spawnclass="SpaceShip" pawndesign="spaceshipassff" />
+      <SpawnPoint position="<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" lookat="0,0,0" spawnclass="SpaceShip" pawndesign="spaceshipassff" />
     <?lua end ?>
 
-    <Dock position="-50,-100,50">
-            <effects>
-                <DockToShip target="theDestroyer" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event="dockMe" />
-                </execute>
-            </events>
-            <attached>
-                <DistanceTrigger position="0,0,0" distance="20" target="Pawn" beaconMode="exclude" targetname="destroyerBeacon" name="dockMe" />
-                <Billboard material="Examples/Flare" colour="1.0, 0, 0" />
-            </attached>
-        </Dock>
-
-
-    
+
+
+
+    <Dock>
+        <effects>
+            <DockToShip target="destroyer" />
+        </effects>
+        <events>
+            <execute>
+                <EventListener event="dockMe" />
+            </execute>
+        </events>
+        <attached>
+            <DistanceTrigger position="0,0,0" distance="50" target="Pawn" beaconMode="exclude" targetname="destroyerBeacon" name="dockMe" />
+            <Billboard material="Examples/Flare" colour="1.0, 0, 0" />
+        </attached>
+    </Dock>
+
+
 
       <SpaceShip
+   position               = "-150,-50,-100"
    hudtemplate            = "spaceshiphud"
    camerapositiontemplate = "spaceshipassffcameras"
@@ -71 +76 @@
   >
     <attached>
-        <DistanceTriggerBeacon name="beacon1" />
-        <DockingTarget name="asdf" />
+        <DistanceTriggerBeacon name="bcnSpaceShip1" />
+        <DockingTarget name="spaceShip1" />
 
       <Model position="0,0,0" yaw="90" pitch="-90" roll="0" scale="4" mesh="assff.mesh" />
@@ -96 +101 @@
 
     <Destroyer
-      position          = "100,150,0"
+      position          = "100,150,100"
       collisionType     = "dynamic"
       mass              = "100000"
@@ -108 +113 @@
       <attached>
 
-        <DistanceTriggerBeacon name="destroyerBeacon" />
-        <DockingTarget name="theDestroyer" />
+        <DistanceTriggerBeacon name="bcnDestroyer" />
+        <DockingTarget name="destroyer" />
 
 

code/branches/dockingsystem2/src/modules/docking/CMakeLists.txt

@@ -10 +10 @@
   FIND_HEADER_FILES
   TOLUA_FILES
+    Dock.h
   PCH_FILE
     DockingPrecompiledHeaders.h

code/branches/dockingsystem2/src/modules/docking/Dock.cc

@@ -34 +34 @@
 #include "Dock.h"
 
+#include "core/CoreIncludes.h"
+#include "core/LuaState.h"
+#include "core/GUIManager.h"
 #include "infos/HumanPlayer.h"
 #include "worldentities/pawns/Pawn.h"
 #include "interfaces/PlayerTrigger.h"
-#include "controllers/HumanController.h"
 #include "core/command/ConsoleCommand.h"
 
-
+#include "ToluaBindDocking.h"
 
 namespace orxonox
 {
+    // Register tolua_open function when loading the library
+    DeclareToluaInterface(Docking);
+
     CreateFactory(Dock);
 
@@ -111 +116 @@
         COUT(0) << "Dock triggered by player: " << player->getName() << ".." << std::endl;
 
-        if(bTriggered) {
+        if(bTriggered)
+        {
             // Add player to this Docks candidates
             candidates.insert(player);
 
+            // Show docking dialog
+            GUIManager::showGUI("DockingDialog");
             //DockingEffect::invokeEffect(docking::DOCKING, player, effects_);
-        } else {
+        }
+        else
+        {
             // Remove player from candidates list
             candidates.erase(player);
@@ -127 +137 @@
 
 
-    void Dock::cmdDock() {
-        PlayerInfo* player = HumanController::getLocalControllerSingleton()->getPlayer();
-        for(ObjectList<Dock>::iterator it = ObjectList<Dock>::begin(); it != ObjectList<Dock>::end(); ++it) {
+    void Dock::cmdDock()
+    {
+        PlayerInfo* player = HumanController::getLocalControllerSingleton()->getPlayer();
+        for(ObjectList<Dock>::iterator it = ObjectList<Dock>::begin(); it != ObjectList<Dock>::end(); ++it)
+        {
             if(it->dock(player))
                 break;
@@ -135 +147 @@
     }
 
-    void Dock::cmdUndock() {
-        PlayerInfo* player = HumanController::getLocalControllerSingleton()->getPlayer();
-        for(ObjectList<Dock>::iterator it = ObjectList<Dock>::begin(); it != ObjectList<Dock>::end(); ++it) {
+    void Dock::cmdUndock()
+    {
+        PlayerInfo* player = HumanController::getLocalControllerSingleton()->getPlayer();
+        for(ObjectList<Dock>::iterator it = ObjectList<Dock>::begin(); it != ObjectList<Dock>::end(); ++it)
+        {
             if(it->undock(player))
                 break;
@@ -144 +158 @@
 
 
-    bool Dock::dock(PlayerInfo* player) {
+    bool Dock::dock(PlayerInfo* player)
+    {
         // Check if player is a candidate
-        if(candidates.find(player) == candidates.end()) {
-            COUT(0) << "Player is not a candidate!";
+        if(candidates.find(player) == candidates.end())
+        {
+            COUT(0) << "Player is not a candidate!" << std::endl;
             return false;
         }
@@ -158 +174 @@
     }
 
-    bool Dock::undock(PlayerInfo* player) {
+    bool Dock::undock(PlayerInfo* player)
+    {
         // Check if player is docked to this Dock
-        if(docked.find(player) == docked.end()) {
+        if(docked.find(player) == docked.end())
+        {
             COUT(0) << "Player is not docked to this Dock." << std::endl;
             return false;
@@ -173 +191 @@
 
 
-    bool Dock::addEffect(DockingEffect* effect) {
+    unsigned int Dock::getNumberOfActiveDocks()
+    {
+        int i = 0;
+        PlayerInfo* player = HumanController::getLocalControllerSingleton()->getPlayer();
+        for(ObjectList<Dock>::iterator it = ObjectList<Dock>::begin(); it != ObjectList<Dock>::end(); ++it)
+        {
+            if(it->candidates.find(player) != it->candidates.end())
+                i++;
+        }
+        return i;
+    }
+
+    Dock* Dock::getActiveDockAtIndex(unsigned int index)
+    {
+        PlayerInfo* player = HumanController::getLocalControllerSingleton()->getPlayer();
+        for(ObjectList<Dock>::iterator it = ObjectList<Dock>::begin(); it != ObjectList<Dock>::end(); ++it)
+        {
+            if(it->candidates.find(player) != it->candidates.end())
+            {
+                if(index == 0)
+                    return *it;
+                index--;
+            }
+        }
+        return NULL;
+    }
+
+
+    bool Dock::addEffect(DockingEffect* effect)
+    {
         assert(effect);
         effects.push_back(effect);
@@ -179 +226 @@
     }
 
-    const DockingEffect* Dock::getEffect(unsigned int index) const {
+    const DockingEffect* Dock::getEffect(unsigned int index) const
+    {
         int i = index;
-        for (std::list<DockingEffect*>::const_iterator effect = this->effects.begin(); effect != this->effects.end(); ++effect) {
+        for (std::list<DockingEffect*>::const_iterator effect = this->effects.begin(); effect != this->effects.end(); ++effect)
+        {
             if(i == 0)
                return *effect;

code/branches/dockingsystem2/src/modules/docking/Dock.h

@@ -43 +43 @@
 
 #include "worldentities/StaticEntity.h"
-#include "notifications/NotificationManager.h"
+#include "controllers/HumanController.h"
 
 #include "DockingEffect.h"
 #include "DockingPrereqs.h"
 
-namespace orxonox {
+namespace orxonox // tolua_export
+{  // tolua_export
 
-    class _DockingExport Dock : public StaticEntity {
+    class _DockingExport Dock  // tolua_export
+        : public StaticEntity
+    { // tolua_export
     public:
         Dock(BaseObject* creator);
@@ -66 +69 @@
         bool undock(PlayerInfo* player); //!< Undocks a player (player must be docked)
 
+        void dock() { this->dock(HumanController::getLocalControllerSingleton()->getPlayer()); } // tolua_export
+        static unsigned int getNumberOfActiveDocks(); // tolua_export
+        static Dock* getActiveDockAtIndex(unsigned int index); // tolua_export
+
         static void cmdDock();
         static void cmdUndock();
@@ -73 +80 @@
         std::set<PlayerInfo*> docked; //!< A set of all docked players
         std::list<DockingEffect*> effects; //!< The list of DockingEffects to be executed when a player docks.
-    };
-
-
-}
+    }; // tolua_export
+} // tolua_export
 
 #endif /* _Dock_H__ */