From 4d73bb78eac9fa6367f1fb2ea815dc02c9a8b71d Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 22 Feb 2022 19:07:49 +0100 Subject: [PATCH] Update for the new prop 2d api. --- props_2d/prop_2d_data_mesh_data.cpp | 8 ++++---- props_2d/prop_2d_data_mesh_data.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/props_2d/prop_2d_data_mesh_data.cpp b/props_2d/prop_2d_data_mesh_data.cpp index 8884330..698b87c 100644 --- a/props_2d/prop_2d_data_mesh_data.cpp +++ b/props_2d/prop_2d_data_mesh_data.cpp @@ -69,7 +69,7 @@ bool Prop2DDataMeshData::_processor_handles(Node *node) { return i; } -void Prop2DDataMeshData::_processor_process(Ref prop_data, Node *node, const Transform &transform) { +void Prop2DDataMeshData::_processor_process(Ref prop_data, Node *node, const Transform2D &transform) { MeshDataInstance *i = Object::cast_to(node); ERR_FAIL_COND(!i); @@ -78,11 +78,11 @@ void Prop2DDataMeshData::_processor_process(Ref prop_data, Node *nod m.instance(); m->set_mesh(i->get_mesh_data()); m->set_texture(i->get_texture()); - m->set_transform(transform * i->get_transform()); + //m->set_transform(transform * i->get_transform()); prop_data->add_prop(m); } -Node *Prop2DDataMeshData::_processor_get_node_for(const Transform &transform) { +Node *Prop2DDataMeshData::_processor_get_node_for(const Transform2D &transform) { MeshDataInstance *i = memnew(MeshDataInstance); Ref m; @@ -91,7 +91,7 @@ Node *Prop2DDataMeshData::_processor_get_node_for(const Transform &transform) { i->set_material(m); i->set_texture(get_texture()); i->set_mesh_data(get_mesh()); - i->set_transform(get_transform()); + //i->set_transform(get_transform()); return i; } diff --git a/props_2d/prop_2d_data_mesh_data.h b/props_2d/prop_2d_data_mesh_data.h index bf7d14e..1846ac9 100644 --- a/props_2d/prop_2d_data_mesh_data.h +++ b/props_2d/prop_2d_data_mesh_data.h @@ -59,8 +59,8 @@ public: #endif bool _processor_handles(Node *node); - void _processor_process(Ref prop_data, Node *node, const Transform &transform); - Node *_processor_get_node_for(const Transform &transform); + void _processor_process(Ref prop_data, Node *node, const Transform2D &transform); + Node *_processor_get_node_for(const Transform2D &transform); Prop2DDataMeshData(); ~Prop2DDataMeshData();