Changeset 11382

Timestamp:

Mar 30, 2017, 3:14:02 PM (8 years ago)

Author:

rrogge

Message:

30 March

Location:

code/branches/Dialogue_FS17/src/modules

Files:

• CMakeLists.txt (modified) (1 diff)
• dialogue/CMakeLists.txt (added)
• dialogue/DialogueManager.cc (modified) (2 diffs)
• dialogue/DialogueManager.h (modified) (1 diff)
• dialogue/DialoguePrereqs.h (added)

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

@@ -26 +26 @@
 ################ Sub Directories ################
 
+ADD_SUBDIRECTORY(dialogue)
 ADD_SUBDIRECTORY(designtools)
 ADD_SUBDIRECTORY(gametypes)

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

@@ -7 +7 @@
 #include "network/NetworkFunctionIncludes.h"
 #include "DialogueManager.h"
+#include "DialoguePrereqs.h"
+#include <vector>
+#include <string>
 
 namespace orxonox {
-RegisterClass(DialogueManager);
+        ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false);
+        RegisterClass(DialogueManager);
 
-        DialogueManager::DialogueManager(): OrxonoxOverlay(context){
+        DialogueManager::DialogueManager(){
                 RegisterObject(DialogueManager);
 
         }
-        ~DialogueManager(){}
+        
 
-        std::string setnpc(std::string npc){
+        /*std::string setnpc(std::string npc){
                 return npc;
         }
 
         void setquestion(std::string question){
-                this->question=question;
+                question=question;
         }
 
         std::string getquestion(void){
-                return this->question;
+                return question;
         }
 
         void setanswers(std::string option1, std::string option2, std::string option3){
-                option[0]=option1;
-                option[1]=option2;
-                option[2]=option3;
+                options.at(0)=option1;
+                options.at(1)=option2;
+                options.at(2)=option3;
         }
 
-        std::string[] getanswers(void){
-                return option[];
+        vector<std::string> getanswers(void){
+                return options;
         }
 
-        int getnumOptions(options){
-                return options.length();
+        int getnumOptions(){
+                return options.size();
         }
 
@@ -48 +52 @@
 
         XMLPortParam(DialogueManager, "question", setquestion, getquestion, xmlelement, mode);
-    }
+    }*/
 }

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

@@ -6 +6 @@
 #include "network/Host.h"
 #include "network/NetworkFunctionIncludes.h"
+#include "DialoguePrereqs.h"
+#include "util/Singleton.h"
+#include <string>
+#include <vector>
+#include "OrxonoxPrereqs.h"
 
-namespace orxonox{
-        class DialogueManager {
-                DialogueManager::DialogueManager();
-                ~DialogueManager();
-                virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+//tolua_begin
+namespace orxonox
+//tolua_end
+{//toluaexport
+        class _OrxonoxExport DialogueManager : public Singleton<DialogueManager>{
+                friend class Singleton<DialogueManager>;
+                //tolua_begin
+                //public:
 
-                public:
+                DialogueManager();
+                static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } // tolua_export
+                /*virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
                         void setquestion(std::string question);
                         std::string getquestion(void);
+
                         std::string setnpc(std::string npc);
+
                         void setanswers(std::string option1, std::string option2, std::string option3);
-                        std::string[] getanswers(void);
-                        int getnumOptions(options);
+                        std::vector <std::string> getanswers(void);
+
+                        int getnumOptions();
                         
 
                         std::string question;
                         std::string npc;
-                        std::string[] options;
+                        std::vector<std::string> options;
+                //tolua_end
+*/
+private:
+        static DialogueManager* singletonPtr_s;
 
-
-
-        };      
+        };//toluaexport
 }