Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 26, 2008, 9:30:36 PM (16 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/orxonox
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/OrxonoxStableHeaders.h

    r1543 r1628  
    3737#include "util/OrxonoxPlatform.h"
    3838
    39 #if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC
     39#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && 0
    4040
    4141// including std headers here is useless since they're already precompiled
     
    112112#include "network/Synchronisable.h"
    113113
    114 #include "tools/Mesh.h"
    115 #include "tools/Timer.h"
    116 #include "objects/Model.h"
    117 #include "objects/Tickable.h"
    118 #include "objects/WorldEntity.h"
     114//#include "tools/Mesh.h"
     115//#include "tools/Timer.h"
     116//#include "objects/Model.h"
     117//#include "objects/Tickable.h"
     118//#include "objects/WorldEntity.h"
    119119
    120120#endif /* Compiler MSVC */
  • code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

    r1627 r1628  
    119119
    120120            this->changedVisibility();
    121 
    122             this->setSize(Vector2(0.5f, 0.5f));
    123             this->setPickPoint(Vector2(0.5f, 0.5f));
    124             this->setPosition(Vector2(0.5f, 0.5f));
    125             this->setRotation(Degree(0.0f));
    126             this->setAspectCorrection(true);
    127             this->setBackgroundMaterial("");
    128121        }
    129122
  • code/trunk/src/orxonox/overlays/OverlayGroup.cc

    r1627 r1628  
    6363    {
    6464        BaseObject::XMLPort(xmlElement, mode);
    65 
    66         if (mode == XMLPort::LoadObject)
    67         {
    68             this->setScale(Vector2(1.0f, 1.0f));
    69             this->setScroll(Vector2(0.0f, 0.0f));
    70         }
    7165
    7266        XMLPortParam(OverlayGroup, "scale",  setScale,  getScale,  xmlElement, mode).defaultValues(Vector2(1.0, 1.0));
  • code/trunk/src/orxonox/overlays/OverlayText.cc

    r1627 r1628  
    6565
    6666            this->background_->addChild(this->text_);
    67 
    68             this->setFont("Monofur");
    69             this->caption_ = "";
    70             this->setTextSize(1.0f);
    7167        }
    7268
  • code/trunk/src/orxonox/overlays/hud/HUDBar.cc

    r1627 r1628  
    5555        BaseObject::XMLPort(xmlElement, mode);
    5656
    57         if (mode == XMLPort::LoadObject)
    58         {
    59             this->setColour(ColourValue(1.0, 1.0, 1.0, 1.0));
    60             this->setPosition(0.0f);
    61         }
    62 
    6357        XMLPortParam(BarColour, "colour", setColour, getColour, xmlElement, mode)
    6458            .defaultValues(ColourValue(1.0, 1.0, 1.0, 1.0));
     
    10195            this->bar_->setMaterialName(materialname);
    10296            this->background_->addChild(bar_);
    103 
    104             this->setValue(0.0f);
    105             this->setRightToLeft(false);
    106             this->setAutoColour(true);
    10797        }
    10898
    109         XMLPortParam(HUDBar, "initialValue", setValue,       getValue,       xmlElement, mode).defaultValues(0.0f);
    110         XMLPortParam(HUDBar, "rightToLeft",   setRightToLeft, getRightToLeft, xmlElement, mode).defaultValues(false);
     99        XMLPortParam(HUDBar, "initialValue", setValue,       getValue,       xmlElement, mode).defaultValues(0.4567654f);
     100        XMLPortParam(HUDBar, "rightToLeft",  setRightToLeft, getRightToLeft, xmlElement, mode).defaultValues(false);
    111101        XMLPortParam(HUDBar, "autoColour",   setAutoColour,  getAutoColour,  xmlElement, mode).defaultValues(true);
    112102        XMLPortObject(HUDBar, BarColour, "", addColour, getColour, xmlElement, mode, false, true);
  • code/trunk/src/orxonox/overlays/hud/HUDNavigation.cc

    r1627 r1628  
    9494            // hide at first
    9595            this->setVisible(false);
    96 
    97             this->setFont("Monofur");
    98             this->setTextSize(0.05f);
    99             this->setNavMarkerSize(0.05f);
    100             this->setAimMarkerSize(0.04f);
    10196        }
    10297
  • code/trunk/src/orxonox/overlays/hud/HUDRadar.cc

    r1627 r1628  
    7575            overlay_->add2D(marker_);
    7676            marker_->hide();
    77 
    78             this->setRadarSensitivity(1.0f);
    79             this->setHalfDotSizeDistance(3000.0f);
    80             this->setMaximumDotSize(0.1f);
    8177        }
    8278
Note: See TracChangeset for help on using the changeset viewer.