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

Merge bc7c55b980 into a181f488b2

Browse source
This commit is contained in:
marauder2k7 2025-12-23 10:16:56 +00:00 • committed by GitHub
commit 50b66dc429
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
63 changed files with 1394 additions and 1838 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/materials/materialDefinition.cpp
View file

@ -228,8 +228,6 @@ Material::Material()
mFootstepSoundId = -1; mImpactSoundId = -1;
mImpactFXIndex = -1;
INIT_ASSET(CustomFootstepSound);
INIT_ASSET(CustomImpactSound);
mFriction = 0.0;
mDirectSoundOcclusion = 1.f;

2
Engine/source/materials/materialDefinition.h
View file

@ -356,9 +356,7 @@ public:
/// If defined, overrides mFootstepSoundId.
/// @see mFootstepSoundId
DECLARE_SOUNDASSET(Material, CustomFootstepSound);
DECLARE_ASSET_SETGET(Material, CustomFootstepSound);
DECLARE_SOUNDASSET(Material, CustomImpactSound);
DECLARE_ASSET_SETGET(Material, CustomImpactSound);
F32 mFriction; ///< Friction coefficient when moving along surface.