Changeset 11401 for code/branches

Timestamp:

Apr 13, 2017, 3:47:48 PM (8 years ago)

Author:

rrogge

Message:

zeigt PickupInventory an

Location:

code/branches/Dialogue_FS17

Files:

• data/gui/scripts/Dialogue.lua (added)
• data/levels/events.oxw (modified) (2 diffs)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/dialogue/CMakeLists.txt (modified) (1 diff)
• src/modules/dialogue/DialogueManager.cc (modified) (1 diff)
• src/modules/dialogue/DialogueManager.h (modified) (3 diffs)
• src/modules/dialogue/NextQuestion.cc (modified) (3 diffs)
• src/modules/dialogue/NextQuestion.h (modified) (1 diff)

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

@@ -58 +58 @@
 
 <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">
+    <Backlight position="0,0,0" visible=true frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,0,1"/>
+    <NextQuestion question="Hello World3">
       <events>
         <execute>
@@ -65 +65 @@
         </execute>
       </events>
-    </DialogueManager>
+    </NextQuestion>
 
     <!-- red -->

code/branches/Dialogue_FS17/data/overlays/HUDTemplates3.oxo

@@ -214 +214 @@
     />
 
-  </OverlayGroup>
-</Template>
+    <GUIOverlay
+      name = "Dialogue"
+      guiname = "Dialogue"
+      visible = "false"
+    />
+
+  </OverlayGroup>
+</Template>

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

@@ -1 +1 @@
 SET_SOURCE_FILES(DIALOGUE_SRC_FILES
   DialogueManager.cc
+  NextQuestion.cc
  
 )

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

@@ -41 +41 @@
                 return question;
         }
-        void DialogueManager::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+        /*void DialogueManager::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
         SUPER(DialogueManager, XMLPort, xmlelement, mode);
 
         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){

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>
@@ -24 +23 @@
                 //tolua_begin
                 public:
+                
 
                 DialogueManager(Context* context); // tolua_export
@@ -30 +30 @@
                 static DialogueManager& getInstance() { return Singleton<DialogueManager>::getInstance(); } 
                 
-                virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
                 void setquestion(std::string question);
                 std::string getquestion(void);
+                
 
-
-                virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
-                bool execute(bool bTriggered, BaseObject* trigger);
-
+                
         
 

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

@@ -1 +1 @@
 #include <vector>
 #include <string>
+#include "core/CoreIncludes.h"
+#include "core/GUIManager.h"
+
 
 #include "NextQuestion.h"
@@ -9 +12 @@
         RegisterClass(NextQuestion);
 
-        vector<NextQuestion> nextquestion;
+        NextQuestion::NextQuestion(Context* context) : BaseObject(context)
+    {
+        RegisterObject(NextQuestion);
+        orxout() << "Klasse aufgerufen" << endl;
 
-        void NextQuestion::setanswers(std::string option1, std::string option2, std::string option3){
+    }
+
+        void NextQuestion::setquestion(std::string question){
+                question=question;
+        }
+
+        std::string NextQuestion::getquestion(void){
+                return question;
+        }
+
+        
+        //
+
+        
+        //XML and Event shit
+        void NextQuestion::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(NextQuestion, XMLPort, xmlelement, mode);
+
+        XMLPortParam(NextQuestion, "question", setquestion, getquestion, xmlelement, mode);
+    }
+        bool NextQuestion::execute(bool bTriggered, BaseObject* trigger)
+    {  
+        //if(!bTriggered) return false;
+        
+        
+
+
+        orxout() << "bTriggered is " << bTriggered << endl;
+
+        for (DialogueManager* hud : ObjectList<DialogueManager>())
+            m = hud;
+        m->setquestion(question);
+        //orxout() << " 1 " << mystring << endl;
+        return false;
+    }
+
+    void NextQuestion::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(NextQuestion, XMLEventPort, xmlelement, mode);
+
+        XMLPortEventSink(NextQuestion, BaseObject, "execute", execute, xmlelement, mode); 
+    }
+        /*void NextQuestion::setanswers(std::string option1, std::string option2, std::string option3){
                 options.at(0)=option1;
                 options.at(1)=option2;
@@ -23 +72 @@
         int NextQuestion::getnumOptions(){
                 return options.size();
-        }
+        }*/
 
 }

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

@@ -1 +1 @@
 #include <vector>
 #include <string>
+#include "core/class/Identifier.h"
+#include "OrxonoxPrereqs.h"
+#include "core/XMLPort.h"
+#include "core/EventIncludes.h"
+#include "DialogueManager.h"
 
-#include "core/XMLPort.h"
+
 
 namespace orxonox{
-        void setanswers(std::string option1, std::string option2, std::string option3);
-        std::vector <std::string> getanswers(void);
+        class _OrxonoxExport NextQuestion : public BaseObject
+        {
+                
+                //tolua_begin
+                public:
 
-        int getnumOptions();
-        std::vector<std::string> options;
+                NextQuestion (Context* context); // tolua_export
+                
+
+                void setquestion(std::string question);
+                std::string getquestion(void);
+
+
+                
+ 
+                
+                virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
+                /*void setanswers(std::string option1, std::string option2, std::string option3);
+                std::vector <std::string> getanswers(void);
+
+                int getnumOptions();
+                std::vector<std::string> options;*/
+
+                //Event
+                virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+                bool execute(bool bTriggered, BaseObject* trigger);
+
+                
+        private:
+                std::string question;
+                DialogueManager* m;
+
+        };
+        
 }