feat(JOML): migrate joml for BlockRegion #4
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 tasks
skaldarnar
reviewed
Dec 6, 2020
| @@ -131,7 +132,7 @@ public void placeDoor(ActivateEvent event, EntityRef entity) { | |||
| if (!blockEvent.isConsumed()) { | |||
| EntityRef newDoor = entityManager.create(door.doorRegionPrefab); | |||
| entity.removeComponent(MeshComponent.class); | |||
| newDoor.addComponent(new BlockRegionComponent(Region3i.createBounded(bottomBlockPos, topBlockPos))); | |||
| newDoor.addComponent(new BlockRegionComponent(new BlockRegion().union(JomlUtil.from(bottomBlockPos)).union(JomlUtil.from(topBlockPos)))); | |||
There was a problem hiding this comment.
I'll introduce BlockRegions.encompassing(...) which could be used here.
Comment on lines
196
to
199
| Block bottomBlock = door.bottomBlockFamily.getBlockForPlacement(new BlockPlacementData(regionComp.region.getMin(new org.joml.Vector3i()), newSide, new org.joml.Vector3f(Side.TOP.direction()))); | ||
| worldProvider.setBlock(regionComp.region.getMin(new org.joml.Vector3i()), bottomBlock); | ||
| Block topBlock = door.topBlockFamily.getBlockForPlacement(new BlockPlacementData(regionComp.region.getMax(new org.joml.Vector3i()), newSide, new org.joml.Vector3f(Side.TOP.direction()))); | ||
| worldProvider.setBlock(regionComp.region.getMax(new org.joml.Vector3i()), topBlock); |
There was a problem hiding this comment.
We're basically creating the same immutable vectors twice here 🤔 I think this should be joml-ified by making better use of vector allocation
jdrueckert
commented
Dec 6, 2020
skaldarnar
approved these changes
Dec 6, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR: MovingBlocks/Terasology#4296