From e1ca4c711a5b54653f58f6320f193bae1be62f61 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 30 Apr 2012 15:27:10 +0000 Subject: Corrected parameter order of the entity angles key --- src/editorwindow.cc | 4 +++- src/entityproperties.cc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/editorwindow.cc b/src/editorwindow.cc index ee71577..f9a01c0 100644 --- a/src/editorwindow.cc +++ b/src/editorwindow.cc @@ -159,8 +159,10 @@ bool EditorWindow::loadFile(const QString &filename) entity->properties()->set_radius(f); } else if (ini.got_key_vector3f("angles" , x, y, z)) { + // the angles key param order is pitch yaw roll + // the in-memory order is yaw pitch roll entity->properties()->set_comment(ini.key(), ini.comment()); - entity->properties()->set_angles(x, y, z); + entity->properties()->set_angles(y, x, z); } else if (ini.got_key_float("yaw", x)) { entity->properties()->set_yaw(x); diff --git a/src/entityproperties.cc b/src/entityproperties.cc index 4303b75..533c1fc 100644 --- a/src/entityproperties.cc +++ b/src/entityproperties.cc @@ -107,7 +107,7 @@ void EntityProperties::save(QTextStream &textstream) // angles save_comment(textstream, "angles"); - textstream << "angles=" << angles().x() << " " << angles().y() << " " << angles().z() << '\n'; + textstream << "angles=" << angles().y() << " " << angles().x() << " " << angles().z() << '\n'; // radius save_comment(textstream, "radius"); -- cgit v1.2.3