|
@@ -45,7 +45,7 @@ class EditorNode3DGizmo : public Node3DGizmo {
|
|
|
|
|
|
struct Instance {
|
|
struct Instance {
|
|
RID instance;
|
|
RID instance;
|
|
- Ref<ArrayMesh> mesh;
|
|
|
|
|
|
+ Ref<Mesh> mesh;
|
|
Ref<Material> material;
|
|
Ref<Material> material;
|
|
Ref<SkinReference> skin_reference;
|
|
Ref<SkinReference> skin_reference;
|
|
bool extra_margin = false;
|
|
bool extra_margin = false;
|
|
@@ -95,7 +95,7 @@ protected:
|
|
public:
|
|
public:
|
|
void add_lines(const Vector<Vector3> &p_lines, const Ref<Material> &p_material, bool p_billboard = false, const Color &p_modulate = Color(1, 1, 1));
|
|
void add_lines(const Vector<Vector3> &p_lines, const Ref<Material> &p_material, bool p_billboard = false, const Color &p_modulate = Color(1, 1, 1));
|
|
void add_vertices(const Vector<Vector3> &p_vertices, const Ref<Material> &p_material, Mesh::PrimitiveType p_primitive_type, bool p_billboard = false, const Color &p_modulate = Color(1, 1, 1));
|
|
void add_vertices(const Vector<Vector3> &p_vertices, const Ref<Material> &p_material, Mesh::PrimitiveType p_primitive_type, bool p_billboard = false, const Color &p_modulate = Color(1, 1, 1));
|
|
- void add_mesh(const Ref<ArrayMesh> &p_mesh, const Ref<Material> &p_material = Ref<Material>(), const Transform3D &p_xform = Transform3D(), const Ref<SkinReference> &p_skin_reference = Ref<SkinReference>());
|
|
|
|
|
|
+ void add_mesh(const Ref<Mesh> &p_mesh, const Ref<Material> &p_material = Ref<Material>(), const Transform3D &p_xform = Transform3D(), const Ref<SkinReference> &p_skin_reference = Ref<SkinReference>());
|
|
void add_collision_segments(const Vector<Vector3> &p_lines);
|
|
void add_collision_segments(const Vector<Vector3> &p_lines);
|
|
void add_collision_triangles(const Ref<TriangleMesh> &p_tmesh);
|
|
void add_collision_triangles(const Ref<TriangleMesh> &p_tmesh);
|
|
void add_unscaled_billboard(const Ref<Material> &p_material, real_t p_scale = 1, const Color &p_modulate = Color(1, 1, 1));
|
|
void add_unscaled_billboard(const Ref<Material> &p_material, real_t p_scale = 1, const Color &p_modulate = Color(1, 1, 1));
|