Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Instancing is working! (hooray)

Browse source
This commit is contained in:
Juan Linietsky 2016-11-22 01:26:56 -03:00
parent 70d095d8f2
commit 943d27f46d
14 changed files with 726 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scene/resources/multimesh.h
View file

@ -39,7 +39,6 @@ class MultiMesh : public Resource {
public:
enum TransformFormat {
TRANSFORM_NONE = VS::MULTIMESH_TRANSFORM_NONE,
TRANSFORM_2D = VS::MULTIMESH_TRANSFORM_2D,
TRANSFORM_3D = VS::MULTIMESH_TRANSFORM_3D
};
@ -50,7 +49,6 @@ public:
COLOR_FLOAT = VS::MULTIMESH_COLOR_FLOAT,
};
private:
AABB aabb;
Ref<Mesh> mesh;
RID multimesh;
TransformFormat transform_format;
@ -87,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();