valerie
/
MAndEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mooooom it autoformatted again!

master
Marcus Gosselin 2015-01-17 15:22:21 -05:00
parent fa71eb436b
commit aad6224fbc
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/MAndEngine/Engine.java
View File

@ -19,8 +19,7 @@ import java.util.Stack;
import javax.swing.*; import javax.swing.*;
public class Engine extends Canvas implements KeyListener, MouseMotionListener, public class Engine extends Canvas implements KeyListener, MouseMotionListener, MouseListener, ContainerListener, ComponentListener {
MouseListener, ContainerListener, ComponentListener {
/** /**
* to track the x and y * to track the x and y
@ -62,8 +61,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener,
/** /**
* more framerate stuff, again, chill. * more framerate stuff, again, chill.
*/ */
private static long nextSecond = System.currentTimeMillis() + 1000, private static long nextSecond = System.currentTimeMillis() + 1000, startTime = 0;
startTime = 0;
/** /**
* if our current framerate is below our expected. its not directly * if our current framerate is below our expected. its not directly
@ -185,8 +183,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener,
} }
// this is the later part referred to by a few lines back // this is the later part referred to by a few lines back
repaint(); repaint();
progress += (appInitializer.getProgress() - progress) progress += (appInitializer.getProgress() - progress) / ANIMATION_CONSTANT;
/ ANIMATION_CONSTANT;
} }
// we done now, gather the loot. // we done now, gather the loot.
@ -226,8 +223,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener,
// FRAMERATE OVERCLOCKING AND SUCH, MOVE ALONG. // FRAMERATE OVERCLOCKING AND SUCH, MOVE ALONG.
try { try {
if (!overclock) if (!overclock)
Thread.sleep((long) Math.floor(sleepTime Thread.sleep((long) Math.floor(sleepTime - (System.currentTimeMillis() - startTime)));
- (System.currentTimeMillis() - startTime)));
else else
Thread.sleep(0); Thread.sleep(0);
lag = false; lag = false;
@ -300,8 +296,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener,
* @param app * @param app
*/ */
private static void setWindowProperties(BasicApp app) { private static void setWindowProperties(BasicApp app) {
setWindowProperties(app.getResolution(), app.getFramerate(), setWindowProperties(app.getResolution(), app.getFramerate(), app.getResizable());
app.getResizable());
} }
/** /**
@ -311,8 +306,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener,
* @param fps * @param fps
* @param resizable * @param resizable
*/ */
private static void setWindowProperties(Dimension dimension, int fps, private static void setWindowProperties(Dimension dimension, int fps, boolean resizable) {
boolean resizable) {
frame.setResizable(resizable); frame.setResizable(resizable);
staticMain.setSize(dimension); staticMain.setSize(dimension);
frame.pack(); frame.pack();
@ -334,10 +328,8 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener,
private static void render(Graphics2D g) { private static void render(Graphics2D g) {
g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
RenderingHints.VALUE_TEXT_ANTIALIAS_ON); g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
g.setFont(defaultFont); g.setFont(defaultFont);
@ -366,8 +358,7 @@ public class Engine extends Canvas implements KeyListener, MouseMotionListener,
if (debug > 0) if (debug > 0)
if (!(log.size() == 0)) if (!(log.size() == 0))
for (int i = log.size() - 1; i >= 0; i--) for (int i = log.size() - 1; i >= 0; i--)
log.elementAt(i).render(g, WIDTH - 200, log.elementAt(i).render(g, WIDTH - 200, HEIGHT - 10 - (i * 12));
HEIGHT - 10 - (i * 12));
} catch (Exception e) { } catch (Exception e) {
g.setFont(largerFont); g.setFont(largerFont);
g.setColor(Color.BLACK); g.setColor(Color.BLACK);