Project 1 finished. Jiawei Wang

Part1/PROJ_NIX/makefile

@@ -1,33 +1,33 @@
-#All cuda paths are for v5.0+
-
-NVCC     = nvcc -m64
-CC       = gcc -m64
-CPPC     = g++ -m64
-
-CUDA_FLAGS = -I/usr/local/cuda/samples/common/inc -I/usr/local/cuda/include
-
-LFLAGS = -lglut -lGL -lGLEW 
-
-all: 565simulator
-
-kernel.o: ../src/kernel.cu
-	$(NVCC) $(CUDA_FLAGS) -c ../src/kernel.cu
-
-glslUtility.o: ../src/glslUtility.cpp
-	$(CPPC) $(CUDA_FLAGS) ../src/glslUtility.cpp -c
-
-utilities.o: ../src/utilities.cpp
-	$(CPPC) $(CUDA_FLAGS) ../src/utilities.cpp -c
-
-main.o: ../src/main.cpp ../src/glslUtility.h ../src/kernel.h ../src/utilities.h ../src/main.h
-	$(CPPC) $(CUDA_FLAGS) ../src/main.cpp -c
-
-565simulator: main.o kernel.o glslUtility.o utilities.o
-	$(NVCC) $(LFLAGS) main.o kernel.o glslUtility.o utilities.o -o 565simulator
-
-clean:
-	rm *.o
-	rm 565simulator
-
-test: 565simulator
-	./565simulator
+#All cuda paths are for v5.0+
+
+NVCC     = nvcc -m64
+CC       = gcc -m64
+CPPC     = g++ -m64
+
+CUDA_FLAGS = -I/usr/local/cuda/samples/common/inc -I/usr/local/cuda/include
+
+LFLAGS = -lglut -lGL -lGLEW 
+
+all: 565simulator
+
+kernel.o: ../src/kernel.cu
+	$(NVCC) $(CUDA_FLAGS) -c ../src/kernel.cu
+
+glslUtility.o: ../src/glslUtility.cpp
+	$(CPPC) $(CUDA_FLAGS) ../src/glslUtility.cpp -c
+
+utilities.o: ../src/utilities.cpp
+	$(CPPC) $(CUDA_FLAGS) ../src/utilities.cpp -c
+
+main.o: ../src/main.cpp ../src/glslUtility.h ../src/kernel.h ../src/utilities.h ../src/main.h
+	$(CPPC) $(CUDA_FLAGS) ../src/main.cpp -c
+
+565simulator: main.o kernel.o glslUtility.o utilities.o
+	$(NVCC) $(LFLAGS) main.o kernel.o glslUtility.o utilities.o -o 565simulator
+
+clean:
+	rm *.o
+	rm 565simulator
+
+test: 565simulator
+	./565simulator

Part1/PROJ_NIX/shaders/heightFS.glsl

@@ -1,4 +1,4 @@
-void main(void)
-{
-	gl_FragColor = vec4(0.05,0.15,0.3,1.0);
-}
+void main(void)
+{
+	gl_FragColor = vec4(0.05,0.15,0.3,1.0);
+}

Part1/PROJ_NIX/shaders/heightVS.glsl

@@ -1,9 +1,9 @@
-uniform mat4 u_projMatrix;
-attribute vec4 Position;
-
-void main(void)
-{
-    vec4 pos = u_projMatrix * Position;
-	pos.z += 0.01;
-	gl_Position = pos;
-}
+uniform mat4 u_projMatrix;
+attribute vec4 Position;
+
+void main(void)
+{
+    vec4 pos = u_projMatrix * Position;
+	pos.z += 0.01;
+	gl_Position = pos;
+}

Part1/PROJ_NIX/shaders/planetFS.glsl

@@ -1,4 +1,4 @@
-void main(void)
-{
-	gl_FragColor = vec4(1.0);
-}
+void main(void)
+{
+	gl_FragColor = vec4(1.0);
+}

Part1/PROJ_NIX/shaders/planetGS.glsl

@@ -1,15 +1,15 @@
-#version 330
-
-uniform mat4 u_projMatrix;
-
-layout (points) in;
-layout (points) out;
-layout (max_vertices = 1) out;
-
-void main()
-{
-    vec3 Position = gl_in[0].gl_Position.xyz;
-    gl_Position = u_projMatrix * vec4(Position, 1.0);
-    EmitVertex();
-    EndPrimitive();
-}
+#version 330
+
+uniform mat4 u_projMatrix;
+
+layout (points) in;
+layout (points) out;
+layout (max_vertices = 1) out;
+
+void main()
+{
+    vec3 Position = gl_in[0].gl_Position.xyz;
+    gl_Position = u_projMatrix * vec4(Position, 1.0);
+    EmitVertex();
+    EndPrimitive();
+}

Part1/PROJ_NIX/shaders/planetVS.glsl

@@ -1,8 +1,8 @@
-#version 330
-
-in vec4 Position;
-
-void main(void)
-{
-	gl_Position = Position;
-}
+#version 330
+
+in vec4 Position;
+
+void main(void)
+{
+	gl_Position = Position;
+}

Part1/PROJ_WIN/CIS565_PROJ_1.sln

@@ -1,20 +1,20 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CIS565_PROJ_1", "cIS565_PROJ_1\CIS565_PROJ_1.vcxproj", "{D7BEFF7A-4902-4B7E-922B-B0417A66864C}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D7BEFF7A-4902-4B7E-922B-B0417A66864C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D7BEFF7A-4902-4B7E-922B-B0417A66864C}.Debug|Win32.Build.0 = Debug|Win32
-		{D7BEFF7A-4902-4B7E-922B-B0417A66864C}.Release|Win32.ActiveCfg = Release|Win32
-		{D7BEFF7A-4902-4B7E-922B-B0417A66864C}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CIS565_PROJ_1", "cIS565_PROJ_1\CIS565_PROJ_1.vcxproj", "{D7BEFF7A-4902-4B7E-922B-B0417A66864C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D7BEFF7A-4902-4B7E-922B-B0417A66864C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D7BEFF7A-4902-4B7E-922B-B0417A66864C}.Debug|Win32.Build.0 = Debug|Win32
+		{D7BEFF7A-4902-4B7E-922B-B0417A66864C}.Release|Win32.ActiveCfg = Release|Win32
+		{D7BEFF7A-4902-4B7E-922B-B0417A66864C}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal