Changeset 10265 in orxonox.OLD for branches

Timestamp:

Jan 17, 2007, 4:51:13 PM (18 years ago)

Author:

hejja

Message:

Klasse ist jetzt +- scriptable

Location:

branches/gui/src/world_entities

Files:

• questGUI/quest_gui.cc (modified) (10 diffs)
• questGUI/quest_gui.h (modified) (3 diffs)
• script_trigger.cc (modified) (4 diffs)

branches/gui/src/world_entities/questGUI/quest_gui.cc

@@ -51 +51 @@
 #include "shell_command.h"
 
-
-
-
 ObjectListDefinition(QuestGUI);
 
@@ -61 +58 @@
 
 
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(QuestGUI,
+                        addMethod("guiInit", Executor0<QuestGUI, lua_State*>(&QuestGUI::guiInit))
+                       );
+
+
+
 QuestGUI::QuestGUI(const TiXmlElement* root)
 {
+  if (root != NULL)
+  {
   this->registerObject(this, QuestGUI::_objectList);
 
@@ -71 +77 @@
   this->bKillGui = false;
 
-  this->background = "maps/pogo_bunny.png";
+  this->background = "maps/rand2.png";
+  
+  this->backgroundBottom = "maps/rand-untent.png";
 
   this->myQuest = new Quest(root);
   if(root)
     this->loadParams( root);
-
+  }
 }
 
@@ -110 +118 @@
     questBox->setBorderTop(10);
     questBox->setBorderRight(10);
-    questBox->setBorderBottom(20);
     questBox->setBorderLeft(10);
+    questBox->setBorderBottom(10);
     this->questBox->setBackgroundTexture(background);
     this->bKillGui = false;
@@ -117 +125 @@
     OrxGui::GLGuiBox* headerBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
     {
+      headerBox->setBackgroundTexture(backgroundBottom);
       OrxGui::GLGuiImage* questImage = new OrxGui::GLGuiImage();
       questImage->setWidgetSize(100, 100);
@@ -124 +133 @@
 
       OrxGui::GLGuiBox* outlineBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
-      {
+      {      
         OrxGui::GLGuiMultiLineText* questDetails = new OrxGui::GLGuiMultiLineText();
         questDetails->setText(this->myQuest->getQuestDifficulty());
@@ -130 +139 @@
         outlineBox->setBorderTop(0);
         outlineBox->setBorderRight(0);
-        outlineBox->setBorderBottom(20);
         outlineBox->setBorderLeft(0);
+        outlineBox->setBorderBottom(10);
         outlineBox->pack(questDetails);
       }
       headerBox->setBorderTop(0);
       headerBox->setBorderRight(0);
-      headerBox->setBorderBottom(20);
       headerBox->setBorderLeft(0);
+      headerBox->setBorderBottom(10);
       headerBox->pack(outlineBox);
     }
 
-    OrxGui::GLGuiBox* labelBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
-    {
+    OrxGui::GLGuiBox* labelBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
+    {
+      labelBox->setWidgetSize(500,500);
+      labelBox->setBackgroundTexture(backgroundBottom);
       OrxGui::GLGuiMultiLineText* questTxt = new OrxGui::GLGuiMultiLineText();
       questTxt->setText(this->myQuest->getQuestDescription());
+      //questTxt->setLineWidth( 400);
+      labelBox->pack(questTxt);
       labelBox->setBorderTop(0);
       labelBox->setBorderRight(0);
-      labelBox->setBorderBottom(20);
-      labelBox->setBorderLeft(0);
-      labelBox->pack(questTxt);
-    }
-
-
-    OrxGui::GLGuiBox* rewardBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
+      labelBox->setBorderLeft(40);
+      labelBox->setBorderBottom(10);
+    }
+
+
+    OrxGui::GLGuiBox* rewardBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
     {
       OrxGui::GLGuiImage* rewardImage = new OrxGui::GLGuiImage();
-      rewardImage->setWidgetSize(50, 50);
+      rewardImage->setWidgetSize(100, 100);
       rewardImage->loadImageFromFile(this->myQuest->getRewardPicture());
       rewardImage->show();
@@ -165 +177 @@
       rewardBox->setBorderTop(0);
       rewardBox->setBorderRight(0);
-      rewardBox->setBorderBottom(20);
       rewardBox->setBorderLeft(0);
+      rewardBox->setBorderBottom(10);
       rewardBox->pack(rewardTxt);
     }
@@ -176 +188 @@
         OrxGui::GLGuiButton* acceptButton = new OrxGui::GLGuiPushButton("Accept");
         acceptButton->released.connect(this, &QuestGUI::accept);
-        acceptBox->setBorderRight(70);
+        acceptBox->setBorderLeft(50);
+        acceptBox->setBorderRight(150);
         acceptBox->pack(acceptButton);
       }
@@ -187 +200 @@
         refuseBox->pack(refuseButton);
       }
+      answerBox->setBorderTop(0);
+      answerBox->setBorderRight(0);
+      answerBox->setBorderLeft(0);
+      answerBox->setBorderBottom(0);
       answerBox->pack(acceptBox);
       answerBox->pack(refuseBox);

branches/gui/src/world_entities/questGUI/quest_gui.h

@@ -16 +16 @@
   
   public:
-   QuestGUI (const TiXmlElement* root);
+   QuestGUI (const TiXmlElement* root = NULL);
    virtual ~QuestGUI ();
                      
@@ -29 +29 @@
     bool                    bKillGui;
     std::string             background;
+    std::string             backgroundBottom;
     
     OrxGui::GLGuiBox*       headerBox;
@@ -41 +42 @@
     OrxGui::GLGuiBox*       refuseBox;
 
+
     OrxSound::SoundSource*  selectorSource;
     

branches/gui/src/world_entities/script_trigger.cc

@@ -60 +60 @@
   scriptCalled = false;
   scriptIsOk = false;
-  triggerRemains = true;
+  triggerRemains = false;
   addToScript = false;
   this->activeOnCreation = false;
@@ -180 +180 @@
    }
 
-  if(triggerRemains && scriptCalled)
+ if(triggerRemains && scriptCalled)
   {
     executeAction(timestep);
     return;
   }
-
-  if( !invert && this->distance(target) < radius)
-  {
+ 
+ if( !invert && this->distance(target) < radius)
+  {
+    //printf("Distance is %f \n", this->distance(target));
     executeAction(timestep);
     scriptCalled = true;
@@ -193 +194 @@
 
   }
-  else if( invert && this->distance(target) > radius)
+  
+  if( invert && this->distance(target) > radius)
   {
     executeAction(timestep);
@@ -207 +209 @@
 void ScriptTrigger::executeAction(float timestep)
 {
-
+  printf("Script %s called \n",this->functionName.c_str());
   if(scriptIsOk)
   {