This commit is contained in:
parent
6723031154
commit
0b4c08796e
@ -2099,6 +2099,7 @@ Macro pathing test
|
|||||||
Actually fix pathing spinlock
|
Actually fix pathing spinlock
|
||||||
Support for observing ai entities
|
Support for observing ai entities
|
||||||
ServerGroundMovementTree supports collidable entities
|
ServerGroundMovementTree supports collidable entities
|
||||||
|
ServerGroundMovementTree geom work
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -290,7 +290,10 @@ public class ServerGroundMovementTree implements BehaviorTree {
|
|||||||
CreatureUtils.setVelocity(parent, velocity);
|
CreatureUtils.setVelocity(parent, velocity);
|
||||||
}
|
}
|
||||||
if(body == null){
|
if(body == null){
|
||||||
ServerEntityUtils.repositionEntity(parent, new Vector3d(position).add(velocity,velocity,velocity));
|
Vector3d velVec = new Vector3d(movementVector);
|
||||||
|
velVec.mul(velocity * Globals.engineState.timekeeper.getSimFrameTime());
|
||||||
|
velVec.add(position);
|
||||||
|
ServerEntityUtils.repositionEntity(parent, velVec);
|
||||||
} else {
|
} else {
|
||||||
body.enable();
|
body.enable();
|
||||||
body.setLinearVel(
|
body.setLinearVel(
|
||||||
@ -339,7 +342,10 @@ public class ServerGroundMovementTree implements BehaviorTree {
|
|||||||
this.updateVelocity();
|
this.updateVelocity();
|
||||||
float velocity = this.getModifiedVelocity();
|
float velocity = this.getModifiedVelocity();
|
||||||
if(body == null){
|
if(body == null){
|
||||||
ServerEntityUtils.repositionEntity(parent, new Vector3d(position).add(velocity,velocity,velocity));
|
Vector3d velVec = new Vector3d(movementVector);
|
||||||
|
velVec.mul(velocity * Globals.engineState.timekeeper.getSimFrameTime());
|
||||||
|
velVec.add(position);
|
||||||
|
ServerEntityUtils.repositionEntity(parent, velVec);
|
||||||
} else {
|
} else {
|
||||||
body.enable();
|
body.enable();
|
||||||
body.setLinearVel(
|
body.setLinearVel(
|
||||||
@ -407,7 +413,10 @@ public class ServerGroundMovementTree implements BehaviorTree {
|
|||||||
GravityUtils.serverAttemptActivateGravity(parent);
|
GravityUtils.serverAttemptActivateGravity(parent);
|
||||||
}
|
}
|
||||||
if(body == null){
|
if(body == null){
|
||||||
ServerEntityUtils.repositionEntity(parent, new Vector3d(position).add(velocity,velocity,velocity));
|
Vector3d velVec = new Vector3d(movementVector);
|
||||||
|
velVec.mul(velocity * Globals.engineState.timekeeper.getSimFrameTime());
|
||||||
|
velVec.add(position);
|
||||||
|
ServerEntityUtils.repositionEntity(parent, velVec);
|
||||||
} else {
|
} else {
|
||||||
body.enable();
|
body.enable();
|
||||||
body.setLinearVel(
|
body.setLinearVel(
|
||||||
|
|||||||
@ -44,7 +44,7 @@ public class AIManager {
|
|||||||
/**
|
/**
|
||||||
* Controls whether the ai manager should simulate each frame or not
|
* Controls whether the ai manager should simulate each frame or not
|
||||||
*/
|
*/
|
||||||
private boolean active = true;
|
private boolean active = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The timer service
|
* The timer service
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user