diff --git a/README.md b/README.md index dd258af..3389703 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) +* Zijing Peng + * [LinkedIn](https://www.linkedin.com/in/zijing-peng/) + * [personal website](https://zijingpeng.github.io/) +* Tested on: Windows 22, i7-8750H@ 2.22GHz 16GB, NVIDIA GeForce GTX 1060 + +### Screenshots + +![](./images/example0.png) + +![](./images/example1.png) + +![](./images/example2.png) + +![](./images/example3.png) + +![](./images/example4.png) + + -### (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.) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..d035588 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 = "Zijing Peng"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..e28c4b7 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(0.5, 0.0, 0.0); payload.color = float4(barycentrics, 1); } diff --git a/images/example0.png b/images/example0.png new file mode 100644 index 0000000..fc83b75 Binary files /dev/null and b/images/example0.png differ diff --git a/images/example1.png b/images/example1.png new file mode 100644 index 0000000..e3f7fd8 Binary files /dev/null and b/images/example1.png differ diff --git a/images/example2.png b/images/example2.png new file mode 100644 index 0000000..73f89d5 Binary files /dev/null and b/images/example2.png differ diff --git a/images/example3.png b/images/example3.png new file mode 100644 index 0000000..e83fce2 Binary files /dev/null and b/images/example3.png differ diff --git a/images/example4.png b/images/example4.png new file mode 100644 index 0000000..7aae029 Binary files /dev/null and b/images/example4.png differ