Version 1.5.1: Music update

added current song to HUD
started ground work for menu
optimized rendering: limited frames 60fps

Author: redomar

README.md

@@ -1,4 +1,4 @@
-JavaGame Alpha v1.5
+JavaGame Alpha v1.5.1
 ===================
 
 #####What is JavaGame?

res/music/yoshi.mp3 res/music/yoshi song.mp3res/music/yoshi.mp3 renamed to res/music/yoshi song.mp3

@@ -58,7 +58,7 @@ public class Game extends Canvas implements Runnable {
 	private Player player;
 	private Music music = new Music();
 	private Thread musicThread = new Thread(music);
-	private String nowPlaying = "Playing Music";
+	private String nowPlaying; 
 
 	private boolean notActive = true;
 
@@ -147,7 +147,7 @@ public void run() {
 			long now = System.nanoTime();
 			delta += (now - lastTime) / nsPerTick;
 			lastTime = now;
-			boolean shouldRender = true;
+			boolean shouldRender = false;
 
 			while (delta >= 1) {
 				ticks++;
@@ -235,6 +235,7 @@ public void render() {
 			g.drawString("MUSIC is OFF | press 'M' to start", 0, getHeight()-8);
 		} else{
 			g.drawString("MUSIC is ON | You cannot turn off the music", 0, getHeight()-8);
+			setNowPlaying(WordUtils.capitalize(music.getSongName()[music.getSongNumber()].substring(7, (music.getSongName()[music.getSongNumber()].length() - 4))));
 			g.drawString(nowPlaying, (getWidth() - nowPlaying.length()) - (120 + nowPlaying.length()), getHeight() - 20 );
 		}
 		g.dispose();
@@ -243,25 +244,25 @@ public void render() {
 
 	public static void main(String[] args) {
 		try {
-			JSplash splash = new JSplash(Game.class.getResource("/splash/splash.png"), true, true, false, "v1.5 Alpha", null, Color.RED, Color.ORANGE);
+			JSplash splash = new JSplash(Game.class.getResource("/splash/splash.png"), true, true, false, "v1.5.1 Alpha", null, Color.RED, Color.ORANGE);
 			splash.toFront();
 			splash.splashOn();
 			splash.setProgress(10, "Initializing Game");
-			Thread.sleep(750);
-			splash.setProgress(25, "Loading Classes");
 			Thread.sleep(500);
+			splash.setProgress(25, "Loading Classes");
+			Thread.sleep(250);
 			splash.setProgress(35, "Applying Configurations");
-			Thread.sleep(500);
+			Thread.sleep(250);
 			splash.setProgress(40, "Loading Sprites");
-			Thread.sleep(750);
-			splash.setProgress(50, "Loading Textures");
 			Thread.sleep(500);
+			splash.setProgress(50, "Loading Textures");
+			Thread.sleep(250);
 			splash.setProgress(60, "Loading Map");
-			Thread.sleep(1500);
+			Thread.sleep(750);
 			splash.setProgress(80, "Configuring Map");
-			Thread.sleep(500);
+			Thread.sleep(250);
 			splash.setProgress(90, "Pulling InputPanes");
-			Thread.sleep(750);
+			Thread.sleep(500);
 			splash.setProgress(92, "Aquring data: Multiplayer");
 			Thread.sleep(200);
 			Jdata_Host = JOptionPane.showConfirmDialog(getGame(), "Do you want to be the HOST?");
@@ -277,6 +278,7 @@ public static void main(String[] args) {
 			Thread.sleep(500);
 			splash.splashOff();
 			new Game().start();
+//			new Menu().start();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/com/redomar/game/Game.java

@@ -12,8 +12,8 @@ public class Music implements Runnable{
 
 	private InputStream file;
 	private Player musicPlayer;
-	private String songName[] = {"/music/yoshi.mp3", "/music/Towards The End.mp3"};
-	private int songNumber;
+	private static String songName[] = {"/music/yoshi song.mp3", "/music/Towards The End.mp3", "/music/Towards The End.mp3"};
+	private static int songNumber;
 
 	private static Random rand = new Random();
 
@@ -22,7 +22,7 @@ public Music(InputStream url){
 	}
 
 	public Music() {
-		
+		Music.songNumber = rand.nextInt(3);
 	}
 
 	public void Play(){
@@ -35,6 +35,10 @@ public void Play(){
             System.out.println(e);
 		}
 	}
+	
+	public synchronized void start(){
+		this.run();
+	}
 
 	@Override
 	public void run() {
@@ -57,6 +61,14 @@ public void stop() {
 	}
 
 	private void initSongNumber() {
-		this.songNumber = rand.nextInt(2);
+		Music.songNumber = rand.nextInt(3);
+	}
+
+	public String[] getSongName() {
+		return songName;
+	}
+
+	public int getSongNumber() {
+		return songNumber;
 	}
 }

src/com/redomar/game/lib/Music.java

@@ -0,0 +1,34 @@
+package com.redomar.game.menu;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+
+import javax.swing.JFrame;
+
+public class DedicatedJFrame {
+
+	private static JFrame frame;
+
+	public DedicatedJFrame(int WIDTH, int HEIGHT, int SCALE, String NAME){
+		setFrame(new JFrame(NAME));
+		getFrame().setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		getFrame().setLayout(new BorderLayout());
+		getFrame().pack();
+		getFrame().setResizable(false);
+		getFrame().setLocationRelativeTo(null);
+		getFrame().setVisible(true);
+		
+		getFrame().setMinimumSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
+		getFrame().setMaximumSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
+		getFrame().setPreferredSize(new Dimension(WIDTH * SCALE, HEIGHT * SCALE));
+	}
+	
+	public JFrame getFrame() {
+		return frame;
+	}
+
+	public void setFrame(JFrame frame) {
+		DedicatedJFrame.frame = frame;
+	}
+	
+}

src/com/redomar/game/menu/DedicatedJFrame.java

@@ -0,0 +1,89 @@
+package com.redomar.game.menu;
+
+import java.awt.Color;
+import java.util.Random;
+
+
+
+public class Menu implements Runnable{
+
+	private static final int WIDTH = 160;
+	private static final int HEIGHT = (WIDTH / 3 * 2);
+	private static final int SCALE = 3;
+	private static final String NAME = "Menu";
+	
+	private DedicatedJFrame frame = new DedicatedJFrame(WIDTH, HEIGHT, SCALE, NAME);
+	
+	private boolean running = false;
+	
+	public synchronized void start() {
+		running = true;
+		new Thread(this).start();
+	}
+
+	public synchronized void stop() {
+		running = false;
+	}
+	
+	public void run() {
+		long lastTime = System.nanoTime();
+		double nsPerTick = 1000000000D / 3D;
+
+		int ticks = 0;
+		int frames = 0;
+
+		long lastTimer = System.currentTimeMillis();
+		double delta = 0;
+
+		while (running) {
+			long now = System.nanoTime();
+			delta += (now - lastTime) / nsPerTick;
+			lastTime = now;
+			boolean shouldRender = false;
+
+			while (delta >= 1) {
+				ticks++;
+				delta -= 1;
+				shouldRender = true;
+			}
+
+			try {
+				Thread.sleep(2);
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
+
+			if (shouldRender) {
+				frames++;
+				render();
+			}
+
+			if (System.currentTimeMillis() - lastTimer >= 1000) {
+				lastTimer += 1000;
+				frame.getFrame().setTitle("Frames: " + frames + " Ticks: " + ticks);
+				frames = 0;
+				ticks = 0;
+			}
+		}
+	}
+
+	private void render() {
+		frame.getFrame().getContentPane().setBackground(Color.BLACK);
+		
+		Random rand = new Random();
+		
+		float r = rand.nextFloat();
+		float g = rand.nextFloat();
+		float b = rand.nextFloat();
+		
+		Color randomColor = new Color(r, g, b);
+		
+		frame.getFrame().getContentPane().setBackground(randomColor);
+		
+	}
+
+//	public static void main(String[] args) {
+//		new Menu().start();
+//	}
+	
+}