Player position and velocity (#514)

Set elevator speed

Author: jerethk

TheForceEngine/TFE_DarkForces/Scripting/gs_player.cpp

@@ -4,6 +4,8 @@
 #include <TFE_DarkForces/mission.h>
 #include <TFE_DarkForces/pickup.h>
 #include <TFE_DarkForces/weapon.h>
+#include <TFE_Jedi/Collision/collision.h>
+#include <TFE_FrontEndUI/frontEndUi.h>
 #include <TFE_System/system.h>
 #include <angelscript.h>
 
@@ -33,6 +35,91 @@ namespace TFE_DarkForces
 		s_reviveTick = s_curTick + 436;
 	}
 
+	vec3_float getPlayerPosition()
+	{
+		return
+		{
+			fixed16ToFloat(s_playerObject->posWS.x),
+			-fixed16ToFloat(s_playerObject->posWS.y),
+			fixed16ToFloat(s_playerObject->posWS.z),
+		};
+	}
+
+	void setPlayerPosition(vec3_float position)
+	{
+		fixed16_16 newX = floatToFixed16(position.x);
+		fixed16_16 newY = -floatToFixed16(position.y);
+		fixed16_16 newZ = floatToFixed16(position.z);
+
+		// Check if player object has moved out of its current sector
+		// Start with a bounds check
+		bool outOfHorzBounds = newX < s_playerObject->sector->boundsMin.x || newX > s_playerObject->sector->boundsMax.x ||
+			newZ < s_playerObject->sector->boundsMin.z || newZ > s_playerObject->sector->boundsMax.z;
+		bool outOfVertBounds = newY < s_playerObject->sector->ceilingHeight || newY > s_playerObject->sector->floorHeight;
+
+		// If within bounds, check if it has passed through a wall
+		RWall* collisionWall = nullptr;
+		if (!outOfHorzBounds && !outOfVertBounds)
+		{
+			collisionWall = collision_wallCollisionFromPath(s_playerObject->sector, s_playerObject->posWS.x, s_playerObject->posWS.z, newX, newZ);
+		}
+
+		if (collisionWall || outOfHorzBounds || outOfVertBounds)
+		{
+			// Try to find a new sector for the player object; if there is none, don't move it
+			RSector* sector = sector_which3D(newX, newY, newZ);
+			if (sector)
+			{
+				if (sector != s_playerObject->sector)
+				{
+					sector_addObject(sector, s_playerObject);
+				}
+			}
+			else
+			{
+				TFE_FrontEndUI::logToConsole("Cannot find a sector to move player to.");
+				return;
+			}
+		}
+
+		s_playerObject->posWS.x = newX;
+		s_playerObject->posWS.y = newY;
+		s_playerObject->posWS.z = newZ;
+		s_playerYPos = newY;
+	}
+
+	float getPlayerYaw()
+	{
+		return angleToFloat(s_playerObject->yaw);
+	}
+
+	void setPlayerYaw(float value)
+	{
+		float yaw = floatToAngle(value);
+		s_playerObject->yaw = yaw;
+		s_playerYaw = yaw;
+	}
+
+	vec3_float getPlayerVelocity()
+	{
+		vec3_fixed velFixed;
+		TFE_DarkForces::player_getVelocity(&velFixed);
+
+		return {
+			fixed16ToFloat(velFixed.x),
+			-fixed16ToFloat(velFixed.y),
+			fixed16ToFloat(velFixed.z),
+		};
+	}
+	
+	void setPlayerVelocity(vec3_float vel)
+	{
+		s_playerVelX = floatToFixed16(vel.x);
+		s_playerUpVel  = -floatToFixed16(vel.y);
+		s_playerUpVel2 = -floatToFixed16(vel.y);
+		s_playerVelZ = floatToFixed16(vel.z);
+	}
+
 	s32 getBatteryPercent()
 	{
 		return (s32)(100.0 * s_batteryPower / FIXED(2) );
@@ -492,6 +579,14 @@ namespace TFE_DarkForces
 
 			ScriptObjFunc("void kill()", killPlayer);
 
+			// Position and velocity
+			ScriptPropertyGetFunc("float3 get_position()", getPlayerPosition);
+			ScriptPropertySetFunc("void set_position(float3)", setPlayerPosition);
+			ScriptPropertyGetFunc("float get_yaw()", getPlayerYaw);
+			ScriptPropertySetFunc("void set_yaw(float)", setPlayerYaw);
+			ScriptPropertyGetFunc("float3 get_velocity()", getPlayerVelocity);
+			ScriptPropertySetFunc("void set_velocity(float3)", setPlayerVelocity);
+			
 			// Health / ammo getters
 			ScriptLambdaPropertyGet("int get_health()", s32, { return s_playerInfo.health; });
 			ScriptLambdaPropertyGet("int get_shields()", s32, { return s_playerInfo.shields; });

TheForceEngine/TFE_DarkForces/Scripting/scriptElev.cpp

@@ -23,6 +23,14 @@ namespace TFE_DarkForces
 		return (data->updateFlags & ELEV_MASTER_ON) != 0;
 	}
 
+	void setElevSpeed(s32 value, ScriptElev* elev)
+	{
+		if (!ScriptElev::isScriptElevValid(elev)) { return; }
+
+		InfElevator* data = (InfElevator*)allocator_getByIndex(s_infSerState.infElevators, elev->m_id);
+		data->speed = data->type == IELEV_ROTATE_WALL ? FIXED(floatToAngle(value)) : FIXED(value);
+	}
+
 	void ScriptElev::registerType()
 	{
 		s32 res = 0;
@@ -35,5 +43,7 @@ namespace TFE_DarkForces
 		ScriptObjFunc("bool isValid()", isScriptElevValid);
 		// Properties
 		ScriptPropertyGetFunc("bool get_master()", getElevMaster);
+		
+		ScriptPropertySetFunc("void set_speed(int)", setElevSpeed);
 	}
 }

TheForceEngine/TFE_DarkForces/player.cpp

@@ -142,10 +142,6 @@ namespace TFE_DarkForces
 	static fixed16_16 s_minEyeDistFromFloor;
 	static fixed16_16 s_postLandVel;
 	static fixed16_16 s_landUpVel = 0;
-	static fixed16_16 s_playerVelX;
-	static fixed16_16 s_playerUpVel;
-	static fixed16_16 s_playerUpVel2;
-	static fixed16_16 s_playerVelZ;
 	static fixed16_16 s_externalVelX;
 	static fixed16_16 s_externalVelZ;
 	static fixed16_16 s_playerCrouchSpd;
@@ -241,6 +237,12 @@ namespace TFE_DarkForces
 	angle14_32 s_camOffsetRoll = 0;
 	angle14_32 s_playerYaw;
 
+	// Expose player velocity for scripting
+	fixed16_16 s_playerVelX;
+	fixed16_16 s_playerUpVel;
+	fixed16_16 s_playerUpVel2;
+	fixed16_16 s_playerVelZ;
+
 	// Based on positioning in inventory, these were probably meant to represent thermal
 	// detonators and mines - see player_readInfo() and player_writeInfo()
 	JBool s_itemUnknown1;	// 0x282428	

TheForceEngine/TFE_DarkForces/player.h

@@ -111,6 +111,12 @@ namespace TFE_DarkForces
 	extern Tick s_prevPlayerTick;
 	extern Tick s_reviveTick;
 
+	// Velocity - exposed for scripting
+	extern fixed16_16 s_playerVelX;
+	extern fixed16_16 s_playerUpVel;
+	extern fixed16_16 s_playerUpVel2;
+	extern fixed16_16 s_playerVelZ;
+
 	extern SecObject* s_playerObject;
 	extern SecObject* s_playerEye;
 

TheForceEngine/TFE_Jedi/Math/fixedPoint.h

@@ -118,6 +118,11 @@ namespace TFE_Jedi
 		return angle14_16(angle * 45.5111f);
 	}
 
+	inline f32 angleToFloat(angle14_16 angle)
+	{
+		return angle / 45.5111f;
+	}
+
 	// Convert a floating point angle from [0, 2pi) to a fixed point value where 0 -> 0 and 2pi -> 16384
 	// This isn't really the same as fixed16_16 but matches the original source.
 	inline fixed16_16 floatAngleToFixed(f32 angle)