diff options
| author | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
|---|---|---|
| committer | Rémi Verschelde | 2017-03-19 00:36:26 +0100 |
| commit | f8db8a3faa30b71dca33ced38be16d3f93f43e8a (patch) | |
| tree | 3b798318132cca7eccfbca5818ab55656a2896d7 /scene/3d/multimesh_instance.cpp | |
| parent | 1d418afe863c9e553b69174ce63aef203c46d2f0 (diff) | |
| download | godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.gz godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.tar.zst godot-f8db8a3faa30b71dca33ced38be16d3f93f43e8a.zip | |
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6e3e905b94b8764e99491e608122261.
Diffstat (limited to '')
| -rw-r--r-- | scene/3d/multimesh_instance.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/scene/3d/multimesh_instance.cpp b/scene/3d/multimesh_instance.cpp index a0400035d..a155854cc 100644 --- a/scene/3d/multimesh_instance.cpp +++ b/scene/3d/multimesh_instance.cpp @@ -28,27 +28,20 @@ /*************************************************************************/ #include "multimesh_instance.h" - - - - void MultiMeshInstance::_bind_methods() { - ObjectTypeDB::bind_method(_MD("set_multimesh","multimesh"),&MultiMeshInstance::set_multimesh); - ObjectTypeDB::bind_method(_MD("get_multimesh"),&MultiMeshInstance::get_multimesh); - ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"multimesh",PROPERTY_HINT_RESOURCE_TYPE,"MultiMesh"), _SCS("set_multimesh"), _SCS("get_multimesh")); - - + ObjectTypeDB::bind_method(_MD("set_multimesh", "multimesh"), &MultiMeshInstance::set_multimesh); + ObjectTypeDB::bind_method(_MD("get_multimesh"), &MultiMeshInstance::get_multimesh); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "multimesh", PROPERTY_HINT_RESOURCE_TYPE, "MultiMesh"), _SCS("set_multimesh"), _SCS("get_multimesh")); } -void MultiMeshInstance::set_multimesh(const Ref<MultiMesh>& p_multimesh) { +void MultiMeshInstance::set_multimesh(const Ref<MultiMesh> &p_multimesh) { - multimesh=p_multimesh; + multimesh = p_multimesh; if (multimesh.is_valid()) set_base(multimesh->get_rid()); else set_base(RID()); - } Ref<MultiMesh> MultiMeshInstance::get_multimesh() const { @@ -56,8 +49,6 @@ Ref<MultiMesh> MultiMeshInstance::get_multimesh() const { return multimesh; } - - DVector<Face3> MultiMeshInstance::get_faces(uint32_t p_usage_flags) const { return DVector<Face3>(); @@ -72,10 +63,7 @@ AABB MultiMeshInstance::get_aabb() const { } MultiMeshInstance::MultiMeshInstance() { - } MultiMeshInstance::~MultiMeshInstance() { - - } |
