diff options
author | Juan Linietsky <reduzio@gmail.com> | 2014-09-02 23:13:40 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2014-09-02 23:13:40 -0300 |
commit | 1a2cb755e2d8b9d59178f36702f6dff7235b9088 (patch) | |
tree | 4a88f47c8b984522e36ac973accb34bdcb00363b /tools/editor/scene_tree_editor.h | |
parent | 89fa70706f9166765c3ac3f799225a467800f065 (diff) |
3D Physics and Other Stuff
-=-=-=-=-=-=-=-=-=-=-=-=-=
-New Vehicle (Based on Bullet's RaycastVehicle) - Vehiclebody/VehicleWheel. Demo will come soon, old vehicle (CarBody) will go away soon too.
-A lot of fixes to the 3D physics engine
-Added KinematicBody with demo
-Fixed the space query API for 2D (demo will come soon). 3D is WIP.
-Fixed long-standing bug with body_enter/body_exit for Area and Area2D
-Performance variables now includes physics (active bodies, collision pairs and islands)
-Ability to see what's inside of instanced scenes!
-Fixed Blend Shapes (no bs+skeleton yet)
-Added an Android JavaClassWrapper singleton for using Android native classes directly from GDScript. This is very Alpha!
Diffstat (limited to 'tools/editor/scene_tree_editor.h')
-rw-r--r-- | tools/editor/scene_tree_editor.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tools/editor/scene_tree_editor.h b/tools/editor/scene_tree_editor.h index 19375ba638..5e88c5a41d 100644 --- a/tools/editor/scene_tree_editor.h +++ b/tools/editor/scene_tree_editor.h @@ -51,8 +51,15 @@ class SceneTreeEditor : public Control { BUTTON_GROUP=4, }; + enum { + SCENE_MENU_SHOW_CHILDREN, + SCENE_MENU_OPEN, + }; + Tree *tree; Node *selected; + PopupMenu *instance_menu; + ObjectID instance_node; AcceptDialog *error; @@ -78,6 +85,7 @@ class SceneTreeEditor : public Control { bool can_rename; bool can_open_instance; bool updating_tree; + bool show_enabled_subscene; void _renamed(); UndoRedo *undo_redo; @@ -95,6 +103,7 @@ class SceneTreeEditor : public Control { void _update_selection(TreeItem *item); void _node_script_changed(Node *p_node); void _node_visibility_changed(Node *p_node); + void _subscene_option(int p_idx); void _selection_changed(); Node *get_scene_node(); @@ -112,6 +121,8 @@ public: void set_can_rename(bool p_can_rename) { can_rename=p_can_rename; } void set_editor_selection(EditorSelection *p_selection); + void set_show_enabled_subscene(bool p_show) { show_enabled_subscene=p_show; } + void update_tree() { _update_tree(); } SceneTreeEditor(bool p_label=true,bool p_can_rename=false, bool p_can_open_instance=false); |