Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 27, 2005, 7:14:55 PM (19 years ago)
Author:
bensch
Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

File:
1 edited

Legend:

Unmodified
Added
Removed

  • orxonox/branches/physics/src/world_entities/camera.cc

    r4178 r4332  
    3333Camera::Camera(void)
    3434{
    35   this->setClassName("Camera");
     35  this->setClassID(CL_CAMERA, "Camera");
    3636  this->target = new CameraTarget();
    3737
    … …  
    190190CameraTarget::CameraTarget()
    191191{
    192   this->setClassName("CameraTarget");
     192  this->setClassID(CL_CAMERA_TARGET, "CameraTarget");
    193193  this->setMode(PNODE_MOVEMENT);
    194194}
Note: See TracChangeset for help on using the changeset viewer.