diff --git a/pixels/.classpath b/pixels/.classpath index dfa42f8..a8fcd25 100644 --- a/pixels/.classpath +++ b/pixels/.classpath @@ -2,5 +2,6 @@ + diff --git a/pixels/bin/bz/bronze/pixels/engine/GameContainer.class b/pixels/bin/bz/bronze/pixels/engine/GameContainer.class index ea03637..1a733a7 100644 Binary files a/pixels/bin/bz/bronze/pixels/engine/GameContainer.class and b/pixels/bin/bz/bronze/pixels/engine/GameContainer.class differ diff --git a/pixels/bin/bz/bronze/pixels/engine/Renderer.class b/pixels/bin/bz/bronze/pixels/engine/Renderer.class index 0497ca3..b7e4630 100644 Binary files a/pixels/bin/bz/bronze/pixels/engine/Renderer.class and b/pixels/bin/bz/bronze/pixels/engine/Renderer.class differ diff --git a/pixels/bin/bz/bronze/pixels/engine/Window.class b/pixels/bin/bz/bronze/pixels/engine/Window.class index eb8b60f..86bfce7 100644 Binary files a/pixels/bin/bz/bronze/pixels/engine/Window.class and b/pixels/bin/bz/bronze/pixels/engine/Window.class differ diff --git a/pixels/bin/bz/bronze/pixels/engine/gfx/Image.class b/pixels/bin/bz/bronze/pixels/engine/gfx/Image.class new file mode 100644 index 0000000..9644ec2 Binary files /dev/null and b/pixels/bin/bz/bronze/pixels/engine/gfx/Image.class differ diff --git a/pixels/bin/bz/bronze/pixels/game/GameManager.class b/pixels/bin/bz/bronze/pixels/game/GameManager.class index d56dfe0..dbe29ab 100644 Binary files a/pixels/bin/bz/bronze/pixels/game/GameManager.class and b/pixels/bin/bz/bronze/pixels/game/GameManager.class differ diff --git a/pixels/bin/test.png b/pixels/bin/test.png new file mode 100644 index 0000000..e053c5b Binary files /dev/null and b/pixels/bin/test.png differ diff --git a/pixels/res/test.png b/pixels/res/test.png new file mode 100644 index 0000000..e053c5b Binary files /dev/null and b/pixels/res/test.png differ diff --git a/pixels/src/bz/bronze/pixels/engine/GameContainer.java b/pixels/src/bz/bronze/pixels/engine/GameContainer.java index b98fb3c..803cdb8 100644 --- a/pixels/src/bz/bronze/pixels/engine/GameContainer.java +++ b/pixels/src/bz/bronze/pixels/engine/GameContainer.java @@ -75,8 +75,8 @@ public class GameContainer implements Runnable { } if (render) { - renderer.test(); - //renderer.clear(); + //renderer.test(); + renderer.clear(); game.render(renderer); Window.update(); diff --git a/pixels/src/bz/bronze/pixels/engine/Renderer.java b/pixels/src/bz/bronze/pixels/engine/Renderer.java index f4a47b8..acbfa5b 100644 --- a/pixels/src/bz/bronze/pixels/engine/Renderer.java +++ b/pixels/src/bz/bronze/pixels/engine/Renderer.java @@ -30,12 +30,14 @@ public class Renderer { if ((x < 0 || x >= pW || y < 0 || y >= pH) || value == 0xffff00ff) { return; } + + p[x + y * pW] = value; } public void drawImage(Image image, int offX, int offY) { for (int y = 0; y < image.getH(); y++) { for (int x = 0; x < image.getW(); x++) { - + setPixel(x + offX, y + offY, image.getP()[x + y * image.getW()]); } } } diff --git a/pixels/src/bz/bronze/pixels/engine/Window.java b/pixels/src/bz/bronze/pixels/engine/Window.java index d60086d..2d19e40 100644 --- a/pixels/src/bz/bronze/pixels/engine/Window.java +++ b/pixels/src/bz/bronze/pixels/engine/Window.java @@ -28,7 +28,7 @@ public class Window { } public void create() { - window.setSize(width, height); + window.setSize(width * scale, height * scale); window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); window.setLayout(new BorderLayout()); window.add(viewport, BorderLayout.CENTER); diff --git a/pixels/src/bz/bronze/pixels/game/GameManager.java b/pixels/src/bz/bronze/pixels/game/GameManager.java index d69aec3..60b6c41 100644 --- a/pixels/src/bz/bronze/pixels/game/GameManager.java +++ b/pixels/src/bz/bronze/pixels/game/GameManager.java @@ -5,24 +5,25 @@ import java.awt.event.KeyEvent; import bz.bronze.pixels.engine.AbstractGame; import bz.bronze.pixels.engine.GameContainer; import bz.bronze.pixels.engine.Renderer; +import bz.bronze.pixels.engine.gfx.Image; public class GameManager extends AbstractGame { static GameContainer gc; + + private Image image; public GameManager() { - + image = new Image("/test.png"); } @Override public void update(float dt) { - if (gc.input.isKey(KeyEvent.VK_SPACE)) { - System.out.println("pop goes the weasel"); - } + } @Override public void render(Renderer r) { - + r.drawImage(image, gc.input.mouseX - image.getW() / 2, gc.input.mouseY - image.getH() / 2); } public static void main(String[] args) {