bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename Window to Screen

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-03-09 19:49:50 +01:00
parent 4a1beb5101
commit d0bfa6369a
25 changed files with 110 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/main/java/com/bartlomiejpluta/base/api/game/camera/Camera.java
View File

@@ -1,6 +1,6 @@
package com.bartlomiejpluta.base.api.game.camera;
import com.bartlomiejpluta.base.api.game.window.Window;
import com.bartlomiejpluta.base.api.game.screen.Screen;
import com.bartlomiejpluta.base.api.internal.object.Placeable;
import com.bartlomiejpluta.base.api.internal.render.ShaderManager;
import org.joml.Matrix4fc;
@@ -8,5 +8,5 @@ import org.joml.Matrix4fc;
public interface Camera extends Placeable {
Matrix4fc computeViewModelMatrix(Matrix4fc modelMatrix);
void render(Window window, ShaderManager shaderManager);
void render(Screen screen, ShaderManager shaderManager);
}

4
api/src/main/java/com/bartlomiejpluta/base/api/game/context/Context.java
View File

@@ -3,10 +3,10 @@ package com.bartlomiejpluta.base.api.game.context;
import com.bartlomiejpluta.base.api.game.camera.Camera;
import com.bartlomiejpluta.base.api.game.entity.Entity;
import com.bartlomiejpluta.base.api.game.image.Image;
import com.bartlomiejpluta.base.api.game.window.Window;
import com.bartlomiejpluta.base.api.game.screen.Screen;
public interface Context {
Window getWindow();
Screen getScreen();
Camera getCamera();

6
api/src/main/java/com/bartlomiejpluta/base/api/game/entity/EntityDelegate.java
View File

@@ -2,7 +2,7 @@ package com.bartlomiejpluta.base.api.game.entity;
import com.bartlomiejpluta.base.api.game.camera.Camera;
import com.bartlomiejpluta.base.api.game.map.layer.object.ObjectLayer;
import com.bartlomiejpluta.base.api.game.window.Window;
import com.bartlomiejpluta.base.api.game.screen.Screen;
import com.bartlomiejpluta.base.api.internal.object.Placeable;
import com.bartlomiejpluta.base.api.internal.render.ShaderManager;
import org.joml.Matrix4fc;
@@ -192,7 +192,7 @@ public abstract class EntityDelegate implements Entity {
}
@Override
public void render(Window window, Camera camera, ShaderManager shaderManager) {
entity.render(window, camera, shaderManager);
public void render(Screen screen, Camera camera, ShaderManager shaderManager) {
entity.render(screen, camera, shaderManager);
}
}

6
api/src/main/java/com/bartlomiejpluta/base/api/game/map/handler/MapHandler.java
View File

@@ -2,16 +2,16 @@ package com.bartlomiejpluta.base.api.game.map.handler;
import com.bartlomiejpluta.base.api.game.context.Context;
import com.bartlomiejpluta.base.api.game.map.model.GameMap;
import com.bartlomiejpluta.base.api.game.window.Window;
import com.bartlomiejpluta.base.api.game.screen.Screen;
public interface MapHandler {
void onCreate(Context context, GameMap map);
void onOpen(Context context, GameMap map);
void input(Window window);
void input(Screen screen);
void update(Context context, GameMap map, float dt);
void postRender(Window window);
void postRender(Screen screen);
}

4
api/src/main/java/com/bartlomiejpluta/base/api/game/window/Window.java → api/src/main/java/com/bartlomiejpluta/base/api/game/screen/Screen.java
View File

@@ -1,9 +1,9 @@
package com.bartlomiejpluta.base.api.game.window;
package com.bartlomiejpluta.base.api.game.screen;
import com.bartlomiejpluta.base.api.game.input.Key;
import org.joml.Vector2fc;
public interface Window {
public interface Screen {
void init();
int getWidth();

4
api/src/main/java/com/bartlomiejpluta/base/api/internal/render/Renderable.java
View File

@@ -1,8 +1,8 @@
package com.bartlomiejpluta.base.api.internal.render;
import com.bartlomiejpluta.base.api.game.camera.Camera;
import com.bartlomiejpluta.base.api.game.window.Window;
import com.bartlomiejpluta.base.api.game.screen.Screen;
public interface Renderable {
void render(Window window, Camera camera, ShaderManager shaderManager);
void render(Screen screen, Camera camera, ShaderManager shaderManager);
}