Skip to content

Commit 9c2a78f

Browse files
committed
UI stuff, I'm going to stop committing every 5 minutes now
1 parent c1ce388 commit 9c2a78f

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
# Ignore Gradle build output directory
55
build
66
gradle.properties
7+
8+
9+
src/main/java/test/

src/main/java/com/spireprod/cje/ConsoleJavaEngine.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.spireprod.cje.core.input.Input;
1919
import com.spireprod.cje.core.scenes.Scene;
2020
import com.spireprod.cje.core.scenes.SceneManager;
21+
import com.spireprod.cje.core.ui.TextUI;
2122

2223
public abstract class ConsoleJavaEngine {
2324

@@ -28,6 +29,7 @@ public abstract class ConsoleJavaEngine {
2829

2930
protected Terminal terminal;
3031
protected SceneManager sceneManager;
32+
protected TextUI ctx;
3133
protected ConsoleRenderer renderer;
3234
protected Input input;
3335
protected SwingTerminalFrame frame;
@@ -143,8 +145,8 @@ private void onGameInput(float deltaTime, Input input) {
143145
sceneManager.sceneInput(deltaTime, input);
144146
}
145147

146-
private void onGameUIRender(ConsoleRenderer renderer, Input input) {
147-
sceneManager.sceneUIRender(renderer, input);
148+
private void onGameUIRender(TextUI ctx, ConsoleRenderer renderer, Input input) {
149+
sceneManager.sceneUIRender(ctx, renderer, input);
148150
}
149151

150152
private void onGameRender(ConsoleRenderer renderer) {
@@ -182,7 +184,11 @@ private void loop() throws IOException, InterruptedException {
182184
renderer.clearScreen();
183185

184186
onGameRender(renderer);
185-
onGameUIRender(renderer, input);
187+
188+
// CJE-IMGUI Stuff
189+
ctx.reset();
190+
onGameUIRender(ctx, renderer, input);
191+
ctx.handleInput(input);
186192

187193
screen.refresh();
188194
input.endFrame(); // Moved Here for UI Input

src/main/java/com/spireprod/cje/core/scenes/Scene.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
import com.spireprod.cje.core.ConsoleRenderer;
44
import com.spireprod.cje.core.input.Input;
5+
import com.spireprod.cje.core.ui.TextUI;
56

67
public interface Scene {
78

89
void onSceneUpdate(float delta);
910

1011
void onSceneRender(ConsoleRenderer renderer);
1112

12-
void onSceneUIRender(ConsoleRenderer renderer, Input input);
13+
void onSceneUIRender(TextUI ctx, ConsoleRenderer renderer, Input input);
1314

1415
void onSceneInput(float delta, Input input);
1516

src/main/java/com/spireprod/cje/core/scenes/SceneManager.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.spireprod.cje.core.ConsoleRenderer;
44
import com.spireprod.cje.core.input.Input;
5+
import com.spireprod.cje.core.ui.TextUI;
56

67
public class SceneManager {
78

@@ -20,16 +21,16 @@ public void sceneInput(float deltaTime, Input input) {
2021
currentScene.onSceneInput(deltaTime, input);
2122
}
2223

23-
public void sceneUIRender(ConsoleRenderer renderer, Input input) {
24+
public void sceneUIRender(TextUI ctx, ConsoleRenderer renderer, Input input) {
2425
if (currentScene != null)
25-
currentScene.onSceneUIRender(renderer, input);
26+
currentScene.onSceneUIRender(ctx, renderer, input);
2627
}
27-
28+
2829
public void sceneRender(ConsoleRenderer renderer) {
2930
if (currentScene != null)
3031
currentScene.onSceneRender(renderer);
3132
}
32-
33+
3334
public void setScene(Scene scene) {
3435
currentScene = scene;
3536
}

0 commit comments

Comments
 (0)