diff --git a/.gitignore b/.gitignore index 9594c45..071f185 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ .mtj.tmp/ # Package Files # -*.jar *.war *.ear diff --git a/lwjgl/ibxm.jar b/lwjgl/ibxm.jar new file mode 100644 index 0000000..619d26e Binary files /dev/null and b/lwjgl/ibxm.jar differ diff --git a/lwjgl/jar/lwjgl.jar b/lwjgl/jar/lwjgl.jar new file mode 100644 index 0000000..2617a79 Binary files /dev/null and b/lwjgl/jar/lwjgl.jar differ diff --git a/lwjgl/jogg-0.0.7.jar b/lwjgl/jogg-0.0.7.jar new file mode 100644 index 0000000..ecb0260 Binary files /dev/null and b/lwjgl/jogg-0.0.7.jar differ diff --git a/lwjgl/jorbis-0.0.15.jar b/lwjgl/jorbis-0.0.15.jar new file mode 100644 index 0000000..4cf51f9 Binary files /dev/null and b/lwjgl/jorbis-0.0.15.jar differ diff --git a/lwjgl/lwjgl.jar b/lwjgl/lwjgl.jar new file mode 100644 index 0000000..5da88d3 Binary files /dev/null and b/lwjgl/lwjgl.jar differ diff --git a/lwjgl/lwjgl_util.jar b/lwjgl/lwjgl_util.jar new file mode 100644 index 0000000..d377c51 Binary files /dev/null and b/lwjgl/lwjgl_util.jar differ diff --git a/lwjgl/lwjgl_util_applet.jar b/lwjgl/lwjgl_util_applet.jar new file mode 100644 index 0000000..99a6ccb Binary files /dev/null and b/lwjgl/lwjgl_util_applet.jar differ diff --git a/lwjgl/natives-linux.jar b/lwjgl/natives-linux.jar new file mode 100644 index 0000000..a543ee0 Binary files /dev/null and b/lwjgl/natives-linux.jar differ diff --git a/lwjgl/natives-mac.jar b/lwjgl/natives-mac.jar new file mode 100644 index 0000000..220012b Binary files /dev/null and b/lwjgl/natives-mac.jar differ diff --git a/lwjgl/natives-windows.jar b/lwjgl/natives-windows.jar new file mode 100644 index 0000000..2fb036f Binary files /dev/null and b/lwjgl/natives-windows.jar differ diff --git a/lwjgl/slick-util-src.zip b/lwjgl/slick-util-src.zip new file mode 100644 index 0000000..3b5e8a8 Binary files /dev/null and b/lwjgl/slick-util-src.zip differ diff --git a/lwjgl/slick-util.jar b/lwjgl/slick-util.jar new file mode 100644 index 0000000..10b552a Binary files /dev/null and b/lwjgl/slick-util.jar differ diff --git a/src/diveengine2d/DiveScript.java b/src/diveengine2d/DiveScript.java index 2a1300a..eacde6e 100644 --- a/src/diveengine2d/DiveScript.java +++ b/src/diveengine2d/DiveScript.java @@ -27,5 +27,5 @@ public abstract class DiveScript { * render method beeboop * @param g */ - public void render(Graphics2D g) {} + public void render() {} } diff --git a/src/diveengine2d/Engine.java b/src/diveengine2d/Engine.java index a77d697..d61b257 100644 --- a/src/diveengine2d/Engine.java +++ b/src/diveengine2d/Engine.java @@ -78,6 +78,7 @@ public class Engine { Tests.run(g); bs.show(); */ + SceneManager.render(); } private void updateScene() { @@ -218,7 +219,25 @@ public class Engine { //glRotatef(50.f, 0.f, 0.f, 1.f); + Time.startTime = System.currentTimeMillis(); + if (System.currentTimeMillis() > Time.nextSecond) { + Time.nextSecond += 1000; + Time.FPS = Time.framesInCurrentSecond; + Time.framesInCurrentSecond = 0; + System.out.println("Timed Frames: " + Time.timedFramesCurrent); + System.out.println("Calculated Frames: " + Time.FPS); + Time.timedFramesCurrent = 0; + } + Time.framesInCurrentSecond++; + + render(); + updateScene(); + Time.tickTime = (System.nanoTime() - Time.nanos)/16640000d; + Time.deltaTime = Time.tickTime * Time.timeScale; + Time.nanos = System.nanoTime(); +// System.out.println("dTime: " + Time.deltaTime); + Time.timedFramesCurrent += Time.deltaTime; glfwSwapBuffers(window); glfwPollEvents(); diff --git a/src/diveengine2d/Entity.java b/src/diveengine2d/Entity.java index aa6fcc0..b0aafd7 100644 --- a/src/diveengine2d/Entity.java +++ b/src/diveengine2d/Entity.java @@ -3,6 +3,8 @@ import java.awt.Graphics2D; import java.util.ArrayList; import java.util.List; +import org.newdawn.slick.Color; + public class Entity { public float x = 0, y = 0, rotation = 0; public boolean enabled = true; @@ -39,7 +41,10 @@ public class Entity { components.add(component); } - public void render(Graphics2D g) { - if(DebugSettings.debugLevel > 0) g.drawString("" + x + ", " + y, x, y - 2); + public void render() { + //if(DebugSettings.debugLevel > 0) g.drawString("" + x + ", " + y, x, y - 2); + Color.white.bind(); + + Fonts.defaultFont.drawString(100, 50, "THE LIGHTWEIGHT JAVA GAMES LIBRARY", Color.yellow); } } diff --git a/src/diveengine2d/Fonts.java b/src/diveengine2d/Fonts.java new file mode 100644 index 0000000..00e3a41 --- /dev/null +++ b/src/diveengine2d/Fonts.java @@ -0,0 +1,17 @@ +package diveengine2d; + +import java.awt.Font; + +import org.newdawn.slick.TrueTypeFont; + +public class Fonts { + public static TrueTypeFont defaultFont; + + static { + + Font awtFont = new Font("Times New Roman", Font.BOLD, 24); + defaultFont = new TrueTypeFont(awtFont, true); + + + } +} diff --git a/src/diveengine2d/SceneManager.java b/src/diveengine2d/SceneManager.java index b18671e..0a9f0a9 100644 --- a/src/diveengine2d/SceneManager.java +++ b/src/diveengine2d/SceneManager.java @@ -186,12 +186,12 @@ public class SceneManager { } } - public static void render(Graphics2D g) { + public static void render() { for(Entity e : entities) { for(DiveScript script : e.components) { - script.render(g); + script.render(); } - e.render(g); + e.render(); } }