izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

fixed issues with Tappy Chicken merge

Browse Source 
#ue4
#tappy chicken

[CL 2082276 by Peter Sauerbrei in Main branch]
This commit is contained in:
Peter Sauerbrei
2014-05-22 15:24:52 -04:00
committed by UnrealBot
parent 446972d460
commit 5dc58359e0
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Engine/Source/Runtime/Engine/Private/PhysicsEngine/PhysSubstepTasks.cpp
View File

@@ -296,10 +296,12 @@ void FPhysSubstepTask::SubstepSimulationStart()
float DeltaTime = bLastSubstep ? (DeltaSeconds - TotalSubTime) : SubTime;
float Interpolation = bLastSubstep ? 1.f : Alpha;
#if WITH_VEHICLE
if (VehicleManager)
{
VehicleManager->Update(DeltaTime);
}
#endif
SubstepInterpolation(Interpolation);

7
Engine/Source/Runtime/Engine/Public/EngineDefines.h
View File

@@ -22,6 +22,13 @@
#define WITH_APEX (1 && WITH_PHYSX)
#endif
/**
* Whether or not compiling with Vehicle extensions to PhysX
*/
#ifndef WITH_VEHICLE
#define WITH_VEHICLE (1 && WITH_PHYSX)
#endif
#ifndef WITH_PHYSICS_COOKING
#define WITH_PHYSICS_COOKING (WITH_EDITOR || WITH_APEX) //APEX currently relies on cooking even at runtime
#endif