- Timestamp:
- Dec 14, 2008, 4:16:52 PM (15 years ago)
- Location:
- code/branches/physics_merge
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/physics_merge
- Property svn:mergeinfo changed
-
code/branches/physics_merge/src/orxonox/objects/worldentities/Camera.cc
- Property svn:mergeinfo changed
/code/branches/physics/src/orxonox/objects/worldentities/Camera.cc (added) merged: 2151,2184,2296,2300 /code/trunk/src/orxonox/objects/worldentities/Camera.cc (added) merged: 1913-2085
r2420 r2442 48 48 CreateFactory(Camera); 49 49 50 Camera::Camera(BaseObject* creator) : PositionableEntity(creator)50 Camera::Camera(BaseObject* creator) : StaticEntity(creator) 51 51 { 52 52 RegisterObject(Camera); … … 56 56 57 57 this->camera_ = this->getScene()->getSceneManager()->createCamera(getUniqueNumberString()); 58 this-> getNode()->attachObject(this->camera_);58 this->attachOgreObject(this->camera_); 59 59 60 60 this->bHasFocus_ = false; - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.