Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2012-02-25 16:56:25 +0000
committerStijn Buys <ingar@osirion.org>2012-02-25 16:56:25 +0000
commite10c0a7602c612993e6b99348bab507b7def0881 (patch)
tree2d863e946024fc3560221bedcddb149b253b4918 /src/editorwindow.cc
parent01f671303b75f3e4c683e3ff47b7ee120f0cda12 (diff)
Add entity manipulator widget, added support for editing entity angles.
Diffstat (limited to 'src/editorwindow.cc')
-rw-r--r--src/editorwindow.cc15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/editorwindow.cc b/src/editorwindow.cc
index ae7d024..bd00189 100644
--- a/src/editorwindow.cc
+++ b/src/editorwindow.cc
@@ -137,7 +137,7 @@ bool EditorWindow::loadFile(const QString &filename)
if (ini.got_key_vector3f("location" , x, y, z)) {
entity->properties()->set_comment("location", ini.comment());
entity->properties()->set_location(x, y, z);
- //qDebug() << "got location " << x << " " << y << " " << z;
+ //qDebug() << "got location " << x << " " << y << " " << z;
} else if (ini.got_key_string("label", str)) {
entity->properties()->set_comment("label", ini.comment());
@@ -150,6 +150,19 @@ bool EditorWindow::loadFile(const QString &filename)
} else if (ini.got_key_float("radius", f)) {
entity->properties()->set_comment("radius", ini.comment());
entity->properties()->set_radius(f);
+
+ } else if (ini.got_key_vector3f("angles" , x, y, z)) {
+ entity->properties()->set_comment(ini.key(), ini.comment());
+ entity->properties()->set_angles(x, y, z);
+
+ } else if (ini.got_key_float("yaw", x)) {
+ entity->properties()->set_yaw(x);
+
+ } else if (ini.got_key_float("pitch", y)) {
+ entity->properties()->set_pitch(y);
+
+ } else if (ini.got_key_float("roll", z)) {
+ entity->properties()->set_roll(z);
} else if (ini.got_key_string("info", str)) {
QString comment = entity->properties()->comment("info");