From 07d546b7d02ecebdd8207c9df0fed7f47004b8bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Wed, 3 Mar 2021 14:10:58 +0100 Subject: [PATCH] Refactor camera access in Context interface --- .../bartlomiejpluta/base/api/game/context/Context.java | 6 ++---- .../base/engine/project/model/RenderableContext.java | 10 ++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java index ba936a81..fa397ddb 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java @@ -1,14 +1,12 @@ package com.bartlomiejpluta.base.api.game.context; +import com.bartlomiejpluta.base.api.game.camera.Camera; import com.bartlomiejpluta.base.api.game.entity.Entity; -import org.joml.Vector2f; public interface Context { void openMap(String mapUid); Entity createEntity(String entitySetUid); - void setCameraPosition(Vector2f position); - - void setCameraPosition(float x, float y); + Camera getCamera(); } diff --git a/engine/src/main/java/com/bartlomiejpluta/base/engine/project/model/RenderableContext.java b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/model/RenderableContext.java index 47809201..244a4d45 100644 --- a/engine/src/main/java/com/bartlomiejpluta/base/engine/project/model/RenderableContext.java +++ b/engine/src/main/java/com/bartlomiejpluta/base/engine/project/model/RenderableContext.java @@ -18,7 +18,6 @@ import com.bartlomiejpluta.base.engine.world.map.model.DefaultGameMap; import com.bartlomiejpluta.base.engine.world.tileset.manager.TileSetManager; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.joml.Vector2f; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -59,13 +58,8 @@ public class RenderableContext implements Context, Updatable, Renderable { } @Override - public void setCameraPosition(Vector2f position) { - camera.setPosition(position); - } - - @Override - public void setCameraPosition(float x, float y) { - camera.setPosition(x, y); + public Camera getCamera() { + return camera; } public void input(Window window) {