summaryrefslogtreecommitdiff
path: root/src/mainwin.cc
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2012-07-15 01:57:55 (GMT)
committerMarius Kintel <marius@kintel.net>2012-07-15 01:57:55 (GMT)
commit13557f1f9a44caccb0546717065ed72c27a210b3 (patch)
treed0ed7bd176d7c0b052431cb99efd358602d6b6bb /src/mainwin.cc
parent38a4585d1a9abe9c779c5d0677bfc81c407db371 (diff)
parent2495df6bab07f14f0eed7062dec17d24599aa838 (diff)
Merge branch 'timestamp-cache'
Diffstat (limited to 'src/mainwin.cc')
-rw-r--r--src/mainwin.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc
index 22bc498..3fdee6b 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -99,6 +99,8 @@
#define OPENCSG_VERSION_STRING "unknown, <1.3.2"
#endif
+extern QString examplesdir;
+
// Global application state
unsigned int GuiLocker::gui_locked = 0;
@@ -976,19 +978,17 @@ void MainWindow::updateTemporalVariables()
{
this->root_ctx.set_variable("$t", Value(this->e_tval->text().toDouble()));
- Value vpt;
- vpt.type = Value::VECTOR;
- vpt.append(new Value(-this->glview->object_trans_x));
- vpt.append(new Value(-this->glview->object_trans_y));
- vpt.append(new Value(-this->glview->object_trans_z));
- this->root_ctx.set_variable("$vpt", vpt);
+ Value::VectorType vpt;
+ vpt.push_back(Value(-this->glview->object_trans_x));
+ vpt.push_back(Value(-this->glview->object_trans_y));
+ vpt.push_back(Value(-this->glview->object_trans_z));
+ this->root_ctx.set_variable("$vpt", Value(vpt));
- Value vpr;
- vpr.type = Value::VECTOR;
- vpr.append(new Value(fmodf(360 - this->glview->object_rot_x + 90, 360)));
- vpr.append(new Value(fmodf(360 - this->glview->object_rot_y, 360)));
- vpr.append(new Value(fmodf(360 - this->glview->object_rot_z, 360)));
- root_ctx.set_variable("$vpr", vpr);
+ Value::VectorType vpr;
+ vpr.push_back(Value(fmodf(360 - this->glview->object_rot_x + 90, 360)));
+ vpr.push_back(Value(fmodf(360 - this->glview->object_rot_y, 360)));
+ vpr.push_back(Value(fmodf(360 - this->glview->object_rot_z, 360)));
+ root_ctx.set_variable("$vpr", Value(vpr));
}
bool MainWindow::fileChangedOnDisk()
contact: Jan Huwald // Impressum