Added Music

Author: ChezyName

.idea/workspace.xml

@@ -5,6 +5,7 @@
 import ObsidianEngine.render.Texture;
 import ObsidianEngine.utils.FileUtils;
 import ObsidianEngine.utils.MathUtils;
+import org.joml.Vector2f;
 import org.joml.Vector3f;
 
 import java.util.ArrayList;
@@ -22,11 +23,8 @@ public Zombie(Vector3f StartPosiition, float Radius, int Wave){
         this.mesh = Zombie;
         this.WaveSpawnedOn = Wave;
 
-        System.out.println("Spawning Zombies @ " + StartPosiition);
-
-        float X = (StartPosiition.x) + (MathUtils.getRandomPosNegHalf() * (Radius));
-        float Y = (StartPosiition.y) + (MathUtils.getRandomPosNegHalf() * (Radius));
-        Zombie.setPosition(X,0,Y);
+        Vector2f RandomPoint = MathUtils.getRandomPointOnRadius(StartPosiition.x,StartPosiition.z,Radius);
+        Zombie.setPosition(RandomPoint.x,0,RandomPoint.y);
         Dead = false;
     }
 

src/main/java/Game/Zombie.java

@@ -22,7 +22,7 @@
 import static org.lwjgl.opengl.GL15.*;
 import static org.lwjgl.opengl.GL30.*;
 
-public class Mesh {
+public class Mesh implements Cloneable {
     private Vector3f[] vertices;
     private int[] indices;
     private float[] UVs;
@@ -268,4 +268,9 @@ public boolean CloseEnough(Vector3f otherPosition){
         float Dist = Position.distance(otherPosition);
         return Dist < 50;
     }
+
+    public Object clone() throws CloneNotSupportedException
+    {
+        return super.clone();
+    }
 }

src/main/java/ObsidianEngine/entity/Mesh.java

@@ -0,0 +1,39 @@
+package ObsidianEngine.io;
+
+
+import org.lwjgl.openal.AL;
+import org.lwjgl.openal.ALC;
+import org.lwjgl.openal.ALCCapabilities;
+import org.lwjgl.openal.ALCapabilities;
+
+import static org.lwjgl.openal.ALC10.*;
+import static org.lwjgl.openal.ALC11.*;
+import static org.lwjgl.openal.ALC.*;
+
+public class Audio {
+    public static Audio AudioManager;
+    private long AudioContext;
+    private long AudioDevice;
+
+    public Audio(){
+        String defaultDeviceName = alcGetString(0,ALC_DEVICE_SPECIFIER);
+        AudioDevice = alcOpenDevice(defaultDeviceName);
+        AudioContext = alcCreateContext(AudioDevice,new int[] {0});
+        alcMakeContextCurrent(AudioContext);
+
+        ALCCapabilities capabilitiesA = createCapabilities(AudioDevice);
+        ALCapabilities capabilitiesB = AL.createCapabilities(capabilitiesA);
+
+        if(!AL.getCapabilities().OpenAL10) assert false : "Audio Library not supported.";
+    }
+
+    public static Audio getAudioManager(){
+        if(AudioManager == null) AudioManager = new Audio();
+        return AudioManager;
+    }
+
+    public void Destroy(){
+        alcDestroyContext(AudioContext);
+        alcCloseDevice(AudioDevice);
+    }
+}

src/main/java/ObsidianEngine/io/Audio.java

@@ -7,12 +7,8 @@
 import ObsidianEngine.entity.Mesh;
 import ObsidianEngine.render.Camera;
 import ObsidianEngine.render.Shader;
-import ObsidianEngine.render.Texture;
 import ObsidianEngine.ui.UIRenderer;
-import ObsidianEngine.utils.ColorUtils;
-import ObsidianEngine.utils.FileUtils;
-import ObsidianEngine.utils.MouseUtils;
-import ObsidianEngine.utils.TimeUtils;
+import ObsidianEngine.utils.*;
 import org.joml.Vector3f;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.Version;
@@ -26,7 +22,6 @@
 
 import java.nio.IntBuffer;
 import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
 
 public class Window {
     private int width, height;
@@ -35,6 +30,7 @@ public class Window {
     private long GLFWWindow;
     private TimeUtils time;
     private Input inputSystem;
+    private Sound mainMusic;
 
     private static Window window = null;
     private Camera cam;
@@ -110,6 +106,9 @@ private void init(){
         //Display Window
         GLFW.glfwShowWindow(GLFWWindow);
 
+        //INIT AUDIO LIBRARY
+        Audio.getAudioManager();
+
         //LWJGL -> Binding To OPENGL & GLFW
         GL.createCapabilities();
         glMatrixMode(GL_PROJECTION);
@@ -124,6 +123,11 @@ private void init(){
         //Post Window Init CoreSystems
         inputSystem = new Input(GLFWWindow);
 
+        //Create Audio Context + Load Audio File
+        Audio.getAudioManager();
+        mainMusic = new Sound(FileUtils.getJarLoc() + "/sounds/MainTheme.ogg",true);
+        mainMusic.play();
+
         //Post OpenGL Init
         //Init Default Shader
         Shader.defaultShader = new Shader("/shaders/mainVertex.glsl","/shaders/mainFragment.glsl");
@@ -134,7 +138,7 @@ private void init(){
 
         //Starting Meshes & Models
         //Load Map [MULTI-SPRTIE]
-        Map.getMap(550,50,MapPieces,cam,GLFWWindow,(title + " " + versionNumber));
+        Map.getMap(800,50,MapPieces,cam,GLFWWindow,(title + " " + versionNumber));
 
         /* SINGLE COLOR MAP
         Mesh map = new Plane(15000,15000,new Vector3f(0,0,0));
@@ -200,7 +204,7 @@ private void updateZombies(float Delta){
             //All Zombies Dead / New Wave
             Wave += 1;
             for(int i = 0; i < Math.pow(Wave,2); i++){
-                Zombies.add(new Zombie(cam.getPosition(),350,Wave));
+                Zombies.add(new Zombie(new Vector3f(-30,0,0),350 * ((Wave/2) <= 1 ? 1 : Wave),Wave));
             }
         }
     }
@@ -248,12 +252,10 @@ private void loop() {
             float deltaTime = getDelta();
             float pDelta = (deltaTime/500);
 
-            /*
             if(Input.getKeyDown(GLFW_KEY_W)) Player.setPosition(0,0,-(0.05f)*pDelta);
             if(Input.getKeyDown(GLFW_KEY_S)) Player.setPosition(0,0,(0.05f)*pDelta);
             if(Input.getKeyDown(GLFW_KEY_A)) Player.setPosition(-(0.05f)*pDelta,0,0);
             if(Input.getKeyDown(GLFW_KEY_D)) Player.setPosition((0.05f)*pDelta,0,0);
-            */
 
             float BulletDelay = (System.currentTimeMillis() - LastTimeShot);
 
@@ -284,6 +286,7 @@ private void loop() {
 
         //Cleanup
         inputSystem.destroy(GLFWWindow);
+        Audio.getAudioManager().Destroy();
         GLFW.glfwDestroyWindow(GLFWWindow);
     }
 }

src/main/java/ObsidianEngine/io/Window.java

@@ -1,6 +1,7 @@
 package ObsidianEngine.utils;
 
 import org.joml.Matrix4f;
+import org.joml.Vector2f;
 import org.joml.Vector3f;
 import org.joml.Vector3fc;
 
@@ -23,10 +24,11 @@ public static float getRandomNumber(){
         return (float)(random.nextDouble() * 2 - 1);
     }
 
-    public static float getRandomPosNegHalf(){
-        float PN = getRandomNumber();
-        if(PN > 0.5) return 1;
-        if(PN < -0.5) return -1;
-        else return 0.5f;
+    public static Vector2f getRandomPointOnRadius(float centerX,float centerY,float radius){
+        Random random = new Random();
+        double angle = random.nextDouble() * 2 * Math.PI;
+        double x = centerX + radius * Math.cos(angle);
+        double y = centerY + radius * Math.sin(angle);
+        return new Vector2f((float) x,(float) y);
     }
 }

src/main/java/ObsidianEngine/utils/MathUtils.java

@@ -0,0 +1,84 @@
+package ObsidianEngine.utils;
+
+import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
+
+import static org.lwjgl.openal.AL10.*;
+import static org.lwjgl.stb.STBVorbis.stb_vorbis_decode_filename;
+import static org.lwjgl.system.MemoryStack.*;
+import static org.lwjgl.system.libc.LibCStdlib.free;
+
+public class Sound {
+    private int bufferId;
+    private int sourceId;
+    private String filePath;
+    private boolean isPlaying = false;
+
+    public Sound(String filePath, boolean loops){
+        this.filePath = filePath;
+
+        stackPush();
+        IntBuffer channelsB = stackMallocInt(1);
+        stackPush();
+        IntBuffer sampleRateB = stackMallocInt(1);
+
+        ShortBuffer rawAudio = stb_vorbis_decode_filename(filePath,channelsB,sampleRateB);
+
+        if(rawAudio == null){
+            System.out.println("[SOUND NOT FOUND] " + filePath);
+            stackPop();
+            stackPop();
+            return;
+        }
+
+        int channels = channelsB.get();
+        int sampleRate = sampleRateB.get();
+
+        stackPop();
+        stackPop();
+
+        int format = -1;
+        if(channels == 1){
+            format = AL_FORMAT_MONO16;
+        }
+        else if(channels == 2){
+            format = AL_FORMAT_STEREO16;
+        }
+
+        bufferId = alGenBuffers();
+        alBufferData(bufferId,format,rawAudio,sampleRate);
+
+        sourceId = alGenSources();
+        alSourcei(sourceId,AL_BUFFER,bufferId);
+        alSourcei(sourceId,AL_LOOPING,loops ? 1 : 0);
+        alSourcei(sourceId,AL_POSITION,0);
+        alSourcef(sourceId,AL_GAIN,0.3f);
+
+        free(rawAudio);
+    }
+
+    public void delete(){
+        alDeleteBuffers(bufferId);
+        alDeleteSources(sourceId);
+    }
+
+    public void play(){
+        int state = alGetSourcei(sourceId,AL_SOURCE_STATE);
+        if(state == AL_STOPPED){
+            isPlaying = false;
+            alSourcei(sourceId,AL_POSITION,0);
+        }
+
+        if(!isPlaying){
+            alSourcePlay(sourceId);
+            isPlaying = true;
+        }
+    }
+
+    public void stop(){
+        if(isPlaying){
+            alSourceStop(sourceId);
+            isPlaying = false;
+        }
+    }
+}