KOTOR: Add methods to convert between coordinate systems and use them

xoreos · Dec 13, 2017 · 72f4b23 · 72f4b23
1 parent 570b95d
commit 72f4b23
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/src/engines/kotor/gui/gui.cpp b/src/engines/kotor/gui/gui.cpp
@@ -77,6 +77,16 @@ void GUI::hide() {
 	::Engines::GUI::hide();
 }
 
+void GUI::convertToXoreos(float &x, float &y, const float widgetHeight) const {
+	x = x - (_guiWidth / 2.0f);
+	y = (_guiHeight / 2.0f) - y - widgetHeight;
+}
+
+void GUI::convertToGUI(float &x, float &y, const float widgetHeight) const {
+	x = x + (_guiWidth / 2.0f);
+	y = widgetHeight + (-1.0f * (y - (_guiHeight / 2.0f)));
+}
+
 void GUI::mouseDown() {
 	CursorMan.setState("down");
 }
@@ -113,8 +123,7 @@ void GUI::loadWidget(const Aurora::GFF3Struct &strct, Widget *parent) {
 	float wX, wY, wZ;
 	ctx.widget->getPosition(wX, wY, wZ);
 
-	wX = wX - (_guiWidth / 2.0f);
-	wY = ((_guiHeight - wY) - ctx.widget->getHeight()) - (_guiHeight / 2.0f);
+	convertToXoreos(wX, wY, ctx.widget->getHeight());
 	wZ = _widgetZ + wZ;
 
 	ctx.widget->setPosition(wX, wY, wZ);

diff --git a/src/engines/kotor/gui/gui.h b/src/engines/kotor/gui/gui.h
@@ -62,6 +62,19 @@ class GUI : public Engines::GUI {
 	virtual void show(); ///< Show the GUI.
 	virtual void hide(); ///< Hide the GUI.
 
+	/**
+	 * Converts Kotor' GUI coordinates with a coordinate origin
+	 * in the upper left corner to the Xoreos coordinate system
+	 * with the coordinate origin in the center.
+	 */
+	void convertToXoreos(float &x, float &y, const float widgetHeight) const;
+	/**
+	 * Converts Xoreos' coordinates with a coordinate origin
+	 * in the center to Kotor's GUI coordinates
+	 * with the coordinate origin in the the upper left corner.
+	 */
+	void convertToGUI(float &x, float &y, const float widgetHeight) const;
+
 protected:
 	enum WidgetType {
 		kWidgetTypeInvalid     = - 1,