summaryrefslogtreecommitdiff
path: root/modules/csg
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-12-15 01:39:02 +0100
committerRémi Verschelde <rverschelde@gmail.com>2018-12-15 01:39:02 +0100
commit4629152d68f715514be38921db192251a6de6715 (patch)
treeea1b8d4a06aacf1711b1e99999b3c8806a9ad451 /modules/csg
parenta0519c7c3170ff0c54e9b9a376ab865795630f5f (diff)
doc: Sync classref with current source
Diffstat (limited to 'modules/csg')
-rw-r--r--modules/csg/doc_classes/CSGShape.xml31
1 files changed, 15 insertions, 16 deletions
diff --git a/modules/csg/doc_classes/CSGShape.xml b/modules/csg/doc_classes/CSGShape.xml
index 9a6671c67e..56087cbb82 100644
--- a/modules/csg/doc_classes/CSGShape.xml
+++ b/modules/csg/doc_classes/CSGShape.xml
@@ -11,13 +11,6 @@
<demos>
</demos>
<methods>
- <method name="is_root_shape" qualifiers="const">
- <return type="bool">
- </return>
- <description>
- Returns true if this is a root shape and is thus the object that is rendered.
- </description>
- </method>
<method name="get_collision_layer_bit" qualifiers="const">
<return type="bool">
</return>
@@ -36,6 +29,13 @@
Returns an individual bit on the collision mask.
</description>
</method>
+ <method name="is_root_shape" qualifiers="const">
+ <return type="bool">
+ </return>
+ <description>
+ Returns true if this is a root shape and is thus the object that is rendered.
+ </description>
+ </method>
<method name="set_collision_layer_bit">
<return type="void">
</return>
@@ -63,14 +63,6 @@
<member name="calculate_tangents" type="bool" setter="set_calculate_tangents" getter="is_calculating_tangents">
Calculate tangents for the CSG shape which allows the use of normal maps. This is only applied on the root shape, this setting is ignored on any child.
</member>
- <member name="operation" type="int" setter="set_operation" getter="get_operation" enum="CSGShape.Operation">
- The operation that is performed on this shape. This is ignored for the first CSG child node as the operation is between this node and the previous child of this nodes parent.
- </member>
- <member name="snap" type="float" setter="set_snap" getter="get_snap">
- </member>
- <member name="use_collision" type="bool" setter="set_use_collision" getter="is_using_collision">
- Adds a collision shape to the physics engine for our CSG shape. This will always act like a static body. Note that the collision shape is still active even if the CSG shape itself is hidden.
- </member>
<member name="collision_layer" type="int" setter="set_collision_layer" getter="get_collision_layer">
The physics layers this area is in.
Collidable objects can exist in any of 32 different layers. These layers work like a tagging system, and are not visual. A collidable can use these layers to select with which objects it can collide, using the collision_mask property.
@@ -79,7 +71,14 @@
<member name="collision_mask" type="int" setter="set_collision_mask" getter="get_collision_mask">
The physics layers this CSG shape scans for collisions.
</member>
- </members>
+ <member name="operation" type="int" setter="set_operation" getter="get_operation" enum="CSGShape.Operation">
+ The operation that is performed on this shape. This is ignored for the first CSG child node as the operation is between this node and the previous child of this nodes parent.
+ </member>
+ <member name="snap" type="float" setter="set_snap" getter="get_snap">
+ </member>
+ <member name="use_collision" type="bool" setter="set_use_collision" getter="is_using_collision">
+ Adds a collision shape to the physics engine for our CSG shape. This will always act like a static body. Note that the collision shape is still active even if the CSG shape itself is hidden.
+ </member>
</members>
<constants>
<constant name="OPERATION_UNION" value="0" enum="Operation">