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

feat(JOML): migrate remaining occurrences #34

Merged
merged 3 commits into from
Jan 29, 2021
Merged

feat(JOML): migrate remaining occurrences #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8ba91e
feat(JOML): migrate LostWorldGenerator
skaldarnar Jan 29, 2021
51f7a0c
chore: remove unused imports
skaldarnar Jan 29, 2021
275925c
feat(JOML): migrate ProgressTrackingComponent
skaldarnar Jan 29, 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
2 changes: 0 additions & 2 deletions src/main/java/org/terasology/lost/LevelSpawnSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import org.terasology.logic.location.LocationComponent;
import org.terasology.lost.generator.LostWorldGenerator;
import org.terasology.math.Side;
import org.terasology.math.geom.ImmutableVector2f;
import org.terasology.math.geom.Vector2f;
import org.terasology.polyworld.graph.GraphFacet;
import org.terasology.polyworld.graph.GraphRegion;
import org.terasology.registry.In;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/lost/OnSpawnSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void onPlayerSpawn(OnPlayerSpawnedEvent event, EntityRef player, Inventor
Vector3i spawnPosition = new Vector3i(x, height, y);
spawnLevel("Lost:hut", spawnPosition, assetManager, entityManager);
spawnPosition.y = 0;
progressTrackingComponent.hutPosition = JomlUtil.from(spawnPosition);
progressTrackingComponent.hutPosition.set(spawnPosition);

}
}
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/lost/ProgressTrackingComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

package org.terasology.lost;

import org.joml.Vector3i;
import org.terasology.entitySystem.Component;
import org.terasology.math.geom.Vector3i;

import java.util.HashMap;

Expand Down
9 changes: 3 additions & 6 deletions src/main/java/org/terasology/lost/generator/LostWorldGenerator.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.RoundingMode;
import org.joml.Vector2fc;
import org.joml.Vector2i;
import org.joml.Vector3f;
import org.joml.Vector3fc;
import org.joml.Vector3i;
Expand All @@ -15,10 +16,6 @@
import org.terasology.entitySystem.entity.EntityRef;
import org.terasology.logic.location.LocationComponent;
import org.terasology.logic.spawner.FixedSpawner;
import org.terasology.math.JomlUtil;
import org.terasology.math.geom.ImmutableVector2f;
import org.terasology.math.geom.Vector2f;
import org.terasology.math.geom.Vector2i;
import org.terasology.polyworld.biome.BiomeModel;
import org.terasology.polyworld.biome.WhittakerBiome;
import org.terasology.polyworld.biome.WhittakerBiomeModelFacet;
Expand Down Expand Up @@ -156,12 +153,12 @@ public Vector3fc getSpawnPosition(EntityRef entity) {
Vector2i target;
if (picker.getClosest() != null) {
Vector2fc hit = picker.getClosest().getCenter();
target = new Vector2i(hit.x(), hit.y());
target = new Vector2i(hit.x(), hit.y(), RoundingMode.FLOOR);
} else {
target = new Vector2i(desiredPos.x(), desiredPos.z());
}

FixedSpawner spawner = new FixedSpawner(target.getX(), target.getY());
FixedSpawner spawner = new FixedSpawner(target.x(), target.y());
return spawner.getSpawnPosition(getWorld(), entity);
}

Expand Down