godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21538 from jmf/master 

Fix CSGBox size
This commit is contained in:
Rémi Verschelde 2018-08-29 15:03:01 +02:00 committed by GitHub
parent 27ae49ea29 11c90b0bb3
commit 907b7a3897
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/csg/csg_gizmos.cpp
View File

@ -139,9 +139,9 @@ void CSGShapeSpatialGizmoPlugin::set_handle(EditorSpatialGizmo *p_gizmo, int p_i
d = 0.001; d = 0.001;
switch (p_idx) { switch (p_idx) {
case 0: s->set_width(d); break; case 0: s->set_width(d * 2); break;
case 1: s->set_height(d); break; case 1: s->set_height(d * 2); break;
case 2: s->set_depth(d); break; case 2: s->set_depth(d * 2); break;
} }
} }
@ -329,9 +329,9 @@ void CSGShapeSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
CSGBox *s = Object::cast_to<CSGBox>(cs); CSGBox *s = Object::cast_to<CSGBox>(cs);
Vector<Vector3> handles; Vector<Vector3> handles;
handles.push_back(Vector3(s->get_width(), 0, 0)); handles.push_back(Vector3(s->get_width() * 0.5, 0, 0));
handles.push_back(Vector3(0, s->get_height(), 0)); handles.push_back(Vector3(0, s->get_height() * 0.5, 0));
handles.push_back(Vector3(0, 0, s->get_depth())); handles.push_back(Vector3(0, 0, s->get_depth() * 0.5));
p_gizmo->add_handles(handles, handles_material); p_gizmo->add_handles(handles, handles_material);
} }

8
modules/csg/csg_shape.cpp
View File

@ -917,7 +917,7 @@ CSGBrush *CSGBox::_build_brush() {
int face = 0; int face = 0;
Vector3 vertex_mul(width, height, depth); Vector3 vertex_mul(width * 0.5, height * 0.5, depth * 0.5);
{ {
@ -1051,9 +1051,9 @@ Ref<Material> CSGBox::get_material() const {
CSGBox::CSGBox() { CSGBox::CSGBox() {
// defaults // defaults
width = 1.0; width = 2.0;
height = 1.0; height = 2.0;
depth = 1.0; depth = 2.0;
} }
/////////////// ///////////////