movement tweaks, upright tree fix
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
This commit is contained in:
parent
d25e07f35a
commit
902680ad16
@ -128,7 +128,7 @@
|
|||||||
"type" : "GROUND",
|
"type" : "GROUND",
|
||||||
"acceleration" : 5000.0,
|
"acceleration" : 5000.0,
|
||||||
"maxVelocity" : 500.5,
|
"maxVelocity" : 500.5,
|
||||||
"strafeMultiplier" : 0.7,
|
"strafeMultiplier" : 1.0,
|
||||||
"backpedalMultiplier" : 0.5,
|
"backpedalMultiplier" : 0.5,
|
||||||
"footstepFirstAudioOffset" : 0.2,
|
"footstepFirstAudioOffset" : 0.2,
|
||||||
"footstepSecondAudioOffset" : 0.6,
|
"footstepSecondAudioOffset" : 0.6,
|
||||||
@ -160,7 +160,7 @@
|
|||||||
{
|
{
|
||||||
"type" : "JUMP",
|
"type" : "JUMP",
|
||||||
"jumpFrames" : 3,
|
"jumpFrames" : 3,
|
||||||
"jumpForce" : 500,
|
"jumpForce" : 700,
|
||||||
"animationJump" : {
|
"animationJump" : {
|
||||||
"nameThirdPerson" : "Jump",
|
"nameThirdPerson" : "Jump",
|
||||||
"nameFirstPerson" : "Jump",
|
"nameFirstPerson" : "Jump",
|
||||||
|
|||||||
@ -546,6 +546,8 @@ Block sfx
|
|||||||
Fix server hitboxes freaking out at animation end
|
Fix server hitboxes freaking out at animation end
|
||||||
Fix hitcapsule misalignment
|
Fix hitcapsule misalignment
|
||||||
Always upright tree
|
Always upright tree
|
||||||
|
Fix upright tree clearing linear force/velocity
|
||||||
|
Movement tweaks
|
||||||
|
|
||||||
|
|
||||||
# TODO
|
# TODO
|
||||||
|
|||||||
@ -33,9 +33,9 @@ public class ClientAlwaysUprightTree implements BehaviorTree {
|
|||||||
if(body != null){
|
if(body != null){
|
||||||
Vector3d position = EntityUtils.getPosition(parent);
|
Vector3d position = EntityUtils.getPosition(parent);
|
||||||
Quaterniond sourceRotation = new Quaterniond(EntityUtils.getRotation(parent));
|
Quaterniond sourceRotation = new Quaterniond(EntityUtils.getRotation(parent));
|
||||||
Vector3d linearVelocity = new Vector3d();
|
Vector3d linearVelocity = PhysicsUtils.odeVecToJomlVec(body.getLinearVel());
|
||||||
Vector3d angularVelocity = new Vector3d();
|
Vector3d angularVelocity = new Vector3d();
|
||||||
Vector3d linearForce = new Vector3d();
|
Vector3d linearForce = PhysicsUtils.odeVecToJomlVec(body.getForce());
|
||||||
Vector3d angularForce = new Vector3d();
|
Vector3d angularForce = new Vector3d();
|
||||||
|
|
||||||
//make sure rotation is vertical
|
//make sure rotation is vertical
|
||||||
|
|||||||
@ -36,9 +36,9 @@ public class ServerAlwaysUprightTree implements BehaviorTree {
|
|||||||
Realm realm = Globals.realmManager.getEntityRealm(parent);
|
Realm realm = Globals.realmManager.getEntityRealm(parent);
|
||||||
Vector3d position = EntityUtils.getPosition(parent);
|
Vector3d position = EntityUtils.getPosition(parent);
|
||||||
Quaterniond sourceRotation = new Quaterniond(EntityUtils.getRotation(parent));
|
Quaterniond sourceRotation = new Quaterniond(EntityUtils.getRotation(parent));
|
||||||
Vector3d linearVelocity = new Vector3d();
|
Vector3d linearVelocity = PhysicsUtils.odeVecToJomlVec(body.getLinearVel());
|
||||||
Vector3d angularVelocity = new Vector3d();
|
Vector3d angularVelocity = new Vector3d();
|
||||||
Vector3d linearForce = new Vector3d();
|
Vector3d linearForce = PhysicsUtils.odeVecToJomlVec(body.getForce());
|
||||||
Vector3d angularForce = new Vector3d();
|
Vector3d angularForce = new Vector3d();
|
||||||
|
|
||||||
//make sure rotation is vertical
|
//make sure rotation is vertical
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user