1 files changed, 33 insertions, 16 deletions

diff --git a/scene/2d/polygon_2d.h b/scene/2d/polygon_2d.h
index 07b8828532..777c1f82f3 100644
--- a/scene/2d/polygon_2d.h
+++ b/scene/2d/polygon_2d.h
@@ -37,21 +37,26 @@ class Polygon2D : public Node2D {
 
 	GDCLASS(Polygon2D, Node2D);
 
-	PoolVector<Vector2> polygon;
-	PoolVector<Vector2> uv;
-	PoolVector<Color> vertex_colors;
+	Vector<Vector2> polygon;
+	Vector<Vector2> uv;
+	Vector<Color> vertex_colors;
 	Array polygons;
 	int internal_vertices;
 
 	struct Bone {
 		NodePath path;
-		PoolVector<float> weights;
+		Vector<float> weights;
 	};
 
 	Vector<Bone> bone_weights;
 
 	Color color;
-	Ref<Texture> texture;
+	Ref<Texture2D> texture;
+	Ref<Texture2D> normal_map;
+	Ref<Texture2D> specular_map;
+	Color specular_color;
+	float shininess;
+
 	Size2 tex_scale;
 	Vector2 tex_ofs;
 	bool tex_tile;
@@ -90,14 +95,14 @@ public:
 	virtual bool _edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const;
 #endif
 
-	void set_polygon(const PoolVector<Vector2> &p_polygon);
-	PoolVector<Vector2> get_polygon() const;
+	void set_polygon(const Vector<Vector2> &p_polygon);
+	Vector<Vector2> get_polygon() const;
 
 	void set_internal_vertex_count(int p_count);
 	int get_internal_vertex_count() const;
 
-	void set_uv(const PoolVector<Vector2> &p_uv);
-	PoolVector<Vector2> get_uv() const;
+	void set_uv(const Vector<Vector2> &p_uv);
+	Vector<Vector2> get_uv() const;
 
 	void set_polygons(const Array &p_polygons);
 	Array get_polygons() const;
@@ -105,11 +110,23 @@ public:
 	void set_color(const Color &p_color);
 	Color get_color() const;
 
-	void set_vertex_colors(const PoolVector<Color> &p_colors);
-	PoolVector<Color> get_vertex_colors() const;
+	void set_vertex_colors(const Vector<Color> &p_colors);
+	Vector<Color> get_vertex_colors() const;
+
+	void set_texture(const Ref<Texture2D> &p_texture);
+	Ref<Texture2D> get_texture() const;
+
+	void set_normal_map(const Ref<Texture2D> &p_normal_map);
+	Ref<Texture2D> get_normal_map() const;
+
+	void set_specular_map(const Ref<Texture2D> &p_specular_map);
+	Ref<Texture2D> get_specular_map() const;
+
+	void set_specular_color(const Color &p_specular_color);
+	Color get_specular_color() const;
 
-	void set_texture(const Ref<Texture> &p_texture);
-	Ref<Texture> get_texture() const;
+	void set_shininess(float p_shininess);
+	float get_shininess() const;
 
 	void set_texture_offset(const Vector2 &p_offset);
 	Vector2 get_texture_offset() const;
@@ -135,13 +152,13 @@ public:
 	void set_offset(const Vector2 &p_offset);
 	Vector2 get_offset() const;
 
-	void add_bone(const NodePath &p_path = NodePath(), const PoolVector<float> &p_weights = PoolVector<float>());
+	void add_bone(const NodePath &p_path = NodePath(), const Vector<float> &p_weights = Vector<float>());
 	int get_bone_count() const;
 	NodePath get_bone_path(int p_index) const;
-	PoolVector<float> get_bone_weights(int p_index) const;
+	Vector<float> get_bone_weights(int p_index) const;
 	void erase_bone(int p_idx);
 	void clear_bones();
-	void set_bone_weights(int p_index, const PoolVector<float> &p_weights);
+	void set_bone_weights(int p_index, const Vector<float> &p_weights);
 	void set_bone_path(int p_index, const NodePath &p_path);
 
 	void set_skeleton(const NodePath &p_skeleton);