1 files changed, 16 insertions, 32 deletions

diff --git a/src/mainwin.cc b/src/mainwin.cc
index 0280bbe..da6149c 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -964,7 +964,7 @@ void MainWindow::pasteViewportTranslation()
 {
 	QTextCursor cursor = editor->textCursor();
 	QString txt;
-	txt.sprintf("[ %.2f, %.2f, %.2f ]", -this->qglview->object_trans.x(), -this->qglview->object_trans.y(), -this->qglview->object_trans.z());
+	txt.sprintf("[ %.2f, %.2f, %.2f ]", -qglview->gcam.object_trans.x(), -qglview->gcam.object_trans.y(), -qglview->gcam.object_trans.z());
 	cursor.insertText(txt);
 }
 
@@ -973,7 +973,7 @@ void MainWindow::pasteViewportRotation()
 	QTextCursor cursor = editor->textCursor();
 	QString txt;
 	txt.sprintf("[ %.2f, %.2f, %.2f ]",
-		fmodf(360 - this->qglview->object_rot.x() + 90, 360), fmodf(360 - this->qglview->object_rot.y(), 360), fmodf(360 - this->qglview->object_rot.z(), 360));
+		fmodf(360 - qglview->gcam.object_rot.x() + 90, 360), fmodf(360 - qglview->gcam.object_rot.y(), 360), fmodf(360 - qglview->gcam.object_rot.z(), 360));
 	cursor.insertText(txt);
 }
 
@@ -982,15 +982,15 @@ void MainWindow::updateTemporalVariables()
 	this->root_ctx.set_variable("$t", Value(this->e_tval->text().toDouble()));
 	
 	Value::VectorType vpt;
-	vpt.push_back(Value(-this->qglview->object_trans.x()));
-	vpt.push_back(Value(-this->qglview->object_trans.y()));
-	vpt.push_back(Value(-this->qglview->object_trans.z()));
+	vpt.push_back(Value(-qglview->gcam.object_trans.x()));
+	vpt.push_back(Value(-qglview->gcam.object_trans.y()));
+	vpt.push_back(Value(-qglview->gcam.object_trans.z()));
 	this->root_ctx.set_variable("$vpt", Value(vpt));
 	
 	Value::VectorType vpr;
-	vpr.push_back(Value(fmodf(360 - this->qglview->object_rot.x() + 90, 360)));
-	vpr.push_back(Value(fmodf(360 - this->qglview->object_rot.y(), 360)));
-	vpr.push_back(Value(fmodf(360 - this->qglview->object_rot.z(), 360)));
+	vpr.push_back(Value(fmodf(360 - qglview->gcam.object_rot.x() + 90, 360)));
+	vpr.push_back(Value(fmodf(360 - qglview->gcam.object_rot.y(), 360)));
+	vpr.push_back(Value(fmodf(360 - qglview->gcam.object_rot.z(), 360)));
 	root_ctx.set_variable("$vpr", Value(vpr));
 }
 
@@ -1617,65 +1617,49 @@ void MainWindow::animateUpdate()
 
 void MainWindow::viewAngleTop()
 {
-	this->qglview->object_rot.x() = 90;
-	this->qglview->object_rot.y() = 0;
-	this->qglview->object_rot.z() = 0;
+	qglview->gcam.object_rot << 90,0,0;
 	this->qglview->updateGL();
 }
 
 void MainWindow::viewAngleBottom()
 {
-	this->qglview->object_rot.x() = 270;
-	this->qglview->object_rot.y() = 0;
-	this->qglview->object_rot.z() = 0;
+	qglview->gcam.object_rot << 270,0,0;
 	this->qglview->updateGL();
 }
 
 void MainWindow::viewAngleLeft()
 {
-	this->qglview->object_rot.x() = 0;
-	this->qglview->object_rot.y() = 0;
-	this->qglview->object_rot.z() = 90;
+	qglview->gcam.object_rot << 0,0,90;
 	this->qglview->updateGL();
 }
 
 void MainWindow::viewAngleRight()
 {
-	this->qglview->object_rot.x() = 0;
-	this->qglview->object_rot.y() = 0;
-	this->qglview->object_rot.z() = 270;
+	qglview->gcam.object_rot << 0,0,270;
 	this->qglview->updateGL();
 }
 
 void MainWindow::viewAngleFront()
 {
-	this->qglview->object_rot.x() = 0;
-	this->qglview->object_rot.y() = 0;
-	this->qglview->object_rot.z() = 0;
+	qglview->gcam.object_rot << 0,0,0;
 	this->qglview->updateGL();
 }
 
 void MainWindow::viewAngleBack()
 {
-	this->qglview->object_rot.x() = 0;
-	this->qglview->object_rot.y() = 0;
-	this->qglview->object_rot.z() = 180;
+	qglview->gcam.object_rot << 0,0,180;
 	this->qglview->updateGL();
 }
 
 void MainWindow::viewAngleDiagonal()
 {
-	this->qglview->object_rot.x() = 35;
-	this->qglview->object_rot.y() = 0;
-	this->qglview->object_rot.z() = -25;
+	qglview->gcam.object_rot << 35,0,-25;
 	this->qglview->updateGL();
 }
 
 void MainWindow::viewCenter()
 {
-	this->qglview->object_trans.x() = 0;
-	this->qglview->object_trans.y() = 0;
-	this->qglview->object_trans.z() = 0;
+	qglview->gcam.object_trans << 0,0,0;
 	this->qglview->updateGL();
 }