Changeset 7401 for code/trunk/src/orxonox/worldentities/WorldEntity.h

Timestamp:

Sep 11, 2010, 12:34:00 AM (14 years ago)

Author:

landauf

Message:

merged doc branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/WorldEntity.h (modified) (2 diffs)

code/trunk/src/orxonox/worldentities/WorldEntity.h

@@ -299 +299 @@
             @brief
                 Returns the diagonal elements of the inertia tensor when calculated in local coordinates.
-            @Note
+            @note
                 The local inertia tensor cannot be set, but is calculated by Bullet according to the collisionShape.
                 With compound collision shapes, an approximation is used.
@@ -367 +367 @@
             @param otherObject
                 The object this one has collided into.
-            @pram contactPoint
+            @param contactPoint
                 Contact point provided by Bullet. Holds more information and can me modified. See return value.
-            @Return
+            @return
                 Returning false means that no modification to the contactPoint has been made. Return true otherwise!
-            @Note
+            @note
                 Condition is that enableCollisionCallback() was called.
             */