Changeset 11173 for code/branches

Timestamp:

Apr 21, 2016, 4:05:15 PM (9 years ago)

Author:

binderm

Message:

Campaignmenu improved, it's now possible to only show single levels and not all together.

Location:

code/branches/bindermFS16

Files:

• data/gui/layouts/CampaignMenu.layout (modified) (10 diffs)
• data/gui/scripts/CampaignMenu.lua (modified) (1 diff)
• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/LevelManager.cc (modified) (4 diffs)
• src/orxonox/LevelManager.h (modified) (5 diffs)
• src/orxonox/gametypes/Mission.cc (modified) (1 diff)
• src/orxonox/overlays/CampaignMenu.cc (modified) (2 diffs)
• src/orxonox/overlays/CampaignMenu.h (modified) (1 diff)

code/branches/bindermFS16/data/gui/layouts/CampaignMenu.layout

@@ -8 +8 @@
         <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1.0,0},{1.0,0}}" />
         <Property Name="BackgroundEnabled" Value="False" />
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission1Button" >
             <Property Name="Text" Value="Mission One" />
@@ -13 +14 @@
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.1,0},{0.65,0},{0.15,0}}" />
+            <Property Name="Disabled" Value="False" />
             <Event Name="Clicked" Function="CampaignMenu.Mission1Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission2Button" >
             <Property Name="Text" Value="Fight in our Back" />
@@ -23 +26 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission2Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission3Button" >
             <Property Name="Text" Value="Pirate Attack" />
@@ -31 +35 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission3Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission4Button" >
             <Property Name="Text" Value="Trip to Area 51" />
@@ -39 +44 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission4Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission5Button" >
             <Property Name="Text" Value="Area 51 under Fire" />
@@ -47 +53 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission5Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission6Button" >
             <Property Name="Text" Value="Escape the Bastards" />
@@ -55 +62 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission6Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission7Button" >
             <Property Name="Text" Value="Expedition to Sector 5C" />
@@ -63 +71 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission7Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission8Button" >
             <Property Name="Text" Value="Shuttle under Attack" />
@@ -71 +80 @@
             <Event Name="Clicked" Function="CampaignMenu.Mission8Button_clicked"/>
         </Window>
+
         <Window Type="MenuWidgets/Button" Name="orxonox/Mission9Button" >
             <Property Name="Text" Value="Retaliation" />
@@ -80 +90 @@
         </Window>
 
-
         <Window Type="MenuWidgets/Button" Name="orxonox/CampaignMenuBackButton" >
             <Property Name="Text" Value="Back" />
+            <Property Name="Visible" Value="False"/>
             <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
             <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.85,0},{0.65,0},{0.9,0}}" />
+            <Property Name="Visible" Value="True"/>
+            <Property Name="Disabled" Value="False"/>
             <Event Name="Clicked" Function="CampaignMenu.CampaignMenuBackButton_clicked"/> 
         </Window>
+
         <Window Type="MenuWidgets/StaticText" Name="orxonox/CampaignMenuCongratulation" >
             <Property Name="Text" Value="Campaign Completed!!!" />

code/branches/bindermFS16/data/gui/scripts/CampaignMenu.lua

@@ -19 +19 @@
 
 
-    if (P.getIndexOfLastFinishedMission() == orxonox.LevelManager:getInstance():getNumberOfCampaignMissions() - 1) then
-        local label = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
-        label:setProperty("Visible","True")
+--    if (P.getIndexOfLastFinishedMission() == orxonox.LevelManager:getInstance():getNumberOfCampaignMissions() - 1) then
+--        local label = winMgr:getWindow("orxonox/CampaignMenuCongratulation")
+--        label:setProperty("Visible","True")
+--    end
+end
+
+function P.updateButton(index, button)
+    if (orxonox.LevelManager:getInstance():missionactivate(index)) then
+        button:setProperty("Visible", "True")
+        button:setProperty("Disabled", "False")
+    else
+        button:setProperty("Disabled", "True")
     end
 end
 
-function P.updateButton(index, button)
-    if (P.shouldDisplayButton(index)) then
-        button:setProperty("Visible", "True")
+--function P.shouldDisplayButton(index)
+--    local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
+--    return index < size
+--end
 
-        if (P.shouldEnableButton(index)) then
-            button:setProperty("Disabled", "False")
-        end
-    end
-end
+--function P.shouldActivateButton(index) --checks if button should be activated or not
+--    return index <= P.getIndexOfLastFinishedMission() + 1
+--end
 
-function P.shouldDisplayButton(index)
-    local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
-    return index < size
-end
-
-function P.shouldEnableButton(index)
-    return index <= P.getIndexOfLastFinishedMission() + 1
-end
-
-function P.getIndexOfLastFinishedMission()
-    local lastMission = orxonox.LevelManager:getInstance():getLastFinishedCampaignMission()
-    if (lastMission and lastMission ~= "") then
-        local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
-        local index = 0
-        while index < size do
-            local mission = orxonox.LevelManager:getInstance():getCampaignMission(index)
-            if (mission == lastMission) then 
-                return index
-            end
-            index = index + 1
-        end
-    end
-    return -1
-end
+--function P.getIndexOfLastFinishedMission()
+--    local lastMission = orxonox.LevelManager:getInstance():getLastFinishedCampaignMission()
+--    if (lastMission and lastMission ~= "") then
+--        local size = orxonox.LevelManager:getInstance():getNumberOfCampaignMissions()
+--        local index = 0
+--        while index < size do
+--            local mission = orxonox.LevelManager:getInstance():getCampaignMission(index)
+--            if (mission == lastMission) then 
+--                return index
+--            end
+--            index = index + 1
+--        end
+--    end
+--    return -1
+--end
 
 function P.Mission1Button_clicked(e)

code/branches/bindermFS16/data/gui/scripts/SingleplayerMenu.lua

@@ -172 +172 @@
 
 function P.CampaignButton_clicked(e)
-    orxonox.CampaignMenu:test()
+--    P.test()
     showMenuSheet("CampaignMenu", true)
 end
 
+--function P.test()
+--    orxonox.CampaignMenu:test()
+--end
+
 return P

code/branches/bindermFS16/src/orxonox/CMakeLists.txt

@@ -58 +58 @@
   TOLUA_FILES
     chat/ChatInputHandler.h
+    overlays/CampaignMenu.h
     LevelInfo.h
     LevelManager.h

code/branches/bindermFS16/src/orxonox/LevelManager.cc

@@ -49 +49 @@
 namespace orxonox
 {
+
+    LevelStatus::LevelStatus()
+    {
+        this->won = true;
+    }
+
+    LevelStatus::~LevelStatus()
+    {}
+
+    bool LevelManager::missionactivate(int index)
+    {
+        //check for index level activate...
+        return index-5;
+    }
+
+    void LevelManager::setLevelStatus(int completedLevel)
+    {
+//        allLevelStatus_[completedLevel]=new LevelStatus;
+    }
+
+
     SetCommandLineArgument(level, "").shortcut("l").information("Default level file (overrides LevelManager::defaultLevelName_ configValue)");
 
@@ -63 +84 @@
         RegisterObject(LevelManager);
         this->setConfigValues();
+
+
 
         // check override
@@ -73 +96 @@
         this->nextIndex_ = 0;
         this->nextLevel_ = this->availableLevels_.begin();
-    }
+
+        allLevelStatus_.reserve(1);
+    }
+
 
     LevelManager::~LevelManager()
@@ -103 +129 @@
         ModifyConfigValue(lastFinishedCampaignMission_, set, lastFinishedCampaignMission);
     }
+
+
 
     /**

code/branches/bindermFS16/src/orxonox/LevelManager.h

@@ -48 +48 @@
 #include "core/config/Configurable.h"
 
+
+namespace orxonox
+{
+
+    class LevelStatus
+    {
+    public:
+        LevelStatus();
+        virtual ~LevelStatus();
+        
+
+    private:
+        bool won;
+        std::vector<int> nextLevels;
+
+    };
+}
+
 // tolua_begin
 namespace orxonox
@@ -63 +81 @@
         Damian 'Mozork' Frick
 
-    @ingroup Orxonox
+
+    @ingroup Orxonox1
     */
+
+
+
+
     class _OrxonoxExport LevelManager
     // tolua_end
@@ -74 +97 @@
             virtual ~LevelManager();
 
+            void setLevelStatus(int integer);
+
+
             void setConfigValues(); //!< Set the config values for this object.
 
             void requestActivity(Level* level); //!< Request activity for the input Level.
             void releaseActivity(Level* level); //!< Release activity for the input Level.
+
             Level* getActiveLevel(); //!< Get the currently active Level.
 
             // tolua_begin
+            bool missionactivate(int index);
             void setDefaultLevel(const std::string& levelName); //!< Set the default Level.
             /**
@@ -97 +125 @@
             inline unsigned int getNumberOfCampaignMissions()
                 { return this->campaignMissions_.size(); }
+
             inline const std::string& getCampaignMission(unsigned int index)
                 { return this->campaignMissions_[index]; }
+
 
             /**
@@ -129 +159 @@
             std::string lastFinishedCampaignMission_;
             std::vector<std::string> campaignMissions_;
+            std::vector<LevelStatus> allLevelStatus_;
+
+
 
             static LevelManager* singletonPtr_s;

code/branches/bindermFS16/src/orxonox/gametypes/Mission.cc

@@ -92 +92 @@
 
             LevelManager::getInstance().setLastFinishedCampaignMission(this->getFilename());
+            //LevelManager::getInstance().setLevelStatus(7);
         }
         else if (!this->gtinfo_->hasEnded())

code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.cc

@@ -33 +33 @@
 #include "core/GameMode.h"
 
+
 namespace orxonox
 {
+
+    
     RegisterClass(CampaignMenu);
 
@@ -52 +55 @@
     }
 
-    //loads the campaign menu
-    void CampaignMenu::loadNewMenu()
+
+    //loads the new campaign menu
+    void CampaignMenu::loadnewmenu()
     {
         

code/branches/bindermFS16/src/orxonox/overlays/CampaignMenu.h

@@ -32 +32 @@
 #include <string>
 #include "core/BaseObject.h"
+#include "util/Singleton.h"
 
-
-namespace orxonox // tolua_export
-{ // tolua_export
-
-        class _OrxonoxExport CampaignMenu // tolua_export
-         : public BaseObject
-    { // tolua_export
+//tolua_begin
+namespace orxonox
+{
+//tolua_end
+class _OrxonoxExport CampaignMenu : public BaseObject //tolua_export
+    { //tolua_export
     public:
         CampaignMenu(Context* context);
         ~CampaignMenu();
-        static void test(); // tolua_export
-        void loadNewMenu();
-    };// tolua_export
-} // tolua_export
+        static void test(); //tolua_export
+        void loadnewmenu();
+    }; //tolua_export
+
+
+
+} //tolua_export
 
 #endif /* _CampaignMenu_H__ */