summaryrefslogtreecommitdiff
path: root/servers/visual/visual_server_raster.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-09-17 20:03:10 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-09-17 20:03:10 -0300
commit990f6cf50e96213a4b1a2961e61a9b922cd75d71 (patch)
tree600fb659508e8745d7656416b24f89b2157a2630 /servers/visual/visual_server_raster.h
parent76aaa96d0e114d5293efed2fd0378ea390076b7e (diff)
More Bug Fixes
-=-=-=-=-=-=- -Fixed a few bugs in Mixer, now playback of chiptunes works great :) -Changed how visibility AABB generation from skeletons work, it's fully automatic and real-time now, generated from current skeleton pose for the frame. -Fixed camera in 3D kinematic character demo.
Diffstat (limited to 'servers/visual/visual_server_raster.h')
-rw-r--r--servers/visual/visual_server_raster.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h
index 2620225cc2..49e7996c59 100644
--- a/servers/visual/visual_server_raster.h
+++ b/servers/visual/visual_server_raster.h
@@ -610,7 +610,7 @@ class VisualServerRaster : public VisualServer {
void _portal_disconnect(Instance *p_portal,bool p_cleanup=false);
void _portal_attempt_connect(Instance *p_portal);
void _dependency_queue_update(RID p_rid,bool p_update_aabb=false);
- void _instance_queue_update(Instance *p_instance,bool p_update_aabb=false);
+ _FORCE_INLINE_ void _instance_queue_update(Instance *p_instance,bool p_update_aabb=false);
void _update_instances();
void _update_instance_aabb(Instance *p_instance);
void _update_instance(Instance *p_instance);
@@ -640,7 +640,8 @@ class VisualServerRaster : public VisualServer {
mutable RID_Owner<CanvasItem> canvas_item_owner;
Map< RID, Set<RID> > instance_dependency_map;
-
+ Map< RID, Set<Instance*> > skeleton_dependency_map;
+
ViewportRect viewport_rect;
_FORCE_INLINE_ void _instance_draw(Instance *p_instance);