Changeset 11406 for code/branches/Dialogue_FS17/src

Timestamp:

Apr 27, 2017, 3:36:57 PM (7 years ago)

Author:

rrogge

Message:

Dialogfenster geht auf

Location:

code/branches/Dialogue_FS17/src/modules/dialogue

Files:

• CMakeLists.txt (modified) (1 diff)
• Dialogue.layout (deleted)
• Dialogue.lua (deleted)
• DialogueManager.cc (modified) (2 diffs)
• DialogueManager.h (modified) (3 diffs)
• NextQuestion.cc (modified) (3 diffs)

code/branches/Dialogue_FS17/src/modules/dialogue/CMakeLists.txt

@@ -8 +8 @@
   MODULE
   FIND_HEADER_FILES
+   TOLUA_FILES
+    DialogueManager.h
   LINK_LIBRARIES
     orxonox

code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.cc

@@ -22 +22 @@
 
         DialogueManager::DialogueManager(Context* context): BaseObject(context){
+                orxout() << "Dialog Konstruktor" << endl;
                 RegisterObject(DialogueManager);
                 
@@ -34 +35 @@
     
 
-    void DialogueManager::setquestion(std::string question){
-                question=question;
+    void DialogueManager::setquestion(std::string q){
+                orxout() << "setquestion" << endl;
+                question=q;
+                orxout() << "Question is " << question;
         }
 
         std::string DialogueManager::getquestion(void){
+                orxout() << question << endl;
                 return question;
         }

code/branches/Dialogue_FS17/src/modules/dialogue/DialogueManager.h

@@ -14 +14 @@
 #include "core/EventIncludes.h"
 
-//tolua_begin
-namespace orxonox
-//tolua_end
-{//toluaexport
-        class _OrxonoxExport DialogueManager : public Singleton<DialogueManager>, public BaseObject
-        {
+
+namespace orxonox //tolua_export
+
+{//tolua_export
+        class _OrxonoxExport DialogueManager //tolua_export
+        : public Singleton<DialogueManager>, public BaseObject
+        {//tolua_export
                 friend class Singleton<DialogueManager>;
-                //tolua_begin
+        
                 public:
                 
 
-                DialogueManager(Context* context); // tolua_export
+                DialogueManager(Context* context); 
                 
 
-                static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } 
+                static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } //tolua_export
                 
-                void setquestion(std::string question);
-                std::string getquestion(void);
+                void setquestion(std::string question); //tolua_export
+                std::string getquestion(void); //tolua_export
                 
 
@@ -48 +49 @@
                         std::string npc;
                         std::vector<std::string> options;
-                //tolua_end
+                
 */
 private:
@@ -54 +55 @@
         static DialogueManager* singletonPtr_s;
 
-        };//toluaexport
-}
+        };//tolua_export
+}//tolua_export
+

code/branches/Dialogue_FS17/src/modules/dialogue/NextQuestion.cc

@@ -3 +3 @@
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
+#include "overlays/OrxonoxOverlay.h"
 
 
@@ -16 +17 @@
         RegisterObject(NextQuestion);
         orxout() << "Klasse aufgerufen" << endl;
+         DialogueManager* d = new DialogueManager(context);
+        
 
     }
 
         void NextQuestion::setquestion(std::string question){
-                question=question;
+                this->question=question;
         }
 
         std::string NextQuestion::getquestion(void){
+                orxout() << question;
                 return question;
         }
@@ -47 +51 @@
         orxout() << "bTriggered is " << bTriggered << endl;
 
-        for (DialogueManager* hud : ObjectList<DialogueManager>())
-            m = hud;
-        m->setquestion(question);
-        //orxout() << " 1 " << mystring << endl;
+        //for (DialogueManager* hud : ObjectList<DialogueManager>())
+            //m = hud;
+
+        DialogueManager& m = DialogueManager::getInstance();
+                
+        m.setquestion(question);
+        orxout() << " 1 " << endl;
+
+       
+        OrxonoxOverlay::showOverlay("Dialogue");
+
         return false;
     }