Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Nov 24, 2005, 12:13:22 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

Location:
trunk/src/lib
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/collision_detection/Makefile.am

    r5687 r5750  
    66libORXcd_a_SOURCES = cd_engine.cc \
    77                     collision.cc \
    8                      obb.cc \
     8                     obb.cc \
    99                     obb_tree.cc \
    10                      obb_tree_node.cc \
     10                     obb_tree_node.cc \
    1111                     bv_tree.cc \
    12                      bv_tree_node.cc \
    13                      bounding_volume.cc \
    14                      bounding_sphere.cc
     12                     bv_tree_node.cc \
     13                     bounding_volume.cc \
     14                     bounding_sphere.cc
    1515
    1616
    1717noinst_HEADERS =     cd_engine.h \
    18                      collision_defs.h \
     18                     collision_defs.h \
    1919                     collision.h \
    20                      obb.h \
     20                     obb.h \
    2121                     obb_tree.h \
    22                      obb_tree_node.h \
     22                     obb_tree_node.h \
    2323                     bv_tree.h \
    24                      bv_tree_node.h \
    25                      bounding_volume.h \
    26                      bounding_sphere.h
     24                     bv_tree_node.h \
     25                     bounding_volume.h \
     26                     bounding_sphere.h
    2727

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

    r5414 r5750  
    7070  inline const Vector& getAbsCoor () const { return this->absCoordinate; };
    7171  void shiftCoor (const Vector& shift);
     72  void shiftCoor (float x, float y, float z) { this->shiftCoor(Vector(x, y, z)); };
    7273
    7374  void setRelDir (const Quaternion& relDir);
    … …  
    127128  static const char* parentingModeToChar(int parentingMode);
    128129  static PARENT_MODE charToParentingMode(const char* parentingMode);
     130
     131
    129132 private:
    130133  void init(PNode* parent);

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

    r5671 r5750  
    2929using namespace std;
    3030
    31 CREATE_FACTORY(Light);
     31CREATE_FACTORY(Light, CL_LIGHT);
    3232
    3333//! Definition of the Lights and their Names

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

    r5671 r5750  
    2525#include "load_param.h"
    2626
    27 CREATE_FACTORY(GLMenuImageScreen);
     27CREATE_FACTORY(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
    2828
    2929using namespace std;

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

    r5671 r5750  
    2929
    3030
    31 CREATE_FACTORY(ParticleEmitter);
     31CREATE_FACTORY(ParticleEmitter, CL_PARTICLE_EMITTER);
    3232
    3333/**

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

    r5671 r5750  
    3232#include "tinyxml.h"
    3333
    34 CREATE_FACTORY(ParticleSystem);
     34CREATE_FACTORY(ParticleSystem, CL_PARTICLE_SYSTEM);
    3535SHELL_COMMAND(texture, ParticleSystem, setMaterialTexture)
    3636    ->defaultValues(1, "maps/evil-flower.png");

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

    r5357 r5750  
    2323using namespace std;
    2424
    25 CREATE_FACTORY(Gravity);
     25CREATE_FACTORY(Gravity, CL_FIELD_GRAVITY);
    2626
    2727Gravity::Gravity(const TiXmlElement* root)

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

    r5671 r5750  
    2929using namespace std;
    3030
    31 CREATE_FACTORY(PhysicsConnection);
     31CREATE_FACTORY(PhysicsConnection, CL_PHYSICS_CONNECTION);
    3232
    3333/**
Note: See TracChangeset for help on using the changeset viewer.