From 3369dc05673d299319db564bf9fb673cc82e8497 Mon Sep 17 00:00:00 2001 From: hal8174 Date: Wed, 19 Jun 2024 13:44:06 +0200 Subject: [PATCH] Fineal Framework changes for Assignement 3 --- .gitattributes | 1 + Assignments/Assignment3/Application3.cpp | 4 ++-- .../rthwif/testing/cornell_box_reference.tga | Bin 786450 -> 786425 bytes Framework/external/embree/readme.pdf | Bin 2762952 -> 2762907 bytes Framework/external/glfw/examples/glfw.icns | Bin 27988 -> 27986 bytes Framework/scenes/fire/temperature.vol | Bin 4474880 -> 4474860 bytes 6 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..d007f9f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* eol=lf diff --git a/Assignments/Assignment3/Application3.cpp b/Assignments/Assignment3/Application3.cpp index 1e069cb..28f405c 100644 --- a/Assignments/Assignment3/Application3.cpp +++ b/Assignments/Assignment3/Application3.cpp @@ -4,8 +4,8 @@ void Application3::initScene() { Data_Constructor(&data, 1, 8); /* select scene here */ - //standardScene(); - causticScene(); + standardScene(); + // causticScene(); } void Application3::standardScene() { diff --git a/Framework/external/embree/kernels/rthwif/testing/cornell_box_reference.tga b/Framework/external/embree/kernels/rthwif/testing/cornell_box_reference.tga index b4b8fefbd1bc031611e8fe6826a2894089581de9..bd21c6f83d1c6d07219fada22b3186c8bcd34c6c 100644 GIT binary patch delta 166 zcmbQ#VDR(5{)PmD&4~tcJDdOS-2Q(jWBOz!u4mh`e3>+3w@+Ec^oMo(#0^Xr_?Wn! zZ%^IN6ztu;lZzRMS+?)wVzu_%{xz8Oy>VWO@{W*`ux2LY>+@89gYqQ*T$#Y!)S+`4G;S#CXuIIz;TLdz`ejj(JK8SJS PE%zxl5M$XF?i_9aK$c5T delta 206 zcmezQUw=}A!G;6_M&8W{26Ht^wORYPL-irdgKxP{u|b%$&C`$Q%>T`XY6Eb}MK`EA%5lzwQ9l0y2e+RQ*3E^i3x*Nft z$MA9uJEAFBgDJT-Xs49F7Ae2>(G7K4`<~doozY5|yVh0@DXiAjXo1LQ%2haauwseh^7zYUne9zJCSkeX4yf+;gSSBs@iIyI-_4-h`#`W+hDf>1Mu#Z^eGP%~Qb5XuDXVlH7rkY#&>NW6v%{$@gpL zW%zzOJvxdB4!(hSbRmkV6(P7*1Rq$+xDlkZ zG~feF6fLEY;Nqa7=uX^;h!2PaAE4ce3nM~*7a!lb|M~CY-o=wmb_9|aI^$axdV3D! z^tYcvBX6t2jFV-Ey?lX9$1IS9nE2v;8LBcFwbA;y0V z{uC7IKN4=@CcNf5Y3--+fZ2siftA`Jxj+IV$fE?RixFq99jN$%nk3zdWMa$2ad%HeR zZ&$I7o-q|G1|^`BrebBj6z*(vl#6HBrL+o4X=-R1+3T{Z^dYlmRiKeITj_g$djoTV zD&PVise!rg_t94m+)GY)JLC4_Q;plUYPxOHJAPoUxzwrV(sTD0vut=tHheY(-Ks_3 G#QcAVy`EYC diff --git a/Framework/external/glfw/examples/glfw.icns b/Framework/external/glfw/examples/glfw.icns index ad98f39752132003199572e951ee6d99dcceb823..ed21596b32c94711cca020cfbb34a19272b073ab 100644 GIT binary patch delta 19 bcmca|i}BJe#tp|jHXrxsu4S%XLfITSXvv^6xP5P`$z`Gyb^X=p8I zjI`iw5*pfcI73AK1rh1e5E4C; zGD522yf^Sv&WWQqhU1jVxk^Vos&nH6dMK)szqcu}Bk%6f)t&5e@p47RNt{A2l`GTk wS6MC+yDRo delta 410 zcmWm8yGuf07zS{(W0#|+Jm%?QH#5`HJY^RvFI~?dAwf$)L$pXsLxbjl2pm2L+j&GL_EytPz@@K@$9PDM&Pn@7clLqLd(WKFJ ziZ8BMp=d$wyM*8-^5#TX)@nG`ANkIfZtb45UQ)t}0A0`xJ