asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CapsuleMesh loading issue (radius reset)

Browse source
This commit is contained in:
tefusion 2022-06-21 22:15:46 +02:00
parent 3ccff61979
commit ad7b3549a5
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/resources/primitive_meshes.cpp
View file

@ -439,12 +439,15 @@ void CapsuleMesh::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "height", PROPERTY_HINT_RANGE, "0.001,100.0,0.001,or_greater,suffix:m"), "set_height", "get_height"); ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "height", PROPERTY_HINT_RANGE, "0.001,100.0,0.001,or_greater,suffix:m"), "set_height", "get_height");
ADD_PROPERTY(PropertyInfo(Variant::INT, "radial_segments", PROPERTY_HINT_RANGE, "1,100,1,or_greater"), "set_radial_segments", "get_radial_segments"); ADD_PROPERTY(PropertyInfo(Variant::INT, "radial_segments", PROPERTY_HINT_RANGE, "1,100,1,or_greater"), "set_radial_segments", "get_radial_segments");
ADD_PROPERTY(PropertyInfo(Variant::INT, "rings", PROPERTY_HINT_RANGE, "1,100,1,or_greater"), "set_rings", "get_rings"); ADD_PROPERTY(PropertyInfo(Variant::INT, "rings", PROPERTY_HINT_RANGE, "1,100,1,or_greater"), "set_rings", "get_rings");
ADD_LINKED_PROPERTY("radius", "height");
ADD_LINKED_PROPERTY("height", "radius");
} }
void CapsuleMesh::set_radius(const float p_radius) { void CapsuleMesh::set_radius(const float p_radius) {
radius = p_radius; radius = p_radius;
if (radius > height * 0.5) { if (radius > height * 0.5) {
radius = height * 0.5; height = radius * 2.0;
} }
_request_update(); _request_update();
} }
@ -456,7 +459,7 @@ float CapsuleMesh::get_radius() const {
void CapsuleMesh::set_height(const float p_height) { void CapsuleMesh::set_height(const float p_height) {
height = p_height; height = p_height;
if (radius > height * 0.5) { if (radius > height * 0.5) {
height = radius * 2; radius = height * 0.5;
} }
_request_update(); _request_update();
} }