Changeset 11612 for code/branches/Dialog_HS17/src

Timestamp:

Nov 30, 2017, 3:35:25 PM (7 years ago)

Author:

kuchlert

Message:

funktioniert bis dialogmanager getInstance, angefangen und noch zu tun: luafunktionen von dialogmanager, lua und layout

Location:

code/branches/Dialog_HS17/src/modules/dialog

Files:

• Dialog.cc (modified) (1 diff)
• Dialog.h (modified) (2 diffs)
• DialogManager.cc (modified) (1 diff)
• DialogManager.h (modified) (1 diff)
• DialogPrereqs.h (modified) (1 diff)

code/branches/Dialog_HS17/src/modules/dialog/Dialog.cc

@@ -113 +113 @@
         return end;
     }
+
+        std::string Dialog::getQuestionString()
+        {
+                return this->questions_.find(this->currentQuestionId_)->second->getQuestion();
+        }
 }

code/branches/Dialog_HS17/src/modules/dialog/Dialog.h

@@ -33 +33 @@
                         void addAnswer(Answer* answer); //fuegt Answer der Map hinzu
 
-                        Question* getQuestion(unsigned int index) const; // returned string der momentanen Frage
-                        Answer* getAnswer(unsigned int index) const; // returned string der momentanen Frage
+                        Question* getQuestion(unsigned int index) const; // // benoetigt fuer xmlPort
+                        Answer* getAnswer(unsigned int index) const; // benoetigt fuer xmlPort
                         std::vector<std::string> getAnswers();  // returned vector mit allen momentanen AntwortenIds
 
@@ -43 +43 @@
                         bool ending(); //retruned true wenn die Id der Antwort end ist oder keine Antworten auf die frage eingetragen sind
 
+                        std::string getQuestionString(); //gibt string der momentanen Frage 
 
                 private: 

code/branches/Dialog_HS17/src/modules/dialog/DialogManager.cc

@@ -2 +2 @@
 #include "core/CoreIncludes.h"
 #include "core/singleton/ScopedSingletonIncludes.h"
+#include <string>
 
-namespace orxonox
-{
-    ManageScopedSingleton(DialogManager, ScopeID::ROOT, false);
+namespace orxonox {
+        ManageScopedSingleton(DialogManager, ScopeID::ROOT, false);
+        
 
-    RegisterAbstractClass(DialogManager).inheritsFrom<Listable>();
+        
+        DialogManager::DialogManager()
+        {
+                this->currentTalk_ = nullptr;
+        }
 
-    DialogManager::DialogManager()
-    {
-        RegisterObject(DialogManager);
-
-        this->currentTalk_ = NULL;
-    }
-
-    void DialogManager::setDialog(Dialog* dialog)
+        void DialogManager::setDialog(Dialog* dialog)
         {
                 this->currentTalk_ = dialog;    
         }
 
-        const Dialog* DialogManager::getCurrentDialog()
-        {
-                return this->currentTalk_;
-        }
-        
-        bool DialogManager::empty()
-        {
-                if(this->currentTalk_ == NULL)
-                {
-                        return true;
-                }
-                else 
-                {
-                        return false;
-                }
-        } 
+        //from here onward funcionality for lua axports
+
+    std::string DialogManager::getQuestion()
+    {
+        return this->currentTalk_->getQuestionString();
+    }
+
+    /*
+    std::vector<std::string> DialogManager::getAnswers()
+    {
+        // lua hat komisch arrays (eigentlich tables), wie implementiert man answers so das man nacher den key der gegeben antwort a
+        // hat um ihn fuer update zu benutzen?
+    }
+        */
 }

code/branches/Dialog_HS17/src/modules/dialog/DialogManager.h

@@ -4 +4 @@
 #include "DialogPrereqs.h"
 #include "util/Singleton.h"
+#include "core/singleton/ScopedSingletonIncludes.h"
 #include "core/object/Listable.h"
 #include "Dialog.h"
 
-namespace orxonox
-{
-    class _DialogExport DialogManager : public Singleton<DialogManager>, public Listable
-    {
+#include <string>
+
+namespace orxonox //tolua_export
+
+{//tolua_export
+    class _OrxonoxExport DialogManager //tolua_export
+    : public Singleton<DialogManager>
+    {//tolua_export
         friend class Singleton<DialogManager>;
+    
+        public:
+        
+        DialogManager(); 
+        
 
-        public:
-            DialogManager();
+        static DialogManager& getInstance() { return Singleton<DialogManager>::getInstance(); } //tolua_export
 
-           // int getValue() const { return this->value_; }
+        void setDialog(Dialog* dialog);
 
-                static DialogManager& getInstance() { return Singleton<DialogManager>::getInstance(); } //toloa_export
+        //from here on luafunctionality is declared
 
-                void setDialog(Dialog* dialog);
-                const Dialog* getCurrentDialog();
-                bool empty();
+        std::string getQuestion(); //tolua_export
+        //std::vector<std::string> getAnswers();
 
-            //form here on all lua functionality used in lua scrips is declared
+private:
+    static DialogManager* singletonPtr_s;
 
+    Dialog* currentTalk_;
 
-        private:
-                Dialog* currentTalk_;
-            //int value_;
-
-            static DialogManager* singletonPtr_s;
-    };
-}
+    };//tolua_export
+}//tolua_export
 
 #endif /* _DialogManager_H__ */

code/branches/Dialog_HS17/src/modules/dialog/DialogPrereqs.h

@@ -43 +43 @@
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Dialogue_STATIC_BUILD)
-#  ifdef Dialogue_SHARED_BUILD
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(Dialog_STATIC_BUILD)
+#  ifdef Dialog_SHARED_BUILD
 #    define _DialogExport __declspec(dllexport)
 #  else