diff --git a/GrafikaProjekt/Debug/grk-cw6.exe b/GrafikaProjekt/Debug/grk-cw6.exe index f3502aa..20244d7 100644 Binary files a/GrafikaProjekt/Debug/grk-cw6.exe and b/GrafikaProjekt/Debug/grk-cw6.exe differ diff --git a/GrafikaProjekt/Debug/grk-cw6.pdb b/GrafikaProjekt/Debug/grk-cw6.pdb index 70fb157..d67c559 100644 Binary files a/GrafikaProjekt/Debug/grk-cw6.pdb and b/GrafikaProjekt/Debug/grk-cw6.pdb differ diff --git a/GrafikaProjekt/pliki/Debug/Camera.obj b/GrafikaProjekt/pliki/Debug/Camera.obj index 07cad68..f2cc3f8 100644 Binary files a/GrafikaProjekt/pliki/Debug/Camera.obj and b/GrafikaProjekt/pliki/Debug/Camera.obj differ diff --git a/GrafikaProjekt/pliki/Debug/Render_Utils.obj b/GrafikaProjekt/pliki/Debug/Render_Utils.obj index 2af1645..207d6bb 100644 Binary files a/GrafikaProjekt/pliki/Debug/Render_Utils.obj and b/GrafikaProjekt/pliki/Debug/Render_Utils.obj differ diff --git a/GrafikaProjekt/pliki/Debug/SOIL.obj b/GrafikaProjekt/pliki/Debug/SOIL.obj index 9e7679c..f81a65a 100644 Binary files a/GrafikaProjekt/pliki/Debug/SOIL.obj and b/GrafikaProjekt/pliki/Debug/SOIL.obj differ diff --git a/GrafikaProjekt/pliki/Debug/Shader_Loader.obj b/GrafikaProjekt/pliki/Debug/Shader_Loader.obj index a5da6d8..d2f2596 100644 Binary files a/GrafikaProjekt/pliki/Debug/Shader_Loader.obj and b/GrafikaProjekt/pliki/Debug/Shader_Loader.obj differ diff --git a/GrafikaProjekt/pliki/Debug/Texture.obj b/GrafikaProjekt/pliki/Debug/Texture.obj index 041f2a5..f984067 100644 Binary files a/GrafikaProjekt/pliki/Debug/Texture.obj and b/GrafikaProjekt/pliki/Debug/Texture.obj differ diff --git a/GrafikaProjekt/pliki/Debug/grk-cw6.exe.recipe b/GrafikaProjekt/pliki/Debug/grk-cw6.exe.recipe index b5f96c4..9f44b1e 100644 --- a/GrafikaProjekt/pliki/Debug/grk-cw6.exe.recipe +++ b/GrafikaProjekt/pliki/Debug/grk-cw6.exe.recipe @@ -2,7 +2,7 @@ - C:\Users\luksli\Desktop\GrafikaProjekt\GrafikaProjekt\Debug\grk-cw6.exe + C:\Users\Tomek\source\repos\Grafika\GrafikaProjekt\Debug\grk-cw6.exe diff --git a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.command.1.tlog b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.command.1.tlog index f233d85..9348a0a 100644 Binary files a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.command.1.tlog and b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.command.1.tlog differ diff --git a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.read.1.tlog b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.read.1.tlog index 1850ea4..e46699a 100644 Binary files a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.read.1.tlog and b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.read.1.tlog differ diff --git a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.write.1.tlog b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.write.1.tlog index e0310db..50f5a03 100644 Binary files a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.write.1.tlog and b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/CL.write.1.tlog differ diff --git a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/grk-cw6.lastbuildstate b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/grk-cw6.lastbuildstate index 24f5976..48ade2b 100644 --- a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/grk-cw6.lastbuildstate +++ b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/grk-cw6.lastbuildstate @@ -1,2 +1,2 @@ PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.30.30705:TargetPlatformVersion=10.0.19041.0: -Debug|Win32|C:\Users\luksli\Desktop\GrafikaProjekt\GrafikaProjekt\| +Debug|Win32|C:\Users\Tomek\source\repos\Grafika\GrafikaProjekt\| diff --git a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/link.read.1.tlog b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/link.read.1.tlog index db52ed0..5baad64 100644 Binary files a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/link.read.1.tlog and b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/link.read.1.tlog differ diff --git a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/link.write.1.tlog b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/link.write.1.tlog index d9d9222..1c823a5 100644 Binary files a/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/link.write.1.tlog and b/GrafikaProjekt/pliki/Debug/grk-cw6.tlog/link.write.1.tlog differ diff --git a/GrafikaProjekt/pliki/Debug/image_DXT.obj b/GrafikaProjekt/pliki/Debug/image_DXT.obj index 212c7f3..174d7b0 100644 Binary files a/GrafikaProjekt/pliki/Debug/image_DXT.obj and b/GrafikaProjekt/pliki/Debug/image_DXT.obj differ diff --git a/GrafikaProjekt/pliki/Debug/image_helper.obj b/GrafikaProjekt/pliki/Debug/image_helper.obj index 0424139..bfeca3e 100644 Binary files a/GrafikaProjekt/pliki/Debug/image_helper.obj and b/GrafikaProjekt/pliki/Debug/image_helper.obj differ diff --git a/GrafikaProjekt/pliki/Debug/main.obj b/GrafikaProjekt/pliki/Debug/main.obj index ca89132..56c675e 100644 Binary files a/GrafikaProjekt/pliki/Debug/main.obj and b/GrafikaProjekt/pliki/Debug/main.obj differ diff --git a/GrafikaProjekt/pliki/Debug/projekt.log b/GrafikaProjekt/pliki/Debug/projekt.log index 8307022..f10b67e 100644 --- a/GrafikaProjekt/pliki/Debug/projekt.log +++ b/GrafikaProjekt/pliki/Debug/projekt.log @@ -1,4 +1,4 @@  main.cpp -C:\Users\luksli\Desktop\GrafikaProjekt\GrafikaProjekt\pliki\src\main.cpp(329,12): warning C4244: "argument": konwersja z "time_t" do "unsigned int", możliwa utrata danych +C:\Users\Tomek\source\repos\Grafika\GrafikaProjekt\pliki\src\main.cpp(329,12): warning C4244: "argument": konwersja z "time_t" do "unsigned int", możliwa utrata danych Camera.obj : warning LNK4075: zignorowano opcję „/EDITANDCONTINUE” z powodu określenia opcji „/INCREMENTAL:NO” - projekt.vcxproj -> C:\Users\luksli\Desktop\GrafikaProjekt\GrafikaProjekt\Debug\grk-cw6.exe + projekt.vcxproj -> C:\Users\Tomek\source\repos\Grafika\GrafikaProjekt\Debug\grk-cw6.exe diff --git a/GrafikaProjekt/pliki/Debug/stb_image_aug.obj b/GrafikaProjekt/pliki/Debug/stb_image_aug.obj index 7816320..e59469f 100644 Binary files a/GrafikaProjekt/pliki/Debug/stb_image_aug.obj and b/GrafikaProjekt/pliki/Debug/stb_image_aug.obj differ diff --git a/GrafikaProjekt/pliki/Debug/vc143.idb b/GrafikaProjekt/pliki/Debug/vc143.idb index 1582ec5..0cdf3d2 100644 Binary files a/GrafikaProjekt/pliki/Debug/vc143.idb and b/GrafikaProjekt/pliki/Debug/vc143.idb differ diff --git a/GrafikaProjekt/pliki/Debug/vc143.pdb b/GrafikaProjekt/pliki/Debug/vc143.pdb index 21d9aa5..fbb149f 100644 Binary files a/GrafikaProjekt/pliki/Debug/vc143.pdb and b/GrafikaProjekt/pliki/Debug/vc143.pdb differ diff --git a/GrafikaProjekt/pliki/models/fish4.mtl b/GrafikaProjekt/pliki/models/fish4.mtl new file mode 100644 index 0000000..f0c12bc --- /dev/null +++ b/GrafikaProjekt/pliki/models/fish4.mtl @@ -0,0 +1,12 @@ +# Blender MTL File: 'None' +# Material Count: 1 + +newmtl 04___Default +Ns 225.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 diff --git a/GrafikaProjekt/pliki/models/fish4.obj b/GrafikaProjekt/pliki/models/fish4.obj index 6ba8b70..d93514e 100644 --- a/GrafikaProjekt/pliki/models/fish4.obj +++ b/GrafikaProjekt/pliki/models/fish4.obj @@ -2,272 +2,272 @@ # www.blender.org mtllib fish4.mtl o fish4 -v -0.018057 -0.008770 0.033772 -v -0.015090 -0.010404 0.031758 -v -0.013406 -0.016913 0.033908 -v -0.017765 -0.015581 0.032398 -v -0.011904 -0.015463 0.041036 -v -0.019150 -0.008770 0.033908 -v -0.018815 -0.015581 0.032534 -v -0.016926 -0.005980 0.036398 -v -0.017976 -0.005980 0.036535 -v -0.012144 -0.010091 0.041352 -v -0.020042 -0.000820 0.016558 -v -0.020446 -0.000820 0.016557 -v -0.019752 0.012035 0.022219 -v -0.019347 0.012035 0.022220 -v -0.020219 -0.013008 0.018542 -v -0.019815 -0.013008 0.018542 -v 0.001802 -0.021191 -0.011105 -v 0.001802 -0.016582 -0.019296 -v 0.010634 -0.017744 -0.007894 -v 0.001802 -0.023557 -0.003475 -v 0.009055 -0.021001 0.007920 -v 0.001802 -0.025777 0.006522 -v 0.001802 -0.026387 0.017619 -v 0.010405 -0.021001 0.017603 -v 0.010405 -0.020842 0.024003 -v 0.001802 -0.026125 0.020790 -v 0.010730 -0.017734 0.043312 -v 0.007453 -0.013813 0.051278 -v 0.001802 -0.018262 0.051039 -v 0.001802 -0.021873 0.043859 -v 0.001802 -0.011807 -0.025223 -v 0.010634 -0.014885 -0.011549 -v 0.012496 -0.016923 0.007335 -v 0.014358 -0.016923 0.017392 -v 0.014358 -0.016767 0.024840 -v 0.011878 -0.015463 0.041036 -v 0.008976 -0.010496 0.051436 -v 0.001802 -0.006779 -0.032204 -v 0.003065 -0.003134 -0.030541 -v 0.011790 -0.002146 -0.018244 -v 0.012515 -0.009308 -0.015205 -v 0.013854 -0.001722 0.005745 -v 0.014705 -0.010127 0.006750 -v 0.016896 -0.010127 0.017181 -v 0.015918 -0.001298 0.016436 -v 0.015918 -0.001623 0.023969 -v 0.016896 -0.009973 0.024344 -v 0.012118 -0.010091 0.041352 -v 0.011896 -0.000268 0.043297 -v 0.008267 -0.001218 0.053815 -v 0.008976 -0.006745 0.051558 -v 0.002433 0.002269 -0.030586 -v 0.007825 0.005143 -0.019244 -v 0.008996 0.009771 0.004951 -v 0.010167 0.011718 0.015854 -v 0.010167 0.012353 0.024175 -v 0.009057 0.012377 0.042511 -v 0.006188 0.008749 0.053594 -v -0.001854 -0.021191 -0.011105 -v -0.001854 -0.023557 -0.003475 -v -0.010686 -0.017744 -0.007894 -v -0.001854 -0.016582 -0.019296 -v -0.001854 -0.025777 0.006522 -v -0.009107 -0.021001 0.007920 -v -0.001854 -0.026387 0.017619 -v -0.001854 -0.026125 0.020790 -v -0.010457 -0.020842 0.024003 -v -0.010457 -0.021001 0.017603 -v -0.001854 -0.018262 0.051039 -v -0.007505 -0.013813 0.051278 -v -0.010782 -0.017734 0.043312 -v -0.001854 -0.021873 0.043859 -v -0.010686 -0.014885 -0.011549 -v -0.001854 -0.011807 -0.025223 -v -0.012548 -0.016923 0.007335 -v -0.014410 -0.016767 0.024840 -v -0.014410 -0.016923 0.017392 -v -0.009028 -0.010496 0.051436 -v -0.001854 -0.006779 -0.032204 -v -0.012567 -0.009308 -0.015205 -v -0.011842 -0.002146 -0.018244 -v -0.003117 -0.003134 -0.030541 -v -0.014757 -0.010127 0.006750 -v -0.013906 -0.001722 0.005745 -v -0.016948 -0.010127 0.017181 -v -0.016948 -0.009973 0.024344 -v -0.015970 -0.001623 0.023969 -v -0.015970 -0.001298 0.016436 -v -0.009028 -0.006745 0.051558 -v -0.008319 -0.001218 0.053815 -v -0.011948 -0.000268 0.043297 -v -0.007877 0.005143 -0.019244 -v -0.002485 0.002269 -0.030586 -v -0.009048 0.009771 0.004951 -v -0.010219 0.012353 0.024175 -v -0.010219 0.011718 0.015854 -v -0.006239 0.008749 0.053594 -v -0.009109 0.012377 0.042511 -v 0.000373 -0.032642 -0.020006 -v 0.000373 -0.033751 -0.006029 -v -0.000425 -0.033751 -0.006029 -v -0.000425 -0.032642 -0.020006 -v 0.000373 -0.032857 0.006093 -v -0.000425 -0.032857 0.006093 -v 0.001802 -0.010506 0.066751 -v 0.001802 -0.008069 0.066558 -v -0.001854 -0.008069 0.066558 -v -0.001854 -0.010506 0.066751 -v 0.001802 -0.007469 0.067895 -v -0.001854 -0.007469 0.067895 -v 0.001802 -0.006870 0.069231 -v 0.001802 -0.004137 0.069004 -v -0.001854 -0.004137 0.069004 -v -0.001854 -0.006870 0.069231 -v 0.001802 -0.001088 0.065454 -v -0.001854 -0.001088 0.065454 -v 0.001802 0.016038 0.060381 -v -0.001854 0.016038 0.060381 -v -0.001854 0.005751 0.063679 -v 0.001802 0.005751 0.063679 -v 0.000373 0.037729 0.024589 -v -0.000425 0.037729 0.024589 -v -0.000425 0.036860 0.032845 -v 0.000373 0.036860 0.032845 -v 0.000373 0.027447 -0.026222 -v 0.000373 0.020170 -0.037027 -v -0.000425 0.020170 -0.037027 -v -0.000425 0.027447 -0.026222 -v 0.000306 0.005692 -0.069208 -v -0.000358 0.005692 -0.069208 -v -0.000358 0.011042 -0.069231 -v 0.000306 0.011042 -0.069231 -v 0.000294 -0.000709 -0.059808 -v 0.000385 -0.018887 -0.057486 -v -0.000437 -0.018887 -0.057486 -v -0.000346 -0.000709 -0.059808 -v 0.000373 -0.023707 -0.040558 -v -0.000425 -0.023707 -0.040558 -v -0.000425 -0.017161 -0.039976 -v 0.000373 -0.017161 -0.039976 -v 0.000373 -0.026978 -0.034983 -v -0.000425 -0.026978 -0.034983 -v 0.004948 -0.008944 0.059170 -v 0.001802 -0.012607 0.059938 -v 0.004948 -0.005405 0.059313 -v 0.004948 -0.006469 0.059248 -v 0.004948 -0.002969 0.060476 -v 0.004114 0.001927 0.060633 -v -0.005000 -0.008944 0.059170 -v -0.001854 -0.012607 0.059938 -v -0.005000 -0.006469 0.059248 -v -0.005000 -0.002969 0.060476 -v -0.005000 -0.005405 0.059313 -v -0.004166 0.001927 0.060633 -v 0.001802 0.023021 0.053829 -v -0.001854 0.023021 0.053829 -v 0.001802 0.030015 0.043840 -v -0.001854 0.030015 0.043840 -v 0.010405 -0.020683 0.033069 -v 0.001802 -0.026169 0.035483 -v 0.015918 -0.001948 0.031502 -v 0.015064 -0.010404 0.031758 -v 0.010167 0.012432 0.032508 -v 0.001802 0.027164 0.032479 -v -0.010457 -0.020683 0.033069 -v -0.001854 -0.026169 0.035483 -v -0.015970 -0.001948 0.031502 -v -0.010219 0.012432 0.032508 -v 0.000373 0.037221 0.016239 -v -0.000425 0.037221 0.016239 -v 0.001802 -0.008429 -0.037817 -v 0.002642 -0.003998 -0.037798 -v -0.001854 -0.008429 -0.037817 -v -0.002693 -0.003998 -0.037798 -v -0.002274 0.001264 -0.036426 -v 0.000373 0.013865 -0.043472 -v -0.000425 0.013865 -0.043472 -v 0.002222 0.001264 -0.036426 -v 0.001802 0.006193 -0.036102 -v 0.001802 0.008027 -0.030453 -v 0.001498 -0.010260 -0.042286 -v 0.002268 -0.003895 -0.044799 -v -0.001550 -0.010260 -0.042286 -v -0.002320 -0.003895 -0.044799 -v -0.001935 0.002288 -0.045397 -v -0.001854 0.006193 -0.036102 -v 0.001498 0.007888 -0.045590 -v -0.001550 0.007888 -0.045590 -v 0.001883 0.002288 -0.045397 -v 0.000558 -0.013623 -0.046586 -v 0.000558 -0.002711 -0.050809 -v -0.000610 -0.013623 -0.046586 -v -0.000610 -0.002711 -0.050809 -v -0.000610 0.003963 -0.052246 -v 0.000558 0.009907 -0.051898 -v -0.000610 0.009907 -0.051898 -v 0.000558 0.003963 -0.052246 -v 0.000558 -0.019023 -0.054039 -v 0.000385 -0.001743 -0.054269 -v -0.000610 -0.019023 -0.054039 -v -0.000437 -0.001743 -0.054269 -v -0.000346 0.003617 -0.060155 -v 0.000294 0.011627 -0.062762 -v -0.000346 0.011627 -0.062762 -v 0.000294 0.003617 -0.060155 -v 0.001802 0.013921 -0.019395 -v 0.001802 0.019977 0.002529 -v 0.001802 0.022754 0.014388 -v 0.001802 0.024959 0.023433 -v -0.001854 0.013921 -0.019395 -v -0.001854 0.008027 -0.030453 -v -0.001854 0.022754 0.014388 -v -0.001854 0.019977 0.002529 -v -0.001854 0.027164 0.032479 -v -0.001854 0.024959 0.023433 -v 0.000373 0.009587 -0.031266 -v 0.000373 0.016614 -0.020309 -v 0.000373 0.009949 -0.039032 -v -0.000425 0.009949 -0.039032 -v -0.000425 0.009587 -0.031266 -v -0.000425 0.016614 -0.020309 -v -0.000425 0.022764 0.001489 -v -0.000425 0.028190 0.022390 -v -0.000425 0.025969 0.014118 -v -0.000425 0.031894 0.040830 -v -0.000425 0.030410 0.030663 -v 0.000373 0.031894 0.040830 -v 0.000373 0.030410 0.030663 -v 0.000373 0.028190 0.022390 -v 0.000373 0.022764 0.001489 -v 0.000373 0.025969 0.014118 -v 0.000373 0.033759 -0.007514 -v 0.000373 0.036713 0.007888 -v -0.000425 0.033759 -0.007514 -v -0.000425 0.036713 0.007888 -v 0.000373 -0.028853 0.012790 -v -0.000425 -0.028853 0.012790 -v 0.013380 -0.016913 0.033908 -v 0.000373 -0.037729 0.012444 -v -0.000425 -0.037729 0.012444 -v -0.000425 -0.037412 0.011788 -v 0.000373 -0.037412 0.011788 -v 0.000373 -0.028971 0.030565 -v 0.000373 -0.027353 0.019749 -v -0.000425 -0.028971 0.030565 -v -0.000425 -0.027353 0.019749 -v 0.000373 -0.032310 0.025181 -v 0.000373 -0.029607 0.017327 -v -0.000425 -0.032310 0.025181 -v -0.000425 -0.029607 0.017327 -v 0.000373 -0.036122 0.017700 -v 0.000373 -0.034577 0.013569 -v -0.000425 -0.036122 0.017700 -v -0.000425 -0.034577 0.013569 -v 0.018057 -0.008770 0.033772 -v 0.017765 -0.015581 0.032398 -v 0.018815 -0.015581 0.032534 -v 0.019150 -0.008770 0.033908 -v 0.017976 -0.005980 0.036535 -v 0.016926 -0.005980 0.036398 -v 0.020042 -0.000820 0.016558 -v 0.019347 0.012035 0.022220 -v 0.019752 0.012035 0.022219 -v 0.020446 -0.000820 0.016557 -v 0.019815 -0.013008 0.018542 -v 0.020219 -0.013008 0.018542 +v -0.018057 -0.002636 0.024598 +v -0.015090 -0.004270 0.022584 +v -0.013406 -0.010779 0.024734 +v -0.017765 -0.009447 0.023224 +v -0.011904 -0.009329 0.031862 +v -0.019150 -0.002636 0.024734 +v -0.018815 -0.009447 0.023360 +v -0.016926 0.000154 0.027224 +v -0.017976 0.000154 0.027361 +v -0.012144 -0.003957 0.032178 +v -0.020042 0.005314 0.007384 +v -0.020446 0.005314 0.007383 +v -0.019752 0.018169 0.013045 +v -0.019347 0.018169 0.013046 +v -0.020219 -0.006874 0.009368 +v -0.019815 -0.006874 0.009368 +v 0.001802 -0.015057 -0.020279 +v 0.001802 -0.010448 -0.028470 +v 0.010634 -0.011610 -0.017068 +v 0.001802 -0.017423 -0.012649 +v 0.009055 -0.014867 -0.001254 +v 0.001802 -0.019643 -0.002652 +v 0.001802 -0.020253 0.008445 +v 0.010405 -0.014867 0.008429 +v 0.010405 -0.014708 0.014829 +v 0.001802 -0.019991 0.011616 +v 0.010730 -0.011600 0.034138 +v 0.007453 -0.007679 0.042104 +v 0.001802 -0.012128 0.041865 +v 0.001802 -0.015739 0.034685 +v 0.001802 -0.005673 -0.034397 +v 0.010634 -0.008751 -0.020723 +v 0.012496 -0.010789 -0.001839 +v 0.014358 -0.010789 0.008218 +v 0.014358 -0.010633 0.015666 +v 0.011878 -0.009329 0.031862 +v 0.008976 -0.004362 0.042262 +v 0.001802 -0.000645 -0.041378 +v 0.003065 0.003000 -0.039715 +v 0.011790 0.003988 -0.027418 +v 0.012515 -0.003174 -0.024379 +v 0.013854 0.004412 -0.003429 +v 0.014705 -0.003993 -0.002424 +v 0.016896 -0.003993 0.008007 +v 0.015918 0.004836 0.007262 +v 0.015918 0.004511 0.014795 +v 0.016896 -0.003839 0.015170 +v 0.012118 -0.003957 0.032178 +v 0.011896 0.005866 0.034123 +v 0.008267 0.004916 0.044641 +v 0.008976 -0.000611 0.042384 +v 0.002433 0.008403 -0.039760 +v 0.007825 0.011277 -0.028418 +v 0.008996 0.015905 -0.004223 +v 0.010167 0.017852 0.006680 +v 0.010167 0.018487 0.015001 +v 0.009057 0.018511 0.033337 +v 0.006188 0.014883 0.044420 +v -0.001854 -0.015057 -0.020279 +v -0.001854 -0.017423 -0.012649 +v -0.010686 -0.011610 -0.017068 +v -0.001854 -0.010448 -0.028470 +v -0.001854 -0.019643 -0.002652 +v -0.009107 -0.014867 -0.001254 +v -0.001854 -0.020253 0.008445 +v -0.001854 -0.019991 0.011616 +v -0.010457 -0.014708 0.014829 +v -0.010457 -0.014867 0.008429 +v -0.001854 -0.012128 0.041865 +v -0.007505 -0.007679 0.042104 +v -0.010782 -0.011600 0.034138 +v -0.001854 -0.015739 0.034685 +v -0.010686 -0.008751 -0.020723 +v -0.001854 -0.005673 -0.034397 +v -0.012548 -0.010789 -0.001839 +v -0.014410 -0.010633 0.015666 +v -0.014410 -0.010789 0.008218 +v -0.009028 -0.004362 0.042262 +v -0.001854 -0.000645 -0.041378 +v -0.012567 -0.003174 -0.024379 +v -0.011842 0.003988 -0.027418 +v -0.003117 0.003000 -0.039715 +v -0.014757 -0.003993 -0.002424 +v -0.013906 0.004412 -0.003429 +v -0.016948 -0.003993 0.008007 +v -0.016948 -0.003839 0.015170 +v -0.015970 0.004511 0.014795 +v -0.015970 0.004836 0.007262 +v -0.009028 -0.000611 0.042384 +v -0.008319 0.004916 0.044641 +v -0.011948 0.005866 0.034123 +v -0.007877 0.011277 -0.028418 +v -0.002485 0.008403 -0.039760 +v -0.009048 0.015905 -0.004223 +v -0.010219 0.018487 0.015001 +v -0.010219 0.017852 0.006680 +v -0.006239 0.014883 0.044420 +v -0.009109 0.018511 0.033337 +v 0.000373 -0.026508 -0.029180 +v 0.000373 -0.027617 -0.015203 +v -0.000425 -0.027617 -0.015203 +v -0.000425 -0.026508 -0.029180 +v 0.000373 -0.026723 -0.003081 +v -0.000425 -0.026723 -0.003081 +v 0.001802 -0.004372 0.057577 +v 0.001802 -0.001935 0.057384 +v -0.001854 -0.001935 0.057384 +v -0.001854 -0.004372 0.057577 +v 0.001802 -0.001335 0.058721 +v -0.001854 -0.001335 0.058721 +v 0.001802 -0.000736 0.060057 +v 0.001802 0.001997 0.059830 +v -0.001854 0.001997 0.059830 +v -0.001854 -0.000736 0.060057 +v 0.001802 0.005046 0.056280 +v -0.001854 0.005046 0.056280 +v 0.001802 0.022172 0.051207 +v -0.001854 0.022172 0.051207 +v -0.001854 0.011885 0.054505 +v 0.001802 0.011885 0.054505 +v 0.000373 0.043863 0.015415 +v -0.000425 0.043863 0.015415 +v -0.000425 0.042994 0.023671 +v 0.000373 0.042994 0.023671 +v 0.000373 0.033581 -0.035396 +v 0.000373 0.026304 -0.046201 +v -0.000425 0.026304 -0.046201 +v -0.000425 0.033581 -0.035396 +v 0.000306 0.011826 -0.078382 +v -0.000358 0.011826 -0.078382 +v -0.000358 0.017176 -0.078405 +v 0.000306 0.017176 -0.078405 +v 0.000294 0.005425 -0.068982 +v 0.000385 -0.012753 -0.066660 +v -0.000437 -0.012753 -0.066660 +v -0.000346 0.005425 -0.068982 +v 0.000373 -0.017573 -0.049732 +v -0.000425 -0.017573 -0.049732 +v -0.000425 -0.011027 -0.049150 +v 0.000373 -0.011027 -0.049150 +v 0.000373 -0.020844 -0.044157 +v -0.000425 -0.020844 -0.044157 +v 0.004948 -0.002810 0.049996 +v 0.001802 -0.006473 0.050764 +v 0.004948 0.000729 0.050139 +v 0.004948 -0.000335 0.050074 +v 0.004948 0.003165 0.051302 +v 0.004114 0.008061 0.051459 +v -0.005000 -0.002810 0.049996 +v -0.001854 -0.006473 0.050764 +v -0.005000 -0.000335 0.050074 +v -0.005000 0.003165 0.051302 +v -0.005000 0.000729 0.050139 +v -0.004166 0.008061 0.051459 +v 0.001802 0.029155 0.044655 +v -0.001854 0.029155 0.044655 +v 0.001802 0.036149 0.034666 +v -0.001854 0.036149 0.034666 +v 0.010405 -0.014549 0.023895 +v 0.001802 -0.020035 0.026309 +v 0.015918 0.004186 0.022328 +v 0.015064 -0.004270 0.022584 +v 0.010167 0.018566 0.023334 +v 0.001802 0.033298 0.023305 +v -0.010457 -0.014549 0.023895 +v -0.001854 -0.020035 0.026309 +v -0.015970 0.004186 0.022328 +v -0.010219 0.018566 0.023334 +v 0.000373 0.043355 0.007065 +v -0.000425 0.043355 0.007065 +v 0.001802 -0.002295 -0.046991 +v 0.002642 0.002136 -0.046972 +v -0.001854 -0.002295 -0.046991 +v -0.002693 0.002136 -0.046972 +v -0.002274 0.007398 -0.045600 +v 0.000373 0.019999 -0.052646 +v -0.000425 0.019999 -0.052646 +v 0.002222 0.007398 -0.045600 +v 0.001802 0.012327 -0.045276 +v 0.001802 0.014161 -0.039627 +v 0.001498 -0.004126 -0.051460 +v 0.002268 0.002239 -0.053973 +v -0.001550 -0.004126 -0.051460 +v -0.002320 0.002239 -0.053973 +v -0.001935 0.008422 -0.054571 +v -0.001854 0.012327 -0.045276 +v 0.001498 0.014022 -0.054764 +v -0.001550 0.014022 -0.054764 +v 0.001883 0.008422 -0.054571 +v 0.000558 -0.007489 -0.055760 +v 0.000558 0.003423 -0.059983 +v -0.000610 -0.007489 -0.055760 +v -0.000610 0.003423 -0.059983 +v -0.000610 0.010097 -0.061420 +v 0.000558 0.016041 -0.061072 +v -0.000610 0.016041 -0.061072 +v 0.000558 0.010097 -0.061420 +v 0.000558 -0.012889 -0.063213 +v 0.000385 0.004391 -0.063443 +v -0.000610 -0.012889 -0.063213 +v -0.000437 0.004391 -0.063443 +v -0.000346 0.009751 -0.069329 +v 0.000294 0.017761 -0.071936 +v -0.000346 0.017761 -0.071936 +v 0.000294 0.009751 -0.069329 +v 0.001802 0.020055 -0.028569 +v 0.001802 0.026111 -0.006645 +v 0.001802 0.028888 0.005214 +v 0.001802 0.031093 0.014259 +v -0.001854 0.020055 -0.028569 +v -0.001854 0.014161 -0.039627 +v -0.001854 0.028888 0.005214 +v -0.001854 0.026111 -0.006645 +v -0.001854 0.033298 0.023305 +v -0.001854 0.031093 0.014259 +v 0.000373 0.015721 -0.040440 +v 0.000373 0.022748 -0.029483 +v 0.000373 0.016083 -0.048206 +v -0.000425 0.016083 -0.048206 +v -0.000425 0.015721 -0.040440 +v -0.000425 0.022748 -0.029483 +v -0.000425 0.028898 -0.007685 +v -0.000425 0.034324 0.013216 +v -0.000425 0.032103 0.004944 +v -0.000425 0.038028 0.031656 +v -0.000425 0.036544 0.021489 +v 0.000373 0.038028 0.031656 +v 0.000373 0.036544 0.021489 +v 0.000373 0.034324 0.013216 +v 0.000373 0.028898 -0.007685 +v 0.000373 0.032103 0.004944 +v 0.000373 0.039893 -0.016688 +v 0.000373 0.042847 -0.001286 +v -0.000425 0.039893 -0.016688 +v -0.000425 0.042847 -0.001286 +v 0.000373 -0.022719 0.003616 +v -0.000425 -0.022719 0.003616 +v 0.013380 -0.010779 0.024734 +v 0.000373 -0.031595 0.003270 +v -0.000425 -0.031595 0.003270 +v -0.000425 -0.031278 0.002614 +v 0.000373 -0.031278 0.002614 +v 0.000373 -0.022837 0.021391 +v 0.000373 -0.021219 0.010575 +v -0.000425 -0.022837 0.021391 +v -0.000425 -0.021219 0.010575 +v 0.000373 -0.026176 0.016007 +v 0.000373 -0.023473 0.008153 +v -0.000425 -0.026176 0.016007 +v -0.000425 -0.023473 0.008153 +v 0.000373 -0.029988 0.008526 +v 0.000373 -0.028443 0.004395 +v -0.000425 -0.029988 0.008526 +v -0.000425 -0.028443 0.004395 +v 0.018057 -0.002636 0.024598 +v 0.017765 -0.009447 0.023224 +v 0.018815 -0.009447 0.023360 +v 0.019150 -0.002636 0.024734 +v 0.017976 0.000154 0.027361 +v 0.016926 0.000154 0.027224 +v 0.020042 0.005314 0.007384 +v 0.019347 0.018169 0.013046 +v 0.019752 0.018169 0.013045 +v 0.020446 0.005314 0.007383 +v 0.019815 -0.006874 0.009368 +v 0.020219 -0.006874 0.009368 vt 0.693000 0.378400 vt 0.679800 0.357300 vt 0.693900 0.273500 @@ -550,26 +550,26 @@ vt 0.579600 0.480700 vt 0.592700 0.323800 vt 0.592700 0.323800 vn -0.4416 -0.8756 -0.1956 -vn -0.0661 0.9952 0.0723 +vn -0.0661 0.9952 0.0724 vn 0.0936 0.8355 0.5415 vn -0.6792 -0.3888 0.6226 vn 0.3653 0.9065 0.2119 vn 0.3708 0.9258 0.0738 -vn 0.3788 0.6248 0.6828 -vn 0.2429 -0.7404 -0.6268 -vn 0.7161 0.6163 -0.3276 -vn 0.4247 0.9053 -0.0099 +vn 0.3787 0.6248 0.6828 +vn 0.2429 -0.7404 -0.6267 +vn 0.7162 0.6163 -0.3276 +vn 0.4247 0.9053 -0.0098 vn -0.7991 -0.5946 -0.0890 vn -0.7175 0.6881 -0.1081 vn -0.0938 0.5629 -0.8212 vn -0.1217 -0.5399 -0.8329 vn -0.5483 0.6175 0.5640 vn -0.6098 -0.5602 0.5606 -vn -0.2156 -0.8359 0.5048 +vn -0.2156 -0.8359 0.5047 vn -0.2898 -0.8676 0.4042 -vn -0.2468 -0.7792 0.5761 +vn -0.2468 -0.7792 0.5762 vn -0.1148 -0.8305 0.5451 -vn -0.1065 -0.6431 0.7584 +vn -0.1065 -0.6431 0.7583 vn -0.0547 -0.8295 0.5558 vn 0.1193 -0.3498 0.9292 vn -0.0307 -0.6330 0.7735 @@ -579,57 +579,57 @@ vn 0.3802 -0.7515 0.5392 vn 0.4874 -0.6942 0.5297 vn 0.4968 -0.2512 0.8307 vn 0.4162 -0.2351 0.8783 -vn -0.3036 -0.8695 0.3896 +vn -0.3037 -0.8695 0.3896 vn -0.3566 -0.7789 0.5159 vn -0.1297 -0.8615 0.4909 vn -0.0668 -0.8473 0.5269 -vn 0.0676 -0.8547 0.5147 +vn 0.0676 -0.8547 0.5146 vn 0.3669 -0.9048 0.2160 vn 0.4151 -0.8895 0.1912 -vn -0.2786 -0.8839 0.3756 +vn -0.2786 -0.8839 0.3757 vn -0.3645 -0.9312 0.0017 vn -0.3466 -0.9231 -0.1664 vn -0.3402 -0.8978 0.2798 vn -0.1391 -0.9612 -0.2381 vn -0.1587 -0.9790 0.1283 -vn -0.0919 -0.9879 0.1252 +vn -0.0919 -0.9879 0.1251 vn -0.0960 -0.9635 -0.2500 -vn 0.0098 -0.9682 -0.2498 +vn 0.0098 -0.9682 -0.2499 vn 0.0842 -0.9869 0.1374 vn 0.4454 -0.8953 -0.0063 vn 0.3164 -0.9434 -0.0989 -vn 0.4004 -0.9128 -0.0806 +vn 0.4004 -0.9128 -0.0807 vn 0.3678 -0.9297 0.0213 vn -0.2847 -0.9497 -0.1307 -vn -0.2815 -0.8445 -0.4556 +vn -0.2815 -0.8445 -0.4557 vn -0.1508 -0.8710 -0.4676 vn -0.1025 -0.8647 -0.4917 -vn -0.0243 -0.8771 -0.4798 +vn -0.0243 -0.8771 -0.4797 vn 0.2195 -0.9254 -0.3089 -vn 0.3612 -0.9075 -0.2144 +vn 0.3612 -0.9075 -0.2145 vn -0.2164 0.8396 0.4982 -vn -0.1156 0.8360 0.5365 -vn -0.2468 0.7792 0.5761 -vn -0.2904 0.8692 0.4003 -vn -0.0437 0.8342 0.5497 -vn -0.1065 0.6430 0.7584 -vn 0.1086 0.3541 0.9289 +vn -0.1156 0.8360 0.5364 +vn -0.2467 0.7792 0.5762 +vn -0.2904 0.8691 0.4003 +vn -0.0437 0.8342 0.5498 +vn -0.1065 0.6431 0.7584 +vn 0.1086 0.3540 0.9289 vn -0.0615 0.4889 0.8702 vn 0.0268 0.6286 0.7773 -vn -0.0307 0.6331 0.7735 -vn 0.4969 0.2512 0.8307 -vn 0.4870 0.6946 0.5295 -vn 0.3796 0.7539 0.5363 +vn -0.0307 0.6331 0.7734 +vn 0.4969 0.2512 0.8306 +vn 0.4870 0.6945 0.5295 +vn 0.3797 0.7538 0.5363 vn 0.4162 0.2351 0.8783 vn -0.3566 0.7789 0.5159 -vn -0.3036 0.8695 0.3897 +vn -0.3035 0.8695 0.3897 vn -0.1297 0.8615 0.4908 vn 0.0690 0.8547 0.5146 -vn -0.0667 0.8473 0.5268 -vn 0.4140 0.8899 0.1913 +vn -0.0666 0.8474 0.5268 +vn 0.4140 0.8900 0.1913 vn -0.3145 0.8883 0.3348 vn -0.3402 0.8978 0.2798 -vn -0.3466 0.9231 -0.1665 +vn -0.3467 0.9231 -0.1665 vn -0.3734 0.9276 0.0083 vn -0.1587 0.9789 0.1283 vn -0.1391 0.9612 -0.2382 @@ -638,30 +638,30 @@ vn 0.0854 0.9868 0.1377 vn 0.0099 0.9682 -0.2499 vn -0.0959 0.9635 -0.2499 vn 0.3665 0.9302 0.0209 -vn 0.4002 0.9129 -0.0807 +vn 0.4002 0.9129 -0.0806 vn 0.3165 0.9436 -0.0976 vn -0.2815 0.8445 -0.4556 vn -0.2847 0.9497 -0.1307 vn -0.1508 0.8710 -0.4676 vn -0.0244 0.8770 -0.4798 -vn -0.1025 0.8647 -0.4917 -vn 0.3612 0.9075 -0.2144 +vn -0.1025 0.8647 -0.4916 +vn 0.3612 0.9075 -0.2143 vn 0.2195 0.9254 -0.3088 vn -0.1715 -0.6419 0.7474 vn -0.0067 -0.6442 0.7649 vn -0.0092 0.6383 0.7697 -vn -0.1723 0.6391 0.7496 +vn -0.1723 0.6390 0.7496 vn 0.2292 -0.5960 0.7696 -vn 0.2387 0.5876 0.7731 +vn 0.2386 0.5876 0.7731 vn 0.7410 -0.4694 0.4802 vn 0.6174 -0.6468 0.4477 -vn 0.6174 0.6468 0.4477 +vn 0.6174 0.6468 0.4478 vn 0.7410 0.4694 0.4802 vn 0.3611 -0.4958 0.7898 vn 0.3610 0.4958 0.7898 vn 0.7554 -0.4926 0.4321 -vn 0.7807 -0.5005 -0.3741 -vn 0.7807 0.5005 -0.3742 +vn 0.7807 -0.5006 -0.3741 +vn 0.7807 0.5004 -0.3742 vn 0.7554 0.4926 0.4321 vn 0.7093 -0.5350 -0.4590 vn 0.7093 0.5350 -0.4590 @@ -672,113 +672,113 @@ vn 0.8328 -0.4967 -0.2443 vn 0.0160 -0.6890 -0.7246 vn 0.0160 0.6890 -0.7246 vn 0.2438 0.6600 -0.7106 -vn 0.2439 -0.6600 -0.7106 +vn 0.2439 -0.6599 -0.7106 vn -0.3256 -0.6783 -0.6587 -vn -0.4587 -0.6873 -0.5632 +vn -0.4587 -0.6872 -0.5633 vn -0.4588 0.6872 -0.5632 vn -0.3256 0.6783 -0.6587 -vn -0.6952 -0.6164 0.3698 -vn -0.6952 0.6164 0.3698 +vn -0.6952 -0.6164 0.3697 +vn -0.6952 0.6163 0.3699 vn -0.6010 0.5826 -0.5471 -vn -0.6010 -0.5827 -0.5471 +vn -0.6010 -0.5826 -0.5471 vn -0.5060 -0.8075 0.3033 -vn -0.5602 -0.5744 0.5969 -vn -0.5609 0.5712 0.5992 +vn -0.5601 -0.5744 0.5969 +vn -0.5609 0.5712 0.5993 vn -0.5067 0.8075 0.3019 vn -0.7217 -0.5824 0.3740 -vn -0.7218 0.5824 0.3740 +vn -0.7218 0.5823 0.3741 vn -0.7471 0.6100 -0.2641 -vn -0.7471 -0.6100 -0.2641 +vn -0.7471 -0.6101 -0.2641 vn -0.3265 -0.6595 0.6771 vn -0.3275 0.6592 0.6769 vn 0.4357 -0.8642 0.2517 vn 0.4253 -0.3950 0.8143 -vn 0.4040 -0.9063 0.1238 +vn 0.4041 -0.9063 0.1238 vn 0.4143 -0.9097 0.0281 -vn 0.4149 -0.9095 -0.0275 +vn 0.4149 -0.9095 -0.0274 vn 0.4483 -0.8829 -0.1395 vn 0.4356 0.8642 0.2518 vn 0.4253 0.3950 0.8143 vn 0.4143 0.9097 0.0281 vn 0.4149 0.9094 -0.0276 -vn 0.4040 0.9064 0.1237 -vn 0.4483 0.8829 -0.1396 -vn 0.5613 -0.5236 -0.6409 +vn 0.4040 0.9063 0.1237 +vn 0.4483 0.8829 -0.1397 +vn 0.5613 -0.5235 -0.6409 vn 0.5613 0.5235 -0.6409 -vn 0.3321 -0.5819 -0.7423 +vn 0.3321 -0.5820 -0.7423 vn 0.3322 0.5820 -0.7422 vn 0.1112 -0.6504 0.7514 vn 0.3344 -0.3622 0.8700 -vn 0.1630 -0.9755 -0.1481 -vn -0.1505 -0.9824 0.1108 +vn 0.1630 -0.9755 -0.1480 +vn -0.1506 -0.9824 0.1108 vn 0.0222 -0.9062 -0.4223 vn -0.0985 -0.8947 -0.4357 -vn 0.1110 0.6520 0.7500 +vn 0.1110 0.6521 0.7500 vn 0.3305 0.3620 0.8716 vn 0.1635 0.9755 -0.1470 vn 0.0222 0.9062 -0.4223 vn -0.0429 -0.7071 -0.7058 vn -0.0429 0.7071 -0.7058 vn 0.2124 -0.6496 0.7300 -vn -0.0456 -0.9979 0.0451 +vn -0.0456 -0.9979 0.0450 vn 0.2106 0.6654 0.7162 vn -0.0345 0.9973 0.0654 vn -0.0475 0.9948 -0.0905 vn -0.8189 -0.5736 0.0212 vn -0.8189 0.5736 0.0212 -vn -0.0475 -0.9948 -0.0905 +vn -0.0475 -0.9948 -0.0906 vn -0.1814 -0.9430 -0.2790 -vn -0.2222 -0.8931 -0.3911 +vn -0.2222 -0.8932 -0.3911 vn 0.2630 -0.7050 0.6586 vn -0.1574 -0.9866 0.0432 vn 0.2311 0.7242 0.6497 vn -0.1777 0.9806 0.0828 -vn -0.1204 0.9917 -0.0443 -vn -0.1592 0.9329 -0.3232 -vn 0.0841 -0.7204 -0.6885 +vn -0.1204 0.9917 -0.0444 +vn -0.1592 0.9328 -0.3232 +vn 0.0841 -0.7204 -0.6884 vn 0.0841 0.7204 -0.6885 -vn -0.1204 -0.9917 -0.0442 +vn -0.1205 -0.9917 -0.0441 vn 0.3886 -0.6792 0.6226 vn -0.1426 -0.9896 0.0204 -vn 0.3935 0.6907 0.6067 -vn -0.1417 0.9892 0.0373 +vn 0.3936 0.6907 0.6067 +vn -0.1417 0.9892 0.0374 vn -0.0998 0.9950 0.0030 vn 0.1195 -0.6803 -0.7231 vn 0.1195 0.6802 -0.7232 -vn -0.0998 -0.9950 0.0029 +vn -0.0997 -0.9950 0.0029 vn 0.2046 -0.6511 0.7309 -vn -0.0354 -0.9994 0.0034 +vn -0.0353 -0.9994 0.0033 vn 0.2075 0.6501 0.7310 vn -0.0314 0.9995 0.0052 -vn -0.0137 0.9999 0.0038 -vn 0.0194 -0.6785 -0.7344 +vn -0.0137 0.9999 0.0037 +vn 0.0194 -0.6785 -0.7343 vn 0.0194 0.6784 -0.7344 -vn -0.0137 -0.9999 0.0038 +vn -0.0138 -0.9999 0.0037 vn -0.1966 -0.8537 -0.4822 -vn -0.1328 -0.8626 -0.4881 +vn -0.1328 -0.8627 -0.4880 vn -0.1082 -0.8659 -0.4884 -vn -0.1033 -0.8862 -0.4515 +vn -0.1033 -0.8862 -0.4516 vn -0.1855 0.8570 -0.4807 vn -0.2704 0.8798 -0.3910 vn -0.1082 0.8659 -0.4884 -vn -0.1328 0.8626 -0.4881 +vn -0.1328 0.8626 -0.4882 vn -0.0985 0.8947 -0.4357 vn -0.1033 0.8862 -0.4516 vn -0.0721 -0.9189 -0.3879 -vn -0.0844 -0.9776 -0.1926 -vn -0.5564 -0.7133 0.4263 -vn -0.5428 0.7188 0.4344 +vn -0.0844 -0.9776 -0.1927 +vn -0.5563 -0.7133 0.4263 +vn -0.5428 0.7187 0.4345 vn -0.1381 0.9340 -0.3296 vn -0.0805 0.9766 -0.1995 vn -0.0574 0.9753 -0.2135 -vn -0.0514 0.9802 -0.1913 +vn -0.0514 0.9802 -0.1912 vn -0.0497 0.9778 -0.2037 vn 0.3104 0.5366 -0.7847 -vn -0.0374 0.9827 -0.1811 -vn 0.3103 -0.5366 -0.7847 +vn -0.0374 0.9827 -0.1812 +vn 0.3102 -0.5366 -0.7847 vn -0.0374 -0.9827 -0.1812 -vn -0.0513 -0.9802 -0.1913 -vn -0.0573 -0.9753 -0.2134 +vn -0.0513 -0.9802 -0.1912 +vn -0.0573 -0.9753 -0.2135 vn -0.0497 -0.9778 -0.2037 vn -0.1839 -0.6921 -0.6980 vn -0.0900 -0.6930 -0.7153 @@ -786,10 +786,10 @@ vn -0.1838 0.6921 -0.6980 vn -0.0900 0.6929 -0.7154 vn 0.3204 -0.5355 0.7814 vn 0.3204 0.5355 0.7814 -vn 0.0929 -0.8342 0.5436 -vn -0.0592 -0.6335 0.7714 -vn -0.0592 0.6335 0.7715 -vn -0.7885 0.5716 0.2269 +vn 0.0929 -0.8342 0.5435 +vn -0.0592 -0.6335 0.7715 +vn -0.0592 0.6334 0.7715 +vn -0.7885 0.5716 0.2270 vn -0.7885 -0.5717 0.2268 vn 0.3241 -0.5423 0.7751 vn -0.6394 -0.6619 -0.3912 @@ -797,24 +797,24 @@ vn 0.3125 0.5812 0.7514 vn -0.6205 0.6748 -0.3994 vn 0.3517 -0.6978 0.6240 vn -0.5386 -0.6880 -0.4863 -vn 0.3517 0.6979 0.6240 +vn 0.3517 0.6978 0.6240 vn -0.5386 0.6881 -0.4863 vn 0.2719 -0.6880 0.6729 vn -0.5897 -0.6975 -0.4071 vn 0.2719 0.6880 0.6729 vn -0.5897 0.6975 -0.4071 vn -0.6747 0.7090 -0.2052 -vn -0.6792 0.3880 0.6230 +vn -0.6792 0.3881 0.6230 vn 0.3794 -0.6243 0.6829 vn 0.3715 -0.9255 0.0743 vn 0.7165 -0.6163 -0.3267 -vn 0.2696 0.6091 -0.7458 +vn 0.2696 0.6091 -0.7459 vn -0.7990 0.5948 -0.0890 vn -0.1217 0.5399 -0.8329 -vn -0.0938 -0.5629 -0.8211 -vn -0.7175 -0.6882 -0.1081 +vn -0.0938 -0.5629 -0.8212 +vn -0.7174 -0.6882 -0.1081 vn -0.6098 0.5602 0.5606 -vn -0.5484 -0.6175 0.5639 +vn -0.5483 -0.6175 0.5639 usemtl 04___Default s 1 f 1/1/1 2/2/2 3/3/3 4/4/4 diff --git a/GrafikaProjekt/pliki/src/main.cpp b/GrafikaProjekt/pliki/src/main.cpp index de8ff05..04e4093 100644 --- a/GrafikaProjekt/pliki/src/main.cpp +++ b/GrafikaProjekt/pliki/src/main.cpp @@ -29,6 +29,7 @@ Core::RenderContext fish3Context; Core::RenderContext fish4Context; Core::RenderContext fish5Context; Core::RenderContext fish6Context; +Core::RenderContext clownfishContext; Core::RenderContext plant1; Core::RenderContext plant3; Core::RenderContext plant4; @@ -103,6 +104,7 @@ GLuint textureAsteroid; GLuint textureSubmarine; GLuint textureFish1; GLuint textureFish2; +GLuint textureclownFish; GLuint texturePlant1; GLuint texturePlant3; GLuint texturePlant4; @@ -301,7 +303,7 @@ void renderScene() drawObjectTexture(sphereContext, glm::translate(glm::vec3(0, -1.2, 0)), textureAsteroid); drawObjectTexture(fish1Context, glm::translate(glm::vec3(0, 0, 0)), textureFish1); rypa = (rypa + 1) % 360; - drawObjectTexture(fish2Context, glm::rotate(glm::degrees((float)rypa / (float)360), glm::vec3(0, -1, 0)) * glm::translate(glm::vec3(0.5, 0, (float)rypa/(float)360)), textureFish2); + drawObjectTexture(fish2Context, glm::rotate(glm::degrees((float)rypa / (float)360), glm::vec3(0, -1, 0)) * glm::translate(glm::vec3(1, 0, (float)rypa/(float)360)), textureFish2); drawObjectTexture(smiglo, shipModelMatrix * glm::translate(glm::vec3(0, -0.3, -1)) * glm::rotate(glm::degrees((float)rypa), glm::vec3(0, 0, 1)), textureSmiglo); drawObjectTexture(cave, glm::translate(glm::vec3(0, -0.6, 0)), textureAsteroid); @@ -343,6 +345,7 @@ void init() loadModelToContext("models/teren1.obj", sphereContext); loadModelToContext("models/fish1.obj", fish1Context); loadModelToContext("models/fish4.obj", fish2Context); + loadModelToContext("models/fish13.obj", clownfishContext); loadModelToContext("models/roslina2.obj", plant1); loadModelToContext("models/roslina3.obj", plant3); loadModelToContext("models/smiglo.obj", smiglo); @@ -355,6 +358,7 @@ void init() textureSubmarine = Core::LoadTexture("textures/sub1.png"); textureFish1 = Core::LoadTexture("textures/scale.png"); textureFish2 = Core::LoadTexture("textures/scale2.png"); + textureclownFish = Core::LoadTexture("textures/clownfish.png"); texturePlant1 = Core::LoadTexture("textures/plant.png"); texturePlant3 = Core::LoadTexture("textures/plant3.png"); textureSmiglo = Core::LoadTexture("textures/metal.png"); diff --git a/GrafikaProjekt/pliki/textures/clownfish.png b/GrafikaProjekt/pliki/textures/clownfish.png new file mode 100644 index 0000000..dd96f79 Binary files /dev/null and b/GrafikaProjekt/pliki/textures/clownfish.png differ