Nathan's pull request

Part1/PROJ_WIN/Project3/Project3.vcxproj

@@ -13,6 +13,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D7BEFF7A-4902-4B7E-922B-B0417A66864C}</ProjectGuid>
     <RootNamespace>Project3</RootNamespace>
+    <ProjectName>NBODY</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -26,7 +27,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -62,7 +63,7 @@
       <GPUDebugInfo>true</GPUDebugInfo>
       <GenerateLineInfo>true</GenerateLineInfo>
       <HostDebugInfo>true</HostDebugInfo>
-      <CodeGeneration>compute_10,sm_10;compute_20,sm_20;compute_30,sm_30</CodeGeneration>
+      <CodeGeneration>compute_10,sm_10;</CodeGeneration>
     </CudaCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -71,11 +72,14 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v5.5\include;C:/ProgramData/NVIDIA Corporation/CUDA Samples/v5.5/common/inc;../shared/glew/includes;../shared/freeglut/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>../shared/glew/lib;../shared/freeglut/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>cudart.lib; glew32.lib;glu32.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

Part1/PROJ_WIN/Project3/shaders/heightFS.glsl

@@ -1,4 +1,10 @@
+varying float f_height;
+varying vec2 v_Texcoords;
+
 void main(void)
 {
-	gl_FragColor = vec4(0.05,0.15,0.3,1.0);
+    float shade = (1.0-2.0*sqrt(f_height));
+    float alpha = float(mod(v_Texcoords.x+0.025, 0.05) > 0.046 || mod(v_Texcoords.y+0.025, 0.05) > 0.046);
+	vec4 color = mix(vec4(0.05,0.15,0.3,1.0), vec4(0.05, 0.3, 0.4, 1.0), alpha);
+    gl_FragColor = shade*color;
 }

Part1/PROJ_WIN/Project3/shaders/heightVS.glsl

@@ -1,9 +1,18 @@
 uniform mat4 u_projMatrix;
+uniform sampler2D u_height;
+
 attribute vec4 Position;
+attribute vec2 Texcoords;
+
+varying vec2 v_Texcoords;
+varying float f_height;
 
 void main(void)
 {
-    vec4 pos = u_projMatrix * Position;
-	pos.z += 0.01;
-	gl_Position = pos;
+    v_Texcoords = Texcoords;
+    vec4 pos = Position;
+    f_height = texture2D(u_height, Texcoords).w;
+    pos.z = -0.01-clamp(f_height,0.0,2.0);
+    pos = u_projMatrix * pos;
+    gl_Position = pos;
 }

Part1/PROJ_WIN/Project3/shaders/planetFS.glsl

@@ -1,4 +1,26 @@
-void main(void)
+#version 330
+
+in vec3 WorldCoord;
+in vec3 ToCam;
+in vec3 Up;
+in vec3 Right;
+in vec2 TexCoord;
+out vec4 FragColor;
+
+void main()
 {
-	gl_FragColor = vec4(1.0);
-}
+	vec2 coord = 2.01 * (TexCoord - vec2(0.5));
+    float r = length(coord);
+    if (r >= 1.0) { discard; }
+	float dist = length(WorldCoord);
+    if(dist <= 0.01)
+    {
+        FragColor = vec4(1.0);
+        return;
+    }
+	vec3 N = Right*-coord.x + Up*coord.y + ToCam*sqrt(1-r*r);
+    vec3 L = normalize(-WorldCoord);
+    float light = 0.1 + 0.9*clamp(dot(N,L),0.0, 1.0)*exp(-dist);
+    vec3 color = vec3(0.4, 0.1, 0.6);
+    FragColor = vec4(color*light,1.0);
+} 

Part1/PROJ_WIN/Project3/shaders/planetGS.glsl

@@ -1,15 +1,49 @@
 #version 330
 
 uniform mat4 u_projMatrix;
+uniform vec3 u_cameraPos;
 
 layout (points) in;
-layout (points) out;
-layout (max_vertices = 1) out;
+layout (triangle_strip) out;
+layout (max_vertices = 4) out;
+
+out vec3 WorldCoord;
+out vec3 ToCam;
+out vec3 Up;
+out vec3 Right;
+out vec2 TexCoord;
+
+const float scale = 0.03;
 
 void main()
 {
     vec3 Position = gl_in[0].gl_Position.xyz;
-    gl_Position = u_projMatrix * vec4(Position, 1.0);
+    WorldCoord = Position;
+
+    ToCam = normalize(u_cameraPos - Position);
+    Up = vec3(0.0, 0.0, 1.0);
+    Right = cross(ToCam, Up);
+    Up = cross(Right, ToCam);
+
+	vec3 Pos = Position + scale*Right - scale*Up;
+    gl_Position = u_projMatrix * vec4(Pos, 1.0);
+    TexCoord = vec2(0.0, 0.0);
+    EmitVertex();
+
+    Pos = Position + scale*Right + scale*Up;
+    gl_Position = u_projMatrix * vec4(Pos, 1.0);
+    TexCoord = vec2(0.0, 1.0);
     EmitVertex();
+
+    Pos = Position - scale*Right - scale*Up;
+    gl_Position = u_projMatrix * vec4(Pos, 1.0);
+    TexCoord = vec2(1.0, 0.0);
+    EmitVertex();
+
+    Pos = Position - scale*Right + scale*Up;
+    gl_Position = u_projMatrix * vec4(Pos, 1.0);
+    TexCoord = vec2(1.0, 1.0);
+    EmitVertex();
+
     EndPrimitive();
 }