diff options
12 files changed, 23 insertions, 22 deletions
diff --git a/core/src/main/java/kz/ilotterytea/frogartha/entities/PlayerEntity.java b/core/src/main/java/kz/ilotterytea/frogartha/entities/PlayerEntity.java index a4f42de..94f5e28 100644 --- a/core/src/main/java/kz/ilotterytea/frogartha/entities/PlayerEntity.java +++ b/core/src/main/java/kz/ilotterytea/frogartha/entities/PlayerEntity.java @@ -9,8 +9,8 @@ import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.math.collision.Ray; import kz.ilotterytea.frogartha.FrogarthaConstants; import kz.ilotterytea.frogartha.FrogarthaGame; -import kz.ilotterytea.frogartha.domain.client.ChangedDirectionAction; -import kz.ilotterytea.frogartha.domain.client.PlayerJumpAction; +import kz.ilotterytea.frogartha.domain.actions.ChangedDirectionAction; +import kz.ilotterytea.frogartha.domain.actions.PlayerJumpAction; public class PlayerEntity extends RenderableEntity { private final Camera camera; diff --git a/core/src/main/java/kz/ilotterytea/frogartha/screens/GameScreen.java b/core/src/main/java/kz/ilotterytea/frogartha/screens/GameScreen.java index 24fc00c..51f7287 100644 --- a/core/src/main/java/kz/ilotterytea/frogartha/screens/GameScreen.java +++ b/core/src/main/java/kz/ilotterytea/frogartha/screens/GameScreen.java @@ -79,9 +79,10 @@ public class GameScreen implements Screen { // Building a dummy scene ModelBuilder modelBuilder = new ModelBuilder(); - Model plane = modelBuilder.createBox(20f, 0.1f, 20f, new Material(ColorAttribute.createDiffuse(Color.LIME)), + Model plane = modelBuilder.createBox(20f, 1f, 20f, new Material(ColorAttribute.createDiffuse(Color.LIME)), VertexAttributes.Usage.Position | VertexAttributes.Usage.Normal); Scene planeScene = new Scene(new ModelInstance(plane)); + planeScene.modelInstance.transform.translate(0f, -1f, 0f); sceneManager.addScene(planeScene); camera = new PerspectiveCamera(60f, Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); diff --git a/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java b/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java index 7b3ae4e..738ee3a 100644 --- a/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java +++ b/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionClient.java @@ -8,9 +8,9 @@ import com.github.czyzby.websocket.serialization.impl.ManualSerializer; import kz.ilotterytea.frogartha.FrogarthaConstants; import kz.ilotterytea.frogartha.FrogarthaGame; import kz.ilotterytea.frogartha.domain.Identity; +import kz.ilotterytea.frogartha.domain.events.ChangedDirectionEvent; +import kz.ilotterytea.frogartha.domain.events.PlayerJumpEvent; import kz.ilotterytea.frogartha.domain.server.Acknowledge; -import kz.ilotterytea.frogartha.events.ChangedDirectionEvent; -import kz.ilotterytea.frogartha.events.PlayerJumpEvent; import kz.ilotterytea.frogartha.exceptions.PlayerKickException; import kz.ilotterytea.frogartha.utils.Logger; import kz.ilotterytea.frogartha.utils.SerializerUtils; diff --git a/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionHandlers.java b/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionHandlers.java index 21bf8d9..2fc50b8 100644 --- a/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionHandlers.java +++ b/core/src/main/java/kz/ilotterytea/frogartha/sessions/SessionHandlers.java @@ -2,10 +2,10 @@ package kz.ilotterytea.frogartha.sessions; import com.badlogic.gdx.math.Vector3; import kz.ilotterytea.frogartha.FrogarthaGame; +import kz.ilotterytea.frogartha.domain.events.ChangedDirectionEvent; +import kz.ilotterytea.frogartha.domain.events.PlayerJumpEvent; import kz.ilotterytea.frogartha.domain.server.Acknowledge; import kz.ilotterytea.frogartha.entities.PlayerEntity; -import kz.ilotterytea.frogartha.events.ChangedDirectionEvent; -import kz.ilotterytea.frogartha.events.PlayerJumpEvent; import kz.ilotterytea.frogartha.screens.GameScreen; import kz.ilotterytea.frogartha.utils.Logger; diff --git a/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java b/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java index 1a94970..24a607d 100644 --- a/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java +++ b/server/src/main/java/kz/ilotterytea/frogartha/server/FrogarthaServer.java @@ -2,8 +2,8 @@ package kz.ilotterytea.frogartha.server; import com.github.czyzby.websocket.serialization.impl.ManualSerializer; import kz.ilotterytea.frogartha.domain.Identity; -import kz.ilotterytea.frogartha.domain.client.ChangedDirectionAction; -import kz.ilotterytea.frogartha.domain.client.PlayerJumpAction; +import kz.ilotterytea.frogartha.domain.actions.ChangedDirectionAction; +import kz.ilotterytea.frogartha.domain.actions.PlayerJumpAction; import kz.ilotterytea.frogartha.exceptions.PlayerKickException; import kz.ilotterytea.frogartha.utils.Logger; import kz.ilotterytea.frogartha.utils.SerializerUtils; diff --git a/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java b/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java index b6dcc3c..1cc0e57 100644 --- a/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java +++ b/server/src/main/java/kz/ilotterytea/frogartha/server/ServerHandlers.java @@ -4,11 +4,11 @@ import com.badlogic.gdx.math.Vector3; import kz.ilotterytea.frogartha.FrogarthaConstants; import kz.ilotterytea.frogartha.domain.Identity; import kz.ilotterytea.frogartha.domain.PlayerState; -import kz.ilotterytea.frogartha.domain.client.ChangedDirectionAction; -import kz.ilotterytea.frogartha.domain.client.PlayerJumpAction; +import kz.ilotterytea.frogartha.domain.actions.ChangedDirectionAction; +import kz.ilotterytea.frogartha.domain.actions.PlayerJumpAction; +import kz.ilotterytea.frogartha.domain.events.ChangedDirectionEvent; +import kz.ilotterytea.frogartha.domain.events.PlayerJumpEvent; import kz.ilotterytea.frogartha.domain.server.Acknowledge; -import kz.ilotterytea.frogartha.events.ChangedDirectionEvent; -import kz.ilotterytea.frogartha.events.PlayerJumpEvent; import kz.ilotterytea.frogartha.exceptions.PlayerKickException; import kz.ilotterytea.frogartha.utils.Logger; diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/client/ChangedDirectionAction.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/ChangedDirectionAction.java index 9c64c56..b3004ba 100644 --- a/shared/src/main/java/kz/ilotterytea/frogartha/domain/client/ChangedDirectionAction.java +++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/ChangedDirectionAction.java @@ -1,4 +1,4 @@ -package kz.ilotterytea.frogartha.domain.client; +package kz.ilotterytea.frogartha.domain.actions; import com.badlogic.gdx.math.Vector3; import com.github.czyzby.websocket.serialization.SerializationException; diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/domain/client/PlayerJumpAction.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/PlayerJumpAction.java index 272f514..9d150a4 100644 --- a/shared/src/main/java/kz/ilotterytea/frogartha/domain/client/PlayerJumpAction.java +++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/actions/PlayerJumpAction.java @@ -1,4 +1,4 @@ -package kz.ilotterytea.frogartha.domain.client; +package kz.ilotterytea.frogartha.domain.actions; import com.github.czyzby.websocket.serialization.SerializationException; import com.github.czyzby.websocket.serialization.Transferable; diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/events/ChangedDirectionEvent.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/ChangedDirectionEvent.java index eefe20a..71eea4d 100644 --- a/shared/src/main/java/kz/ilotterytea/frogartha/events/ChangedDirectionEvent.java +++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/ChangedDirectionEvent.java @@ -1,4 +1,4 @@ -package kz.ilotterytea.frogartha.events; +package kz.ilotterytea.frogartha.domain.events; import com.badlogic.gdx.math.Vector3; import com.github.czyzby.websocket.serialization.SerializationException; diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/events/Event.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/Event.java index dcc0177..3c1efe7 100644 --- a/shared/src/main/java/kz/ilotterytea/frogartha/events/Event.java +++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/Event.java @@ -1,4 +1,4 @@ -package kz.ilotterytea.frogartha.events; +package kz.ilotterytea.frogartha.domain.events; public class Event { protected int playerId; diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/events/PlayerJumpEvent.java b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/PlayerJumpEvent.java index a084555..6df14bc 100644 --- a/shared/src/main/java/kz/ilotterytea/frogartha/events/PlayerJumpEvent.java +++ b/shared/src/main/java/kz/ilotterytea/frogartha/domain/events/PlayerJumpEvent.java @@ -1,4 +1,4 @@ -package kz.ilotterytea.frogartha.events; +package kz.ilotterytea.frogartha.domain.events; import com.badlogic.gdx.math.Vector3; import com.github.czyzby.websocket.serialization.SerializationException; diff --git a/shared/src/main/java/kz/ilotterytea/frogartha/utils/SerializerUtils.java b/shared/src/main/java/kz/ilotterytea/frogartha/utils/SerializerUtils.java index a00c0ff..2df2acf 100644 --- a/shared/src/main/java/kz/ilotterytea/frogartha/utils/SerializerUtils.java +++ b/shared/src/main/java/kz/ilotterytea/frogartha/utils/SerializerUtils.java @@ -2,11 +2,11 @@ package kz.ilotterytea.frogartha.utils; import com.github.czyzby.websocket.serialization.impl.ManualSerializer; import kz.ilotterytea.frogartha.domain.Identity; -import kz.ilotterytea.frogartha.domain.client.ChangedDirectionAction; -import kz.ilotterytea.frogartha.domain.client.PlayerJumpAction; +import kz.ilotterytea.frogartha.domain.actions.ChangedDirectionAction; +import kz.ilotterytea.frogartha.domain.actions.PlayerJumpAction; +import kz.ilotterytea.frogartha.domain.events.ChangedDirectionEvent; +import kz.ilotterytea.frogartha.domain.events.PlayerJumpEvent; import kz.ilotterytea.frogartha.domain.server.Acknowledge; -import kz.ilotterytea.frogartha.events.ChangedDirectionEvent; -import kz.ilotterytea.frogartha.events.PlayerJumpEvent; import kz.ilotterytea.frogartha.exceptions.PlayerKickException; public class SerializerUtils { |