diff --git a/README.md b/README.md index dd258af..66638b1 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,29 @@ 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) +* Stephen Lee + * [LinkedIn](https://www.linkedin.com/in/stephen-lee-bb5a40163/) +* Tested on: Windows 10, i7-9750H @ 2.60GHz, RTX 2060 6GB (Personal computer) -### (TODO: Your README) +Part 3.1 +==================== +3.1.1 +![](images/3.1.1.PNG) + +3.1.2 +![](images/3.1.2.p1.PNG) +![](images/3.1.2.p2.PNG) +![](images/3.1.2.p3.PNG) +![](images/3.1.2.p4.PNG) +![](images/3.1.2.p5.PNG) +![](images/3.1.2.p6.PNG) +![](images/3.1.2.p7.PNG) + +3.1.3 +![](images/3.1.3.PNG) -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +3.2 +![](images/3.2.PNG) +3.3 +![](images/3.3.PNG) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..1a5b34a 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 = "Stephen Lee"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..6493146 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.2f, 0.5f, 0.2f); payload.color = float4(barycentrics, 1); } diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/packages.config b/dxr-support/src/D3D12RaytracingHelloWorld/packages.config new file mode 100644 index 0000000..250dd4f --- /dev/null +++ b/dxr-support/src/D3D12RaytracingHelloWorld/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/images/3.1.1.PNG b/images/3.1.1.PNG new file mode 100644 index 0000000..398f80c Binary files /dev/null and b/images/3.1.1.PNG differ diff --git a/images/3.1.2.p1.PNG b/images/3.1.2.p1.PNG new file mode 100644 index 0000000..75b6d77 Binary files /dev/null and b/images/3.1.2.p1.PNG differ diff --git a/images/3.1.2.p2.PNG b/images/3.1.2.p2.PNG new file mode 100644 index 0000000..beafea9 Binary files /dev/null and b/images/3.1.2.p2.PNG differ diff --git a/images/3.1.2.p3.PNG b/images/3.1.2.p3.PNG new file mode 100644 index 0000000..9f5a2f4 Binary files /dev/null and b/images/3.1.2.p3.PNG differ diff --git a/images/3.1.2.p4.PNG b/images/3.1.2.p4.PNG new file mode 100644 index 0000000..29991c6 Binary files /dev/null and b/images/3.1.2.p4.PNG differ diff --git a/images/3.1.2.p5.PNG b/images/3.1.2.p5.PNG new file mode 100644 index 0000000..ea39efa Binary files /dev/null and b/images/3.1.2.p5.PNG differ diff --git a/images/3.1.2.p6.PNG b/images/3.1.2.p6.PNG new file mode 100644 index 0000000..b47b2af Binary files /dev/null and b/images/3.1.2.p6.PNG differ diff --git a/images/3.1.2.p7.PNG b/images/3.1.2.p7.PNG new file mode 100644 index 0000000..2db0564 Binary files /dev/null and b/images/3.1.2.p7.PNG differ diff --git a/images/3.1.3.PNG b/images/3.1.3.PNG new file mode 100644 index 0000000..90a3113 Binary files /dev/null and b/images/3.1.3.PNG differ diff --git a/images/3.2.PNG b/images/3.2.PNG new file mode 100644 index 0000000..0b0b137 Binary files /dev/null and b/images/3.2.PNG differ diff --git a/images/3.3.PNG b/images/3.3.PNG new file mode 100644 index 0000000..93367e1 Binary files /dev/null and b/images/3.3.PNG differ