Seth/HyperLap2D
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ComponentRetriever from TransformMathUtils

Browse Source
This commit is contained in:
fgnm
2021-08-21 12:59:09 +02:00
parent 65dc73d60b
commit 9519fc7ba4
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyperlap2d-runtime-libgdx
+1 -1
Submodule hyperlap2d-runtime-libgdx updated: 6bdace5325...29f2563339
src/main/java/games/rednblack/editor/view/stage/input/SandboxInputAdapter.java
+9 -3
View File
@@ -11,8 +11,11 @@ import com.badlogic.gdx.utils.SnapshotArray;
import com.badlogic.gdx.utils.viewport.Viewport;
import games.rednblack.editor.HyperLap2DFacade;
import games.rednblack.editor.renderer.components.NodeComponent;
import games.rednblack.editor.renderer.components.ParentNodeComponent;
import games.rednblack.editor.renderer.components.TransformComponent;
import games.rednblack.editor.renderer.components.ViewPortComponent;
import games.rednblack.editor.renderer.data.LayerItemVO;
import games.rednblack.editor.renderer.utils.ComponentRetriever;
import games.rednblack.editor.renderer.utils.TransformMathUtils;
import games.rednblack.editor.utils.EntityBounds;
import games.rednblack.editor.utils.runtime.EntityUtils;
@@ -103,7 +106,9 @@ public class SandboxInputAdapter implements InputProcessor {
inpputListenerComponent = mapper.get(target);
if(inpputListenerComponent == null) return false;
Array<InputListener> listeners = inpputListenerComponent.getAllListeners();
TransformMathUtils.sceneToLocalCoordinates(target, hitTargetLocalCoordinates, sandbox.getEngine());
ComponentMapper<TransformComponent> transformMapper = (ComponentMapper<TransformComponent>) ComponentRetriever.getMapper(TransformComponent.class, sandbox.getEngine());
ComponentMapper<ParentNodeComponent> parentMapper = (ComponentMapper<ParentNodeComponent>) ComponentRetriever.getMapper(ParentNodeComponent.class, sandbox.getEngine());
TransformMathUtils.sceneToLocalCoordinates(target, hitTargetLocalCoordinates, transformMapper, parentMapper);
for (int j = 0, s = listeners.size; j < s; j++) {
if (listeners.get(j).touchDown(target, hitTargetLocalCoordinates.x, hitTargetLocalCoordinates.y, pointer, button)) {
return true;
@@ -220,8 +225,9 @@ public class SandboxInputAdapter implements InputProcessor {
public int hit(int root, float x, float y){
Vector2 localCoordinates = tmpVector2.set(x, y);
TransformMathUtils.parentToLocalCoordinates(root, localCoordinates, sandbox.getEngine());
ComponentMapper<TransformComponent> transformMapper = (ComponentMapper<TransformComponent>) ComponentRetriever.getMapper(TransformComponent.class, sandbox.getEngine());
TransformMathUtils.parentToLocalCoordinates(root, localCoordinates, transformMapper);
NodeComponent nodeComponent = SandboxComponentRetriever.get(root, NodeComponent.class);
SnapshotArray<Integer> childrenEntities = nodeComponent.children;
src/main/java/games/rednblack/editor/view/ui/followers/BasicFollower.java
+5 -1
View File
@@ -18,6 +18,7 @@
package games.rednblack.editor.view.ui.followers;
import com.artemis.ComponentMapper;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
@@ -27,6 +28,7 @@ import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Pools;
import games.rednblack.editor.renderer.components.DimensionsComponent;
import games.rednblack.editor.renderer.components.MainItemComponent;
import games.rednblack.editor.renderer.components.ParentNodeComponent;
import games.rednblack.editor.renderer.components.TransformComponent;
import games.rednblack.editor.renderer.utils.TransformMathUtils;
import games.rednblack.editor.utils.runtime.SandboxComponentRetriever;
@@ -76,7 +78,9 @@ public abstract class BasicFollower extends Group {
position.x = 0;
position.y = 0;
TransformMathUtils.localToAscendantCoordinates(sandbox.getCurrentViewingEntity(), entity, position, sandbox.getEngine());
ComponentMapper<TransformComponent> transformMapper = (ComponentMapper<TransformComponent>) ComponentMapper.getFor(TransformComponent.class, sandbox.getEngine());
ComponentMapper<ParentNodeComponent> parentNodeMapper = (ComponentMapper<ParentNodeComponent>) ComponentMapper.getFor(ParentNodeComponent.class, sandbox.getEngine());
TransformMathUtils.localToAscendantCoordinates(sandbox.getCurrentViewingEntity(), entity, position, transformMapper, parentNodeMapper);
position = Sandbox.getInstance().worldToScreen(position);
setX( ( int ) ( position.x ) );