Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

partial port of kinematicCharacterMover #3902

Merged
merged 9 commits into from
Jul 21, 2020
Merged

partial port of kinematicCharacterMover #3902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
901f3b9
partial port of kinematicCharacterMover
pollend Apr 21, 2020
317f3a3
added rotationYXZ in-place of quat4f
pollend Apr 21, 2020
9557136
updated rotation
pollend Apr 21, 2020
d22fb1b
removed Vector3fUtil usage from KinematicCharacterMover
pollend Apr 21, 2020
e0e7b1b
ported CharacterMovmentSystemUtility
pollend Apr 21, 2020
6309a39
Update engine/src/main/java/org/terasology/logic/characters/Character…
pollend Apr 22, 2020
8ae609a
Update engine/src/main/java/org/terasology/logic/characters/Kinematic…
pollend Apr 22, 2020
74e8615
Merge remote-tracking branch 'upstream/develop' into feature/joml-kin…
pollend Apr 29, 2020
d9bfa0c
Merge branch 'feature/joml-kinematic-character-mover' of github.com:p…
pollend Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions engine/src/main/java/org/terasology/logic/characters/CharacterMovementSystemUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@
*/
package org.terasology.logic.characters;

import org.joml.Quaternionf;
import org.joml.Vector3f;
import org.terasology.entitySystem.entity.EntityRef;
import org.terasology.logic.location.LocationComponent;
import org.terasology.math.JomlUtil;
import org.terasology.math.TeraMath;
import org.terasology.math.geom.BaseQuat4f;
import org.terasology.math.geom.BaseVector3f;
import org.terasology.math.geom.Quat4f;
import org.terasology.math.geom.Vector3f;
import org.terasology.physics.engine.CharacterCollider;
import org.terasology.physics.engine.PhysicsEngine;

Expand Down Expand Up @@ -63,27 +62,27 @@ public void setToState(EntityRef entity, CharacterStateEvent state) {
movementComp.footstepDelta = state.getFootstepDelta();
entity.saveComponent(movementComp);

setPhysicsLocation(entity, state.getPosition());
setPhysicsLocation(entity, JomlUtil.from(state.getPosition()));

// set the pitch to the character's gaze entity
Quat4f rotation = new Quat4f(0f, TeraMath.DEG_TO_RAD * state.getPitch(), 0f);
Quaternionf rotation = new Quaternionf().rotationX(TeraMath.DEG_TO_RAD * state.getPitch());
EntityRef gazeEntity = GazeAuthoritySystem.getGazeEntityForCharacter(entity);
if (!gazeEntity.equals(entity)) {
// Only set the gaze entity rotation if it is not the same as the main entity.
// The character is assumed to only rotate side to side, introducing pitch makes things act strangely
LocationComponent gazeLocation = gazeEntity.getComponent(LocationComponent.class);
gazeLocation.setLocalRotation(rotation);
gazeLocation.setLocalRotation(JomlUtil.from(rotation));
gazeEntity.saveComponent(gazeLocation);
}
}

public void setToInterpolateState(EntityRef entity, CharacterStateEvent a, CharacterStateEvent b, long time) {
float t = (float) (time - a.getTime()) / (b.getTime() - a.getTime());
Vector3f newPos = BaseVector3f.lerp(a.getPosition(), b.getPosition(), t);
Quat4f newRot = BaseQuat4f.interpolate(a.getRotation(), b.getRotation(), t);
Vector3f newPos = JomlUtil.from(a.getPosition()).lerp(JomlUtil.from(b.getPosition()),t);
Quaternionf newRot = JomlUtil.from(a.getRotation()).nlerp(JomlUtil.from(b.getRotation()),t);
LocationComponent location = entity.getComponent(LocationComponent.class);
location.setWorldPosition(newPos);
location.setWorldRotation(newRot);
location.setWorldPosition(JomlUtil.from(newPos));
location.setWorldRotation(JomlUtil.from(newRot));
entity.saveComponent(location);

CharacterMovementComponent movementComponent = entity.getComponent(CharacterMovementComponent.class);
Expand All @@ -105,9 +104,9 @@ public void setToInterpolateState(EntityRef entity, CharacterStateEvent a, Chara

public void setToExtrapolateState(EntityRef entity, CharacterStateEvent state, long time) {
float t = (time - state.getTime()) * 0.0001f;
Vector3f newPos = new Vector3f(state.getVelocity());
newPos.scale(t);
newPos.add(state.getPosition());
Vector3f newPos = new Vector3f(JomlUtil.from(state.getVelocity()));
newPos.mul(t);
newPos.add(JomlUtil.from(state.getPosition()));
extrapolateLocationComponent(entity, state, newPos);

extrapolateCharacterMovementComponent(entity, state);
Expand All @@ -117,7 +116,7 @@ public void setToExtrapolateState(EntityRef entity, CharacterStateEvent state, l

private void extrapolateLocationComponent(EntityRef entity, CharacterStateEvent state, Vector3f newPos) {
LocationComponent location = entity.getComponent(LocationComponent.class);
location.setWorldPosition(newPos);
location.setWorldPosition(JomlUtil.from(newPos));
location.setWorldRotation(state.getRotation());
entity.saveComponent(location);
}
Expand All @@ -138,6 +137,6 @@ private void extrapolateCharacterMovementComponent(EntityRef entity, CharacterSt
*/
private void setPhysicsLocation(EntityRef entity, Vector3f newPos) {
CharacterCollider collider = physics.getCharacterCollider(entity);
collider.setLocation(newPos);
collider.setLocation(JomlUtil.from(newPos));
}
}
Loading