ENGINES: Add makeLookAt overload with coordinates for K1/K2

xoreos · Jul 15, 2018 · ca3bae9 · ca3bae9
1 parent e3c8c96
commit ca3bae9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/src/engines/kotor/object.cpp b/src/engines/kotor/object.cpp
@@ -155,12 +155,16 @@ void Object::setOrientation(float x, float y, float z, float angle) {
 	_orientation[3] = angle;
 }
 
-void Object::makeLookAt(Object *target) {
-	float dx = target->_position[0] - _position[0];
-	float dy = target->_position[1] - _position[1];
+void Object::makeLookAt(float x, float y) {
+	float dx = x - _position[0];
+	float dy = y - _position[1];
 	setOrientation(0.0f, 0.0f, 1.0f, Common::rad2deg(std::atan2(dy, dx)) - 90.0f);
 }
 
+void Object::makeLookAt(Object *target) {
+	makeLookAt(target->_position[0], target->_position[1]);
+}
+
 Room *Object::getRoom() {
 	return _room;
 }

diff --git a/src/engines/kotor/object.h b/src/engines/kotor/object.h
@@ -103,6 +103,7 @@ class Object : public Aurora::NWScript::Object, public KotOR::ScriptContainer {
 	/** Set the object's orientation. */
 	virtual void setOrientation(float x, float y, float z, float angle);
 
+	void makeLookAt(float x, float y);
 	void makeLookAt(Object *target);
 
 	/** Get a room the object is in. */

diff --git a/src/engines/kotor2/object.cpp b/src/engines/kotor2/object.cpp
@@ -124,12 +124,16 @@ void Object::setOrientation(float x, float y, float z, float angle) {
 	_orientation[3] = angle;
 }
 
-void Object::makeLookAt(Object *target) {
-	float dx = target->_position[0] - _position[0];
-	float dy = target->_position[1] - _position[1];
+void Object::makeLookAt(float x, float y) {
+	float dx = x - _position[0];
+	float dy = y - _position[1];
 	setOrientation(0.0f, 0.0f, 1.0f, Common::rad2deg(std::atan2(dy, dx)) - 90.0f);
 }
 
+void Object::makeLookAt(Object *target) {
+	makeLookAt(target->_position[0], target->_position[1]);
+}
+
 Room *Object::getRoom() {
 	return _room;
 }

diff --git a/src/engines/kotor2/object.h b/src/engines/kotor2/object.h
@@ -90,6 +90,7 @@ class Object : public Aurora::NWScript::Object, public KotOR2::ScriptContainer {
 	/** Set the object's orientation. */
 	virtual void setOrientation(float x, float y, float z, float angle);
 
+	void makeLookAt(float x, float y);
 	void makeLookAt(Object *target);
 
 	/** Get a room the object is in. */