Blend shapes using transform feedback (GPU)

1 files changed, 24 insertions, 3 deletions

diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp
index 2439eacd7..0f7dabcc1 100644
--- a/servers/visual/visual_server_scene.cpp
+++ b/servers/visual/visual_server_scene.cpp
@@ -738,13 +738,25 @@ void VisualServerScene::instance_attach_object_instance_ID(RID p_instance,Object
 }
 void VisualServerScene::instance_set_morph_target_weight(RID p_instance,int p_shape, float p_weight){
 
+	Instance *instance = instance_owner.get( p_instance );
+	ERR_FAIL_COND( !instance );
+
+	if (instance->update_item.in_list()) {
+		_update_dirty_instance(instance);
+	}
+
+	ERR_FAIL_INDEX(p_shape,instance->morph_values.size());
+	instance->morph_values[p_shape]=p_weight;
 }
+
 void VisualServerScene::instance_set_surface_material(RID p_instance,int p_surface, RID p_material){
 
 	Instance *instance = instance_owner.get( p_instance );
 	ERR_FAIL_COND( !instance );
 
-	_update_dirty_instance(instance);
+	if (instance->update_item.in_list()) {
+		_update_dirty_instance(instance);
+	}
 
 	ERR_FAIL_INDEX(p_surface,instance->materials.size());
 
@@ -770,13 +782,13 @@ void VisualServerScene::instance_attach_skeleton(RID p_instance,RID p_skeleton){
 		return;
 
 	if (instance->skeleton.is_valid()) {
-		VSG::storage->instance_remove_dependency(p_skeleton,instance);
+		VSG::storage->instance_remove_skeleton(p_skeleton,instance);
 	}
 
 	instance->skeleton=p_skeleton;
 
 	if (instance->skeleton.is_valid()) {
-		VSG::storage->instance_add_dependency(p_skeleton,instance);
+		VSG::storage->instance_add_skeleton(p_skeleton,instance);
 	}
 
 	_instance_queue_update(instance,true);
@@ -2227,6 +2239,7 @@ void VisualServerScene::_update_dirty_instance(Instance *p_instance) {
 	if (p_instance->update_aabb)
 		_update_instance_aabb(p_instance);
 
+
 	if (p_instance->update_materials) {
 
 		if (p_instance->base_type==VS::INSTANCE_MESH) {
@@ -2239,6 +2252,14 @@ void VisualServerScene::_update_dirty_instance(Instance *p_instance) {
 				}
 			}
 			p_instance->materials.resize(new_mat_count);
+
+			int new_morph_count = VSG::storage->mesh_get_morph_target_count(p_instance->base);
+			if (new_morph_count!=p_instance->morph_values.size()) {
+				p_instance->morph_values.resize(new_morph_count);
+				for(int i=0;i<new_morph_count;i++) {
+					p_instance->morph_values[i]=0;
+				}
+			}
 		}
 
 		if ((1<<p_instance->base_type)&VS::INSTANCE_GEOMETRY_MASK) {