Changeset 9869 in orxonox.OLD for trunk/src/world_entities/camera.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/camera.h (modified) (2 diffs)

trunk/src/world_entities/camera.h

@@ -22 +22 @@
 class Camera : public PNode, public EventListener
 {
+  ObjectListDeclaration(Camera);
 public:
   //! an enumerator for different types of view
@@ -84 +85 @@
 {
   friend class Camera;             //! The CameraTarget is a friend of Camera. noone else needs a CameraTarget, so noone else can create it.
+  ObjectListDeclaration(CameraTarget);
 
 private: