From 1e73f5e41ad49151ed0e7753ed867a5e59489e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 12 Dec 2019 18:23:03 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@695 a8b55f48-bf90-11e4-a774-851b48703e85 --- qglengine/core/glprimitives.cpp | 4 ++-- qglengine/renderer_service.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qglengine/core/glprimitives.cpp b/qglengine/core/glprimitives.cpp index 4bdfb55..4b1ea63 100644 --- a/qglengine/core/glprimitives.cpp +++ b/qglengine/core/glprimitives.cpp @@ -264,10 +264,10 @@ Mesh * Primitive::cylinder(int segments, float radius, float height, float end_a Mesh * Primitive::arrow(int segments, float thick, float angle) { - double cone_r = 2. * thick; + double cone_r = 1.5 * thick; double cone_h = 1.5 * cone_r / tan(angle * deg2rad); Mesh * ret = new Mesh(); - Mesh * m = Primitive::cylinder(segments, thick, 1. - cone_h); + Mesh * m = Primitive::cylinder(segments, thick / 2., 1. - cone_h); ret->append(m); delete m; m = Primitive::cone(segments, cone_r, cone_h); diff --git a/qglengine/renderer_service.cpp b/qglengine/renderer_service.cpp index 40b089c..40b0ab3 100644 --- a/qglengine/renderer_service.cpp +++ b/qglengine/renderer_service.cpp @@ -56,8 +56,8 @@ RendererService::RendererService(Renderer * r_): r(r_) { size_vp_scale = size_full_scale = 1.; box_mesh = Primitive::cube(0.8, 0.8, 0.8); box_mesh_f = Primitive::cubeFrame(0.8, 0.8, 0.8); - omni_mesh = Primitive::ellipsoid(2, 1); - omni_mesh_f = Primitive::ellipsoidFrame(2, 1); + omni_mesh = Primitive::ellipsoid(2, 1, 0.5); + omni_mesh_f = Primitive::ellipsoidFrame(2, 1, 0.5); omni_mesh ->scalePoints(1.5); omni_mesh_f->scalePoints(1.5); cone_mesh = Primitive::cone(8, 0.5, 1.);