[Orxonox-commit 6787] r11415 - in code/branches/Dialogue_FS17: data/gui/scripts src/modules/dialogue

[rrogge at orxonox.net]

Author: rrogge
Date: 2017-05-11 15:04:50 +0200 (Thu, 11 May 2017)
New Revision: 11415

Modified:
   code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua
   code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc
   code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h
   code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc
Log:
Singletonkram figured out

Modified: code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua
===================================================================
--- code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua	2017-05-09 09:11:13 UTC (rev 11414)
+++ code/branches/Dialogue_FS17/data/gui/scripts/Dialogue.lua	2017-05-11 13:04:50 UTC (rev 11415)
@@ -96,19 +96,19 @@
     
     local detailsButton = winMgr:createWindow("MenuWidgets/Button", "/DetailsButton")
     local a1 = orxonox.DialogueManager:getInstance():getanswers1()
-    detailsButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0.3, P.imageHeight+2*P.buttonWidth),CEGUI.UDim(0, (P.imageHeight-P.textHeight)/2)))
-    detailsButton:setSize(CEGUI.UVector2(CEGUI.UDim(0, P.buttonWidth), CEGUI.UDim(0, P.textHeight)))
+    detailsButton:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.25, 0)))
+    detailsButton:setSize(CEGUI.UVector2(CEGUI.UDim(0, 575), CEGUI.UDim(0, P.textHeight)))
     detailsButton:setText(a1)
     orxonox.GUIManager:subscribeEventHelper(detailsButton, "Clicked", P.name ..".a1Button_clicked")
-    root:addChildWindow(detailsButton)
+    P.wrapper:addChildWindow(detailsButton)
 
     local a2Button = winMgr:createWindow("MenuWidgets/Button", "/a2Button")
     local a2 = orxonox.DialogueManager:getInstance():getanswers2()
-    a2Button:setPosition(CEGUI.UVector2(CEGUI.UDim(0.3, P.imageHeight+40+2*P.buttonWidth),CEGUI.UDim(0, (P.imageHeight-P.textHeight)/2)))
-    a2Button:setSize(CEGUI.UVector2(CEGUI.UDim(0, P.buttonWidth), CEGUI.UDim(0, P.textHeight)))
+    a2Button:setPosition(CEGUI.UVector2(CEGUI.UDim(0.1, 0),CEGUI.UDim(0.4, 0)))
+    a2Button:setSize(CEGUI.UVector2(CEGUI.UDim(0, 575), CEGUI.UDim(0, P.textHeight)))
     a2Button:setText(a2)
     orxonox.GUIManager:subscribeEventHelper(a2Button, "Clicked", P.name ..".a2Button_clicked")
-    root:addChildWindow(a2Button)
+    P.wrapper:addChildWindow(a2Button)
 
 
 end
@@ -138,7 +138,7 @@
 end
 
 function P.a2Button_clicked(e)
-    orxonox.DialogueManager:getInstance():a2clicked()
+    orxonox.CommandExecutor:execute("OrxonoxOverlay toggleVisibility Dialogue")
 end
 
 return P

Modified: code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc	2017-05-09 09:11:13 UTC (rev 11414)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc	2017-05-11 13:04:50 UTC (rev 11415)
@@ -5,24 +5,22 @@
 #include "core/singleton/ScopedSingletonIncludes.h"
 #include "network/Host.h"
 #include "network/NetworkFunctionIncludes.h"
-#include "DialogueManager.h"
 #include "DialoguePrereqs.h"
 #include <vector>
 #include <string>
 #include "core/XMLPort.h"
+#include "NextQuestion.h"
 
 
 namespace orxonox {
-	//ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false);
-	RegisterAbstractClass(DialogueManager).inheritsFrom<BaseObject>();
+	ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false);
+	
 
+	//DialogueManager* DialogueManager::singletonPtr_s =nullptr;
 
-
-	DialogueManager* DialogueManager::singletonPtr_s =nullptr;
-
-	DialogueManager::DialogueManager(Context* context): BaseObject(context){
+	DialogueManager::DialogueManager(){
 		orxout() << "Dialog Konstruktor" << endl;
-		RegisterObject(DialogueManager);
+		//RegisterObject(DialogueManager);
 		
 		
 
@@ -65,6 +63,7 @@
 	}
 	bool DialogueManager::a1clicked(void){
 		orxout() << "a1 clicked" << endl;
+
 		return true;
 	}
 	bool DialogueManager::a2clicked(void){

Modified: code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h	2017-05-09 09:11:13 UTC (rev 11414)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h	2017-05-11 13:04:50 UTC (rev 11415)
@@ -15,11 +15,13 @@
 
 
 
+
+
 namespace orxonox //tolua_export
 
 {//tolua_export
 	class _OrxonoxExport DialogueManager //tolua_export
-	: public Singleton<DialogueManager>, public BaseObject
+	: public Singleton<DialogueManager>
 	{//tolua_export
 		friend class Singleton<DialogueManager>;
 	
@@ -26,7 +28,7 @@
 		public:
 		
 
-		DialogueManager(Context* context); 
+		DialogueManager(); 
 		
 
 		static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } //tolua_export
@@ -55,6 +57,7 @@
 		
 */
 private:
+	//NextQuestion currentQuestion;
 	std::string a1;
 	std::string a2;
 	std::string question;

Modified: code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc
===================================================================
--- code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc	2017-05-09 09:11:13 UTC (rev 11414)
+++ code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc	2017-05-11 13:04:50 UTC (rev 11415)
@@ -16,7 +16,7 @@
     {
         RegisterObject(NextQuestion);
         orxout() << "Klasse aufgerufen" << endl;
-         DialogueManager* d = new DialogueManager(context);
+       
         
     }
 
@@ -108,7 +108,8 @@
 		return a2;
 	}
 
-	NextQuestion NextQuestion::compare(){
+
+	/*NextQuestion NextQuestion::compare(){
 		DialogueManager& m = DialogueManager::getInstance();
 		if(m.a1clicked()){
 			return *possibleQuestions[0];
@@ -117,7 +118,7 @@
 		else if(m.a2clicked()){
 			return *possibleQuestions[1];
 		}
-	}
+	}*/
 
 
 }
\ No newline at end of file