summaryrefslogtreecommitdiff
path: root/servers/visual/visual_server_scene.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-08-26 00:40:45 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-08-26 00:47:28 -0300
commit1894157c9fab05984428d83a743b0fe1d720c80c (patch)
tree817530eb75258c3dc6c73d4eb276af7b61761b06 /servers/visual/visual_server_scene.h
parentd9e94fa0c308f8f157e71fb03bab5834308b56ee (diff)
-Massive clean up to gizmos
-Make sure handles are always visible (on top) -Fixed instanced scene selection (should work properly now) -Added interpolated camera -Customizable gizmo colors in editor settings
Diffstat (limited to 'servers/visual/visual_server_scene.h')
-rw-r--r--servers/visual/visual_server_scene.h42
1 files changed, 1 insertions, 41 deletions
diff --git a/servers/visual/visual_server_scene.h b/servers/visual/visual_server_scene.h
index 910e75c3e3..177521e267 100644
--- a/servers/visual/visual_server_scene.h
+++ b/servers/visual/visual_server_scene.h
@@ -137,38 +137,6 @@ public:
virtual void camera_set_environment(RID p_camera, RID p_env);
virtual void camera_set_use_vertical_aspect(RID p_camera, bool p_enable);
- /*
-
- struct RoomInfo {
-
- Transform affine_inverse;
- Room *room;
- List<Instance*> owned_geometry_instances;
- List<Instance*> owned_portal_instances;
- List<Instance*> owned_room_instances;
- List<Instance*> owned_light_instances; //not used, but just for the sake of it
- Set<Instance*> disconnected_child_portals;
- Set<Instance*> owned_autoroom_geometry;
- uint64_t last_visited_pass;
- RoomInfo() { last_visited_pass=0; }
-
- };
-
- struct InstancePortal {
-
- Portal *portal;
- Set<Instance*> candidate_set;
- Instance *connected;
- uint64_t last_visited_pass;
-
- Plane plane_cache;
- Vector<Vector3> transformed_point_cache;
-
-
- PortalInfo() { connected=NULL; last_visited_pass=0;}
- };
-*/
-
/* SCENARIO API */
struct Instance;
@@ -236,10 +204,6 @@ public:
float lod_end_hysteresis;
RID lod_instance;
- Instance *room;
- SelfList<Instance> room_item;
- bool visible_in_all_rooms;
-
uint64_t last_render_pass;
uint64_t last_frame_pass;
@@ -263,7 +227,7 @@ public:
}
Instance()
- : scenario_item(this), update_item(this), room_item(this) {
+ : scenario_item(this), update_item(this) {
octree_id = 0;
scenario = NULL;
@@ -281,9 +245,6 @@ public:
lod_begin_hysteresis = 0;
lod_end_hysteresis = 0;
- room = NULL;
- visible_in_all_rooms = false;
-
last_render_pass = 0;
last_frame_pass = 0;
version = 1;
@@ -496,7 +457,6 @@ public:
virtual void instance_attach_skeleton(RID p_instance, RID p_skeleton);
virtual void instance_set_exterior(RID p_instance, bool p_enabled);
- virtual void instance_set_room(RID p_instance, RID p_room);
virtual void instance_set_extra_visibility_margin(RID p_instance, real_t p_margin);