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

Jump to bottom

chore: remove unused qualifier org.joml.* #4644

Merged
merged 4 commits into from
May 3, 2021
Merged

chore: remove unused qualifier org.joml.* #4644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
977d5f8
chore: remove unused qualifier org.joml.*
pollend May 2, 2021
8d1c1e6
Merge branch 'develop' into chore/cleanup-joml-qualifier
pollend May 3, 2021
3a2ae77
Merge branch 'develop' into chore/cleanup-joml-qualifier
pollend May 3, 2021
328f85e
Merge branch 'develop' into chore/cleanup-joml-qualifier
pollend May 3, 2021
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
10 changes: 5 additions & 5 deletions engine/src/main/java/org/terasology/engine/logic/characters/CharacterSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,13 +213,13 @@ public void onAttackRequest(AttackRequest event, EntityRef character, CharacterC
if (!onItemUseEvent.isConsumed()) {
EntityRef gazeEntity = GazeAuthoritySystem.getGazeEntityForCharacter(character);
LocationComponent gazeLocation = gazeEntity.getComponent(LocationComponent.class);
org.joml.Vector3f direction = gazeLocation.getWorldDirection(new org.joml.Vector3f());
org.joml.Vector3f originPos = gazeLocation.getWorldPosition(new org.joml.Vector3f());
Vector3f direction = gazeLocation.getWorldDirection(new Vector3f());
Vector3f originPos = gazeLocation.getWorldPosition(new Vector3f());
if (recordAndReplayCurrentStatus.getStatus() == RecordAndReplayStatus.RECORDING) {
directionAndOriginPosRecorderList.getAttackEventDirectionAndOriginPosRecorder().add(direction,
originPos);
} else if (recordAndReplayCurrentStatus.getStatus() == RecordAndReplayStatus.REPLAYING) {
org.joml.Vector3f[] data =
Vector3f[] data =
directionAndOriginPosRecorderList.getAttackEventDirectionAndOriginPosRecorder().poll();
direction = data[0];
originPos = data[1];
Expand Down Expand Up @@ -311,14 +311,14 @@ private boolean isPredictionOfEventCorrect(EntityRef character, ActivationReques
CharacterComponent characterComponent = character.getComponent(CharacterComponent.class);
EntityRef camera = GazeAuthoritySystem.getGazeEntityForCharacter(character);
LocationComponent location = camera.getComponent(LocationComponent.class);
org.joml.Vector3f direction = location.getWorldDirection(new org.joml.Vector3f());
Vector3f direction = location.getWorldDirection(new Vector3f());
if (!(event.getDirection().equals(direction, 0.0001f))) {
logger.error("Direction at client {} was different than direction at server {}", event.getDirection(), direction);
}
// Assume the exact same value in case there are rounding mistakes:
direction = event.getDirection();

org.joml.Vector3f originPos = location.getWorldPosition(new org.joml.Vector3f());
Vector3f originPos = location.getWorldPosition(new Vector3f());
if (!(event.getOrigin().equals(originPos, 0.0001f))) {
String msg = "Player {} seems to have cheated: It stated that it performed an action from {} but the predicted position is {}";
logger.info(msg, getPlayerNameFromCharacter(character), event.getOrigin(), originPos);
Expand Down
5 changes: 3 additions & 2 deletions engine/src/main/java/org/terasology/engine/logic/characters/KinematicCharacterMover.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import org.joml.Math;
import org.joml.Quaternionf;
import org.joml.RoundingMode;
import org.joml.Vector3f;
import org.joml.Vector3i;
import org.slf4j.Logger;
Expand Down Expand Up @@ -91,8 +92,8 @@ public CharacterStateEvent step(CharacterStateEvent initial, CharacterMoveInputE
// The CharacterMovementComponent also has a 'radius' which may be used here.
// Question: Is this connected with _shapes_ or bounding boxes in some way?
checkBlockEntry(entity,
new Vector3i(initial.getPosition(), org.joml.RoundingMode.HALF_UP),
new Vector3i(result.getPosition(), org.joml.RoundingMode.HALF_UP),
new Vector3i(initial.getPosition(), RoundingMode.HALF_UP),
new Vector3i(result.getPosition(), RoundingMode.HALF_UP),
characterMovementComponent.height);
}
if (result.getMode() != MovementMode.GHOSTING && result.getMode() != MovementMode.NONE) {
Expand Down
4 changes: 2 additions & 2 deletions engine/src/main/java/org/terasology/engine/math/Side.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public static Side inDirection(int x, int y, int z) {

/**
* The side normal closes to dir
*
*
* @param dir direction
* @return side
*/
Expand Down Expand Up @@ -299,7 +299,7 @@ public Side rollClockwise(int turns) {
* @param dest will hold the result
* @return dest
*/
public org.joml.Vector3i getAdjacentPos(Vector3ic pos, org.joml.Vector3i dest) {
public Vector3i getAdjacentPos(Vector3ic pos, Vector3i dest) {
return dest.set(pos).add(direction());
}

Expand Down