Changeset 11377 for code/branches

Timestamp:

Mar 23, 2017, 3:51:57 PM (8 years ago)

Author:

rrogge

Message:

lua und layout1

Location:

code/branches/Dialogue_FS17

Files:

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

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

@@ -23 +23 @@
   </templates>
   <?lua include("includes/notifications.oxi") ?>
+  
 
   <Scene
@@ -28 +29 @@
     skybox       = "Orxonox/Starbox"
   >
-  <DialogueManager question="Wazzup?" option1="Nothing" option2="Dunno" option3="Do you like fish?">
+  <DialogueManager question="Wazzup">
   </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"/>

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

@@ -11 +11 @@
 RegisterClass(DialogueManager);
 
-        DialogueManager::DialogueManager(){
+        DialogueManager::DialogueManager(): OrxonoxOverlay(context){
                 RegisterObject(DialogueManager);
+
+        }
+        ~DialogueManager(){}
+
+        std::string setnpc(std::string npc){
+                return npc;
         }
 
-        std::string[] setquestion(std::string question){
-                return question;
+        void setquestion(std::string question){
+                this->question=question;
         }
 
-        std::string[] setanswers(std::string option1, std::string option2, std::string option3){
+        std::string getquestion(void){
+                return this->question;
+        }
+
+        void setanswers(std::string option1, std::string option2, std::string option3){
                 option[0]=option1;
                 option[1]=option2;
                 option[2]=option3;
-                return options;
         }
+
+        std::string[] getanswers(void){
+                return option[];
+        }
+
+        int getnumOptions(options){
+                return options.length();
+        }
+
+        void DialogueManager::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(DialogueManager, XMLPort, xmlelement, mode);
+
+        XMLPortParam(DialogueManager, "question", setquestion, getquestion, xmlelement, mode);
+    }
 }

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

@@ -11 +11 @@
                 DialogueManager::DialogueManager();
                 ~DialogueManager();
+                virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
                 public:
-                        std::string[] setquestion(std::string question);
-                        std::string[] setanswers(std::string option1, std::string option2, std::string option3);
+                        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::string question;
+                        std::string npc;
                         std::string[] options;
+