diff --git a/README.md b/README.md
index dd258af..4b44270 100644
--- a/README.md
+++ b/README.md
@@ -3,12 +3,26 @@ Project 0 Getting Started
**University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 0**
-* (TODO) YOUR NAME HERE
- * (TODO) [LinkedIn](), [personal website](), [twitter](), etc.
-* Tested on: (TODO) Windows 22, i7-2222 @ 2.22GHz 22GB, GTX 222 222MB (Moore 2222 Lab)
+* Caroline Lachanski
+ * [LinkedIn](https://www.linkedin.com/in/caroline-lachanski/), [personal website](http://carolinelachanski.com/)
+* Tested on: Windows 10, E5-2687W v3 @ 3.10GHz, NVIDIA TITAN V 12 GB (SIGLab), though I hope to switch to a personal computer for the folowing assignments
-### (TODO: Your README)
+### Screenshots
-Include screenshots, analysis, etc. (Remember, this is public, so don't put
-anything here that you don't want to share with the world.)
+Part 2 output of chrome:\\gpu:
+
+Part 2 modified triangle:
+
+
+Part 4 with name:
+
+
+Part 5 NSight Timeline:
+
+
+Part 6 Autos:
+
+
+Part 6 CUDA Warp Info:
+
diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp
index 886fd4c..75ecffe 100644
--- a/cuda-getting-started/src/main.cpp
+++ b/cuda-getting-started/src/main.cpp
@@ -10,8 +10,7 @@
* C main function.
*/
int main(int argc, char* argv[]) {
- // TODO: Change this line to use your name!
- m_yourName = "TODO: YOUR NAME HERE";
+ m_yourName = "Caroline Lachanski";
if (init(argc, argv)) {
mainLoop();
diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj
index d4d234f..8a65e4c 100644
--- a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj
+++ b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj
@@ -74,8 +74,9 @@
Windows
true
- d3d12.lib;dxgi.lib;dxguid.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)
+ d3d12.lib;dxgi.lib;dxguid.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;$(VCInstallDir)Tools\MSVC\14.16.27023\atlmfc\lib\x64\atls.lib;%(AdditionalDependencies)
d3d12.dll
+ $(VCInstallDir)Tools\MSVC\14.16.27023\atlmfc\lib\x64\atls.lib
true
diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl
index d817ca4..b5148cd 100644
--- a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl
+++ b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl
@@ -69,7 +69,8 @@ void MyRaygenShader()
[shader("closesthit")]
void MyClosestHitShader(inout RayPayload payload, in MyAttributes attr)
{
- float3 barycentrics = float3(1 - attr.barycentrics.x - attr.barycentrics.y, attr.barycentrics.x, attr.barycentrics.y);
+ //float3 barycentrics = float3(1 - attr.barycentrics.x - attr.barycentrics.y, attr.barycentrics.x, attr.barycentrics.y);
+ float3 barycentrics = float3(1.0, 0.75, 0.8);
payload.color = float4(barycentrics, 1);
}
diff --git a/images/autos.png b/images/autos.png
new file mode 100644
index 0000000..8d8227d
Binary files /dev/null and b/images/autos.png differ
diff --git a/images/chromeGpuScreenshot.png b/images/chromeGpuScreenshot.png
new file mode 100644
index 0000000..ad586f1
Binary files /dev/null and b/images/chromeGpuScreenshot.png differ
diff --git a/images/cudaGettingStartedWithName.png b/images/cudaGettingStartedWithName.png
new file mode 100644
index 0000000..4c046f1
Binary files /dev/null and b/images/cudaGettingStartedWithName.png differ
diff --git a/images/nsightTimeline.png b/images/nsightTimeline.png
new file mode 100644
index 0000000..e1f3e01
Binary files /dev/null and b/images/nsightTimeline.png differ
diff --git a/images/triangleButNowItsPink.png b/images/triangleButNowItsPink.png
new file mode 100644
index 0000000..b4d7e3c
Binary files /dev/null and b/images/triangleButNowItsPink.png differ
diff --git a/images/warpInfo.png b/images/warpInfo.png
new file mode 100644
index 0000000..121d84b
Binary files /dev/null and b/images/warpInfo.png differ