TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1750 from Sir-Skurpsalot/Sir-Skurpsalot-player-patch-1

Browse source 
Sir skurpsalot player patch 1
This commit is contained in:
Brian Roberts 2026-05-24 11:22:07 -05:00 • committed by GitHub
commit 3cf9d1f5d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/T3D/player.cpp
View file

@ -1015,19 +1015,19 @@ void PlayerData::initPersistFields()
"Used when computing the damage location.\n" "Used when computing the damage location.\n"
"@see Player::getDamageLocation" ); "@see Player::getDamageLocation" );
addFieldV( "boxTorsoLeftPercentage", TypeRangedF32, Offset(boxTorsoLeftPercentage, PlayerData), &CommonValidators::NormalizedFloat, addFieldV( "boxTorsoLeftPercentage", TypeRangedF32, Offset(boxTorsoLeftPercentage, PlayerData), &CommonValidators::NormalizedFloat,
"@brief Percentage of the player's bounding box width that represents the left side of the torso.\n\n" "@brief Percentage of the player's bounding box width from center that represents the left side of the torso.\n\n"
"Used when computing the damage location.\n" "Used when computing the damage location.\n"
"@see Player::getDamageLocation" ); "@see Player::getDamageLocation" );
addFieldV( "boxTorsoRightPercentage", TypeRangedF32, Offset(boxTorsoRightPercentage, PlayerData), &CommonValidators::NormalizedFloat, addFieldV( "boxTorsoRightPercentage", TypeRangedF32, Offset(boxTorsoRightPercentage, PlayerData), &CommonValidators::NormalizedFloat,
"@brief Percentage of the player's bounding box width that represents the right side of the torso.\n\n" "@brief Percentage of the player's bounding box width from center that represents the right side of the torso.\n\n"
"Used when computing the damage location.\n" "Used when computing the damage location.\n"
"@see Player::getDamageLocation" ); "@see Player::getDamageLocation" );
addFieldV( "boxTorsoBackPercentage", TypeRangedF32, Offset(boxTorsoBackPercentage, PlayerData), &CommonValidators::NormalizedFloat, addFieldV( "boxTorsoBackPercentage", TypeRangedF32, Offset(boxTorsoBackPercentage, PlayerData), &CommonValidators::NormalizedFloat,
"@brief Percentage of the player's bounding box depth that represents the back side of the torso.\n\n" "@brief Percentage of the player's bounding box depth from center that represents the back side of the torso.\n\n"
"Used when computing the damage location.\n" "Used when computing the damage location.\n"
"@see Player::getDamageLocation" ); "@see Player::getDamageLocation" );
addFieldV( "boxTorsoFrontPercentage", TypeRangedF32, Offset(boxTorsoFrontPercentage, PlayerData), &CommonValidators::NormalizedFloat, addFieldV( "boxTorsoFrontPercentage", TypeRangedF32, Offset(boxTorsoFrontPercentage, PlayerData), &CommonValidators::NormalizedFloat,
"@brief Percentage of the player's bounding box depth that represents the front side of the torso.\n\n" "@brief Percentage of the player's bounding box depth from center that represents the front side of the torso.\n\n"
"Used when computing the damage location.\n" "Used when computing the damage location.\n"
"@see Player::getDamageLocation" ); "@see Player::getDamageLocation" );
@ -2395,10 +2395,10 @@ void Player::getDamageLocation(const Point3F& in_rPos, const char *&out_rpVert,
{ {
F32 xWidth = boxSize.x; F32 xWidth = boxSize.x;
//boxTorsoBackPercentage and boxTorsoLeftPercentage should both be negative floats //boxTorsoBackPercentage and boxTorsoLeftPercentage need to be flipped negative
F32 backPoint = yLength * mDataBlock->boxTorsoBackPercentage; F32 backPoint = (yLength * mDataBlock->boxTorsoBackPercentage) * -1.0f;
F32 frontPoint = yLength * mDataBlock->boxTorsoFrontPercentage; F32 frontPoint = yLength * mDataBlock->boxTorsoFrontPercentage;
F32 leftPoint = xWidth * mDataBlock->boxTorsoLeftPercentage; F32 leftPoint = (xWidth * mDataBlock->boxTorsoLeftPercentage) * -1.0f;
F32 rightPoint = xWidth * mDataBlock->boxTorsoRightPercentage; F32 rightPoint = xWidth * mDataBlock->boxTorsoRightPercentage;
S32 index = 0; //Middle hits are cases 0-2 S32 index = 0; //Middle hits are cases 0-2