diff --git a/core/assets/music.mp3 b/core/assets/music.mp3 new file mode 100644 index 0000000..b763bf3 Binary files /dev/null and b/core/assets/music.mp3 differ diff --git a/core/src/netwerkprog/game/MainGame.java b/core/src/netwerkprog/game/MainGame.java index 03bbda2..f91f753 100644 --- a/core/src/netwerkprog/game/MainGame.java +++ b/core/src/netwerkprog/game/MainGame.java @@ -1,7 +1,11 @@ package netwerkprog.game; import com.badlogic.gdx.ApplicationAdapter; +import com.badlogic.gdx.Files; import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.audio.Music; +import com.badlogic.gdx.backends.lwjgl.audio.Mp3; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; @@ -21,11 +25,17 @@ public class MainGame extends ApplicationAdapter { float ratio = (float) Gdx.graphics.getWidth() / Gdx.graphics.getHeight(); xUpdate = ratio; yUpdate = ratio; + + // play music + Music music = Gdx.audio.newMusic(Gdx.files.getFileHandle("core/assets/music.mp3", Files.FileType.Internal)); + music.setVolume(.1f); + music.play(); + music.setLooping(true); } @Override public void render() { - Gdx.gl.glClearColor(1, 0, 0, 1); + Gdx.gl.glClearColor(xPos/Gdx.graphics.getWidth(), 0, 0, 1); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); batch.begin(); updatePos(); diff --git a/core/src/netwerkprog/game/client/Client.java b/core/src/netwerkprog/game/client/Client.java index 1ad80d4..e5bd3da 100644 --- a/core/src/netwerkprog/game/client/Client.java +++ b/core/src/netwerkprog/game/client/Client.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.net.Socket; import java.util.Scanner; +//TODO rewrite with GDX library https://www.gamefromscratch.com/post/2014/03/11/LibGDX-Tutorial-10-Basic-networking.aspx public class Client { private int port; private String hostname; diff --git a/core/src/netwerkprog/game/server/Server.java b/core/src/netwerkprog/game/server/Server.java index 5f94406..8188d3b 100644 --- a/core/src/netwerkprog/game/server/Server.java +++ b/core/src/netwerkprog/game/server/Server.java @@ -1,5 +1,10 @@ package netwerkprog.game.server; +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.Net; +import com.badlogic.gdx.net.ServerSocketHints; +import com.badlogic.gdx.net.SocketHints; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; @@ -8,6 +13,7 @@ import java.net.Socket; import java.util.ArrayList; import java.util.HashMap; +//TODO rewrite this with the GDX library https://www.gamefromscratch.com/post/2014/03/11/LibGDX-Tutorial-10-Basic-networking.aspx public class Server { private ServerSocket serverSocket; private static final int PORT = 8000; @@ -17,6 +23,7 @@ public class Server { public static void main(String[] args) { Server server = new Server(); server.connect(); + } public void connect() { diff --git a/core/src/netwerkprog/game/server/ServerClient.java b/core/src/netwerkprog/game/server/ServerClient.java index d4bca8e..777b83a 100644 --- a/core/src/netwerkprog/game/server/ServerClient.java +++ b/core/src/netwerkprog/game/server/ServerClient.java @@ -5,6 +5,7 @@ import java.io.DataOutputStream; import java.io.IOException; import java.net.Socket; +//TODO rewrite with GDX library https://www.gamefromscratch.com/post/2014/03/11/LibGDX-Tutorial-10-Basic-networking.aspx public class ServerClient implements Runnable { private DataInputStream in; private DataOutputStream out;