Connected spot light functionality to the rest of the engine.

Author: brokenprogrammer

.gitignore

@@ -14,3 +14,5 @@ hs_err_pid*
 # shader files in target
 /target/classes/shaders/*.frag
 /target/classes/shaders/*.vert
+/target/
+/bin/

src/main/java/me/oskarmendel/mass/Mass.java

@@ -25,18 +25,6 @@
 package me.oskarmendel.mass;
 
 import me.oskarmendel.mass.core.Game;
-import org.lwjgl.glfw.GLFWErrorCallback;
-import org.lwjgl.glfw.GLFWVidMode;
-import org.lwjgl.opengl.GL;
-import org.lwjgl.system.MemoryStack;
-
-import java.nio.IntBuffer;
-
-import static org.lwjgl.glfw.Callbacks.glfwFreeCallbacks;
-import static org.lwjgl.glfw.GLFW.*;
-import static org.lwjgl.opengl.GL11.*;
-import static org.lwjgl.system.MemoryStack.stackPush;
-import static org.lwjgl.system.MemoryUtil.NULL;
 
 /**
  * Starting point of the application.

src/main/java/me/oskarmendel/mass/core/Game.java

@@ -30,6 +30,7 @@
 import me.oskarmendel.mass.gfx.*;
 import me.oskarmendel.mass.gfx.light.DirectionalLight;
 import me.oskarmendel.mass.gfx.light.PointLight;
+import me.oskarmendel.mass.gfx.light.SpotLight;
 import me.oskarmendel.mass.util.OBJLoader;
 import org.joml.Vector3f;
 import org.lwjgl.glfw.GLFWErrorCallback;
@@ -90,6 +91,10 @@ public class Game {
     private PointLight pointLight;
     private DirectionalLight directionalLight;
     private float lightAngle;
+    
+    private SpotLight spotLight;
+    private float spotAngle = 0;
+    private float spotInc = 1;
 
     /**
      * Default constructor for the game.
@@ -166,6 +171,15 @@ public void init() {
         pointLight = new PointLight(lightColour, lightPosition, lightIntensity);
         PointLight.Attenuation att = new PointLight.Attenuation(0.0f, 0.0f, 1.0f);
         pointLight.setAttenuation(att);
+        
+        // Spot light example.
+        lightPosition = new Vector3f(0.0f, 0.0f, 10f);
+        pointLight = new PointLight(lightColour, lightPosition, lightIntensity);
+        att = new PointLight.Attenuation(0.0f, 0.0f, 0.02f);
+        pointLight.setAttenuation(att);
+        Vector3f coneDir = new Vector3f(0, 0, -1);
+        float cutOff = (float) Math.cos(Math.toRadians(140));
+        spotLight = new SpotLight(pointLight, coneDir, cutOff);
 
         // Directional light example.
         lightPosition = new Vector3f(-1, 0,0 );
@@ -238,11 +252,11 @@ private void input() {
             cameraInc.y = 1;
         }
 
-        float lightPos = pointLight.getPosition().z;
+        float lightPos = spotLight.getPointLight().getPosition().z;
         if (screen.isKeyPressed(GLFW_KEY_N)) {
-            this.pointLight.getPosition().z = lightPos + 0.1f;
+            this.spotLight.getPointLight().getPosition().z = lightPos + 0.1f;
         } else if (screen.isKeyPressed(GLFW_KEY_M)) {
-            this.pointLight.getPosition().z = lightPos - 0.1f;
+            this.spotLight.getPointLight().getPosition().z = lightPos - 0.1f;
         }
     }
 
@@ -260,6 +274,18 @@ public void update() {
             // Do something for every loaded entity.
             entity.getRotation().y += 1.0f;
         }
+        
+        // Update spot light direction.
+        spotAngle += spotInc * 0.05f;
+        if (spotAngle > 2) {
+        	spotInc = -1;
+        } else if (spotAngle < -2) {
+        	spotInc = 1;
+        }
+        
+        double spotAngleRad = Math.toRadians(spotAngle);
+        Vector3f coneDir = spotLight.getConeDirection();
+        coneDir.y = (float) Math.sin(spotAngleRad);
 
         // Update directional light direction.
         lightAngle += 1.1f;
@@ -289,6 +315,7 @@ public void update() {
      * Renders the game.
      */
     public void render() {
-        renderer.render(this.camera, this.entities, ambientLight, pointLight, directionalLight);
+        renderer.render(this.camera, this.entities, ambientLight, 
+        		pointLight, spotLight, directionalLight);
     }
 }

src/main/java/me/oskarmendel/mass/gfx/Renderer.java

@@ -28,6 +28,7 @@
 import me.oskarmendel.mass.entity.Entity;
 import me.oskarmendel.mass.gfx.light.DirectionalLight;
 import me.oskarmendel.mass.gfx.light.PointLight;
+import me.oskarmendel.mass.gfx.light.SpotLight;
 import me.oskarmendel.mass.gfx.shader.Shader;
 import me.oskarmendel.mass.gfx.shader.ShaderProgram;
 import org.joml.Matrix4f;
@@ -86,7 +87,7 @@ public void init() {
     }
 
     public void render(Camera camera, Entity[] entities, Vector3f ambientLight,
-                       PointLight pointLight, DirectionalLight directionalLight) {
+                       PointLight pointLight, SpotLight spotLight, DirectionalLight directionalLight) {
         clear();
 
         shaderProgram.use();
@@ -108,10 +109,24 @@ public void render(Camera camera, Entity[] entities, Vector3f ambientLight,
         lightPos.y = aux.y;
         lightPos.z = aux.z;
         shaderProgram.setUniform("pointLight", currPointLight);
+        
+        // Update the spot light relative to the view matrix.
+        SpotLight currSpotLight = new SpotLight(spotLight);
+        Vector4f dir = new Vector4f(currSpotLight.getConeDirection(), 0);
+        dir.mul(viewMatrix);
+        currSpotLight.setConeDirection(new Vector3f(dir.x, dir.y, dir.z));
+        
+        Vector3f spotLightPos = currSpotLight.getPointLight().getPosition();
+        Vector4f auxSpot = new Vector4f(spotLightPos, 1);
+        auxSpot.mul(viewMatrix);
+        spotLightPos.x = auxSpot.x;
+        spotLightPos.y = auxSpot.y;
+        spotLightPos.z = auxSpot.z;
+        shaderProgram.setUniform("spotLight", currSpotLight);
 
         // Update the directional light relative to the viewMatrix of the camera.
         DirectionalLight currDirLight = new DirectionalLight(directionalLight);
-        Vector4f dir = new Vector4f(currDirLight.getDirection(), 0);
+        dir = new Vector4f(currDirLight.getDirection(), 0);
         dir.mul(viewMatrix);
         currDirLight.setDirection(new Vector3f(dir.x, dir.y, dir.z));
         shaderProgram.setUniform("directionalLight", currDirLight);

src/main/java/me/oskarmendel/mass/gfx/Screen.java

@@ -153,4 +153,13 @@ public void destroy() {
     public boolean isClosing() {
         return glfwWindowShouldClose(id);
     }
+    
+    /**
+     * Returns the vsync value for this screen.
+     * 
+     * @return - The vsync value set for this screen.
+     */
+    public boolean getVsync() {
+    	return this.vsync;
+    }
 }

src/main/java/me/oskarmendel/mass/gfx/Transformation.java

@@ -24,7 +24,6 @@
 
 package me.oskarmendel.mass.gfx;
 
-import com.sun.deploy.config.VerboseDefaultConfig;
 import me.oskarmendel.mass.entity.Entity;
 import org.joml.Matrix4f;
 import org.joml.Vector3f;

src/main/java/me/oskarmendel/mass/gfx/shader/ShaderProgram.java

@@ -27,6 +27,8 @@
 import me.oskarmendel.mass.gfx.Material;
 import me.oskarmendel.mass.gfx.light.DirectionalLight;
 import me.oskarmendel.mass.gfx.light.PointLight;
+import me.oskarmendel.mass.gfx.light.SpotLight;
+
 import org.joml.Matrix4f;
 import org.joml.Vector3f;
 import org.joml.Vector4f;
@@ -162,6 +164,18 @@ public void setUniform(String location, PointLight pointLight) {
         setUniform(getUniformLocation(location + ".att.linear"), pointLight.getAttenuation().getLinear());
         setUniform(getUniformLocation(location + ".att.exponent"), pointLight.getAttenuation().getExponent());
     }
+    
+    /**
+     * Sets the SpotLight uniform variable with the specified location name.
+     *
+     * @param location - Location name.
+     * @param spotLight - SpotLight object to get values from.
+     */
+    public void setUniform(String location, SpotLight spotLight) {
+    	setUniform((location + ".pl"), spotLight.getPointLight());
+    	setUniform(getUniformLocation(location + ".coneDirection"), spotLight.getConeDirection());
+        setUniform(getUniformLocation(location + ".cutOff"), spotLight.getCutOff());
+    }
 
     /**
      * Sets the DirectionalLight uniform variable with the specified location name.

src/main/resources/shaders/default.frag

@@ -20,6 +20,12 @@ struct PointLight {
     Attenuation att;
 };
 
+struct SpotLight {
+	PointLight pl;
+	vec3 coneDirection;
+	float cutOff;
+};
+
 struct DirectionalLight {
     vec3 color;
     vec3 direction;
@@ -39,6 +45,7 @@ uniform vec3 ambientLight;
 uniform float specularPower;
 uniform Material material;
 uniform PointLight pointLight;
+uniform SpotLight spotLight;
 uniform DirectionalLight directionalLight;
 
 vec4 ambientC;
@@ -95,6 +102,22 @@ vec4 calcPointLight(PointLight light, vec3 position, vec3 normal) {
     return lightColor / attenuationInv;
 }
 
+vec4 calcSpotLight(SpotLight light, vec3 position, vec3 normal) {
+	vec3 lightDirection = light.pl.position - position;
+	vec3 toLightDir = normalize(lightDirection);
+	vec3 fromLightDir = -toLightDir;
+	float spotAlfa = dot(fromLightDir, normalize(light.coneDirection));
+	
+	vec4 color = vec4(0, 0, 0, 0);
+	
+	if (spotAlfa > light.cutOff) {
+		color = calcPointLight(light.pl, position, normal);
+		color *= (1.0 - (1.0 - spotAlfa) / (1.0 - light.cutOff));
+	}
+	
+	return color;
+}
+
 vec4 calcDirectionalLight(DirectionalLight light, vec3 position, vec3 normal) {
     return calcLightColor(light.color, light.intensity, position, normalize(light.direction), normal);
 }
@@ -104,6 +127,7 @@ void main() {
 
     vec4 diffuseSpecularComp = calcDirectionalLight(directionalLight, vertexPos, vertexNormal);
     diffuseSpecularComp += calcPointLight(pointLight, vertexPos, vertexNormal);
+    diffuseSpecularComp += calcSpotLight(spotLight, vertexPos, vertexNormal);
 
     fragColor = ambientC * vec4(ambientLight, 1) + diffuseSpecularComp;
 }

src/main/resources/shaders/default.vert

@@ -12,9 +12,9 @@ uniform mat4 modelViewMatrix;
 uniform mat4 projectionMatrix;
 
 void main() {
-    vec4 mvPos = modelViewMatrix * vec4(position, 1.0);
-    gl_Position = projectionMatrix * mvPos;
+    vec4 pos = modelViewMatrix * vec4(position, 1.0);
+    gl_Position = projectionMatrix * pos;
     outTexCoord = texCoord;
     vertexNormal = normalize(modelViewMatrix * vec4(normals, 0.0)).xyz;
-    vertexPos = mvPos.xyz;
+    vertexPos = pos.xyz;
 }