TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into aiSubsystem

Browse source 
# Conflicts:
#	Engine/source/T3D/player.cpp
This commit is contained in:
AzaezelX 2025-04-28 14:28:54 -05:00
commit 618ddbc9ba
60 changed files with 1751 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/T3D/shapeBase.cpp
View file

@ -173,6 +173,8 @@ ShapeBaseData::ShapeBaseData()
density( 1.0f ),
maxEnergy( 0.0f ),
maxDamage( 1.0f ),
mCollisionMul(0.0f),
mImpactMul(0.0f),
repairRate( 0.0033f ),
disabledLevel( 1.0f ),
destroyedLevel( 1.0f ),
@ -231,6 +233,8 @@ ShapeBaseData::ShapeBaseData(const ShapeBaseData& other, bool temp_clone) : Game
density = other.density;
maxEnergy = other.maxEnergy;
maxDamage = other.maxDamage;
mCollisionMul = other.mCollisionMul;
mImpactMul = other.mImpactMul;
repairRate = other.repairRate;
disabledLevel = other.disabledLevel;
destroyedLevel = other.destroyedLevel;
@ -591,6 +595,10 @@ void ShapeBaseData::initPersistFields()
addField( "isInvincible", TypeBool, Offset(isInvincible, ShapeBaseData),
"Invincible flag; when invincible, the object cannot be damaged or "
"repaired." );
addFieldV("collisionMul", TypeRangedF32, Offset(mCollisionMul, ShapeBaseData), &CommonValidators::PositiveFloat,
"collision damage multiplier");
addFieldV("impactMul", TypeRangedF32, Offset(mImpactMul, ShapeBaseData), &CommonValidators::PositiveFloat,
"impact damage multiplier");
endGroup( "Damage/Energy" );
addGroup( "Camera", "The settings used by the shape when it is the camera." );