1 files changed, 83 insertions, 3 deletions

diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp
index eed26f5399..4d6ebc81c3 100644
--- a/scene/2d/polygon_2d.cpp
+++ b/scene/2d/polygon_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "polygon_2d.h"
 #include "core/math/geometry.h"
-
+#include "skeleton_2d.h"
 Dictionary Polygon2D::_edit_get_state() const {
 	Dictionary state = Node2D::_edit_get_state();
 	state["offset"] = offset;
@@ -91,8 +91,20 @@ void Polygon2D::_notification(int p_what) {
 			if (polygon.size() < 3)
 				return;
 
+			Skeleton2D *skeleton_node = NULL;
+			if (has_node(skeleton)) {
+				skeleton_node = Object::cast_to<Skeleton2D>(get_node(skeleton));
+			}
+
+			if (skeleton_node)
+				VS::get_singleton()->canvas_item_attach_skeleton(get_canvas_item(), skeleton_node->get_skeleton());
+			else
+				VS::get_singleton()->canvas_item_attach_skeleton(get_canvas_item(), RID());
+
 			Vector<Vector2> points;
 			Vector<Vector2> uvs;
+			Vector<int> bones;
+			Vector<float> weights;
 
 			points.resize(polygon.size());
 
@@ -180,6 +192,70 @@ void Polygon2D::_notification(int p_what) {
 				}
 			}
 
+			if (!invert && bone_weights.size()) {
+				//a skeleton is set! fill indices and weights
+				int vc = points.size();
+				bones.resize(vc * 4);
+				weights.resize(vc * 4);
+
+				int *bonesw = bones.ptrw();
+				float *weightsw = weights.ptrw();
+
+				for (int i = 0; i < vc * 4; i++) {
+					bonesw[i] = 0;
+					weightsw[i] = 0;
+				}
+
+				for (int i = 0; i < bone_weights.size(); i++) {
+					if (bone_weights[i].weights.size() != points.size()) {
+						continue; //different number of vertices, sorry not using.
+					}
+					if (!skeleton_node->has_node(bone_weights[i].path)) {
+						continue; //node does not exist
+					}
+					Bone2D *bone = Object::cast_to<Bone2D>(skeleton_node->get_node(bone_weights[i].path));
+					if (!bone) {
+						continue;
+					}
+
+					int bone_index = bone->get_index_in_skeleton();
+					PoolVector<float>::Read r = bone_weights[i].weights.read();
+					for (int j = 0; j < vc; j++) {
+						if (r[j] == 0.0)
+							continue; //weight is unpainted, skip
+						//find an index with a weight
+						for (int k = 0; k < 4; k++) {
+							if (weightsw[j * 4 + k] < r[j]) {
+								//this is less than this weight, insert weight!
+								for (int l = 3; l > k; l--) {
+									weightsw[j * 4 + l] = weightsw[j * 4 + l - 1];
+									bonesw[j * 4 + l] = bonesw[j * 4 + l - 1];
+								}
+								weightsw[j * 4 + k] = r[j];
+								bonesw[j * 4 + k] = bone_index;
+								break;
+							}
+						}
+					}
+				}
+
+				//normalize the weights
+				for (int i = 0; i < vc; i++) {
+					float tw = 0;
+					for (int j = 0; j < 4; j++) {
+						tw += weightsw[i * 4 + j];
+					}
+					if (tw == 0)
+						continue; //unpainted, do nothing
+
+					//normalize
+					for (int j = 0; j < 4; j++) {
+						weightsw[i * 4 + j] /= tw;
+						//						print_line("point " + itos(i) + " idx " + itos(j) + " index: " + itos(bonesw[i * 4 + j]) + " weight: " + rtos(weightsw[i * 4 + j]));
+					}
+				}
+			}
+
 			Vector<Color> colors;
 			int color_len = vertex_colors.size();
 			colors.resize(len);
@@ -197,7 +273,8 @@ void Polygon2D::_notification(int p_what) {
 			//			VS::get_singleton()->canvas_item_add_triangle_array(get_canvas_item(), indices, points, colors, uvs, texture.is_valid() ? texture->get_rid() : RID());
 
 			if (invert || splits.size() == 0) {
-				VS::get_singleton()->canvas_item_add_polygon(get_canvas_item(), points, colors, uvs, texture.is_valid() ? texture->get_rid() : RID(), RID(), antialiased);
+				Vector<int> indices = Geometry::triangulate_polygon(points);
+				VS::get_singleton()->canvas_item_add_triangle_array(get_canvas_item(), indices, points, colors, uvs, bones, weights, texture.is_valid() ? texture->get_rid() : RID());
 			} else {
 				//use splits
 				Vector<int> loop;
@@ -268,7 +345,7 @@ void Polygon2D::_notification(int p_what) {
 
 				//print_line("loops: " + itos(loops.size()) + " indices: " + itos(indices.size()));
 
-				VS::get_singleton()->canvas_item_add_triangle_array(get_canvas_item(), indices, points, colors, uvs, texture.is_valid() ? texture->get_rid() : RID());
+				VS::get_singleton()->canvas_item_add_triangle_array(get_canvas_item(), indices, points, colors, uvs, bones, weights, texture.is_valid() ? texture->get_rid() : RID());
 			}
 
 		} break;
@@ -488,9 +565,12 @@ void Polygon2D::_set_bones(const Array &p_bones) {
 }
 
 void Polygon2D::set_skeleton(const NodePath &p_skeleton) {
+	if (skeleton == p_skeleton)
+		return;
 	skeleton = p_skeleton;
 	update();
 }
+
 NodePath Polygon2D::get_skeleton() const {
 	return skeleton;
 }