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

rigidshape and derivatives cleanups

Browse source 
dragforce for rigidshapes and children defaulted to a value it's own debuggers won't complain about out of the gate
removed duplicate invalidation for flying vehicle sounds causing network instability
removed redundant hovervehicle vars
This commit is contained in:
AzaezelX 2023-09-27 13:43:24 -05:00 • committed by Brian Roberts
parent 5615cc33d8
commit 0f55389712
4 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/T3D/rigidShape.cpp
View file

@ -276,7 +276,7 @@ RigidShapeData::RigidShapeData()
for (S32 i = 0; i < Sounds::MaxSounds; i++) for (S32 i = 0; i < Sounds::MaxSounds; i++)
INIT_SOUNDASSET_ARRAY(WaterSounds, i); INIT_SOUNDASSET_ARRAY(WaterSounds, i);
dragForce = 0; dragForce = 0.01f;
vertFactor = 0.25; vertFactor = 0.25;
dustTrailEmitter = NULL; dustTrailEmitter = NULL;
@ -354,7 +354,7 @@ bool RigidShapeData::preload(bool server, String &errorStr)
} }
} }
if (dragForce <= 0.01f) if (dragForce < 0.01f)
{ {
Con::warnf("RigidShapeData::preload: dragForce must be at least 0.01"); Con::warnf("RigidShapeData::preload: dragForce must be at least 0.01");
dragForce = 0.01f; dragForce = 0.01f;

3
Engine/source/T3D/vehicles/flyingVehicle.cpp
View file

@ -143,8 +143,7 @@ bool FlyingVehicleData::preload(bool server, String &errorStr)
{ {
if (!isFlyingSoundsValid(i)) if (!isFlyingSoundsValid(i))
{ {
Con::errorf(ConsoleLogEntry::General, "FlyingVehicleData::preload: Invalid FlyingSounds asset."); //return false; -TODO: trigger asset download
return false;
} }
} }
for (S32 j = 0; j < MaxJetEmitters; j++) for (S32 j = 0; j < MaxJetEmitters; j++)

2
Engine/source/T3D/vehicles/hoverVehicle.cpp
View file

@ -123,8 +123,6 @@ HoverVehicle::JetActivation HoverVehicle::sJetActivation[NumThrustDirections] =
// //
HoverVehicleData::HoverVehicleData() HoverVehicleData::HoverVehicleData()
{ {
dragForce = 0;
vertFactor = 0.25f;
floatingThrustFactor = 0.15f; floatingThrustFactor = 0.15f;
mainThrustForce = 0; mainThrustForce = 0;

3
Engine/source/T3D/vehicles/hoverVehicle.h
View file

@ -74,9 +74,6 @@ class HoverVehicleData : public VehicleData
static const char *sJetNode[MaxJetNodes]; static const char *sJetNode[MaxJetNodes];
S32 jetNode[MaxJetNodes]; S32 jetNode[MaxJetNodes];
F32 dragForce;
F32 vertFactor;
F32 floatingThrustFactor; F32 floatingThrustFactor;
F32 mainThrustForce; F32 mainThrustForce;