diff --git a/README.md b/README.md index dd258af..25bc1bb 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,24 @@ 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) +* Tianhong (Sam) Wen + * [LinkedIn](https://www.linkedin.com/in/tianhongwen/) +* Tested on: Windows 10, i7-7700 @ 2.80GHz 16GB, GTX 1050 4096MB -### (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 3.1.1 +![](images/3_1_1.PNG) + +#### Part 3.1.2 +![](images/3_1_2.PNG) + +#### Part 3.1.3 +![](images/3_1_3.PNG) + +#### Part 3.2 +![](images/3_2.PNG) + +#### Part 3.3 +![](images/3_3.PNG) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..6254f7e 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 = "Tianhong Wen"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..fd41dda 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, 0, 0.8); payload.color = float4(barycentrics, 1); } diff --git a/images/3_1_1.PNG b/images/3_1_1.PNG new file mode 100644 index 0000000..c022ed6 Binary files /dev/null and b/images/3_1_1.PNG differ diff --git a/images/3_1_2.PNG b/images/3_1_2.PNG new file mode 100644 index 0000000..2fdda35 Binary files /dev/null and b/images/3_1_2.PNG differ diff --git a/images/3_1_3.PNG b/images/3_1_3.PNG new file mode 100644 index 0000000..ed4de35 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..6ba1f38 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..882b21c Binary files /dev/null and b/images/3_3.PNG differ