Aberration and partial Doppler effect

Updated the Depth shader to include these effects.
fonsp · Oct 27, 2014 · 5ecdb59 · 5ecdb59
1 parent 095a79e
commit 5ecdb59
Show file tree

Hide file tree

Showing 9 changed files with 208 additions and 21 deletions.
diff --git a/GraphicsEngine/Core/Config.cs b/GraphicsEngine/Core/Config.cs
@@ -68,7 +68,7 @@ public void Reload()
 
 			string file = File.ReadAllText(fileName);
 
-			string[] fileSplit0 = file.Split(new string[] { "\n" }, StringSplitOptions.RemoveEmptyEntries);
+			string[] fileSplit0 = file.Split(new string[] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries);
 
 			foreach(string line in fileSplit0)
 			{
@@ -80,6 +80,7 @@ public void Reload()
 						//Comment
 						break;
 					case "":
+					case null:
 						//Empty line
 						break;
 					case "bool":

diff --git a/GraphicsEngine/Core/Entity.cs b/GraphicsEngine/Core/Entity.cs
@@ -76,7 +76,6 @@ public override void Render(int pass)
 
 				if(mesh.useVBO && mesh.hasVBO)
 				{
-					//Console.WriteLine("Rendering {0} using VBO", this.name);
 					GL.EnableClientState(ArrayCap.TextureCoordArray);
 					GL.EnableClientState(ArrayCap.NormalArray);
 					GL.EnableClientState(ArrayCap.VertexArray);

diff --git a/GraphicsEngine/Core/Shader.cs b/GraphicsEngine/Core/Shader.cs
@@ -123,24 +123,39 @@ public static Shader diffuseShader
 					vertexShader = @"
 #version 120
 uniform float time;
+uniform float b;
+uniform vec3 vdir;
+uniform vec3 cpos;
+uniform mat4 crot;
+
 varying float intensity;
 
 void main()
 {
 	intensity = (dot(gl_LightSource[0].position.xyz, gl_Normal)+1.0)/2.0;
 	
-	/*vec4 v =  gl_ModelViewMatrix * gl_Vertex;
-	v.z = sin(0.02 * v.x + time) * 20.0 + v.z;
-    gl_Position = gl_ProjectionMatrix * v;*/
-	gl_Position = ftransform();
+	vec4 v = gl_Vertex;
+	v.xyz = v.xyz - cpos;
+	v = gl_ModelViewMatrix * v;
+	if(b > 0)
+	{
+		v.xyz = v.xyz + vdir * b * length(v.xyz);
+	}
+	v = crot * v;
+    gl_Position = gl_ProjectionMatrix * v;
 	
 	gl_FrontColor = vec4(gl_Color.xyz, 1.0 / (gl_Position.w / 2000.0 + 1.0));
 	gl_TexCoord[0] = gl_MultiTexCoord0;
 }",
 					fragmentShader = @"
 #version 120
 uniform float time;
+uniform float b;
+uniform vec3 vdir;
+uniform vec3 cpos;
+uniform mat4 crot;
 uniform sampler2D tex;
+
 varying float intensity;
 
 void main()
@@ -178,6 +193,10 @@ public static Shader unlitShader
 					vertexShader = @"
 #version 120
 uniform float time;
+uniform float b;
+uniform vec3 vdir;
+uniform vec3 cpos;
+uniform mat4 crot;
 
 void main()
 {
@@ -188,6 +207,10 @@ void main()
 					fragmentShader = @"
 #version 120
 uniform float time;
+uniform float b;
+uniform vec3 vdir;
+uniform vec3 cpos;
+uniform mat4 crot;
 uniform sampler2D tex;
 
 void main()
@@ -224,21 +247,46 @@ public static Shader depthShader
 					vertexShader = @"
 #version 120
 uniform float time;
+uniform float b;
+uniform vec3 vdir;
+uniform vec3 cpos;
+uniform mat4 crot;
+varying float dopp;
 
 void main()
 {
-    gl_Position = ftransform();
+	vec4 v = gl_Vertex;
+	v.xyz = v.xyz - cpos;
+	v = gl_ModelViewMatrix * v;
+	dopp = 0.0;
+	if(b > 0)
+	{
+		dopp = dot(v.xyz, vdir) * b / length(v.xyz);
+		v.xyz = v.xyz + vdir * b * length(v.xyz);
+	}
+	v = crot * v;
+    gl_Position = gl_ProjectionMatrix * v;
 	gl_TexCoord[0] = gl_MultiTexCoord0;
 	gl_FrontColor = vec4(gl_Color.xyz, 1.0 / (gl_Position.w / 2000.0 + 1.0));
 }",
 					fragmentShader = @"
 #version 120
 uniform float time;
+uniform float b;
+uniform vec3 vdir;
+uniform vec3 cpos;
+uniform mat4 crot;
 uniform sampler2D tex;
+varying float dopp;
 
 void main()
 {
-	gl_FragColor = texture2D(tex, gl_TexCoord[0].xy) * vec4(gl_Color.xyz, 1.0) * vec4(vec3(gl_Color.w), 1.0);
+	
+	vec4 shift = vec4(1.0);
+	shift.r = 2 * max(0, 0.5 - abs(dopp + 0.0)) + 2 * max(0, 0.5 - abs(dopp + 0.5)) + 2 * max(0, 0.5 - abs(dopp + 1.0));
+	shift.g = 2 * max(0, 0.5 - abs(dopp - 0.5)) + 2 * max(0, 0.5 - abs(dopp + 0.0)) + 2 * max(0, 0.5 - abs(dopp + 0.5));
+	shift.b = 2 * max(0, 0.5 - abs(dopp - 1.0)) + 2 * max(0, 0.5 - abs(dopp - 0.5)) + 2 * max(0, 0.5 - abs(dopp + 0.0));
+	gl_FragColor = texture2D(tex, gl_TexCoord[0].xy) * vec4(vec3(0.5 + dopp / 2.0), 1.0) * vec4(vec3(gl_Color.w), 1.0) * shift;
 }"
 				};
 			}
@@ -270,16 +318,26 @@ public static Shader wireframeShader
 					vertexShader = @"
 #version 120
 uniform float time;
+uniform float b;
+uniform vec3 vdir;
+uniform vec3 cpos;
+uniform mat4 crot;
 
 void main()
 {
+    vec4 v = gl_Vertex;
+	v.xyz = v.xyz - cpos;
+    gl_Position = gl_ProjectionMatrix * (crot * (gl_ModelViewMatrix * v));
 	gl_FrontColor = gl_Color;
-    gl_Position = ftransform();
 	gl_TexCoord[0] = gl_MultiTexCoord0;
 }",
 					fragmentShader = @"
 #version 120
 uniform float time;
+uniform float b;
+uniform vec3 vdir;
+uniform vec3 cpos;
+uniform mat4 crot;
 uniform sampler2D tex;
 
 void main()
@@ -316,14 +374,24 @@ public static Shader collisionShader
 					vertexShader = @"
 #version 120
 uniform float time;
+uniform float b;
+uniform vec3 vdir;
+uniform vec3 cpos;
+uniform mat4 crot;
 
 void main()
 {
-    gl_Position = ftransform();
+	vec4 v = gl_Vertex;
+	v.xyz = v.xyz - cpos;
+	gl_Position = gl_ProjectionMatrix * (crot * (gl_ModelViewMatrix * v));
 }",
 					fragmentShader = @"
 #version 120
 uniform float time;
+uniform float b;
+uniform vec3 vdir;
+uniform vec3 cpos;
+uniform mat4 crot;
 uniform sampler2D tex;
 
 void main()
@@ -496,6 +564,20 @@ public void SetUniform(string name, Vector4 value)
 			}
 			GL.Uniform4(uniforms[name], value);
 		}
+
+		public void SetUniform(string name, Matrix4 value)
+		{
+			if(!compiled)
+			{
+				return;
+			}
+			GL.UseProgram(sp);
+			if(!uniforms.ContainsKey(name))
+			{
+				uniforms.Add(name, GL.GetUniformLocation(sp, name));
+			}
+			GL.UniformMatrix4(uniforms[name], false, ref value);
+		}
 		#endregion
 	}
 }
diff --git a/GraphicsEngine/GraphicsProgram.cs b/GraphicsEngine/GraphicsProgram.cs
@@ -36,24 +36,35 @@ public GraphicsProgram(string[] arguments, bool enableLogging, string logFilenam
 				}
 			}
 			Debug.WriteLine("---------------");
-			Debug.WriteLine("A game by Fons van der Plas");
+			Debug.WriteLine("ReSim - Relativity Simulator");
 			Debug.WriteLine("---------------");
-			Debug.WriteLine("Copyright 2013 Fons van der Plas");
-			Debug.WriteLine("Fons van der Plas, fonsvdplas@gmail.com");
+			Debug.WriteLine("Created by:");
+			Debug.WriteLine("Fons van der Plas (fons-), fonsvdplas@gmail.com");
+			Debug.WriteLine("Just Verlinden (Mhilez), justverlinden@gmail.com");
+			Debug.WriteLine("---------------");
+			Debug.WriteLine("https://github.com/fons-/resim");
 			Debug.WriteLine("---------------");
 			Debug.WriteLine("Program launched at " + DateTime.Now);
 			Debug.Write("Received arguments: ");
-			foreach(string s in programArguments)
+			int i;
+			for(i = 0; i < programArguments.Length - 1; i++)
+			{
+				Debug.Write(programArguments[i] + ", ");
+			}
+			if(programArguments.Length == 0)
 			{
-				Debug.Write(s + ", ");
+				Debug.Write("none");
+			}
+			else
+			{
+				Debug.Write(programArguments[0]);
 			}
 			Debug.WriteLine("");
 		}
 
 		public virtual void LoadResources()
 		{
 
-
 		}
 
 		public virtual void InitGame()

diff --git a/GraphicsEngine/Properties/AssemblyInfo.cs b/GraphicsEngine/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Microsoft")]
 [assembly: AssemblyProduct("GraphicsLibrary")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2013")]
+[assembly: AssemblyCopyright("Copyright © 2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/GraphicsEngine/RenderWindow.cs b/GraphicsEngine/RenderWindow.cs
@@ -30,6 +30,10 @@ public static RenderWindow Instance
 		public bool escapeOnEscape = true;
 		private readonly GameTimer updateSw = new GameTimer();
 		private float _time = 0f;
+		public float c = 2000f;
+		public float v = 0f;
+		public float b = 0f;
+		public float lf = 1f;
 		public float time { get { return _time; } }
 		public bool enableVelocity = true;
 		protected double timeSinceLastUpdate = 0;
@@ -227,7 +231,7 @@ protected override void OnUpdateFrame(FrameEventArgs e)
 			}
 #endif
 			timeSinceLastUpdate = e.Time * timeMultiplier;
-			_time += (float) timeSinceLastUpdate;
+			_time += (float)timeSinceLastUpdate;
 
 			program.Update((float)timeSinceLastUpdate);
 			if(enableVelocity)
@@ -258,14 +262,51 @@ protected override void OnRenderFrame(FrameEventArgs e)
 			UpdateViewport();
 
 
-			Matrix4 modelview = Matrix4.LookAt(Camera.Instance.position, Camera.Instance.position - Vector3.UnitZ, Vector3.UnitY) * Matrix4.Rotate(Camera.Instance.derivedOrientation);
+			Matrix4 modelview = /*Matrix4.LookAt(Vector3.Zero, Vector3.Zero-Vector3.UnitZ, Vector3.UnitY) * */Matrix4.CreateFromQuaternion(Camera.Instance.derivedOrientation);
 
 			GL.MatrixMode(MatrixMode.Modelview);
-			GL.LoadMatrix(ref modelview);
+
+			//GL.LoadMatrix(ref modelview);
+			GL.LoadIdentity();
 
 			//Update shaders
 			Shader.diffuseShaderCompiled.SetUniform("time", _time);
 			Shader.unlitShaderCompiled.SetUniform("time", _time);
+			Shader.depthShaderCompiled.SetUniform("time", _time);
+			Shader.wireframeShaderCompiled.SetUniform("time", _time);
+			Shader.collisionShaderCompiled.SetUniform("time", _time);
+
+			v = Camera.Instance.velocity.Length;
+			b = v / c;
+			lf = 1f / (float)Math.Sqrt(1.0 - b);
+
+			Shader.diffuseShaderCompiled.SetUniform("b", b);
+			Shader.unlitShaderCompiled.SetUniform("b", b);
+			Shader.depthShaderCompiled.SetUniform("b", b);
+			Shader.wireframeShaderCompiled.SetUniform("b", b);
+			Shader.collisionShaderCompiled.SetUniform("b", b);
+
+			Vector3 vDir = Camera.Instance.velocity.Normalized();
+
+			Shader.diffuseShaderCompiled.SetUniform("vdir", vDir);
+			Shader.unlitShaderCompiled.SetUniform("vdir", vDir);
+			Shader.depthShaderCompiled.SetUniform("vdir", vDir);
+			Shader.wireframeShaderCompiled.SetUniform("vdir", vDir);
+			Shader.collisionShaderCompiled.SetUniform("vdir", vDir);
+
+			Shader.diffuseShaderCompiled.SetUniform("cpos", Camera.Instance.position);
+			Shader.unlitShaderCompiled.SetUniform("cpos", Camera.Instance.position);
+			Shader.depthShaderCompiled.SetUniform("cpos", Camera.Instance.position);
+			Shader.wireframeShaderCompiled.SetUniform("cpos", Camera.Instance.position);
+			Shader.collisionShaderCompiled.SetUniform("cpos", Camera.Instance.position);
+
+			Matrix4 cRot = Matrix4.CreateFromQuaternion(Camera.Instance.derivedOrientation);
+
+			Shader.diffuseShaderCompiled.SetUniform("crot", cRot);
+			Shader.unlitShaderCompiled.SetUniform("crot", cRot);
+			Shader.depthShaderCompiled.SetUniform("crot", cRot);
+			Shader.wireframeShaderCompiled.SetUniform("crot", cRot);
+			Shader.collisionShaderCompiled.SetUniform("crot", cRot);
 
 			for(int i = 0; i < amountOfRenderPasses; i++)
 			{

diff --git a/Resim/Game.ini b/Resim/Game.ini
@@ -4,7 +4,7 @@
 
 ; Player
 int walkingSpeed 3500
-int runningSpeed 7500
+int runningSpeed 10000
 int jumpForce 0600
 int walkHeight 170
 int crouchHeight 90

diff --git a/Resim/Program/InitGame.cs b/Resim/Program/InitGame.cs
@@ -19,7 +19,13 @@ public partial class Game
 
 		public override void InitGame()
 		{
+			#region Program arguments
+
+			//TODO: Program arguments
+
+			#endregion
 			#region Entities
+
 			skybox.mesh.material.textureName = "skybox";
 			skybox.isLit = false;
 			float size = Camera.Instance.ZFar / 1.8f;//Sqrt(3)
@@ -117,6 +123,7 @@ public override void InitGame()
 			map.Add(map0d);
 			map.Add(map0e);*/
 			map.Add(map1);
+
 			#endregion
 
 			Camera.Instance.position = new Vector3(2700, 300, -6075);