diff options
Diffstat (limited to 'scene/3d/collision_shape_3d.h')
| -rw-r--r-- | scene/3d/collision_shape_3d.h | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/scene/3d/collision_shape_3d.h b/scene/3d/collision_shape_3d.h index 8515d292af..cb7fe21eae 100644 --- a/scene/3d/collision_shape_3d.h +++ b/scene/3d/collision_shape_3d.h @@ -5,8 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md). */ +/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -33,27 +33,21 @@ #include "scene/3d/node_3d.h" #include "scene/resources/shape_3d.h" + class CollisionObject3D; class CollisionShape3D : public Node3D { - GDCLASS(CollisionShape3D, Node3D); OBJ_CATEGORY("3D Physics Nodes"); Ref<Shape3D> shape; - uint32_t owner_id; - CollisionObject3D *parent; - - Node *debug_shape; - bool debug_shape_dirty; + uint32_t owner_id = 0; + CollisionObject3D *parent = nullptr; void resource_changed(RES res); - bool disabled; + bool disabled = false; protected: - void _update_debug_shape(); - void _shape_changed(); - void _update_in_shape_owner(bool p_xform_only = false); protected: @@ -61,7 +55,7 @@ protected: static void _bind_methods(); public: - void make_convex_from_brothers(); + void make_convex_from_siblings(); void set_shape(const Ref<Shape3D> &p_shape); Ref<Shape3D> get_shape() const; @@ -69,7 +63,7 @@ public: void set_disabled(bool p_disabled); bool is_disabled() const; - String get_configuration_warning() const; + TypedArray<String> get_configuration_warnings() const override; CollisionShape3D(); ~CollisionShape3D(); |