summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-06-26 23:56:57 +0200
committerGitHub <noreply@github.com>2017-06-26 23:56:57 +0200
commitf1cc3b700a1400a045950af65a5a8f959434befc (patch)
treeeb3dec4e8e45fff8936e59e808d2e6045aea31a8
parentb0516e041230223f8de2ce66c4b6a4ab39021770 (diff)
parentbf6f3881a1e52c205050d6d167d27cfb698149f4 (diff)
Merge pull request #9268 from BastiaanOlij/improve_defaults
Align primitive defaults to default collision shape sizes
-rw-r--r--scene/resources/primitive_meshes.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp
index d4221dcb3f..8d058377db 100644
--- a/scene/resources/primitive_meshes.cpp
+++ b/scene/resources/primitive_meshes.cpp
@@ -359,8 +359,8 @@ int CapsuleMesh::get_rings() const {
CapsuleMesh::CapsuleMesh() {
// defaults
- radius = 0.5;
- mid_height = 0.5;
+ radius = 1.0;
+ mid_height = 1.0;
radial_segments = 64;
rings = 8;
}
@@ -617,7 +617,7 @@ int CubeMesh::get_subdivide_depth() const {
CubeMesh::CubeMesh() {
// defaults
- size = Vector3(1.0, 1.0, 1.0);
+ size = Vector3(2.0, 2.0, 2.0);
subdivide_w = 0;
subdivide_h = 0;
subdivide_d = 0;
@@ -834,9 +834,9 @@ int CylinderMesh::get_rings() const {
CylinderMesh::CylinderMesh() {
// defaults
- top_radius = 0.5;
- bottom_radius = 0.5;
- height = 1.0;
+ top_radius = 1.0;
+ bottom_radius = 1.0;
+ height = 2.0;
radial_segments = 64;
rings = 4;
}
@@ -951,7 +951,7 @@ int PlaneMesh::get_subdivide_depth() const {
PlaneMesh::PlaneMesh() {
// defaults
- size = Size2(1.0, 1.0);
+ size = Size2(2.0, 2.0);
subdivide_w = 0;
subdivide_d = 0;
}
@@ -1242,7 +1242,7 @@ int PrismMesh::get_subdivide_depth() const {
PrismMesh::PrismMesh() {
// defaults
left_to_right = 0.5;
- size = Vector3(1.0, 1.0, 1.0);
+ size = Vector3(2.0, 2.0, 2.0);
subdivide_w = 0;
subdivide_h = 0;
subdivide_d = 0;
@@ -1446,8 +1446,8 @@ bool SphereMesh::get_is_hemisphere() const {
SphereMesh::SphereMesh() {
// defaults
- radius = 0.5;
- height = 1.0;
+ radius = 1.0;
+ height = 2.0;
radial_segments = 64;
rings = 32;
is_hemisphere = false;