diff --git a/qglengine/qglview_test/qglview_window.cpp b/qglengine/qglview_test/qglview_window.cpp
index d2df073..ace6511 100644
--- a/qglengine/qglview_test/qglview_window.cpp
+++ b/qglengine/qglview_test/qglview_window.cpp
@@ -215,33 +215,6 @@ void QGLViewWindow::view_keyEvent(Qt::Key k, Qt::KeyboardModifiers m) {
}
-void QGLViewWindow::on_actionAdd_plane_triggered() {
- ObjectBase * o = new ObjectBase(Primitive::plane());
- o->setName("plane");
- view->addObject(o->clone());
- delete o;
-}
-
-
-void QGLViewWindow::on_actionAdd_cube_triggered() {
- ObjectBase * o = new ObjectBase(Primitive::cube());
- o->setName("cube");
- view->addObject(o->clone());
- delete o;
-}
-
-
-void QGLViewWindow::on_actionAdd_sphere_triggered() {
- int seg_xy = 16, seg_z = 16;
- seg_xy = QInputDialog::getInt(this, "New sphere", "XY segments:", seg_xy, 1, 200);
- seg_z = QInputDialog::getInt(this, "New sphere", "Z segments:", seg_z , 1, 200);
- ObjectBase * o = new ObjectBase(Primitive::ellipsoid(seg_xy, seg_z));
- o->setName("sphere");
- view->addObject(o->clone());
- delete o;
-}
-
-
void QGLViewWindow::on_actionArrow_triggered(bool on) {
actionArrow ->setChecked(true);
actionMove ->setChecked(false);
diff --git a/qglengine/qglview_test/qglview_window.h b/qglengine/qglview_test/qglview_window.h
index 1d61f9c..9670b4e 100644
--- a/qglengine/qglview_test/qglview_window.h
+++ b/qglengine/qglview_test/qglview_window.h
@@ -95,10 +95,6 @@ private slots:
void on_pushButton_2_clicked() {view->view()->reloadShaders();}
- void on_actionAdd_plane_triggered();
- void on_actionAdd_cube_triggered();
- void on_actionAdd_sphere_triggered();
-
void on_actionArrow_triggered(bool on);
void on_actionMove_triggered(bool on);
void on_actionRotate_triggered(bool on);
diff --git a/qglengine/qglview_test/qglview_window.ui b/qglengine/qglview_test/qglview_window.ui
index e228f57..91eaaa2 100644
--- a/qglengine/qglview_test/qglview_window.ui
+++ b/qglengine/qglview_test/qglview_window.ui
@@ -80,8 +80,8 @@
0
0
- 934
- 737
+ 945
+ 636
@@ -741,7 +741,7 @@
0
0
1107
- 24
+ 21
@@ -865,21 +859,6 @@
Ctrl+Shift+S
-
-
- Add cube
-
-
-
-
- Add sphere
-
-
-
-
- Add plane
-
-
true
diff --git a/qglengine/renderer_material.cpp b/qglengine/renderer_material.cpp
index 6eab9f6..c111e87 100644
--- a/qglengine/renderer_material.cpp
+++ b/qglengine/renderer_material.cpp
@@ -32,7 +32,7 @@ RendererMaterial::RendererMaterial(Renderer * r_): r(r_),
fbo_mat_thumb(r->view, 6, true , GL_RGBA16F) {
mat_sphere = Primitive::ellipsoid(16, 16);
mat_camera = new Camera();
- mat_camera->setPos(QVector3D(1, 1, 1));
+ mat_camera->setPos(QVector3D(2, 2, 2));
mat_camera->setAim(QVector3D());
mat_camera->setFOV(45.);
mat_light = new Light();
diff --git a/qglengine/renderer_service.cpp b/qglengine/renderer_service.cpp
index 520236a..40b089c 100644
--- a/qglengine/renderer_service.cpp
+++ b/qglengine/renderer_service.cpp
@@ -92,11 +92,11 @@ RendererService::RendererService(Renderer * r_): r(r_) {
delete m;
handle_scale_mesh = Primitive::cylinder(12, 0.06, 0.85);
- m = Primitive::ellipsoid(12, 12, 0.3);
+ m = Primitive::ellipsoid(12, 12, 0.15);
m->translatePoints(QVector3D(0., 0., 0.85));
handle_scale_mesh->append(m);
delete m;
- handle_scale_3_mesh = Primitive::ellipsoid(12, 12, 0.4);
+ handle_scale_3_mesh = Primitive::ellipsoid(12, 12, 0.2);
handle_move_mesh ->scalePoints(7.5);
handle_ms_2_mesh ->scalePoints(7.5);