fixed "sampler arrays indexed with non-constant expressions are forbidden in GLSL 1.30 and later"

fixed inadvertently multi texturing some objects
fixed initial camera jump
stepped down the sim speeds

Author: nptr

SolarSystemSimulation++/jge/RenderPipeline.cpp

@@ -280,7 +280,7 @@ void RenderPipeline::DrawShadowCastingModels(ShaderProgram* shader)
 
 void RenderPipeline::DrawModel(ShaderProgram& shader, Model& m, int lvl)
 {
-	// bind texture 1 (multitextuing)
+	// bind texture 1 (multitexturing)
 	bool useMultitexturing = m.textures[1] > 0;
 	shader.UpdateUniform(UF_USETEX[1], useMultitexturing);
 	if (useMultitexturing)
@@ -383,7 +383,7 @@ void RenderPipeline::DrawNonShadowCastingModels(ShaderProgram* defaultShader)
         }
 
         int lvl = scene->DetermineLODLevel(*m);
-        DrawModelMinimal(*currentShader, *m, lvl);
+        DrawModel(*currentShader, *m, lvl);
 
         lastShader = currentShader;
 	}

SolarSystemSimulation++/main.cpp

@@ -54,6 +54,7 @@ const float SIMULATION_DELTA = 1.0f / SIMULATION_FREQ;
 float simSpeeds[] =
 {
 	0.0f,
+    0.03f / SIMULATION_FREQ,
 	0.1f / SIMULATION_FREQ,
 	1.0f / SIMULATION_FREQ,
 	5.0f / SIMULATION_FREQ,
@@ -62,7 +63,6 @@ float simSpeeds[] =
 	200.0f / SIMULATION_FREQ,
 	400.0f / SIMULATION_FREQ,
 	800.0f / SIMULATION_FREQ,
-	1200.0f / SIMULATION_FREQ,
 };
 double simulationTime;
 float simulationTick = simSpeeds[2];
@@ -153,13 +153,15 @@ void OnKeyPressedCallback(GLFWwindow* window, int key, int scancode, int action,
 
 /**
  * Called when the cursor position changed. Triggers also on hidden cursors!
- * The function updates the camera based on the cursor movement
+ * The function updates the camera based on the cursor movement.
  */
 void OnCursorPosChangedCallback(GLFWwindow* window, double x, double y)
 {
-	// This variable is hack to stop glfwSetCursorPos from triggering an event callback to Mouse(...)
-	// This avoids it being called recursively and hanging up the event loop
-	static bool just_warped = false;
+    // This variable is a hack to prevent the initial camera jump when the cursor isn't caught yet
+    static bool caught_cursor = false;
+    // This variable is a hack to stop glfwSetCursorPos from triggering OnCursorPosChangedCallback() recursively.
+    // Maybe using GLFW_CURSOR_DISABLED is the correct approach?
+    static bool just_warped = false;
 
 	if (just_warped) {
 		just_warped = false;
@@ -170,17 +172,18 @@ void OnCursorPosChangedCallback(GLFWwindow* window, double x, double y)
 		int dx = (int)x - windowWidth / 2;
 		int dy = (int)y - windowHeight / 2;
 
-		if (dx) {
+		if (caught_cursor) {
 			camera->RotateYaw((float)dx);
-		}
-
-		if (dy) {
-			camera->RotatePitch((float)-dy);
+            camera->RotatePitch((float)-dy);
 		}
 
 		just_warped = true;
+        caught_cursor = true;
 		glfwSetCursorPos(window, windowWidth / 2, windowHeight / 2);
 	}
+    else {
+        caught_cursor = false;
+    }
 }
 
 
@@ -428,8 +431,8 @@ void InitGraphics()
 	GLuint defaultVShader = LoadShader(GL_VERTEX_SHADER, "shader\\master.vert");
 	GLuint defaultFShader = LoadShader(GL_FRAGMENT_SHADER, "shader\\masterOptimised.frag");
 	lightingShader.Create(defaultVShader, defaultFShader);
-	lightingShader.RegisterUniform("useTexture[1]");	// uniform doesn't count as active, so register it manually
-	lightingShader.RegisterUniform("texTransform[1]");	// uniform doesn't count as active, so register it manually
+	lightingShader.RegisterUniform("useTexture[1]");	// uniform doesn't count as active, so register it manually?
+	lightingShader.RegisterUniform("texTransform[1]");	// uniform doesn't count as active, so register it manually?
 
 	GLuint shadowVShader = LoadShader(GL_VERTEX_SHADER, "shader\\vsm.vert");
 	GLuint shadowFShader = LoadShader(GL_FRAGMENT_SHADER, "shader\\vsm.frag");

SolarSystemSimulation++/shader/masterOptimised.frag

@@ -115,10 +115,10 @@ float chebyshevUpperBound(samplerCube cube,float distance, vec3 dir)
 }
 
 // Calculate the shadow factor for a light
-float calculateShadowFactor(int index)
+float calculateShadowFactor(samplerCube cube, lightSource light)
 {
-	vec3 fragmentToLightWorld = (lights[index].position - inout_positionWorld).xyz;
-	return chebyshevUpperBound(shadowCubes[index], length(fragmentToLightWorld), -fragmentToLightWorld);
+	vec3 fragmentToLightWorld = (light.position - inout_positionWorld).xyz;
+	return chebyshevUpperBound(cube, length(fragmentToLightWorld), -fragmentToLightWorld);
 }
 
 
@@ -150,8 +150,6 @@ void pointOrSpotLight(in int i, in vec3 N, in vec3 V, in vec3 D, in float shinin
 		// vec3 H = normalize(L + E);
         // float pf = pow(max(dot(N,H), 0.0), shininess);
 
-		shadowFactors[i] = calculateShadowFactor(i);
-
 		diffuse  += lights[i].diffuse  * attenuation * cosAngleIncidence * att2 * shadowFactors[i];
 		specular += lights[i].specular * attenuation * pf * shadowFactors[i] * spec;
 	}
@@ -176,6 +174,20 @@ void directionalLight(in int i, in vec3 N, in vec3 V, in vec3 D, in float shinin
 
 void calculateLighting(in int numLights, in vec3 N, in vec3 V, in vec3 D, in float shininess, in float spec, inout vec4 ambient, inout vec4 diffuse, inout vec4 specular)
 {
+	// 'error: sampler arrays indexed with non-constant expressions are forbidden in GLSL 1.30 and later'
+	if(numLights > 0) {
+		shadowFactors[0] = calculateShadowFactor(shadowCubes[0], lights[0]);
+	}
+	if(numLights > 1) {
+		shadowFactors[1] = calculateShadowFactor(shadowCubes[1], lights[1]);
+	}
+	if(numLights > 2) {
+		shadowFactors[2] = calculateShadowFactor(shadowCubes[2], lights[2]);
+	}
+	if(numLights > 3) {
+		shadowFactors[3] = calculateShadowFactor(shadowCubes[3], lights[3]);
+	}
+
     for (int i = 0; i < numLights; i++)
     {
 		if (lights[i].position.w == 0.0)