diff --git a/README.md b/README.md index dd258af..0b1145b 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) - -### (TODO: Your README) +* Xiaoxiao Zou + * [LinkedIn](https://www.linkedin.com/in/xiaoxiao-zou-23482a1b9/), [personal website](), [twitter](), etc. +* Tested on: Windows 11, AMD Ryzen 9 7940HS @ 4.00 GHz, RTX 4060 Laptop Include screenshots, analysis, etc. (Remember, this is public, so don't put anything here that you don't want to share with the world.) +![](images/part3.1.1.png) + +![](images/part3.1.2.png) + +![](images/part3.1.3.png) + +![](images/part3.2.png) + +![](images/part3.3.png) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..76ccab8 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 = "Xiaoxiao Zou"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj index 86785de..5d3462c 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj @@ -28,7 +28,7 @@ StaticLibrary Unicode - v141 + v142 diff --git a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters index 6285ad0..2455f83 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters @@ -192,6 +192,9 @@ + + + diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj index d4d234f..113e8e5 100644 --- a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj +++ b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj @@ -21,13 +21,13 @@ Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..7248db8 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.2, 0.8, 0.8); payload.color = float4(barycentrics, 1); } diff --git a/images/part3.1.1.png b/images/part3.1.1.png new file mode 100644 index 0000000..96c2c19 Binary files /dev/null and b/images/part3.1.1.png differ diff --git a/images/part3.1.2.png b/images/part3.1.2.png new file mode 100644 index 0000000..2a84fe0 Binary files /dev/null and b/images/part3.1.2.png differ diff --git a/images/part3.1.3.png b/images/part3.1.3.png new file mode 100644 index 0000000..9128f1f Binary files /dev/null and b/images/part3.1.3.png differ diff --git a/images/part3.2.png b/images/part3.2.png new file mode 100644 index 0000000..593e4cd Binary files /dev/null and b/images/part3.2.png differ diff --git a/images/part3.3.png b/images/part3.3.png new file mode 100644 index 0000000..44dee60 Binary files /dev/null and b/images/part3.3.png differ