Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5671 in orxonox.OLD for trunk/src/lib


Ignore:
Timestamp:
Nov 21, 2005, 3:50:41 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: renamed class LoadParam to CLoadParam and Macro LoadParamNew to LoadParam

Location:
trunk/src/lib
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/coord/p_node.cc

    r5654 r5671  
    141141  static_cast<BaseObject*>(this)->loadParams(root);
    142142
    143   LoadParamNEW(root, "rel-coor", this, PNode, setRelCoor)
     143  LoadParam(root, "rel-coor", this, PNode, setRelCoor)
    144144      .describe("Sets The relative position of the Node to its parent.");
    145145
    146   LoadParamNEW(root, "abs-coor", this, PNode, setAbsCoor)
     146  LoadParam(root, "abs-coor", this, PNode, setAbsCoor)
    147147      .describe("Sets The absolute Position of the Node.");
    148148
    149   LoadParamNEW(root, "rel-dir", this, PNode, setRelDir)
     149  LoadParam(root, "rel-dir", this, PNode, setRelDir)
    150150      .describe("Sets The relative rotation of the Node to its parent.");
    151151
    152   LoadParamNEW(root, "abs-dir", this, PNode, setAbsDir)
     152  LoadParam(root, "abs-dir", this, PNode, setAbsDir)
    153153      .describe("Sets The absolute rotation of the Node.");
    154154
    155   LoadParamNEW(root, "parent", this, PNode, setParent)
     155  LoadParam(root, "parent", this, PNode, setParent)
    156156      .describe("the Name of the Parent of this PNode");
    157157
    158   LoadParamNEW(root, "parent-mode", this, PNode, setParentMode)
     158  LoadParam(root, "parent-mode", this, PNode, setParentMode)
    159159      .describe("the mode to connect this node to its parent ()");
    160160

  • trunk/src/lib/graphics/light.cc

    r5653 r5671  
    8888  static_cast<PNode*>(this)->loadParams(root);
    8989
    90   LoadParamNEW(root, "diffuse-color", this, Light, setDiffuseColor)
     90  LoadParam(root, "diffuse-color", this, Light, setDiffuseColor)
    9191      .describe("sets the diffuse color of the Light (red [0-1], green [0-1], blue [0-1])");
    9292
    93   LoadParamNEW(root, "specular-color", this, Light, setSpecularColor)
     93  LoadParam(root, "specular-color", this, Light, setSpecularColor)
    9494      .describe("sets the specular color of the Light (red [0-1], green [0-1], blue [0-1])");
    9595
    96   LoadParamNEW(root, "attenuation", this, Light, setAttenuation)
     96  LoadParam(root, "attenuation", this, Light, setAttenuation)
    9797      .describe("sets the Attenuation of the LightSource (constant Factor, linear Factor, quadratic Factor).");
    9898
    99   LoadParamNEW(root, "spot-direction", this, Light, setSpotDirection)
     99  LoadParam(root, "spot-direction", this, Light, setSpotDirection)
    100100      .describe("sets the Direction of the Spot");
    101101
    102   LoadParamNEW(root, "spot-cutoff", this, Light, setSpotCutoff)
     102  LoadParam(root, "spot-cutoff", this, Light, setSpotCutoff)
    103103      .describe("the cuttoff of the Spotlight");
    104104}
    … …  
    261261      .describe("an XML-Element to load lights from.");
    262262
    263   LoadParamNEW(root, "ambient-color", this, LightManager, setAmbientColor)
     263  LoadParam(root, "ambient-color", this, LightManager, setAmbientColor)
    264264      .describe("sets the ambient Color of the Environmental Light");
    265265}

  • trunk/src/lib/graphics/render2D/element_2d.cc

    r5654 r5671  
    130130{
    131131  // ELEMENT2D-native settings.
    132   LoadParamNEW(root, "alignment", this, Element2D, setAlignment)
     132  LoadParam(root, "alignment", this, Element2D, setAlignment)
    133133      .describe("loads the alignment: (either: center, left, right or screen-center)");
    134134
    135   LoadParamNEW(root, "layer", this, Element2D, setLayer)
     135  LoadParam(root, "layer", this, Element2D, setLayer)
    136136      .describe("loads the layer onto which to project: (either: top, medium, bottom, below-all)");
    137137
    138   LoadParamNEW(root, "bind-node", this, Element2D, setBindNode)
     138  LoadParam(root, "bind-node", this, Element2D, setBindNode)
    139139      .describe("sets a node, this 2D-Element should be shown upon (name of the node)");
    140140
    141   LoadParamNEW(root, "visibility", this, Element2D, setVisibility)
     141  LoadParam(root, "visibility", this, Element2D, setVisibility)
    142142      .describe("if the Element is visible or not");
    143143
    144144
    145145// PNode-style:
    146   LoadParamNEW(root, "rel-coor", this, Element2D, setRelCoor2D)
     146  LoadParam(root, "rel-coor", this, Element2D, setRelCoor2D)
    147147      .describe("Sets The relative position of the Node to its parent.");
    148148
    149   LoadParamNEW(root, "abs-coor", this, Element2D, setAbsCoor2D)
     149  LoadParam(root, "abs-coor", this, Element2D, setAbsCoor2D)
    150150      .describe("Sets The absolute Position of the Node.");
    151151
    152   LoadParamNEW(root, "rel-dir", this, Element2D, setRelDir2D)
     152  LoadParam(root, "rel-dir", this, Element2D, setRelDir2D)
    153153      .describe("Sets The relative rotation of the Node to its parent.");
    154154
    155   LoadParamNEW(root, "abs-dir", this, Element2D, setAbsDir2D)
     155  LoadParam(root, "abs-dir", this, Element2D, setAbsDir2D)
    156156      .describe("Sets The absolute rotation of the Node.");
    157157
    158   LoadParamNEW(root, "parent", this, Element2D, setParent2D)
     158  LoadParam(root, "parent", this, Element2D, setParent2D)
    159159      .describe("the Name of the Parent of this Element2D");
    160160
    161   LoadParamNEW(root, "parent-mode", this, Element2D, setParentMode2D)
     161  LoadParam(root, "parent-mode", this, Element2D, setParentMode2D)
    162162      .describe("the mode to connect this node to its parent ()");
    163163

  • trunk/src/lib/gui/gl_gui/glmenu/glmenu_imagescreen.cc

    r5655 r5671  
    5757void GLMenuImageScreen::loadParams(const TiXmlElement* root)
    5858{
    59   LoadParamNEW(root, "BackgroundImage", this, GLMenuImageScreen, setBackgroundImage)
     59  LoadParam(root, "BackgroundImage", this, GLMenuImageScreen, setBackgroundImage)
    6060    .describe("sets the image to load onto the loadscreen");
    6161
    62   LoadParamNEW(root, "BackgroundPS", this, GLMenuImageScreen, setPosScale)
     62  LoadParam(root, "BackgroundPS", this, GLMenuImageScreen, setPosScale)
    6363    .describe("The Position and Scale of the Background Image in %(0-1.0). PosX, PosY, SizeX, SizeY");
    6464
    65   LoadParamNEW(root, "BarImage", this, GLMenuImageScreen, setBarImage)
     65  LoadParam(root, "BarImage", this, GLMenuImageScreen, setBarImage)
    6666    .describe("sets the image of the LoadingBar");
    6767
    68   LoadParamNEW(root, "BarPS", this, GLMenuImageScreen, setBarPosScale)
     68  LoadParam(root, "BarPS", this, GLMenuImageScreen, setBarPosScale)
    6969    .describe("The Position and Scale of the Loading Bar in %(0-1.0). PosX, PosY, SizeX, SizeY");
    7070
    71   LoadParamNEW(root, "ElementCount", this, GLMenuImageScreen, setMaximum)
     71  LoadParam(root, "ElementCount", this, GLMenuImageScreen, setMaximum)
    7272    .describe("The Count of elements to load into the bar (this is only a maximum value)");
    7373}

  • trunk/src/lib/lang/base_object.cc

    r5652 r5671  
    6262{
    6363  // name setup
    64   LoadParamNEW(root, "name", this, BaseObject, setName)
     64  LoadParam(root, "name", this, BaseObject, setName)
    6565      .describe("the Name of the Object.");
    6666}

  • trunk/src/lib/particles/particle_emitter.cc

    r5653 r5671  
    9595  static_cast<PNode*>(this)->loadParams(root);
    9696
    97   LoadParamNEW(root, "type", this, ParticleEmitter, setType)
     97  LoadParam(root, "type", this, ParticleEmitter, setType)
    9898    .describe("What type of emitter is this [dot, plane, cube, sphere].");
    9999
    100   LoadParamNEW(root, "size", this, ParticleEmitter, setSize)
     100  LoadParam(root, "size", this, ParticleEmitter, setSize)
    101101    .describe("How big the emitter is (no effect on dot-emitters)");
    102102
    103   LoadParamNEW(root, "rate", this, ParticleEmitter, setEmissionRate)
     103  LoadParam(root, "rate", this, ParticleEmitter, setEmissionRate)
    104104    .describe("How many particles should be emittet from this emitter");
    105105
    106   LoadParamNEW(root, "inherit-speed", this, ParticleEmitter, setInheritSpeed)
     106  LoadParam(root, "inherit-speed", this, ParticleEmitter, setInheritSpeed)
    107107    .describe("the extent, the speed of the emitter has on the particles");
    108108
    109   LoadParamNEW(root, "emission-velocity", this, ParticleEmitter, setEmissionVelocity)
     109  LoadParam(root, "emission-velocity", this, ParticleEmitter, setEmissionVelocity)
    110110    .describe("How fast the particles are emittet (their initial speed)");
    111111
    112   LoadParamNEW(root, "emission-momentum", this, ParticleEmitter, setEmissionMomentum)
     112  LoadParam(root, "emission-momentum", this, ParticleEmitter, setEmissionMomentum)
    113113      .describe("How fast the particles rotation is at emissiontime (their initial momentum)");
    114114
    115   LoadParamNEW(root, "spread", this, ParticleEmitter, setSpread)
     115  LoadParam(root, "spread", this, ParticleEmitter, setSpread)
    116116    .describe("The angle the particles are emitted from (angle, deviation)");
    117117
    118118
    119   LoadParamNEW(root, "emission-direction", this, ParticleEmitter, setDirection);
     119  LoadParam(root, "emission-direction", this, ParticleEmitter, setDirection);
    120120}
    121121

  • trunk/src/lib/particles/particle_system.cc

    r5654 r5671  
    119119  static_cast<PhysicsInterface*>(this)->loadParams(root);
    120120
    121   LoadParamNEW(root, "max-count", this, ParticleSystem, setMaxCount)
     121  LoadParam(root, "max-count", this, ParticleSystem, setMaxCount)
    122122      .describe("the maximal count of Particles, that can be emitted into this system");
    123123
    124   LoadParamNEW(root, "life-span", this, ParticleSystem, setLifeSpan)
     124  LoadParam(root, "life-span", this, ParticleSystem, setLifeSpan)
    125125      .describe("sets the life-span of the Particles.");
    126126
    127   LoadParamNEW(root, "conserve", this, ParticleSystem, setConserve)
     127  LoadParam(root, "conserve", this, ParticleSystem, setConserve)
    128128      .describe("sets the Conserve factor of the Particles (1.0: they keep all their energy, 0.0:they keep no energy)");
    129129
    130   LoadParamNEW(root, "type", this, ParticleSystem, setType)
     130  LoadParam(root, "type", this, ParticleSystem, setType)
    131131      .describe("sets the type of the Particles, (dot, spark, sprite or model)");
    132132

  • trunk/src/lib/physics/fields/field.cc

    r5652 r5671  
    6060  static_cast<PNode*>(this)->loadParams(root);
    6161
    62   LoadParamNEW(root, "magnitude", this, Field, setMagnitude)
     62  LoadParam(root, "magnitude", this, Field, setMagnitude)
    6363      .describe("sets the magnitude of this Field")
    6464      ->defaultValues(1, 1);
    6565
    66   LoadParamNEW(root, "attenuation", this, Field, setAttenuation)
     66  LoadParam(root, "attenuation", this, Field, setAttenuation)
    6767      .describe("sets the attenuation of this Field.");
    6868

  • trunk/src/lib/physics/physics_connection.cc

    r5652 r5671  
    5252  static_cast<BaseObject*>(this)->loadParams(root);
    5353
    54   LoadParamNEW(root, "subject", this, PhysicsConnection, setSubject)
     54  LoadParam(root, "subject", this, PhysicsConnection, setSubject)
    5555      .describe("set the subject by a name");
    5656
    57   LoadParamNEW(root, "field", this, PhysicsConnection, setField)
     57  LoadParam(root, "field", this, PhysicsConnection, setField)
    5858      .describe("set the field by name");
    5959
Note: See TracChangeset for help on using the changeset viewer.