Changeset 11393

Timestamp:

Apr 6, 2017, 3:40:23 PM (8 years ago)

Author:

rrogge

Message:

Singleton funktioniert

Location:

code/branches/Dialogue_FS17

Files:

• data/levels/emptyLevel.oxw (modified) (1 diff)
• src/modules/dialogue/DialogueManager.cc (modified) (2 diffs)
• src/modules/dialogue/DialogueManager.h (modified) (3 diffs)
• src/modules/dialogue/NextQuestion.cc (added)
• src/modules/dialogue/NextQuestion.h (added)

code/branches/Dialogue_FS17/data/levels/emptyLevel.oxw

@@ -29 +29 @@
     skybox       = "Orxonox/Starbox"
   >
-  <DialogueManager question="Wazzup">
-  </DialogueManager>
+ <DistanceTrigger name="test" position="0,0,0" target="Pawn" distance=25 stayActive="true"/>
+    <Backlight position="0,0,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,0"/>
+    <DialogueManager question="Hello World3">
+      <events>
+        <execute>
+           <EventListener event="test" />
+        </execute>
+      </events>
+    </DialogueManager>
+
+    <!--<DialogueManager firstquestion="hello world">
+      <options>
+        <NextQuestion answer="ja" question="question?">
+          <options>
+            <NextQuestion answer="" question="">
+            </NextQuestion>
+          </options>
+        </NextQuestion>
+       <events>
+        <execute>
+           <EventListener event="test" />
+        </execute>
+      </events>
+    </DialogueManager>
+  -->
+
+
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />

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

@@ -10 +10 @@
 #include <vector>
 #include <string>
+#include "core/XMLPort.h"
+
 
 namespace orxonox {
-        ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false);
-        RegisterClassNoArgs(DialogueManager);
+        //ManageScopedSingleton(DialogueManager, ScopeID::ROOT, false);
+        RegisterAbstractClass(DialogueManager).inheritsFrom<Configurable>();
 
-        DialogueManager::DialogueManager(){
+
+
+        DialogueManager* DialogueManager::singletonPtr_s =nullptr;
+
+        DialogueManager::DialogueManager(Context* context): BaseObject(context){
                 RegisterObject(DialogueManager);
                 this->setConfigValues();
+                
 
         }
         
+
         /**
      * @brief set the config values in the orxonox.ini file
      */
-    void DialogueManager::setConfigValues()
-    {
-        //SetConfigValue(question,std::string).description("Question");
-        
-    }
+    
 
     void DialogueManager::setquestion(std::string question){
@@ -43 +47 @@
         XMLPortParam(DialogueManager, "question", setquestion, getquestion, xmlelement, mode);
     }
+
+        bool DialogueManager::execute(bool bTriggered, BaseObject* trigger)
+    {  
+        if(!bTriggered) return false;
+
+        orxout() << "bTriggered is " << bTriggered;
+        //orxout() << " 1 " << mystring << endl;
+        return false;
+    }
+
+    void DialogueManager::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(DialogueManager, XMLEventPort, xmlelement, mode);
+
+        XMLPortEventSink(DialogueManager, BaseObject, "execute", execute, xmlelement, mode); 
+    }
+
         /*std::string DialogueManager::setnpc(std::string npc){
                 return npc;

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

@@ -13 +13 @@
 #include "core/config/Configurable.h"
 #include "core/XMLPort.h"
+#include "core/EventIncludes.h"
 
 //tolua_begin
@@ -18 +19 @@
 //tolua_end
 {//toluaexport
-        class _OrxonoxExport DialogueManager : public Singleton<DialogueManager>, public Configurable
+        class _OrxonoxExport DialogueManager : public Singleton<DialogueManager>, public BaseObject
         {
                 friend class Singleton<DialogueManager>;
@@ -24 +25 @@
                 public:
 
-                DialogueManager(); // tolua_export
+                DialogueManager(Context* context); // tolua_export
+                
+
                 static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } 
-                void setConfigValues();
+                
                 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-                        void setquestion(std::string question);
-                        std::string getquestion(void);
+                void setquestion(std::string question);
+                std::string getquestion(void);
+
+
+                virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+                bool execute(bool bTriggered, BaseObject* trigger);
+
+        
 
                         /*std::string setnpc(std::string npc);