Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)

1 files changed, 27 insertions, 5 deletions

diff --git a/scene/resources/multimesh.h b/scene/resources/multimesh.h
index 448b4b3413..85c8718aa7 100644
--- a/scene/resources/multimesh.h
+++ b/scene/resources/multimesh.h
@@ -30,16 +30,31 @@
 #define MULTIMESH_H
 
 #include "scene/resources/mesh.h"
-
+#include "servers/visual_server.h"
 
 class MultiMesh : public Resource {
 
 	OBJ_TYPE( MultiMesh, Resource );
 	RES_BASE_EXTENSION("mmsh");
+public:
 
-	AABB aabb;
+	enum TransformFormat {
+		TRANSFORM_2D = VS::MULTIMESH_TRANSFORM_2D,
+		TRANSFORM_3D = VS::MULTIMESH_TRANSFORM_3D
+	};
+
+	enum ColorFormat {
+		COLOR_NONE = VS::MULTIMESH_COLOR_NONE,
+		COLOR_8BIT = VS::MULTIMESH_COLOR_8BIT,
+		COLOR_FLOAT = VS::MULTIMESH_COLOR_FLOAT,
+	};
+private:
 	Ref<Mesh> mesh;
 	RID multimesh;
+	TransformFormat transform_format;
+	ColorFormat color_format;
+
+
 protected:
 
 	static void _bind_methods();
@@ -55,6 +70,12 @@ public:
 	void set_mesh(const Ref<Mesh>& p_mesh);
 	Ref<Mesh> get_mesh() const;
 
+	void set_color_format(ColorFormat p_color_format);
+	ColorFormat get_color_format() const;
+
+	void set_transform_format(TransformFormat p_transform_format);
+	TransformFormat get_transform_format() const;
+
 	void set_instance_count(int p_count);
 	int get_instance_count() const;
 
@@ -64,11 +85,8 @@ public:
 	void set_instance_color(int p_instance, const Color& p_color);
 	Color get_instance_color(int p_instance) const;
 
-	void set_aabb(const AABB& p_aabb);
 	virtual AABB get_aabb() const;
 
-	void generate_aabb();
-
 	virtual RID get_rid() const;
 
 	MultiMesh();
@@ -76,4 +94,8 @@ public:
 
 };
 
+
+VARIANT_ENUM_CAST( MultiMesh::TransformFormat );
+VARIANT_ENUM_CAST( MultiMesh::ColorFormat);
+
 #endif // MULTI_MESH_H