diff --git a/README.md b/README.md index dd258af..69c795f 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,19 @@ 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) +* Ryan Tong + * [LinkedIn](https://www.linkedin.com/in/ryanctong/), [personal website](), [twitter](), etc. +* Tested on: Windows 10, i7-8750H @ 2.20GHz 16GB, GeForce GTX 1060 6144MB (Personal Laptop) + +### +Compute Capability: 6.1 -### (TODO: Your README) 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 3.1.1](images/part_3-1-1_img.png) +![Part 3.1.2](images/part_3-1-2_img.png) +![Part 3.1.3](images/part_3-1-3_img.png) +![Part 3.2](images/part_3-2_img.png) +![Part 3.3](images/part_3-3_img.png) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..3796b4e 100644 --- a/cuda-getting-started/src/main.cpp +++ b/cuda-getting-started/src/main.cpp @@ -11,7 +11,7 @@ */ int main(int argc, char* argv[]) { // TODO: Change this line to use your name! - m_yourName = "TODO: YOUR NAME HERE"; + m_yourName = "Ryan Tong"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..d26581c 100644 --- a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl +++ b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl @@ -69,7 +69,7 @@ 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(0.8, 0, 0.8); payload.color = float4(barycentrics, 1); } diff --git a/images/part_3-1-1_img.png b/images/part_3-1-1_img.png new file mode 100644 index 0000000..8aeb839 Binary files /dev/null and b/images/part_3-1-1_img.png differ diff --git a/images/part_3-1-2_img.png b/images/part_3-1-2_img.png new file mode 100644 index 0000000..683732f Binary files /dev/null and b/images/part_3-1-2_img.png differ diff --git a/images/part_3-1-3_img.png b/images/part_3-1-3_img.png new file mode 100644 index 0000000..65379c9 Binary files /dev/null and b/images/part_3-1-3_img.png differ diff --git a/images/part_3-2_img.png b/images/part_3-2_img.png new file mode 100644 index 0000000..e19f1fd Binary files /dev/null and b/images/part_3-2_img.png differ diff --git a/images/part_3-3_img.png b/images/part_3-3_img.png new file mode 100644 index 0000000..804df5e Binary files /dev/null and b/images/part_3-3_img.png differ