Changeset 1628 for code/trunk

Timestamp:

Jun 26, 2008, 9:30:36 PM (17 years ago)

Author:

rgrieder

Message:

default values for XMLPort work after all. There was just a bug that got fixed now.

Location:

code/trunk/src

Files:

• core/XMLPort.h (modified) (1 diff)
• orxonox/OrxonoxStableHeaders.h (modified) (2 diffs)
• orxonox/overlays/OrxonoxOverlay.cc (modified) (1 diff)
• orxonox/overlays/OverlayGroup.cc (modified) (1 diff)
• orxonox/overlays/OverlayText.cc (modified) (1 diff)
• orxonox/overlays/hud/HUDBar.cc (modified) (2 diffs)
• orxonox/overlays/hud/HUDNavigation.cc (modified) (1 diff)
• orxonox/overlays/hud/HUDRadar.cc (modified) (1 diff)

code/trunk/src/core/XMLPort.h

@@ -152 +152 @@
                                 this->parseResult_ = PR_waiting_for_default_values;
                         }
+                        else
+                            this->parseResult_ = PR_waiting_for_default_values;
                     }
                     catch (ticpp::Exception& ex)

code/trunk/src/orxonox/OrxonoxStableHeaders.h

@@ -37 +37 @@
 #include "util/OrxonoxPlatform.h"
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && 0
 
 // including std headers here is useless since they're already precompiled
@@ -112 +112 @@
 #include "network/Synchronisable.h"
 
-#include "tools/Mesh.h"
-#include "tools/Timer.h"
-#include "objects/Model.h"
-#include "objects/Tickable.h"
-#include "objects/WorldEntity.h"
+//#include "tools/Mesh.h"
+//#include "tools/Timer.h"
+//#include "objects/Model.h"
+//#include "objects/Tickable.h"
+//#include "objects/WorldEntity.h"
 
 #endif /* Compiler MSVC */

code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -119 +119 @@
 
             this->changedVisibility();
-
-            this->setSize(Vector2(0.5f, 0.5f));
-            this->setPickPoint(Vector2(0.5f, 0.5f));
-            this->setPosition(Vector2(0.5f, 0.5f));
-            this->setRotation(Degree(0.0f));
-            this->setAspectCorrection(true);
-            this->setBackgroundMaterial("");
         }
 

code/trunk/src/orxonox/overlays/OverlayGroup.cc

@@ -63 +63 @@
     {
         BaseObject::XMLPort(xmlElement, mode);
-
-        if (mode == XMLPort::LoadObject)
-        {
-            this->setScale(Vector2(1.0f, 1.0f));
-            this->setScroll(Vector2(0.0f, 0.0f));
-        }
 
         XMLPortParam(OverlayGroup, "scale",  setScale,  getScale,  xmlElement, mode).defaultValues(Vector2(1.0, 1.0));

code/trunk/src/orxonox/overlays/OverlayText.cc

@@ -65 +65 @@
 
             this->background_->addChild(this->text_);
-
-            this->setFont("Monofur");
-            this->caption_ = "";
-            this->setTextSize(1.0f);
         }
 

code/trunk/src/orxonox/overlays/hud/HUDBar.cc

@@ -55 +55 @@
         BaseObject::XMLPort(xmlElement, mode);
 
-        if (mode == XMLPort::LoadObject)
-        {
-            this->setColour(ColourValue(1.0, 1.0, 1.0, 1.0));
-            this->setPosition(0.0f);
-        }
-
         XMLPortParam(BarColour, "colour", setColour, getColour, xmlElement, mode)
             .defaultValues(ColourValue(1.0, 1.0, 1.0, 1.0));
@@ -101 +95 @@
             this->bar_->setMaterialName(materialname);
             this->background_->addChild(bar_);
-
-            this->setValue(0.0f);
-            this->setRightToLeft(false);
-            this->setAutoColour(true);
         }
 
-        XMLPortParam(HUDBar, "initialValue", setValue,       getValue,       xmlElement, mode).defaultValues(0.0f);
-        XMLPortParam(HUDBar, "rightToLeft",   setRightToLeft, getRightToLeft, xmlElement, mode).defaultValues(false);
+        XMLPortParam(HUDBar, "initialValue", setValue,       getValue,       xmlElement, mode).defaultValues(0.4567654f);
+        XMLPortParam(HUDBar, "rightToLeft",  setRightToLeft, getRightToLeft, xmlElement, mode).defaultValues(false);
         XMLPortParam(HUDBar, "autoColour",   setAutoColour,  getAutoColour,  xmlElement, mode).defaultValues(true);
         XMLPortObject(HUDBar, BarColour, "", addColour, getColour, xmlElement, mode, false, true);

code/trunk/src/orxonox/overlays/hud/HUDNavigation.cc

@@ -94 +94 @@
             // hide at first
             this->setVisible(false);
-
-            this->setFont("Monofur");
-            this->setTextSize(0.05f);
-            this->setNavMarkerSize(0.05f);
-            this->setAimMarkerSize(0.04f);
         }
 

code/trunk/src/orxonox/overlays/hud/HUDRadar.cc

@@ -75 +75 @@
             overlay_->add2D(marker_);
             marker_->hide();
-
-            this->setRadarSensitivity(1.0f);
-            this->setHalfDotSizeDistance(3000.0f);
-            this->setMaximumDotSize(0.1f);
         }