Changeset 11162 for code/branches

Timestamp:

Apr 1, 2016, 7:38:22 PM (9 years ago)

Author:

fvultier

Message:

Managed to call a C++ test function from a Lua script that gets executed when a button is pressed.

Location:

code/branches/bindermFS16

Files:

• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/CampaignMenu.cc (modified) (2 diffs)
• src/orxonox/overlays/CampaignMenu.h (modified) (1 diff)

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

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

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

@@ -65 +65 @@
     sound/SoundManager.h
     controllers/ScriptController.h
+    overlays/CampaignMenu.h
   PCH_FILE
     OrxonoxPrecompiledHeaders.h

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

@@ -32 +32 @@
 #include "core/XMLPort.h"
 #include "core/GameMode.h"
-#include "core/command/ConsoleCommandIncludes.h"
-
-
 
 namespace orxonox
 {
-
-    SetConsoleCommand("CampaignMenu", "test", &CampaignMenu::test);
-
     RegisterClass(CampaignMenu);
 
@@ -58 +52 @@
     }
 
-    //loads the new campaign menu
-    void CampaignMenu::loadnewmenu()
+    //loads the campaign menu
+    void CampaignMenu::loadNewMenu()
     {
         

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

@@ -33 +33 @@
 #include "core/BaseObject.h"
 
-namespace orxonox
-{
-class _OrxonoxExport CampaignMenu : public BaseObject
-    {
+
+namespace orxonox // tolua_export
+{ // tolua_export
+
+        class _OrxonoxExport CampaignMenu // tolua_export
+         : public BaseObject
+    { // tolua_export
     public:
         CampaignMenu(Context* context);
         ~CampaignMenu();
-        void test();
-        void loadnewmenu();
-    };
-
-
-
-}
+        static void test(); // tolua_export
+        void loadNewMenu();
+    };// tolua_export
+} // tolua_export
 
 #endif /* _CampaignMenu_H__ */