maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use bullet.Bt.CollisionObjectActivationState [see #1731]

Browse source
This commit is contained in:
Valentín Barros 2020-08-08 10:50:24 +02:00
parent f6bdcd0a65
commit 476ec0aa49
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Sources/armory/trait/VehicleBody.hx
View file

@ -79,7 +79,7 @@ class VehicleBody extends Trait {
vehicle = new bullet.Bt.RaycastVehicle(tuning, carChassis, vehicleRayCaster);
// Never deactivate the vehicle
carChassis.setActivationState(bullet.Bt.CollisionObject.DISABLE_DEACTIVATION);
carChassis.setActivationState(bullet.Bt.CollisionObjectActivationState.DISABLE_DEACTIVATION);
// Choose coordinate system
var rightIndex = 0;

8
Sources/armory/trait/physics/bullet/RigidBody.hx
View file

@ -245,7 +245,7 @@ class RigidBody extends iron.Trait {
setDeactivationParams(deactivationParams[0], deactivationParams[1], deactivationParams[2]);
}
else {
setActivationState(ActivationState.NoDeactivation);
setActivationState(bullet.Bt.CollisionObjectActivationState.DISABLE_DEACTIVATION);
}
if (linearDamping != 0.04 || angularDamping != 0.1) {
@ -609,10 +609,4 @@ class RigidBody extends iron.Trait {
var Terrain = 7;
}
@:enum abstract ActivationState(Int) from Int to Int {
var Active = 1;
var NoDeactivation = 4;
var NoSimulation = 5;
}
#end