diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-05 16:44:50 +0100 |
commit | 5dbf1809c6e3e905b94b8764e99491e608122261 (patch) | |
tree | 5e5a5360db15d86d59ec8c6e4f7eb511388c5a9a /scene/3d/spatial.cpp | |
parent | 45438e9918d421b244bfd7776a30e67dc7f2d3e3 (diff) | |
download | redot-engine-5dbf1809c6e3e905b94b8764e99491e608122261.tar.gz |
A Whole New World (clang-format edition)
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?
I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon
A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format
A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
Diffstat (limited to 'scene/3d/spatial.cpp')
-rw-r--r-- | scene/3d/spatial.cpp | 407 |
1 files changed, 181 insertions, 226 deletions
diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp index 58a6a24567..1125a7a4d2 100644 --- a/scene/3d/spatial.cpp +++ b/scene/3d/spatial.cpp @@ -28,8 +28,8 @@ /*************************************************************************/ #include "spatial.h" -#include "scene/main/viewport.h" #include "message_queue.h" +#include "scene/main/viewport.h" #include "scene/scene_string_names.h" /* @@ -66,10 +66,7 @@ future: no idea */ - - SpatialGizmo::SpatialGizmo() { - } void Spatial::_notify_dirty() { @@ -80,14 +77,12 @@ void Spatial::_notify_dirty() { } } - - void Spatial::_update_local_transform() const { data.local_transform.basis = Basis(); data.local_transform.basis.scale(data.scale); data.local_transform.basis.rotate(data.rotation); - data.dirty&=~DIRTY_LOCAL; + data.dirty &= ~DIRTY_LOCAL; } void Spatial::_propagate_transform_changed(Spatial *p_origin) { @@ -102,48 +97,46 @@ void Spatial::_propagate_transform_changed(Spatial *p_origin) { data.children_lock++; - for (List<Spatial*>::Element *E=data.children.front();E;E=E->next()) { + for (List<Spatial *>::Element *E = data.children.front(); E; E = E->next()) { if (E->get()->data.toplevel_active) continue; //don't propagate to a toplevel E->get()->_propagate_transform_changed(p_origin); } - if (data.notify_transform && !data.ignore_notification && !xform_change.in_list()) { get_tree()->xform_change_list.add(&xform_change); - } - data.dirty|=DIRTY_GLOBAL; + data.dirty |= DIRTY_GLOBAL; data.children_lock--; } void Spatial::_notification(int p_what) { - switch(p_what) { + switch (p_what) { case NOTIFICATION_ENTER_TREE: { Node *p = get_parent(); if (p) - data.parent=p->cast_to<Spatial>(); + data.parent = p->cast_to<Spatial>(); if (data.parent) - data.C=data.parent->data.children.push_back(this); + data.C = data.parent->data.children.push_back(this); else - data.C=NULL; + data.C = NULL; if (data.toplevel && !get_tree()->is_editor_hint()) { if (data.parent) { data.local_transform = data.parent->get_global_transform() * get_transform(); - data.dirty=DIRTY_VECTORS; //global is always dirty upon entering a scene + data.dirty = DIRTY_VECTORS; //global is always dirty upon entering a scene } - data.toplevel_active=true; + data.toplevel_active = true; } - data.dirty|=DIRTY_GLOBAL; //global is always dirty upon entering a scene + data.dirty |= DIRTY_GLOBAL; //global is always dirty upon entering a scene _notify_dirty(); notification(NOTIFICATION_ENTER_WORLD); @@ -151,38 +144,37 @@ void Spatial::_notification(int p_what) { } break; case NOTIFICATION_EXIT_TREE: { - notification(NOTIFICATION_EXIT_WORLD,true); + notification(NOTIFICATION_EXIT_WORLD, true); if (xform_change.in_list()) get_tree()->xform_change_list.remove(&xform_change); if (data.C) data.parent->data.children.erase(data.C); - data.parent=NULL; - data.C=NULL; - data.toplevel_active=false; + data.parent = NULL; + data.C = NULL; + data.toplevel_active = false; } break; case NOTIFICATION_ENTER_WORLD: { - data.inside_world=true; - data.viewport=NULL; + data.inside_world = true; + data.viewport = NULL; Node *parent = get_parent(); - while(parent && !data.viewport) { - data.viewport=parent->cast_to<Viewport>(); - parent=parent->get_parent(); + while (parent && !data.viewport) { + data.viewport = parent->cast_to<Viewport>(); + parent = parent->get_parent(); } ERR_FAIL_COND(!data.viewport); - if (get_script_instance()) { Variant::CallError err; - get_script_instance()->call_multilevel(SceneStringNames::get_singleton()->_enter_world,NULL,0); + get_script_instance()->call_multilevel(SceneStringNames::get_singleton()->_enter_world, NULL, 0); } #ifdef TOOLS_ENABLED if (get_tree()->is_editor_hint()) { //get_scene()->call_group(SceneMainLoop::GROUP_CALL_REALTIME,SceneStringNames::get_singleton()->_spatial_editor_group,SceneStringNames::get_singleton()->_request_gizmo,this); - get_tree()->call_group_flags(0,SceneStringNames::get_singleton()->_spatial_editor_group,SceneStringNames::get_singleton()->_request_gizmo,this); + get_tree()->call_group_flags(0, SceneStringNames::get_singleton()->_spatial_editor_group, SceneStringNames::get_singleton()->_request_gizmo, this); if (!data.gizmo_disabled) { if (data.gizmo.is_valid()) @@ -203,15 +195,14 @@ void Spatial::_notification(int p_what) { if (get_script_instance()) { Variant::CallError err; - get_script_instance()->call_multilevel(SceneStringNames::get_singleton()->_exit_world,NULL,0); + get_script_instance()->call_multilevel(SceneStringNames::get_singleton()->_exit_world, NULL, 0); } - data.viewport=NULL; - data.inside_world=false; + data.viewport = NULL; + data.inside_world = false; } break; - case NOTIFICATION_TRANSFORM_CHANGED: { #ifdef TOOLS_ENABLED @@ -225,10 +216,10 @@ void Spatial::_notification(int p_what) { } } -void Spatial::set_transform(const Transform& p_transform) { +void Spatial::set_transform(const Transform &p_transform) { - data.local_transform=p_transform; - data.dirty|=DIRTY_VECTORS; + data.local_transform = p_transform; + data.dirty |= DIRTY_VECTORS; _change_notify("transform/translation"); _change_notify("transform/rotation"); _change_notify("transform/scale"); @@ -236,23 +227,18 @@ void Spatial::set_transform(const Transform& p_transform) { if (data.notify_local_transform) { notification(NOTIFICATION_LOCAL_TRANSFORM_CHANGED); } - - - } -void Spatial::set_global_transform(const Transform& p_transform) { +void Spatial::set_global_transform(const Transform &p_transform) { Transform xform = (data.parent && !data.toplevel_active) ? - data.parent->get_global_transform().affine_inverse() * p_transform : - p_transform; + data.parent->get_global_transform().affine_inverse() * p_transform : + p_transform; set_transform(xform); - } - Transform Spatial::get_transform() const { if (data.dirty & DIRTY_LOCAL) { @@ -275,13 +261,13 @@ Transform Spatial::get_global_transform() const { if (data.parent && !data.toplevel_active) { - data.global_transform=data.parent->get_global_transform() * data.local_transform; + data.global_transform = data.parent->get_global_transform() * data.local_transform; } else { - data.global_transform=data.local_transform; + data.global_transform = data.local_transform; } - data.dirty&=~DIRTY_GLOBAL; + data.dirty &= ~DIRTY_GLOBAL; } return data.global_transform; @@ -321,88 +307,83 @@ void Spatial::remove_child_notify(Node *p_child) { Spatial *Spatial::get_parent_spatial() const { return data.parent; - } Transform Spatial::get_relative_transform(const Node *p_parent) const { - if (p_parent==this) + if (p_parent == this) return Transform(); - ERR_FAIL_COND_V(!data.parent,Transform()); + ERR_FAIL_COND_V(!data.parent, Transform()); - if (p_parent==data.parent) + if (p_parent == data.parent) return get_transform(); else return data.parent->get_relative_transform(p_parent) * get_transform(); - } -void Spatial::set_translation(const Vector3& p_translation) { +void Spatial::set_translation(const Vector3 &p_translation) { - data.local_transform.origin=p_translation; + data.local_transform.origin = p_translation; _propagate_transform_changed(this); if (data.notify_local_transform) { notification(NOTIFICATION_LOCAL_TRANSFORM_CHANGED); } - } -void Spatial::set_rotation(const Vector3& p_euler_rad){ +void Spatial::set_rotation(const Vector3 &p_euler_rad) { - if (data.dirty&DIRTY_VECTORS) { - data.scale=data.local_transform.basis.get_scale(); - data.dirty&=~DIRTY_VECTORS; + if (data.dirty & DIRTY_VECTORS) { + data.scale = data.local_transform.basis.get_scale(); + data.dirty &= ~DIRTY_VECTORS; } - data.rotation=p_euler_rad; - data.dirty|=DIRTY_LOCAL; + data.rotation = p_euler_rad; + data.dirty |= DIRTY_LOCAL; _propagate_transform_changed(this); if (data.notify_local_transform) { notification(NOTIFICATION_LOCAL_TRANSFORM_CHANGED); } - } -void Spatial::set_rotation_in_degrees(const Vector3& p_euler_deg) { +void Spatial::set_rotation_in_degrees(const Vector3 &p_euler_deg) { set_rotation(p_euler_deg * Math_PI / 180.0); } -void Spatial::_set_rotation_deg(const Vector3& p_euler_deg) { +void Spatial::_set_rotation_deg(const Vector3 &p_euler_deg) { WARN_PRINT("Deprecated method Spatial._set_rotation_deg(): This method was renamed to set_rotation_deg. Please adapt your code accordingly, as the old method will be obsoleted."); set_rotation_in_degrees(p_euler_deg); } -void Spatial::set_scale(const Vector3& p_scale){ +void Spatial::set_scale(const Vector3 &p_scale) { - if (data.dirty&DIRTY_VECTORS) { - data.rotation=data.local_transform.basis.get_rotation(); - data.dirty&=~DIRTY_VECTORS; + if (data.dirty & DIRTY_VECTORS) { + data.rotation = data.local_transform.basis.get_rotation(); + data.dirty &= ~DIRTY_VECTORS; } - data.scale=p_scale; - data.dirty|=DIRTY_LOCAL; + data.scale = p_scale; + data.dirty |= DIRTY_LOCAL; _propagate_transform_changed(this); if (data.notify_local_transform) { notification(NOTIFICATION_LOCAL_TRANSFORM_CHANGED); } - } -Vector3 Spatial::get_translation() const{ +Vector3 Spatial::get_translation() const { return data.local_transform.origin; } -Vector3 Spatial::get_rotation() const{ +Vector3 Spatial::get_rotation() const { - if (data.dirty&DIRTY_VECTORS) { - data.scale=data.local_transform.basis.get_scale(); - data.rotation=data.local_transform.basis.get_rotation(); + if (data.dirty & DIRTY_VECTORS) { + data.scale = data.local_transform.basis.get_scale(); + data.rotation = data.local_transform.basis.get_rotation(); - data.dirty&=~DIRTY_VECTORS; + data.dirty &= ~DIRTY_VECTORS; } return data.rotation; @@ -421,19 +402,18 @@ Vector3 Spatial::_get_rotation_deg() const { return get_rotation_in_degrees(); } -Vector3 Spatial::get_scale() const{ +Vector3 Spatial::get_scale() const { - if (data.dirty&DIRTY_VECTORS) { - data.scale=data.local_transform.basis.get_scale(); - data.rotation=data.local_transform.basis.get_rotation(); + if (data.dirty & DIRTY_VECTORS) { + data.scale = data.local_transform.basis.get_scale(); + data.rotation = data.local_transform.basis.get_rotation(); - data.dirty&=~DIRTY_VECTORS; + data.dirty &= ~DIRTY_VECTORS; } return data.scale; } - void Spatial::update_gizmo() { #ifdef TOOLS_ENABLED @@ -443,12 +423,12 @@ void Spatial::update_gizmo() { return; if (data.gizmo_dirty) return; - data.gizmo_dirty=true; - MessageQueue::get_singleton()->push_call(this,"_update_gizmo"); + data.gizmo_dirty = true; + MessageQueue::get_singleton()->push_call(this, "_update_gizmo"); #endif } -void Spatial::set_gizmo(const Ref<SpatialGizmo>& p_gizmo) { +void Spatial::set_gizmo(const Ref<SpatialGizmo> &p_gizmo) { #ifdef TOOLS_ENABLED @@ -456,7 +436,7 @@ void Spatial::set_gizmo(const Ref<SpatialGizmo>& p_gizmo) { return; if (data.gizmo.is_valid() && is_inside_world()) data.gizmo->free(); - data.gizmo=p_gizmo; + data.gizmo = p_gizmo; if (data.gizmo.is_valid() && is_inside_world()) { data.gizmo->create(); @@ -482,7 +462,7 @@ Ref<SpatialGizmo> Spatial::get_gizmo() const { void Spatial::_update_gizmo() { - data.gizmo_dirty=false; + data.gizmo_dirty = false; if (data.gizmo.is_valid()) { if (is_visible_in_tree()) data.gizmo->redraw(); @@ -491,19 +471,18 @@ void Spatial::_update_gizmo() { } } - void Spatial::set_disable_gizmo(bool p_enabled) { - data.gizmo_disabled=p_enabled; + data.gizmo_disabled = p_enabled; if (!p_enabled && data.gizmo.is_valid()) - data.gizmo=Ref<SpatialGizmo>(); + data.gizmo = Ref<SpatialGizmo>(); } #endif void Spatial::set_as_toplevel(bool p_enabled) { - if (data.toplevel==p_enabled) + if (data.toplevel == p_enabled) return; if (is_inside_tree() && !get_tree()->is_editor_hint()) { @@ -512,30 +491,28 @@ void Spatial::set_as_toplevel(bool p_enabled) { else if (data.parent) set_transform(data.parent->get_global_transform().affine_inverse() * get_global_transform()); - data.toplevel=p_enabled; - data.toplevel_active=p_enabled; + data.toplevel = p_enabled; + data.toplevel_active = p_enabled; } else { - data.toplevel=p_enabled; + data.toplevel = p_enabled; } - } -bool Spatial::is_set_as_toplevel() const{ +bool Spatial::is_set_as_toplevel() const { return data.toplevel; } Ref<World> Spatial::get_world() const { - ERR_FAIL_COND_V(!is_inside_world(),Ref<World>()); + ERR_FAIL_COND_V(!is_inside_world(), Ref<World>()); return data.viewport->find_world(); - } #ifdef TOOLS_ENABLED -void Spatial::set_import_transform(const Transform& p_transform) { - data.import_transform=p_transform; +void Spatial::set_import_transform(const Transform &p_transform) { + data.import_transform = p_transform; } Transform Spatial::get_import_transform() const { @@ -544,7 +521,6 @@ Transform Spatial::get_import_transform() const { } #endif - void Spatial::_propagate_visibility_changed() { notification(NOTIFICATION_VISIBILITY_CHANGED); @@ -555,22 +531,21 @@ void Spatial::_propagate_visibility_changed() { _update_gizmo(); #endif - for (List<Spatial*>::Element*E=data.children.front();E;E=E->next()) { + for (List<Spatial *>::Element *E = data.children.front(); E; E = E->next()) { - Spatial *c=E->get(); + Spatial *c = E->get(); if (!c || !c->data.visible) continue; c->_propagate_visibility_changed(); } } - void Spatial::show() { if (data.visible) return; - data.visible=true; + data.visible = true; if (!is_inside_tree()) return; @@ -581,35 +556,33 @@ void Spatial::show() { } } -void Spatial::hide(){ +void Spatial::hide() { if (!data.visible) return; bool was_visible = is_visible_in_tree(); - data.visible=false; + data.visible = false; if (!data.parent || was_visible) { _propagate_visibility_changed(); } - } -bool Spatial::is_visible_in_tree() const{ +bool Spatial::is_visible_in_tree() const { - const Spatial *s=this; + const Spatial *s = this; - while(s) { + while (s) { if (!s->data.visible) { return false; } - s=s->data.parent; + s = s->data.parent; } return true; } - void Spatial::set_visible(bool p_visible) { if (p_visible) @@ -623,64 +596,57 @@ bool Spatial::is_visible() const { return data.visible; } -void Spatial::rotate(const Vector3& p_normal,float p_radians) { +void Spatial::rotate(const Vector3 &p_normal, float p_radians) { - Transform t =get_transform(); - t.basis.rotate(p_normal,p_radians); + Transform t = get_transform(); + t.basis.rotate(p_normal, p_radians); set_transform(t); } void Spatial::rotate_x(float p_radians) { - Transform t =get_transform(); - t.basis.rotate(Vector3(1,0,0),p_radians); + Transform t = get_transform(); + t.basis.rotate(Vector3(1, 0, 0), p_radians); set_transform(t); - } -void Spatial::rotate_y(float p_radians){ +void Spatial::rotate_y(float p_radians) { - Transform t =get_transform(); - t.basis.rotate(Vector3(0,1,0),p_radians); + Transform t = get_transform(); + t.basis.rotate(Vector3(0, 1, 0), p_radians); set_transform(t); - } -void Spatial::rotate_z(float p_radians){ +void Spatial::rotate_z(float p_radians) { - Transform t =get_transform(); - t.basis.rotate(Vector3(0,0,1),p_radians); + Transform t = get_transform(); + t.basis.rotate(Vector3(0, 0, 1), p_radians); set_transform(t); - } -void Spatial::translate(const Vector3& p_offset){ +void Spatial::translate(const Vector3 &p_offset) { - Transform t =get_transform(); + Transform t = get_transform(); t.translate(p_offset); set_transform(t); - } -void Spatial::scale(const Vector3& p_ratio){ +void Spatial::scale(const Vector3 &p_ratio) { - Transform t =get_transform(); + Transform t = get_transform(); t.basis.scale(p_ratio); set_transform(t); - } -void Spatial::global_rotate(const Vector3& p_normal,float p_radians){ +void Spatial::global_rotate(const Vector3 &p_normal, float p_radians) { - Basis rotation(p_normal,p_radians); + Basis rotation(p_normal, p_radians); Transform t = get_global_transform(); - t.basis= rotation * t.basis; + t.basis = rotation * t.basis; set_global_transform(t); - } -void Spatial::global_translate(const Vector3& p_offset){ +void Spatial::global_translate(const Vector3 &p_offset) { Transform t = get_global_transform(); - t.origin+=p_offset; + t.origin += p_offset; set_global_transform(t); - } void Spatial::orthonormalize() { @@ -688,44 +654,40 @@ void Spatial::orthonormalize() { Transform t = get_transform(); t.orthonormalize(); set_transform(t); - } void Spatial::set_identity() { set_transform(Transform()); - } - -void Spatial::look_at(const Vector3& p_target, const Vector3& p_up_normal) { +void Spatial::look_at(const Vector3 &p_target, const Vector3 &p_up_normal) { Transform lookat; - lookat.origin=get_global_transform().origin; - if (lookat.origin==p_target) { + lookat.origin = get_global_transform().origin; + if (lookat.origin == p_target) { ERR_EXPLAIN("Node origin and target are in the same position, look_at() failed"); ERR_FAIL(); } - if (p_up_normal.cross(p_target-lookat.origin)==Vector3()) { + if (p_up_normal.cross(p_target - lookat.origin) == Vector3()) { ERR_EXPLAIN("Up vector and direction between node origin and target are aligned, look_at() failed"); ERR_FAIL(); } - lookat=lookat.looking_at(p_target,p_up_normal); + lookat = lookat.looking_at(p_target, p_up_normal); set_global_transform(lookat); } -void Spatial::look_at_from_pos(const Vector3& p_pos,const Vector3& p_target, const Vector3& p_up_normal) { +void Spatial::look_at_from_pos(const Vector3 &p_pos, const Vector3 &p_target, const Vector3 &p_up_normal) { Transform lookat; - lookat.origin=p_pos; - lookat=lookat.looking_at(p_target,p_up_normal); + lookat.origin = p_pos; + lookat = lookat.looking_at(p_target, p_up_normal); set_global_transform(lookat); - } void Spatial::set_notify_transform(bool p_enable) { - data.notify_transform=p_enable; + data.notify_transform = p_enable; } bool Spatial::is_transform_notification_enabled() const { @@ -733,7 +695,7 @@ bool Spatial::is_transform_notification_enabled() const { } void Spatial::set_notify_local_transform(bool p_enable) { - data.notify_local_transform=p_enable; + data.notify_local_transform = p_enable; } bool Spatial::is_local_transform_notification_enabled() const { @@ -742,37 +704,37 @@ bool Spatial::is_local_transform_notification_enabled() const { void Spatial::_bind_methods() { - ClassDB::bind_method(D_METHOD("set_transform","local"), &Spatial::set_transform); + ClassDB::bind_method(D_METHOD("set_transform", "local"), &Spatial::set_transform); ClassDB::bind_method(D_METHOD("get_transform"), &Spatial::get_transform); - ClassDB::bind_method(D_METHOD("set_translation","translation"), &Spatial::set_translation); + ClassDB::bind_method(D_METHOD("set_translation", "translation"), &Spatial::set_translation); ClassDB::bind_method(D_METHOD("get_translation"), &Spatial::get_translation); - ClassDB::bind_method(D_METHOD("set_rotation","rotation_rad"), &Spatial::set_rotation); + ClassDB::bind_method(D_METHOD("set_rotation", "rotation_rad"), &Spatial::set_rotation); ClassDB::bind_method(D_METHOD("get_rotation"), &Spatial::get_rotation); - ClassDB::bind_method(D_METHOD("set_rotation_deg","rotation_deg"), &Spatial::set_rotation_in_degrees); + ClassDB::bind_method(D_METHOD("set_rotation_deg", "rotation_deg"), &Spatial::set_rotation_in_degrees); ClassDB::bind_method(D_METHOD("get_rotation_deg"), &Spatial::get_rotation_in_degrees); - ClassDB::bind_method(D_METHOD("set_scale","scale"), &Spatial::set_scale); + ClassDB::bind_method(D_METHOD("set_scale", "scale"), &Spatial::set_scale); ClassDB::bind_method(D_METHOD("get_scale"), &Spatial::get_scale); - ClassDB::bind_method(D_METHOD("set_global_transform","global"), &Spatial::set_global_transform); + ClassDB::bind_method(D_METHOD("set_global_transform", "global"), &Spatial::set_global_transform); ClassDB::bind_method(D_METHOD("get_global_transform"), &Spatial::get_global_transform); ClassDB::bind_method(D_METHOD("get_parent_spatial"), &Spatial::get_parent_spatial); - ClassDB::bind_method(D_METHOD("set_ignore_transform_notification","enabled"), &Spatial::set_ignore_transform_notification); - ClassDB::bind_method(D_METHOD("set_as_toplevel","enable"), &Spatial::set_as_toplevel); + ClassDB::bind_method(D_METHOD("set_ignore_transform_notification", "enabled"), &Spatial::set_ignore_transform_notification); + ClassDB::bind_method(D_METHOD("set_as_toplevel", "enable"), &Spatial::set_as_toplevel); ClassDB::bind_method(D_METHOD("is_set_as_toplevel"), &Spatial::is_set_as_toplevel); ClassDB::bind_method(D_METHOD("get_world:World"), &Spatial::get_world); // TODO: Obsolete those two methods (old name) properly (GH-4397) - ClassDB::bind_method(D_METHOD("_set_rotation_deg","rotation_deg"), &Spatial::_set_rotation_deg); + ClassDB::bind_method(D_METHOD("_set_rotation_deg", "rotation_deg"), &Spatial::_set_rotation_deg); ClassDB::bind_method(D_METHOD("_get_rotation_deg"), &Spatial::_get_rotation_deg); #ifdef TOOLS_ENABLED ClassDB::bind_method(D_METHOD("_update_gizmo"), &Spatial::_update_gizmo); ClassDB::bind_method(D_METHOD("_set_import_transform"), &Spatial::set_import_transform); ClassDB::bind_method(D_METHOD("_get_import_transform"), &Spatial::get_import_transform); - ADD_PROPERTY( PropertyInfo(Variant::TRANSFORM,"_import_transform",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_import_transform","_get_import_transform"); + ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM, "_import_transform", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "_set_import_transform", "_get_import_transform"); #endif ClassDB::bind_method(D_METHOD("update_gizmo"), &Spatial::update_gizmo); - ClassDB::bind_method(D_METHOD("set_gizmo","gizmo:SpatialGizmo"), &Spatial::set_gizmo); + ClassDB::bind_method(D_METHOD("set_gizmo", "gizmo:SpatialGizmo"), &Spatial::set_gizmo); ClassDB::bind_method(D_METHOD("get_gizmo:SpatialGizmo"), &Spatial::get_gizmo); ClassDB::bind_method(D_METHOD("set_visible"), &Spatial::set_visible); @@ -781,84 +743,77 @@ void Spatial::_bind_methods() { ClassDB::bind_method(D_METHOD("show"), &Spatial::show); ClassDB::bind_method(D_METHOD("hide"), &Spatial::hide); - ClassDB::bind_method(D_METHOD("set_notify_local_transform","enable"), &Spatial::set_notify_local_transform); + ClassDB::bind_method(D_METHOD("set_notify_local_transform", "enable"), &Spatial::set_notify_local_transform); ClassDB::bind_method(D_METHOD("is_local_transform_notification_enabled"), &Spatial::is_local_transform_notification_enabled); - ClassDB::bind_method(D_METHOD("set_notify_transform","enable"), &Spatial::set_notify_transform); + ClassDB::bind_method(D_METHOD("set_notify_transform", "enable"), &Spatial::set_notify_transform); ClassDB::bind_method(D_METHOD("is_transform_notification_enabled"), &Spatial::is_transform_notification_enabled); - void rotate(const Vector3& p_normal,float p_radians); + void rotate(const Vector3 &p_normal, float p_radians); void rotate_x(float p_radians); void rotate_y(float p_radians); void rotate_z(float p_radians); - void translate(const Vector3& p_offset); - void scale(const Vector3& p_ratio); - void global_rotate(const Vector3& p_normal,float p_radians); - void global_translate(const Vector3& p_offset); - - ClassDB::bind_method( D_METHOD("rotate","normal","radians"),&Spatial::rotate ); - ClassDB::bind_method( D_METHOD("global_rotate","normal","radians"),&Spatial::global_rotate ); - ClassDB::bind_method( D_METHOD("rotate_x","radians"),&Spatial::rotate_x ); - ClassDB::bind_method( D_METHOD("rotate_y","radians"),&Spatial::rotate_y ); - ClassDB::bind_method( D_METHOD("rotate_z","radians"),&Spatial::rotate_z ); - ClassDB::bind_method( D_METHOD("translate","offset"),&Spatial::translate ); - ClassDB::bind_method( D_METHOD("global_translate","offset"),&Spatial::global_translate ); - ClassDB::bind_method( D_METHOD("orthonormalize"),&Spatial::orthonormalize ); - ClassDB::bind_method( D_METHOD("set_identity"),&Spatial::set_identity ); - - ClassDB::bind_method( D_METHOD("look_at","target","up"),&Spatial::look_at ); - ClassDB::bind_method( D_METHOD("look_at_from_pos","pos","target","up"),&Spatial::look_at_from_pos ); - - BIND_CONSTANT( NOTIFICATION_TRANSFORM_CHANGED ); - BIND_CONSTANT( NOTIFICATION_ENTER_WORLD ); - BIND_CONSTANT( NOTIFICATION_EXIT_WORLD ); - BIND_CONSTANT( NOTIFICATION_VISIBILITY_CHANGED ); + void translate(const Vector3 &p_offset); + void scale(const Vector3 &p_ratio); + void global_rotate(const Vector3 &p_normal, float p_radians); + void global_translate(const Vector3 &p_offset); + + ClassDB::bind_method(D_METHOD("rotate", "normal", "radians"), &Spatial::rotate); + ClassDB::bind_method(D_METHOD("global_rotate", "normal", "radians"), &Spatial::global_rotate); + ClassDB::bind_method(D_METHOD("rotate_x", "radians"), &Spatial::rotate_x); + ClassDB::bind_method(D_METHOD("rotate_y", "radians"), &Spatial::rotate_y); + ClassDB::bind_method(D_METHOD("rotate_z", "radians"), &Spatial::rotate_z); + ClassDB::bind_method(D_METHOD("translate", "offset"), &Spatial::translate); + ClassDB::bind_method(D_METHOD("global_translate", "offset"), &Spatial::global_translate); + ClassDB::bind_method(D_METHOD("orthonormalize"), &Spatial::orthonormalize); + ClassDB::bind_method(D_METHOD("set_identity"), &Spatial::set_identity); + + ClassDB::bind_method(D_METHOD("look_at", "target", "up"), &Spatial::look_at); + ClassDB::bind_method(D_METHOD("look_at_from_pos", "pos", "target", "up"), &Spatial::look_at_from_pos); + + BIND_CONSTANT(NOTIFICATION_TRANSFORM_CHANGED); + BIND_CONSTANT(NOTIFICATION_ENTER_WORLD); + BIND_CONSTANT(NOTIFICATION_EXIT_WORLD); + BIND_CONSTANT(NOTIFICATION_VISIBILITY_CHANGED); //ADD_PROPERTY( PropertyInfo(Variant::TRANSFORM,"transform/global",PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR ), "set_global_transform", "get_global_transform") ; - ADD_GROUP("Transform",""); - ADD_PROPERTYNZ( PropertyInfo(Variant::TRANSFORM,"transform",PROPERTY_HINT_NONE,""), "set_transform", "get_transform") ; - ADD_PROPERTYNZ( PropertyInfo(Variant::TRANSFORM,"global_transform",PROPERTY_HINT_NONE,"",0), "set_global_transform", "get_global_transform") ; - ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"translation",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_EDITOR), "set_translation", "get_translation") ; - ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"rotation_deg",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_EDITOR), "set_rotation_deg", "get_rotation_deg") ; - ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"rotation",PROPERTY_HINT_NONE,"",0), "set_rotation", "get_rotation") ; - ADD_PROPERTY( PropertyInfo(Variant::VECTOR3,"scale",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_EDITOR), "set_scale", "get_scale") ; - ADD_GROUP("Visibility",""); - ADD_PROPERTYNO( PropertyInfo(Variant::BOOL,"visible"), "set_visible", "is_visible") ; + ADD_GROUP("Transform", ""); + ADD_PROPERTYNZ(PropertyInfo(Variant::TRANSFORM, "transform", PROPERTY_HINT_NONE, ""), "set_transform", "get_transform"); + ADD_PROPERTYNZ(PropertyInfo(Variant::TRANSFORM, "global_transform", PROPERTY_HINT_NONE, "", 0), "set_global_transform", "get_global_transform"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "translation", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "set_translation", "get_translation"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "rotation_deg", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "set_rotation_deg", "get_rotation_deg"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "rotation", PROPERTY_HINT_NONE, "", 0), "set_rotation", "get_rotation"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "scale", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "set_scale", "get_scale"); + ADD_GROUP("Visibility", ""); + ADD_PROPERTYNO(PropertyInfo(Variant::BOOL, "visible"), "set_visible", "is_visible"); //ADD_PROPERTY( PropertyInfo(Variant::TRANSFORM,"transform/local"), "set_transform", "get_transform") ; - ADD_SIGNAL( MethodInfo("visibility_changed" ) ); - + ADD_SIGNAL(MethodInfo("visibility_changed")); } +Spatial::Spatial() + : xform_change(this) { -Spatial::Spatial() : xform_change(this) -{ + data.dirty = DIRTY_NONE; + data.children_lock = 0; - data.dirty=DIRTY_NONE; - data.children_lock=0; - - data.ignore_notification=false; - data.toplevel=false; - data.toplevel_active=false; - data.scale=Vector3(1,1,1); - data.viewport=NULL; - data.inside_world=false; - data.visible=true; + data.ignore_notification = false; + data.toplevel = false; + data.toplevel_active = false; + data.scale = Vector3(1, 1, 1); + data.viewport = NULL; + data.inside_world = false; + data.visible = true; #ifdef TOOLS_ENABLED - data.gizmo_disabled=false; - data.gizmo_dirty=false; + data.gizmo_disabled = false; + data.gizmo_dirty = false; #endif - data.notify_local_transform=false; - data.notify_transform=false; - data.parent=NULL; - data.C=NULL; - + data.notify_local_transform = false; + data.notify_transform = false; + data.parent = NULL; + data.C = NULL; } - Spatial::~Spatial() { - } - - |