diff --git a/src/data/loadbar.png b/src/data/loadbar.png index 076f8bb..e7dbc19 100644 Binary files a/src/data/loadbar.png and b/src/data/loadbar.png differ diff --git a/src/data/loadbar_back.png b/src/data/loadbar_back.png deleted file mode 100644 index 4672810..0000000 Binary files a/src/data/loadbar_back.png and /dev/null differ diff --git a/src/data/loadbar_front.png b/src/data/loadbar_front.png index 9a3f809..8379fec 100644 Binary files a/src/data/loadbar_front.png and b/src/data/loadbar_front.png differ diff --git a/src/ei/engine/LWJGLGameWindow.java b/src/ei/engine/LWJGLGameWindow.java index 0eccaf9..da9b97a 100644 --- a/src/ei/engine/LWJGLGameWindow.java +++ b/src/ei/engine/LWJGLGameWindow.java @@ -22,8 +22,6 @@ public class LWJGLGameWindow { private static Camera cam; // The framerate private int fps; - // If fullscreen - private boolean fullscreen; // The title private String title; // The fps calculator @@ -64,7 +62,6 @@ public class LWJGLGameWindow { LWJGLGameWindow.width = width; LWJGLGameWindow.height = height; this.fps = fps; - this.fullscreen = fullscreen; this.title = title; MultiPrintStream.makeInstance(new MultiPrintStream("log.txt")); @@ -90,7 +87,6 @@ public class LWJGLGameWindow { public void createWindow(DisplayMode dm, boolean fullscreen){ LWJGLGameWindow.width = dm.getWidth(); LWJGLGameWindow.height = dm.getHeight(); - this.fullscreen = fullscreen; MultiPrintStream.makeInstance(new MultiPrintStream("log.txt")); try { diff --git a/src/ei/engine/effects/BitmapProgressBar.java b/src/ei/engine/effects/BitmapProgressBar.java index 8945a60..7d9b2bb 100644 --- a/src/ei/engine/effects/BitmapProgressBar.java +++ b/src/ei/engine/effects/BitmapProgressBar.java @@ -97,7 +97,7 @@ public class BitmapProgressBar extends Entity{ if(progress != null){ progress.setLocation(new Vector3f( (LWJGLGameWindow.getWidth()/2)-progress.getSize().getX(), - (LWJGLGameWindow.getHeight()/2)+3,0.0f)); + (LWJGLGameWindow.getHeight()/2),0.0f)); } if(background != null){ background.setLocation(getLocation()); @@ -200,7 +200,7 @@ public class BitmapProgressBar extends Entity{ if(progress != null){ progress.setLocation(new Vector3f( getLocation().getX()-progress.getSize().getX()+(progress.getSize().getX()*procent), - getLocation().getY()+6,0.0f)); + getLocation().getY(),0.0f)); progress.render(); } if(bar != null) bar.render(); diff --git a/src/ei/engine/sound/SoundManager.java b/src/ei/engine/sound/SoundManager.java index 41cc1c2..d0b0185 100644 --- a/src/ei/engine/sound/SoundManager.java +++ b/src/ei/engine/sound/SoundManager.java @@ -279,4 +279,10 @@ public class SoundManager { } return instance; } + + public void clear(){ + for(int i=0; i