From 1ec46cb1ebfb868f378e56d590656c655904eaaa Mon Sep 17 00:00:00 2001 From: QbieShay Date: Sun, 16 May 2021 14:20:24 +0200 Subject: [PATCH] added offset for plane mesh and quad mesh --- doc/classes/PlaneMesh.xml | 3 +++ doc/classes/QuadMesh.xml | 3 +++ scene/resources/primitive_meshes.cpp | 39 +++++++++++++++++++++++----- scene/resources/primitive_meshes.h | 8 ++++++ 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/doc/classes/PlaneMesh.xml b/doc/classes/PlaneMesh.xml index 59492f10f4c..9febe9579bf 100644 --- a/doc/classes/PlaneMesh.xml +++ b/doc/classes/PlaneMesh.xml @@ -12,6 +12,9 @@ + + Offset from the origin of the generated plane. Useful for particles. + Size of the generated plane. diff --git a/doc/classes/QuadMesh.xml b/doc/classes/QuadMesh.xml index f24fa9f60bc..f302b826b38 100644 --- a/doc/classes/QuadMesh.xml +++ b/doc/classes/QuadMesh.xml @@ -13,6 +13,9 @@ + + Offset of the generated Quad. Useful for particles. + Size on the X and Y axes. diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index 49cc499daea..d4d30182406 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -266,7 +266,7 @@ PrimitiveMesh::~PrimitiveMesh() { } /** - CapsuleMesh + CapsuleMesh */ void CapsuleMesh::_create_mesh_array(Array &p_arr) const { @@ -982,7 +982,7 @@ void PlaneMesh::_create_mesh_array(Array &p_arr) const { u /= (subdivide_w + 1.0); v /= (subdivide_d + 1.0); - points.push_back(Vector3(-x, 0.0, -z)); + points.push_back(Vector3(-x, 0.0, -z) + center_offset); normals.push_back(Vector3(0.0, 1.0, 0.0)); ADD_TANGENT(1.0, 0.0, 0.0, 1.0); uvs.push_back(Vector2(1.0 - u, 1.0 - v)); /* 1.0 - uv to match orientation with Quad */ @@ -1020,10 +1020,13 @@ void PlaneMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("get_subdivide_width"), &PlaneMesh::get_subdivide_width); ClassDB::bind_method(D_METHOD("set_subdivide_depth", "subdivide"), &PlaneMesh::set_subdivide_depth); ClassDB::bind_method(D_METHOD("get_subdivide_depth"), &PlaneMesh::get_subdivide_depth); + ClassDB::bind_method(D_METHOD("set_center_offset", "offset"), &PlaneMesh::set_center_offset); + ClassDB::bind_method(D_METHOD("get_center_offset"), &PlaneMesh::get_center_offset); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "size"), "set_size", "get_size"); ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_width", "get_subdivide_width"); ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_depth", "get_subdivide_depth"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "center_offset"), "set_center_offset", "get_center_offset"); } void PlaneMesh::set_size(const Size2 &p_size) { @@ -1053,11 +1056,21 @@ int PlaneMesh::get_subdivide_depth() const { return subdivide_d; } +void PlaneMesh::set_center_offset(const Vector3 p_offset) { + center_offset = p_offset; + _request_update(); +} + +Vector3 PlaneMesh::get_center_offset() const { + return center_offset; +} + PlaneMesh::PlaneMesh() { // defaults size = Size2(2.0, 2.0); subdivide_w = 0; subdivide_d = 0; + center_offset = Vector3(0.0, 0.0, 0.0); } /** @@ -1365,10 +1378,10 @@ void QuadMesh::_create_mesh_array(Array &p_arr) const { Vector2 _size = Vector2(size.x / 2.0f, size.y / 2.0f); Vector3 quad_faces[4] = { - Vector3(-_size.x, -_size.y, 0), - Vector3(-_size.x, _size.y, 0), - Vector3(_size.x, _size.y, 0), - Vector3(_size.x, -_size.y, 0), + Vector3(-_size.x, -_size.y, 0) + center_offset, + Vector3(-_size.x, _size.y, 0) + center_offset, + Vector3(_size.x, _size.y, 0) + center_offset, + Vector3(_size.x, -_size.y, 0) + center_offset, }; static const int indices[6] = { @@ -1404,12 +1417,17 @@ void QuadMesh::_create_mesh_array(Array &p_arr) const { void QuadMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("set_size", "size"), &QuadMesh::set_size); ClassDB::bind_method(D_METHOD("get_size"), &QuadMesh::get_size); + ClassDB::bind_method(D_METHOD("set_center_offset", "center_offset"), &QuadMesh::set_center_offset); + ClassDB::bind_method(D_METHOD("get_center_offset"), &QuadMesh::get_center_offset); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "size"), "set_size", "get_size"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "center_offset"), "set_center_offset", "get_center_offset"); } QuadMesh::QuadMesh() { primitive_type = PRIMITIVE_TRIANGLES; size = Size2(1.0, 1.0); + center_offset = Vector3(0.0, 0.0, 0.0); } void QuadMesh::set_size(const Size2 &p_size) { @@ -1421,6 +1439,15 @@ Size2 QuadMesh::get_size() const { return size; } +void QuadMesh::set_center_offset(Vector3 p_center_offset) { + center_offset = p_center_offset; + _request_update(); +} + +Vector3 QuadMesh::get_center_offset() const { + return center_offset; +} + /** SphereMesh */ diff --git a/scene/resources/primitive_meshes.h b/scene/resources/primitive_meshes.h index 811ecf6694d..ebbe1513164 100644 --- a/scene/resources/primitive_meshes.h +++ b/scene/resources/primitive_meshes.h @@ -205,6 +205,7 @@ private: Size2 size; int subdivide_w; int subdivide_d; + Vector3 center_offset; protected: static void _bind_methods(); @@ -220,6 +221,9 @@ public: void set_subdivide_depth(const int p_divisions); int get_subdivide_depth() const; + void set_center_offset(const Vector3 p_offset); + Vector3 get_center_offset() const; + PlaneMesh(); }; @@ -268,6 +272,7 @@ class QuadMesh : public PrimitiveMesh { private: Size2 size; + Vector3 center_offset; protected: static void _bind_methods(); @@ -278,6 +283,9 @@ public: void set_size(const Size2 &p_size); Size2 get_size() const; + + void set_center_offset(const Vector3 p_offset); + Vector3 get_center_offset() const; }; /**