las

Merge branch 'master' of https://git.wmi.amu.edu.pl/s473559/Grafika2023
last_c
2024-03-18 17:34:06 +01:00 · 2024-03-18 17:14:32 +01:00 · 2024-03-18 16:51:38 +01:00 · 2024-03-18 14:21:18 +01:00 · 2024-03-04 23:13:45 +01:00 · 2024-03-04 19:36:46 +01:00
167 changed files with 11818367 additions and 240 deletions
--- a/PlanetCreator/Release/grk-cw6.exe
+++ b/PlanetCreator/Release/grk-cw6.exe
--- a/PlanetCreator/Release/grk-cw6.pdb
+++ b/PlanetCreator/Release/grk-cw6.pdb
--- a/PlanetCreator/Release/libcrypto-1_1.dll
+++ b/PlanetCreator/Release/libcrypto-1_1.dll
--- a/PlanetCreator/Release/libssl-1_1.dll
+++ b/PlanetCreator/Release/libssl-1_1.dll
--- a/6/Release/Box.obj
+++ b/6/Release/Box.obj
--- a/6/Release/Camera.obj
+++ b/6/Release/Camera.obj
--- a/6/Release/Distribution.obj
+++ b/6/Release/Distribution.obj
--- a/6/Release/Render_Utils.obj
+++ b/6/Release/Render_Utils.obj
--- a/6/Release/SOIL.obj
+++ b/6/Release/SOIL.obj
--- a/6/Release/Shader_Loader.obj
+++ b/6/Release/Shader_Loader.obj
--- a/6/Release/Texture.obj
+++ b/6/Release/Texture.obj
--- a/6/Release/grk-cw6.exe.recipe
+++ b/6/Release/grk-cw6.exe.recipe
@ -2,7 +2,11 @@
 <Project>
  <ProjectOutputs>
    <ProjectOutput>
-      <FullPath>D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\grk\Release\grk-cw6.exe</FullPath>
+<<<<<<< HEAD
+      <FullPath>D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\Release\grk-cw6.exe</FullPath>
+=======
+      <FullPath>C:\Users\neryt\Grafika2023\PlanetCreator\Release\grk-cw6.exe</FullPath>
+>>>>>>> origin/merge_with_textures
    </ProjectOutput>
  </ProjectOutputs>
  <ContentFiles />
--- a/6/Release/grk-cw6.iobj
+++ b/6/Release/grk-cw6.iobj
--- a/6/Release/grk-cw6.ipdb
+++ b/6/Release/grk-cw6.ipdb
--- a/6/Release/grk-cw6.log
+++ b/6/Release/grk-cw6.log
@ -1,43 +1,277 @@
-  Box.cpp
-  Camera.cpp
-  main.cpp
+  main.cpp
+<<<<<<< HEAD
 C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": ponowna definicja makra
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\grk\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123,1): message : zobacz poprzednią definicję „APIENTRY”
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\ex_6_1.hpp(70,10): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\ex_6_1.hpp(119,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
-  Render_Utils.cpp
-  Shader_Loader.cpp
-  Texture.cpp
-  image_DXT.c
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\image_DXT.c(92,9): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-  image_helper.c
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\image_helper.c(325,17): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\image_helper.c(366,13): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\image_helper.c(373,20): warning C4244: "=": konwersja z "float" do "int", możliwa utrata danych
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\image_helper.c(415,13): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\image_helper.c(422,20): warning C4244: "=": konwersja z "float" do "int", możliwa utrata danych
-  SOIL.c
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\SOIL.c(1719,36): warning C4018: "<=": niezgodność typu ze znakiem/bez znaku
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\SOIL.c(1729,19): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\SOIL.c(1841,6): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-  stb_image_aug.c
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c(177,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c(251,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c(303,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c(1557,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c(2394,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c(2709,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c(2995,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c(3209,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c(3548,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c(3644,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stbi_DDS_aug_c.h(362,19): warning C4018: ">": niezgodność typu ze znakiem/bez znaku
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stbi_DDS_aug_c.h(366,19): warning C4018: ">": niezgodność typu ze znakiem/bez znaku
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stbi_DDS_aug_c.h(390,19): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stbi_DDS_aug_c.h(427,19): warning C4018: "<": niezgodność typu ze znakiem/bez znaku
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stbi_DDS_aug_c.h(498,14): warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123,1): message : zobacz poprzednią definicję „APIENTRY”
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(141,15): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(175,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(181,30): warning C4244: "=": konwersja z "float" do "int", możliwa utrata danych
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(187,20): warning C4244: "=": konwersja z "int" do "float", możliwa utrata danych
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(312,57): warning C4305: "argument": obcięcie z "double" do "GLfloat"
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(313,58): warning C4305: "argument": obcięcie z "double" do "GLfloat"
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(388,10): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(471,57): warning C4305: "argument": obcięcie z "double" do "GLfloat"
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(472,58): warning C4305: "argument": obcięcie z "double" do "GLfloat"
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(506,17): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(595,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(641,70): warning C4305: "argument": obcięcie z "double" do "float"
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(722,44): warning C4305: "argument": obcięcie z "double" do "float"
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(723,45): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(144,47): warning C4244: "inicjowanie": konwersja z "_Ty" do "_Ty", możliwa utrata danych
+=======
+C:\Windows Kits\10\Include\10.0.22000.0\shared\minwindef.h(130,1): warning C4005: APIENTRY: изменение макроопределения
+C:\Users\neryt\Grafika2023\PlanetCreator\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : см. предыдущее определение "APIENTRY"
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(127,15): warning C4244: инициализация: преобразование "double" в "float", возможна потеря данных
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(178,30): warning C4244: =: преобразование "float" в "int", возможна потеря данных
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(184,20): warning C4244: =: преобразование "int" в "float", возможна потеря данных
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(355,16): warning C4305: инициализация: усечение из "double" в "float"
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(459,61): warning C4305: аргумент: усечение из "double" в "GLfloat"
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(460,61): warning C4305: аргумент: усечение из "double" в "GLfloat"
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(473,17): warning C4244: инициализация: преобразование "double" в "float", возможна потеря данных
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(588,13): warning C4244: инициализация: преобразование "double" в "float", возможна потеря данных
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(722,92): warning C4305: аргумент: усечение из "double" в "float"
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(723,96): warning C4305: аргумент: усечение из "double" в "float"
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(724,100): warning C4305: аргумент: усечение из "double" в "float"
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(725,102): warning C4305: аргумент: усечение из "double" в "float"
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(728,106): warning C4305: аргумент: усечение из "double" в "float"
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(729,96): warning C4305: аргумент: усечение из "double" в "float"
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(158,47): warning C4244: инициализация: преобразование "_Ty" в "_Ty", возможна потеря данных
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Ty=float
+          ]
+          and
+          [
+              _Ty=int
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(236,102): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::_Tuple_val<_This>::_Tuple_val<_Ty>(_Other &&)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(245): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::_Tuple_val<_This>::_Tuple_val<_Ty>(_Other &&)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _This=int,
+              _Ty=float,
+              _Other=float
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(236,18): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::tuple<int>::tuple<std::_Exact_args_t,_Ty,,0>(_Tag,_This2 &&)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(245): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::_Tuple_val<_This>::_Tuple_val<_Ty>(_Other &&)"
+          with
+          [
+              _This=int,
+              _Ty=float,
+              _Other=float
+          ]
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(245): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int>::tuple<std::_Exact_args_t,_Ty,,0>(_Tag,_This2 &&)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Ty=float,
+              _Tag=std::_Exact_args_t,
+              _This2=float
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(799,12): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::tuple<int,int>::tuple<std::_Exact_args_t,int,float,0>(_Tag,_This2 &&,float &&)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(245): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int>::tuple<std::_Exact_args_t,_Ty,,0>(_Tag,_This2 &&)"
+          with
+          [
+              _Ty=float,
+              _Tag=std::_Exact_args_t,
+              _This2=float
+          ]
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(860): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,int>::tuple<std::_Exact_args_t,int,float,0>(_Tag,_This2 &&,float &&)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Tag=std::_Exact_args_t,
+              _This2=int
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(243,16): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::tuple<int,int>::tuple<std::_Unpack_tuple_t,_Ty,0,1,0>(_Tag,_Tpl &&,std::integer_sequence<size_t,0,1>)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(860): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,int>::tuple<std::_Exact_args_t,int,float,0>(_Tag,_This2 &&,float &&)"
+          with
+          [
+              _Tag=std::_Exact_args_t,
+              _This2=int
+          ]
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(253): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,int>::tuple<std::_Unpack_tuple_t,_Ty,0,1,0>(_Tag,_Tpl &&,std::integer_sequence<size_t,0,1>)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Ty=std::tuple<int,float>,
+              _Tag=std::_Unpack_tuple_t,
+              _Tpl=std::tuple<int,float>
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(309,16): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::tuple<int,int>::tuple<std::_Unpack_tuple_t,std::tuple<int,float>,0>(_Tag,_Tpl &&)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(252): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,int>::tuple<std::_Unpack_tuple_t,_Ty,0,1,0>(_Tag,_Tpl &&,std::integer_sequence<size_t,0,1>)"
+          with
+          [
+              _Ty=std::tuple<int,float>,
+              _Tag=std::_Unpack_tuple_t,
+              _Tpl=std::tuple<int,float>
+          ]
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(379): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,int>::tuple<std::_Unpack_tuple_t,std::tuple<int,float>,0>(_Tag,_Tpl &&)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Tag=std::_Unpack_tuple_t,
+              _Tpl=std::tuple<int,float>
+          ]
+<<<<<<< HEAD
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(188,50): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::tuple<int,int>::tuple<int,float,0>(std::tuple<int,float> &&) noexcept” funkcji szablon
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(188,33): message : zobacz pierwsze odwołanie do elementu „std::tuple<int,int>::tuple” w „populatePlanet”
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(144,47): warning C4244: "inicjowanie": konwersja z "const int" do "_Ty", możliwa utrata danych
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(379): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,int>::tuple<std::_Unpack_tuple_t,std::tuple<int,float>,0>(_Tag,_Tpl &&)"
+          with
+          [
+              _Tag=std::_Unpack_tuple_t,
+              _Tpl=std::tuple<int,float>
+          ]
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(185): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,int>::tuple<int,float,0>(std::tuple<int,float> &&) noexcept"
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(185): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,int>::tuple<int,float,0>(std::tuple<int,float> &&) noexcept"
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(158,47): warning C4244: инициализация: преобразование "const int" в "_Ty", возможна потеря данных
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Ty=float
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(236,102): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::_Tuple_val<_This>::_Tuple_val<const int&>(_Other)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(245): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::_Tuple_val<_This>::_Tuple_val<const int&>(_Other)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _This=float,
+              _Other=const int &
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(236,18): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::tuple<float>::tuple<std::_Exact_args_t,const int&,,0>(_Tag,_This2)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(245): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::_Tuple_val<_This>::_Tuple_val<const int&>(_Other)"
+          with
+          [
+              _This=float,
+              _Other=const int &
+          ]
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(245): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<float>::tuple<std::_Exact_args_t,const int&,,0>(_Tag,_This2)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Tag=std::_Exact_args_t,
+              _This2=const int &
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(799,12): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::tuple<int,float>::tuple<std::_Exact_args_t,const int&,const int&,0>(_Tag,_This2,const int &)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(245): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<float>::tuple<std::_Exact_args_t,const int&,,0>(_Tag,_This2)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Tag=std::_Exact_args_t,
+              _This2=const int &
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(243,16): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::tuple<int,float>::tuple<std::_Unpack_tuple_t,const _Ty&,0,1,0>(_Tag,_Tpl,std::integer_sequence<size_t,0,1>)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(860): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,float>::tuple<std::_Exact_args_t,const int&,const int&,0>(_Tag,_This2,const int &)"
+          with
+          [
+              _Tag=std::_Exact_args_t,
+              _This2=const int &
+          ]
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(860): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,float>::tuple<std::_Exact_args_t,const int&,const int&,0>(_Tag,_This2,const int &)"
+          with
+          [
+              _Tag=std::_Exact_args_t,
+              _This2=const int &
+          ]
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(253): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,float>::tuple<std::_Unpack_tuple_t,const _Ty&,0,1,0>(_Tag,_Tpl,std::integer_sequence<size_t,0,1>)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Ty=std::tuple<int,int>,
+              _Tag=std::_Unpack_tuple_t,
+              _Tpl=const std::tuple<int,int> &
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\tuple(302,16): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::tuple<int,float>::tuple<std::_Unpack_tuple_t,const std::tuple<int,int>&,0>(_Tag,_Tpl)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(252): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,float>::tuple<std::_Unpack_tuple_t,const _Ty&,0,1,0>(_Tag,_Tpl,std::integer_sequence<size_t,0,1>)"
+          with
+          [
+              _Ty=std::tuple<int,int>,
+              _Tag=std::_Unpack_tuple_t,
+              _Tpl=const std::tuple<int,int> &
+          ]
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(356): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,float>::tuple<std::_Unpack_tuple_t,const std::tuple<int,int>&,0>(_Tag,_Tpl)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Tag=std::_Unpack_tuple_t,
+              _Tpl=const std::tuple<int,int> &
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\algorithm(7929,17): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „std::tuple<int,float>::tuple<int,int,0>(const std::tuple<int,int> &) noexcept” funkcji szablon
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\algorithm(8053,13): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „_BidIt *std::_Insertion_sort_unchecked<_RanIt,bool(__cdecl *)(std::tuple<int,float>,std::tuple<int,float>)>(const _BidIt,const _BidIt,_Pr)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(356): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,float>::tuple<std::_Unpack_tuple_t,const std::tuple<int,int>&,0>(_Tag,_Tpl)"
+          with
+          [
+              _Tag=std::_Unpack_tuple_t,
+              _Tpl=const std::tuple<int,int> &
+          ]
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\algorithm(6926): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,float>::tuple<int,int,0>(const std::tuple<int,int> &) noexcept"
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\algorithm(6926): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple<int,float>::tuple<int,int,0>(const std::tuple<int,int> &) noexcept"
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\algorithm(7050): message : выполняется компиляция ссылки на экземпляр шаблон функции "_BidIt *std::_Insertion_sort_unchecked<_RanIt,bool(__cdecl *)(std::tuple<int,float>,std::tuple<int,float>)>(const _BidIt,const _BidIt,_Pr)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _BidIt=std::tuple<int,int> *,
+              _RanIt=std::tuple<int,int> *,
+              _Pr=bool (__cdecl *)(std::tuple<int,float>,std::tuple<int,float>)
+          ]
+<<<<<<< HEAD
+C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\include\algorithm(8083,5): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „void std::_Sort_unchecked<std::tuple<int,int>*,bool(__cdecl *)(std::tuple<int,float>,std::tuple<int,float>)>(_RanIt,_RanIt,int,_Pr)” funkcji szablon
+=======
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\algorithm(7080): message : выполняется компиляция ссылки на экземпляр шаблон функции "void std::_Sort_unchecked<std::tuple<int,int>*,bool(__cdecl *)(std::tuple<int,float>,std::tuple<int,float>)>(_RanIt,_RanIt,int,_Pr)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _RanIt=std::tuple<int,int> *,
+              _Pr=bool (__cdecl *)(std::tuple<int,float>,std::tuple<int,float>)
+          ]
+<<<<<<< HEAD
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(197,7): message : zobacz odwołanie do kompilowanego tworzenia wystąpienia „void std::sort<std::_Vector_iterator<std::_Vector_val<std::_Simple_types<_Ty>>>,bool(__cdecl *)(std::tuple<int,float>,std::tuple<int,float>)>(const _RanIt,const _RanIt,_Pr)” funkcji szablon
+=======
+C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(193): message : выполняется компиляция ссылки на экземпляр шаблон функции "void std::sort<std::_Vector_iterator<std::_Vector_val<std::_Simple_types<_Ty>>>,bool(__cdecl *)(std::tuple<int,float>,std::tuple<int,float>)>(const _RanIt,const _RanIt,_Pr)"
+>>>>>>> origin/merge_with_textures
+          with
+          [
+              _Ty=std::tuple<int,int>,
+              _RanIt=std::_Vector_iterator<std::_Vector_val<std::_Simple_types<std::tuple<int,int>>>>,
+              _Pr=bool (__cdecl *)(std::tuple<int,float>,std::tuple<int,float>)
+          ]
+<<<<<<< HEAD
  Trwa generowanie kodu
-  Previous IPDB not found, fall back to full compilation.
-  All 491 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
+  79 of 2545 functions ( 3.1%) were compiled, the rest were copied from previous compilation.
+    3 functions were new in current compilation
+    21 functions had inline decision re-evaluated but remain unchanged
  Zakończono generowanie kodu
-  grk-cw6.vcxproj -> D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\grk\Release\grk-cw6.exe
+  grk-cw6.vcxproj -> D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\Release\grk-cw6.exe
+=======
+  Создание кода
+  2 of 2460 functions (<0.1%) were compiled, the rest were copied from previous compilation.
+    0 functions were new in current compilation
+    23 functions had inline decision re-evaluated but remain unchanged
+  Создание кода завершено
+  grk-cw6.vcxproj -> C:\Users\neryt\Grafika2023\PlanetCreator\Release\grk-cw6.exe
+>>>>>>> origin/merge_with_textures
--- a/6/Release/grk-cw6.tlog/CL.command.1.tlog
+++ b/6/Release/grk-cw6.tlog/CL.command.1.tlog
--- a/6/Release/grk-cw6.tlog/CL.read.1.tlog
+++ b/6/Release/grk-cw6.tlog/CL.read.1.tlog
--- a/6/Release/grk-cw6.tlog/CL.write.1.tlog
+++ b/6/Release/grk-cw6.tlog/CL.write.1.tlog
--- a/6/Release/grk-cw6.tlog/Cl.items.tlog
+++ b/6/Release/grk-cw6.tlog/Cl.items.tlog
@ -1,10 +1,17 @@
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\Box.cpp;D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\Release\Box.obj
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\Camera.cpp;D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\Release\Camera.obj
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\main.cpp;D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\Release\main.obj
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\Render_Utils.cpp;D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\Release\Render_Utils.obj
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\Shader_Loader.cpp;D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\Release\Shader_Loader.obj
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\image_DXT.c;D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\Release\image_DXT.obj
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\image_helper.c;D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\Release\image_helper.obj
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\SOIL.c;D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\Release\SOIL.obj
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\SOIL\stb_image_aug.c;D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\Release\stb_image_aug.obj
-D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\src\Texture.cpp;D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\cw 6\Release\Texture.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\Box.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\Box.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\Camera.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\Camera.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\imgui.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\imgui.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\imgui_demo.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\imgui_demo.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\imgui_draw.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\imgui_draw.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\imgui_impl_glfw.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\imgui_impl_glfw.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\imgui_impl_opengl3.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\imgui_impl_opengl3.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\imgui_tables.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\imgui_tables.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\imgui_widgets.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\imgui_widgets.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\main.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\main.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\Render_Utils.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\Render_Utils.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\Shader_Loader.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\Shader_Loader.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\SOIL\image_DXT.c;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\image_DXT.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\SOIL\image_helper.c;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\image_helper.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\SOIL\SOIL.c;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\SOIL.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\SOIL\stb_image_aug.c;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\stb_image_aug.obj
+D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\Texture.cpp;D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\Release\Texture.obj
--- a/6/Release/grk-cw6.tlog/grk-cw6.lastbuildstate
+++ b/6/Release/grk-cw6.tlog/grk-cw6.lastbuildstate
@ -1,2 +1,7 @@
+<<<<<<< HEAD
 PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.36.32532:TargetPlatformVersion=10.0.22621.0:
-Release|Win32|D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\grk\|
+Release|Win32|D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\|
+=======
+PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.22000.0:
+Release|Win32|C:\Users\neryt\Grafika2023\PlanetCreator\|
+>>>>>>> origin/merge_with_textures
--- a/6/Release/grk-cw6.tlog/link.command.1.tlog
+++ b/6/Release/grk-cw6.tlog/link.command.1.tlog
--- a/6/Release/grk-cw6.tlog/link.read.1.tlog
+++ b/6/Release/grk-cw6.tlog/link.read.1.tlog
--- a/6/Release/grk-cw6.tlog/link.write.1.tlog
+++ b/6/Release/grk-cw6.tlog/link.write.1.tlog
--- a/6/Release/image_DXT.obj
+++ b/6/Release/image_DXT.obj
--- a/6/Release/image_helper.obj
+++ b/6/Release/image_helper.obj
--- a/6/Release/imgui.obj
+++ b/6/Release/imgui.obj
--- a/6/Release/imgui_demo.obj
+++ b/6/Release/imgui_demo.obj
--- a/6/Release/imgui_draw.obj
+++ b/6/Release/imgui_draw.obj
--- a/6/Release/imgui_impl_glfw.obj
+++ b/6/Release/imgui_impl_glfw.obj
--- a/6/Release/imgui_impl_opengl3.obj
+++ b/6/Release/imgui_impl_opengl3.obj
--- a/6/Release/imgui_tables.obj
+++ b/6/Release/imgui_tables.obj
--- a/6/Release/imgui_widgets.obj
+++ b/6/Release/imgui_widgets.obj
--- a/6/Release/main.obj
+++ b/6/Release/main.obj
--- a/6/Release/stb_image_aug.obj
+++ b/6/Release/stb_image_aug.obj
--- a/6/Release/vc142.pdb
+++ b/6/Release/vc142.pdb
--- a/6/Release/vc143.pdb
+++ b/6/Release/vc143.pdb
--- a/6/grk-cw6.vcxproj
+++ b/6/grk-cw6.vcxproj
@ -17,6 +17,7 @@
  <ItemGroup>
    <ClCompile Include="src\Box.cpp" />
    <ClCompile Include="src\Camera.cpp" />
+    <ClCompile Include="src\Distribution.cpp" />
    <ClCompile Include="src\imgui.cpp" />
    <ClCompile Include="src\imgui_demo.cpp" />
    <ClCompile Include="src\imgui_draw.cpp" />
@ -35,6 +36,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="src\Camera.h" />
+    <ClInclude Include="src\Distribution.h" />
    <ClInclude Include="src\ex_6_1.hpp" />
    <ClInclude Include="src\imconfig.h" />
    <ClInclude Include="src\imgui.h" />
@ -54,6 +56,7 @@
    <ClInclude Include="src\SOIL\stbi_DDS_aug.h" />
    <ClInclude Include="src\SOIL\stbi_DDS_aug_c.h" />
    <ClInclude Include="src\SOIL\stb_image_aug.h" />
+    <ClInclude Include="src\stb_image.h" />
    <ClInclude Include="src\Texture.h" />
  </ItemGroup>
  <ItemGroup>
@ -66,6 +69,10 @@
    <None Include="shaders\shader_5_sun.vert" />
    <None Include="shaders\shader_biomes.frag" />
    <None Include="shaders\shader_biomes.vert" />
+    <None Include="shaders\shader_pbr.frag" />
+    <None Include="shaders\shader_pbr.vert" />
+    <None Include="shaders\shader_pbr_instanced.frag" />
+    <None Include="shaders\shader_pbr_instanced.vert" />
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{3952C396-B1C6-44CD-96DD-C1AC15D32978}</ProjectGuid>
@ -86,7 +93,7 @@
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='tylko_jedne|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
--- a/6/grk-cw6.vcxproj.filters
+++ b/6/grk-cw6.vcxproj.filters
@ -51,6 +51,30 @@
    <ClCompile Include="src\SOIL\image_helper.c">
      <Filter>Source Files\SOIL</Filter>
    </ClCompile>
+    <ClCompile Include="src\imgui.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\imgui_demo.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\imgui_draw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\imgui_impl_glfw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\imgui_impl_opengl3.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\imgui_tables.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\imgui_widgets.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Distribution.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="src\objload.h">
@ -89,6 +113,39 @@
    <ClInclude Include="src\ex_6_1.hpp">
      <Filter>Source Files</Filter>
    </ClInclude>
+    <ClInclude Include="src\imconfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\imgui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\imgui_impl_glfw.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\imgui_impl_opengl3.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\imgui_impl_opengl3_loader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\imgui_internal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\imstb_rectpack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\imstb_textedit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\imstb_truetype.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Distribution.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\stb_image.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <None Include="shaders\shader_5_sun.frag">
@ -115,5 +172,18 @@
    <None Include="shaders\shader_biomes.vert">
      <Filter>Shader Files</Filter>
    </None>
+    <None Include="packages.config" />
+    <None Include="shaders\shader_pbr.frag">
+      <Filter>Shader Files</Filter>
+    </None>
+    <None Include="shaders\shader_pbr.vert">
+      <Filter>Shader Files</Filter>
+    </None>
+    <None Include="shaders\shader_pbr_instanced.frag">
+      <Filter>Shader Files</Filter>
+    </None>
+    <None Include="shaders\shader_pbr_instanced.vert">
+      <Filter>Shader Files</Filter>
+    </None>
  </ItemGroup>
 </Project>
--- a/6/img/Lisciaste_duzo.png
+++ b/6/img/Lisciaste_duzo.png
--- a/6/img/choinki.png
+++ b/6/img/choinki.png
--- a/6/img/lisciaste.png
+++ b/6/img/lisciaste.png
--- a/6/img/mieszane.png
+++ b/6/img/mieszane.png
--- a/6/img/nothing.bmp
+++ b/6/img/nothing.bmp
--- a/6/img/parametry.png
+++ b/6/img/parametry.png
--- a/6/img/parametry_roslin.png
+++ b/6/img/parametry_roslin.png
--- a/6/img/wiele_planet.jpg
+++ b/6/img/wiele_planet.jpg
--- a/PlanetCreator/cw
+++ b/PlanetCreator/cw
@ -11,6 +11,6 @@ Pos=4,3
 Size=218,129

 [Window][Dodawanie nowej planety]
-Pos=7,7
-Size=403,182
+Pos=132,-14
+Size=282,169

--- a/6/models/2prz_test.obj
+++ b/6/models/2prz_test.obj
--- a/6/models/4prz_test.obj
+++ b/6/models/4prz_test.obj
--- a/6/models/50prz.mtl
+++ b/6/models/50prz.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl material_0.009
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd C:/Users/neryt/meshlab_pl/ros50.png
--- a/6/models/Picsart_24-02-03_16-11-13-806.jpg
+++ b/6/models/Picsart_24-02-03_16-11-13-806.jpg
--- a/6/models/Picsart_24-03-18_13-47-41-102.jpg
+++ b/6/models/Picsart_24-03-18_13-47-41-102.jpg
--- a/6/models/cube.obj
+++ b/6/models/cube.obj
@ -0,0 +1,40 @@
+# Blender v2.90.0 OBJ File: ''
+# www.blender.org
+mtllib cube.mtl
+o Cube
+v -10.000000 -10.000000 10.000000
+v -10.000000 10.000000 10.000000
+v -10.000000 -10.000000 -10.000000
+v -10.000000 10.000000 -10.000000
+v 10.000000 -10.000000 10.000000
+v 10.000000 10.000000 10.000000
+v 10.000000 -10.000000 -10.000000
+v 10.000000 10.000000 -10.000000
+vt 0.375000 0.000000
+vt 0.625000 0.000000
+vt 0.625000 0.250000
+vt 0.375000 0.250000
+vt 0.625000 0.500000
+vt 0.375000 0.500000
+vt 0.625000 0.750000
+vt 0.375000 0.750000
+vt 0.625000 1.000000
+vt 0.375000 1.000000
+vt 0.125000 0.500000
+vt 0.125000 0.750000
+vt 0.875000 0.500000
+vt 0.875000 0.750000
+vn -1.0000 0.0000 0.0000
+vn 0.0000 0.0000 -1.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 0.0000 1.0000
+vn 0.0000 -1.0000 0.0000
+vn 0.0000 1.0000 0.0000
+usemtl _PBR
+s 1
+f 1/1/1 2/2/1 4/3/1 3/4/1
+f 3/4/2 4/3/2 8/5/2 7/6/2
+f 7/6/3 8/5/3 6/7/3 5/8/3
+f 5/8/4 6/7/4 2/9/4 1/10/4
+f 3/11/5 7/6/5 5/8/5 1/12/5
+f 8/5/6 4/13/6 2/14/6 6/7/6
--- a/6/models/image_plant_1_1.jpg
+++ b/6/models/image_plant_1_1.jpg
--- a/6/models/image_plant_1_1.png
+++ b/6/models/image_plant_1_1.png
--- a/6/models/image_plant_2_1.jpg
+++ b/6/models/image_plant_2_1.jpg
--- a/6/models/plant_1_1.mtl
+++ b/6/models/plant_1_1.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd ./models/image_plant_1_1.jpg
--- a/6/models/plant_1_1.obj
+++ b/6/models/plant_1_1.obj
--- a/6/models/plant_1_1_med.mtl
+++ b/6/models/plant_1_1_med.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.002
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd image_plant_1_1.jpg
--- a/6/models/plant_1_1_med.obj
+++ b/6/models/plant_1_1_med.obj
--- a/6/models/plant_1_1_med1.mtl
+++ b/6/models/plant_1_1_med1.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.002
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd image_plant_1_1.jpg
--- a/6/models/plant_1_1_med1.obj
+++ b/6/models/plant_1_1_med1.obj
--- a/6/models/plant_1_1_med_zmn.mtl
+++ b/6/models/plant_1_1_med_zmn.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.004
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd image_plant_1_1.jpg
--- a/6/models/plant_1_1_med_zmn.obj
+++ b/6/models/plant_1_1_med_zmn.obj
--- a/6/models/plant_1_1_small.mtl
+++ b/6/models/plant_1_1_small.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd ./models/image_plant_1_1.jpg
--- a/6/models/plant_1_1_small.obj
+++ b/6/models/plant_1_1_small.obj
@ -0,0 +1,549 @@
+# Blender 4.0.2
+# www.blender.org
+mtllib plant_1_1_small.mtl
+o plant_111
+v 0.433013 3.250000 0.000000
+v 0.000000 3.500000 0.000000
+v 0.288675 3.333330 0.250000
+v 0.577350 3.166670 0.250000
+v 0.866025 3.000000 0.000000
+v 0.577350 3.166670 -0.250000
+v 0.288675 3.333330 -0.250000
+v -0.433013 3.250000 0.000000
+v 0.000000 3.500000 0.000000
+v -0.288675 3.333330 0.250000
+v -0.577350 3.166670 0.250000
+v -0.866025 3.000000 0.000000
+v -0.577350 3.166670 -0.250000
+v -0.288675 3.333330 -0.250000
+v -0.000000 4.250000 -0.433013
+v 0.000000 4.500000 0.000000
+v 0.250000 4.333330 -0.288675
+v 0.250000 4.166670 -0.577350
+v -0.000000 4.000000 -0.866025
+v -0.250000 4.166670 -0.577350
+v -0.250000 4.333330 -0.288675
+v 0.000000 4.250000 0.433013
+v 0.000000 4.500000 0.000000
+v 0.250000 4.333330 0.288675
+v 0.250000 4.166670 0.577350
+v 0.000000 4.000000 0.866025
+v -0.250000 4.166670 0.577350
+v -0.250000 4.333330 0.288675
+v 0.433013 5.250000 0.000000
+v 0.000000 5.500000 0.000000
+v 0.288675 5.333330 0.250000
+v 0.577350 5.166670 0.250000
+v 0.866025 5.000000 0.000000
+v 0.577350 5.166670 -0.250000
+v 0.288675 5.333330 -0.250000
+v -0.433013 5.250000 0.000000
+v 0.000000 5.500000 0.000000
+v -0.288675 5.333330 0.250000
+v -0.577350 5.166670 0.250000
+v -0.866025 5.000000 0.000000
+v -0.577350 5.166670 -0.250000
+v -0.288675 5.333330 -0.250000
+v -0.000000 6.250000 -0.433013
+v 0.000000 6.500000 0.000000
+v 0.250000 6.333330 -0.288675
+v 0.250000 6.166670 -0.577350
+v -0.000000 6.000000 -0.866025
+v -0.250000 6.166670 -0.577350
+v -0.250000 6.333330 -0.288675
+v 0.000000 6.250000 0.433013
+v 0.000000 6.500000 0.000000
+v 0.250000 6.333330 0.288675
+v 0.250000 6.166670 0.577350
+v 0.000000 6.000000 0.866025
+v -0.250000 6.166670 0.577350
+v -0.250000 6.333330 0.288675
+v 0.433013 7.250000 0.000000
+v 0.000000 7.500000 0.000000
+v 0.288675 7.333330 0.250000
+v 0.577350 7.166670 0.250000
+v 0.866025 7.000000 0.000000
+v 0.577350 7.166670 -0.250000
+v 0.288675 7.333330 -0.250000
+v -0.433013 7.250000 0.000000
+v 0.000000 7.500000 0.000000
+v -0.288675 7.333330 0.250000
+v -0.577350 7.166670 0.250000
+v -0.866025 7.000000 0.000000
+v -0.577350 7.166670 -0.250000
+v -0.288675 7.333330 -0.250000
+v 0.000000 0.000000 0.120000
+v 0.084853 0.000000 0.084853
+v 0.120000 0.000000 -0.000000
+v 0.084853 0.000000 -0.084853
+v -0.000000 0.000000 -0.120000
+v -0.084853 0.000000 -0.084853
+v -0.120000 0.000000 0.000000
+v -0.084853 0.000000 0.084853
+v 0.000000 0.500000 0.120000
+v 0.084853 0.500000 0.084853
+v 0.120000 0.500000 -0.000000
+v 0.084853 0.500000 -0.084853
+v -0.000000 0.500000 -0.120000
+v -0.084853 0.500000 -0.084853
+v -0.120000 0.500000 0.000000
+v -0.084853 0.500000 0.084853
+v 0.000000 1.500000 0.160000
+v 0.113137 1.500000 0.113137
+v 0.160000 1.500000 -0.000000
+v 0.113137 1.500000 -0.113137
+v -0.000000 1.500000 -0.160000
+v -0.113137 1.500000 -0.113137
+v -0.160000 1.500000 0.000000
+v -0.113137 1.500000 0.113137
+v 0.000000 2.500000 0.150000
+v 0.106066 2.500000 0.106066
+v 0.150000 2.500000 -0.000000
+v 0.106066 2.500000 -0.106066
+v -0.000000 2.500000 -0.150000
+v -0.106066 2.500000 -0.106066
+v -0.150000 2.500000 0.000000
+v -0.106066 2.500000 0.106066
+v 0.000000 3.500000 0.140000
+v 0.098995 3.500000 0.098995
+v 0.140000 3.500000 -0.000000
+v 0.098995 3.500000 -0.098995
+v -0.000000 3.500000 -0.140000
+v -0.098995 3.500000 -0.098995
+v -0.140000 3.500000 0.000000
+v -0.098995 3.500000 0.098995
+v 0.000000 4.500000 0.130000
+v 0.091924 4.500000 0.091924
+v 0.130000 4.500000 -0.000000
+v 0.091924 4.500000 -0.091924
+v -0.000000 4.500000 -0.130000
+v -0.091924 4.500000 -0.091924
+v -0.130000 4.500000 0.000000
+v -0.091924 4.500000 0.091924
+v 0.000000 5.500000 0.120000
+v 0.084853 5.500000 0.084853
+v 0.120000 5.500000 -0.000000
+v 0.084853 5.500000 -0.084853
+v -0.000000 5.500000 -0.120000
+v -0.084853 5.500000 -0.084853
+v -0.120000 5.500000 0.000000
+v -0.084853 5.500000 0.084853
+v 0.000000 6.500000 0.110000
+v 0.077782 6.500000 0.077782
+v 0.110000 6.500000 -0.000000
+v 0.077782 6.500000 -0.077782
+v -0.000000 6.500000 -0.110000
+v -0.077782 6.500000 -0.077782
+v -0.110000 6.500000 0.000000
+v -0.077782 6.500000 0.077782
+v 0.000000 7.500000 0.100000
+v 0.070711 7.500000 0.070711
+v 0.100000 7.500000 -0.000000
+v 0.070711 7.500000 -0.070711
+v -0.000000 7.500000 -0.100000
+v -0.070711 7.500000 -0.070711
+v -0.100000 7.500000 0.000000
+v -0.070711 7.500000 0.070711
+vn -0.5000 -0.8660 -0.0000
+vn -0.5000 0.8660 -0.0000
+vn -0.0000 -0.8660 0.5000
+vn -0.0000 0.8660 0.5000
+vn 0.3827 -0.0000 0.9239
+vn 0.9239 -0.0000 0.3827
+vn 0.9239 -0.0000 -0.3827
+vn 0.3827 -0.0000 -0.9239
+vn -0.3827 -0.0000 -0.9239
+vn -0.9239 -0.0000 -0.3827
+vn -0.9239 -0.0000 0.3827
+vn -0.3827 -0.0000 0.9239
+vn 0.3824 -0.0369 0.9232
+vn 0.9232 -0.0369 0.3824
+vn 0.9232 -0.0369 -0.3824
+vn 0.3824 -0.0369 -0.9232
+vn -0.3824 -0.0369 -0.9232
+vn -0.9232 -0.0369 -0.3824
+vn -0.9232 -0.0369 0.3824
+vn -0.3824 -0.0369 0.9232
+vn 0.3827 0.0092 0.9238
+vn 0.9238 0.0092 0.3827
+vn 0.9238 0.0092 -0.3827
+vn 0.3827 0.0092 -0.9238
+vn -0.3827 0.0092 -0.9238
+vn -0.9238 0.0092 -0.3827
+vn -0.9238 0.0092 0.3827
+vn -0.3827 0.0092 0.9238
+vt 0.000000 0.000000
+vt 0.552236 0.610859
+vt 0.524502 0.622883
+vt 0.789680 0.782771
+vt 0.647247 0.869476
+vt 0.579969 0.638894
+vt 0.845147 0.798782
+vt 0.372368 0.616700
+vt 0.339036 0.638922
+vt 0.339036 0.594478
+vt 0.372368 0.683365
+vt 0.405701 0.638922
+vt 0.405701 0.594478
+vt 0.588773 0.711704
+vt 0.555441 0.733925
+vt 0.555441 0.689484
+vt 0.588772 0.778366
+vt 0.385701 0.510035
+vt 0.419034 0.532257
+vt 0.385701 0.576701
+vt 0.750861 0.845166
+vt 0.472241 0.717519
+vt 0.444508 0.729542
+vt 0.444508 0.689484
+vt 0.472242 0.777607
+vt 0.499975 0.745553
+vt 0.499975 0.705495
+vt 0.527708 0.717519
+vt 0.499975 0.729542
+vt 0.499975 0.689484
+vt 0.527709 0.777607
+vt 0.555441 0.745553
+vt 0.555441 0.705495
+vt 0.497838 0.817604
+vt 0.460063 0.804271
+vt 0.495616 0.777607
+vt 0.444508 0.857601
+vt 0.500060 0.857601
+vt 0.439034 0.616700
+vt 0.472366 0.594478
+vt 0.472366 0.638922
+vt 0.444508 0.817666
+vt 0.407531 0.802258
+vt 0.444508 0.777607
+vt 0.389041 0.854643
+vt 0.444508 0.857725
+vt 0.305703 0.616700
+vt 0.416775 0.717519
+vt 0.389041 0.729542
+vt 0.389041 0.689484
+vt 0.416775 0.777607
+vt 0.444508 0.745553
+vt 0.444508 0.705495
+vt 0.496769 0.610859
+vt 0.469036 0.622883
+vt 0.734214 0.782771
+vt 0.496770 0.670947
+vt 0.524502 0.638894
+vt 0.789680 0.798782
+vt 0.429039 0.636154
+vt 0.389041 0.638376
+vt 0.654219 0.782771
+vt 0.415706 0.673929
+vt 0.469036 0.689484
+vt 0.469036 0.633932
+vt 0.707549 0.798326
+vt 0.049221 0.497652
+vt 0.037908 0.501710
+vt 0.189641 0.934922
+vt 0.200954 0.930864
+vt 0.029738 0.999922
+vt 0.021080 0.999965
+vt 0.020904 0.933303
+vt 0.029562 0.933260
+vt 0.008835 0.999997
+vt 0.008659 0.933335
+vt 0.000176 1.000000
+vt 0.000000 0.933338
+vt 0.013586 1.000000
+vt 0.004927 0.999980
+vt 0.004927 0.933315
+vt 0.013586 0.933335
+vt 0.268599 0.989431
+vt 0.257286 0.993489
+vt 0.257286 0.960157
+vt 0.268599 0.956099
+vt 0.245972 0.989431
+vt 0.245972 0.956099
+vt 0.060534 0.501710
+vt 0.212267 0.934922
+vt 0.185870 0.864995
+vt 0.200954 0.859584
+vt 0.022593 0.799986
+vt 0.034137 0.799928
+vt 0.006266 0.800029
+vt 0.025832 0.933335
+vt 0.011545 0.800016
+vt 0.027873 0.800016
+vt 0.000000 0.799989
+vt 0.109807 0.849897
+vt 0.257286 0.898111
+vt 0.272370 0.892700
+vt 0.094723 0.844486
+vt 0.216038 0.864995
+vt 0.359816 0.915431
+vt 0.373958 0.910358
+vt 0.021730 0.666661
+vt 0.032553 0.666607
+vt 0.006424 0.666701
+vt 0.012056 0.666683
+vt 0.027363 0.666683
+vt 0.001232 0.666658
+vt 0.257286 0.830292
+vt 0.271428 0.825219
+vt 0.095665 0.777005
+vt 0.109807 0.782078
+vt 0.388099 0.915431
+vt 0.360759 0.849586
+vt 0.373958 0.844851
+vt 0.020868 0.533336
+vt 0.030970 0.533286
+vt 0.006582 0.533373
+vt 0.012566 0.533349
+vt 0.026852 0.533349
+vt 0.002464 0.533326
+vt 0.257286 0.762473
+vt 0.270485 0.757738
+vt 0.096608 0.709524
+vt 0.109807 0.714258
+vt 0.387156 0.849586
+vt 0.361702 0.783741
+vt 0.373958 0.779344
+vt 0.295110 0.720493
+vt 0.304490 0.720447
+vt 0.281845 0.720528
+vt 0.215859 0.887830
+vt 0.229125 0.887830
+vt 0.206478 0.887808
+vt 0.257286 0.694653
+vt 0.269542 0.690257
+vt 0.097551 0.642043
+vt 0.109807 0.646439
+vt 0.386213 0.783741
+vt 0.362645 0.717896
+vt 0.373958 0.713838
+vt 0.579595 0.662306
+vt 0.570215 0.662352
+vt 0.343880 0.849510
+vt 0.352539 0.849467
+vt 0.556949 0.662387
+vt 0.331635 0.849542
+vt 0.393117 0.991349
+vt 0.216369 0.754497
+vt 0.462595 0.632543
+vt 0.207710 0.754477
+vt 0.257286 0.626834
+vt 0.268599 0.622776
+vt 0.245972 0.622776
+vt 0.385270 0.717896
+vt 0.363587 0.652051
+vt 0.373958 0.648331
+vt 0.343018 0.716185
+vt 0.350955 0.716145
+vt 0.331794 0.716214
+vt 0.228615 0.754497
+vt 0.216879 0.621164
+vt 0.228105 0.621164
+vt 0.208942 0.621145
+vt 0.257286 0.559015
+vt 0.267656 0.555295
+vt 0.246915 0.555295
+vt 0.384328 0.652051
+vt 0.629708 0.786153
+vt 0.639135 0.782771
+vt 0.607334 0.782807
+vt 0.614549 0.782771
+vt 0.597130 0.782834
+vt 0.549217 0.845182
+vt 0.589914 0.782836
+vt 0.542001 0.845166
+vt 0.257286 0.491196
+vt 0.598540 0.845166
+vt 0.669023 0.978464
+vt 0.668524 0.560681
+vt 0.648563 0.786153
+s 0
+usemtl Material.001
+f 1/1/1 3/1/1 2/1/1
+f 1/2/1 4/3/1 3/4/1
+f 1/2/1 5/5/1 4/3/1
+f 1/2/1 6/6/1 5/5/1
+f 1/2/1 7/7/1 6/6/1
+f 1/1/1 2/1/1 7/1/1
+f 8/1/2 10/1/2 9/1/2
+f 8/8/2 11/9/2 10/10/2
+f 8/8/2 12/11/2 11/9/2
+f 8/8/2 13/12/2 12/11/2
+f 8/8/2 14/13/2 13/12/2
+f 8/1/2 9/1/2 14/1/2
+f 15/1/3 17/1/3 16/1/3
+f 15/14/3 18/15/3 17/16/3
+f 15/14/3 19/17/3 18/15/3
+f 15/18/3 20/19/3 19/20/3
+f 15/18/3 21/21/3 20/19/3
+f 15/1/3 16/1/3 21/1/3
+f 22/1/4 24/1/4 23/1/4
+f 22/22/4 25/23/4 24/24/4
+f 22/22/4 26/25/4 25/23/4
+f 22/22/4 27/26/4 26/25/4
+f 22/22/4 28/27/4 27/26/4
+f 22/1/4 23/1/4 28/1/4
+f 29/1/1 31/1/1 30/1/1
+f 29/28/1 32/29/1 31/30/1
+f 29/28/1 33/31/1 32/29/1
+f 29/28/1 34/32/1 33/31/1
+f 29/28/1 35/33/1 34/32/1
+f 29/1/1 30/1/1 35/1/1
+f 36/1/2 38/1/2 37/1/2
+f 36/34/2 39/35/2 38/36/2
+f 36/34/2 40/37/2 39/35/2
+f 36/34/2 41/38/2 40/37/2
+f 36/39/2 42/40/2 41/41/2
+f 36/1/2 37/1/2 42/1/2
+f 43/1/3 45/1/3 44/1/3
+f 43/42/3 46/43/3 45/44/3
+f 43/42/3 47/45/3 46/43/3
+f 43/42/3 48/46/3 47/45/3
+f 43/47/3 49/10/3 48/9/3
+f 43/1/3 44/1/3 49/1/3
+f 50/1/4 52/1/4 51/1/4
+f 50/48/4 53/49/4 52/50/4
+f 50/48/4 54/51/4 53/49/4
+f 50/48/4 55/52/4 54/51/4
+f 50/48/4 56/53/4 55/52/4
+f 50/1/4 51/1/4 56/1/4
+f 57/1/1 59/1/1 58/1/1
+f 57/54/1 60/55/1 59/56/1
+f 57/54/1 61/57/1 60/55/1
+f 57/54/1 62/58/1 61/57/1
+f 57/54/1 63/59/1 62/58/1
+f 57/1/1 58/1/1 63/1/1
+f 64/60/2 66/61/2 65/62/2
+f 64/60/2 67/63/2 66/61/2
+f 64/60/2 68/64/2 67/63/2
+f 64/60/2 69/65/2 68/64/2
+f 64/60/2 70/66/2 69/65/2
+f 64/60/2 65/62/2 70/66/2
+f 71/67/5 72/68/5 80/69/5
+f 71/67/5 80/69/5 79/70/5
+f 72/71/6 73/72/6 81/73/6
+f 72/71/6 81/73/6 80/74/6
+f 73/72/7 74/75/7 82/76/7
+f 73/72/7 82/76/7 81/73/7
+f 74/75/8 75/77/8 83/78/8
+f 74/75/8 83/78/8 82/76/8
+f 75/79/9 76/80/9 84/81/9
+f 75/79/9 84/81/9 83/82/9
+f 76/83/10 77/84/10 85/85/10
+f 76/83/10 85/85/10 84/86/10
+f 77/84/11 78/87/11 86/88/11
+f 77/84/11 86/88/11 85/85/11
+f 78/89/12 71/67/12 79/70/12
+f 78/89/12 79/70/12 86/90/12
+f 79/70/13 80/69/13 88/91/13
+f 79/70/13 88/91/13 87/92/13
+f 80/74/14 81/73/14 89/93/14
+f 80/74/14 89/93/14 88/94/14
+f 81/73/15 82/76/15 90/95/15
+f 81/73/15 90/95/15 89/93/15
+f 82/96/16 83/82/16 91/97/16
+f 82/96/16 91/97/16 90/98/16
+f 83/82/17 84/81/17 92/99/17
+f 83/82/17 92/99/17 91/97/17
+f 84/86/18 85/85/18 93/100/18
+f 84/86/18 93/101/18 92/102/18
+f 85/85/19 86/88/19 94/103/19
+f 85/85/19 94/103/19 93/100/19
+f 86/90/20 79/70/20 87/92/20
+f 86/90/20 87/92/20 94/104/20
+f 87/92/21 88/91/21 96/105/21
+f 87/92/21 96/105/21 95/106/21
+f 88/94/22 89/93/22 97/107/22
+f 88/94/22 97/107/22 96/108/22
+f 89/93/23 90/95/23 98/109/23
+f 89/93/23 98/109/23 97/107/23
+f 90/98/24 91/97/24 99/110/24
+f 90/98/24 99/110/24 98/111/24
+f 91/97/25 92/99/25 100/112/25
+f 91/97/25 100/112/25 99/110/25
+f 92/102/26 93/101/26 101/113/26
+f 92/102/26 101/113/26 100/114/26
+f 93/100/27 94/103/27 102/115/27
+f 93/100/27 102/115/27 101/116/27
+f 94/104/28 87/92/28 95/106/28
+f 94/104/28 95/106/28 102/117/28
+f 95/106/21 96/105/21 104/118/21
+f 95/106/21 104/118/21 103/119/21
+f 96/108/22 97/107/22 105/120/22
+f 96/108/22 105/120/22 104/121/22
+f 97/107/23 98/109/23 106/122/23
+f 97/107/23 106/122/23 105/120/23
+f 98/111/24 99/110/24 107/123/24
+f 98/111/24 107/123/24 106/124/24
+f 99/110/25 100/112/25 108/125/25
+f 99/110/25 108/125/25 107/123/25
+f 100/114/26 101/113/26 109/126/26
+f 100/114/26 109/126/26 108/127/26
+f 101/116/27 102/115/27 110/128/27
+f 101/116/27 110/128/27 109/129/27
+f 102/117/28 95/106/28 103/119/28
+f 102/117/28 103/119/28 110/130/28
+f 103/119/21 104/118/21 112/131/21
+f 103/119/21 112/131/21 111/132/21
+f 104/121/22 105/120/22 113/133/22
+f 104/121/22 113/133/22 112/134/22
+f 105/120/23 106/122/23 114/135/23
+f 105/120/23 114/135/23 113/133/23
+f 106/124/24 107/123/24 115/136/24
+f 106/124/24 115/136/24 114/137/24
+f 107/123/25 108/125/25 116/138/25
+f 107/123/25 116/138/25 115/136/25
+f 108/127/26 109/126/26 117/139/26
+f 108/127/26 117/139/26 116/140/26
+f 109/129/27 110/128/27 118/141/27
+f 109/129/27 118/141/27 117/142/27
+f 110/130/28 103/119/28 111/132/28
+f 110/130/28 111/132/28 118/143/28
+f 111/132/21 112/131/21 120/144/21
+f 111/132/21 120/144/21 119/145/21
+f 112/146/22 113/147/22 121/148/22
+f 112/146/22 121/148/22 120/149/22
+f 113/147/23 114/150/23 122/151/23
+f 113/147/23 122/151/23 121/148/23
+f 114/137/24 115/152/24 123/153/24
+f 114/137/24 123/153/24 122/154/24
+f 115/152/25 116/138/25 124/155/25
+f 115/152/25 124/155/25 123/153/25
+f 116/140/26 117/139/26 125/156/26
+f 116/140/26 125/156/26 124/157/26
+f 117/142/27 118/141/27 126/158/27
+f 117/142/27 126/158/27 125/156/27
+f 118/143/28 111/132/28 119/145/28
+f 118/143/28 119/145/28 126/159/28
+f 119/145/21 120/144/21 128/160/21
+f 119/145/21 128/160/21 127/161/21
+f 120/149/22 121/148/22 129/162/22
+f 120/149/22 129/162/22 128/163/22
+f 121/148/23 122/151/23 130/164/23
+f 121/148/23 130/164/23 129/162/23
+f 122/165/24 123/153/24 131/166/24
+f 122/165/24 131/166/24 130/167/24
+f 123/153/25 124/155/25 132/168/25
+f 123/153/25 132/168/25 131/166/25
+f 124/157/26 125/156/26 133/169/26
+f 124/157/26 133/169/26 132/170/26
+f 125/156/27 126/158/27 134/171/27
+f 125/156/27 134/171/27 133/169/27
+f 126/159/28 119/145/28 127/161/28
+f 126/159/28 127/161/28 134/172/28
+f 127/161/21 128/160/21 136/173/21
+f 127/161/21 136/173/21 135/174/21
+f 128/163/22 129/162/22 137/175/22
+f 128/163/22 137/175/22 136/176/22
+f 129/162/23 130/164/23 138/177/23
+f 129/162/23 138/177/23 137/175/23
+f 130/167/24 131/166/24 139/178/24
+f 130/164/24 139/179/24 138/177/24
+f 131/166/25 132/168/25 140/180/25
+f 131/166/25 140/180/25 139/178/25
+f 132/170/26 133/169/26 141/181/26
+f 132/170/26 141/181/26 140/182/26
+f 133/169/27 134/171/27 142/183/27
+f 133/169/27 142/183/27 141/184/27
+f 134/172/28 127/161/28 135/174/28
+f 134/172/28 135/174/28 142/185/28
--- a/6/models/plant_1_1_small_zmn.mtl
+++ b/6/models/plant_1_1_small_zmn.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.005
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd image_plant_1_1.jpg
--- a/6/models/plant_1_1_small_zmn.obj
+++ b/6/models/plant_1_1_small_zmn.obj
@ -0,0 +1,323 @@
+# Blender 4.0.2
+# www.blender.org
+mtllib plant_1_1_small_zmn.mtl
+o plant_111
+v 0.577349 3.166669 0.250000
+v 0.000000 3.500000 -0.000000
+v 0.288675 3.333330 0.250000
+v 0.866025 3.000000 -0.000000
+v 0.577350 3.166670 -0.250000
+v 0.288675 3.333330 -0.250000
+v -0.577349 3.166669 0.250000
+v 0.000000 3.500000 -0.000000
+v -0.288675 3.333330 0.250000
+v -0.866025 3.000000 -0.000000
+v -0.577350 3.166670 -0.250000
+v -0.288675 3.333330 -0.250000
+v 0.250000 4.166669 -0.577350
+v 0.000000 4.500000 -0.000000
+v 0.250000 4.333330 -0.288675
+v 0.000000 4.000000 -0.866025
+v -0.250000 4.166670 -0.577350
+v -0.250000 4.333330 -0.288675
+v 0.250000 4.166669 0.577349
+v 0.000000 4.500000 -0.000000
+v 0.250000 4.333330 0.288675
+v 0.000000 4.000000 0.866025
+v -0.250000 4.166670 0.577350
+v -0.250000 4.333330 0.288675
+v 0.577349 5.166669 0.250000
+v 0.000000 5.500000 -0.000000
+v 0.288675 5.333330 0.250000
+v 0.866025 5.000000 -0.000000
+v 0.577350 5.166670 -0.250000
+v 0.288675 5.333330 -0.250000
+v -0.577349 5.166669 0.250000
+v 0.000000 5.500000 -0.000000
+v -0.288675 5.333330 0.250000
+v -0.866025 5.000000 -0.000000
+v -0.577350 5.166670 -0.250000
+v -0.288675 5.333330 -0.250000
+v -0.250000 6.166669 -0.577350
+v 0.000000 6.500000 -0.000000
+v 0.250000 6.333330 -0.288675
+v 0.250000 6.166670 -0.577350
+v 0.000000 6.000000 -0.866025
+v -0.250000 6.333330 -0.288675
+v -0.250000 6.166669 0.577349
+v 0.000000 6.500000 -0.000000
+v 0.250000 6.333330 0.288675
+v 0.250000 6.166670 0.577350
+v 0.000000 6.000000 0.866024
+v -0.250000 6.333330 0.288675
+v 0.577349 7.166669 0.249999
+v 0.000000 7.500000 -0.000001
+v 0.288675 7.333330 0.249999
+v 0.866025 7.000000 -0.000001
+v 0.577350 7.166670 -0.250001
+v 0.288675 7.333330 -0.250001
+v -0.577349 7.166669 0.249999
+v 0.000000 7.500000 -0.000001
+v -0.288675 7.333330 0.249999
+v -0.866025 7.000000 -0.000001
+v -0.577350 7.166670 -0.250001
+v -0.288675 7.333330 -0.250001
+v 0.000000 0.000000 0.120000
+v 0.084853 0.000000 0.084853
+v 0.120000 0.000000 0.000000
+v 0.084853 -0.000000 -0.084853
+v 0.000000 -0.000000 -0.120000
+v -0.084853 -0.000000 -0.084853
+v -0.120000 0.000000 0.000000
+v -0.084853 0.000000 0.084853
+v 0.000000 0.500000 0.120000
+v 0.084853 0.500000 0.084853
+v 0.120000 0.500000 -0.000000
+v 0.084853 0.500000 -0.084853
+v 0.000000 0.500000 -0.120000
+v -0.084853 0.500000 -0.084853
+v -0.120000 0.500000 -0.000000
+v -0.084853 0.500000 0.084853
+v 0.000000 1.499998 0.160000
+v 0.113137 1.500002 0.113137
+v 0.160000 1.499998 -0.000000
+v 0.113137 1.500001 -0.113137
+v -0.000000 1.499998 -0.160000
+v -0.113137 1.500002 -0.113137
+v -0.160000 1.499998 -0.000000
+v -0.113137 1.500001 0.113137
+v 0.070711 7.500000 -0.070712
+v -0.070711 7.500000 0.070710
+v 0.000000 7.500000 0.099999
+v 0.070711 7.500000 0.070710
+v 0.100000 7.500000 -0.000001
+v 0.000000 7.500000 -0.100001
+v -0.070711 7.500000 -0.070712
+v -0.100000 7.500000 -0.000001
+vn -0.5000 -0.8660 -0.0000
+vn -0.5000 0.8660 -0.0000
+vn -0.0000 -0.8660 0.5000
+vn -0.0000 0.8660 0.5000
+vn 0.3827 -0.0000 0.9239
+vn 0.9239 -0.0000 0.3827
+vn 0.9239 -0.0000 -0.3827
+vn 0.3827 -0.0000 -0.9239
+vn -0.3827 -0.0000 -0.9239
+vn -0.9239 -0.0000 -0.3827
+vn -0.9239 -0.0000 0.3827
+vn -0.3827 -0.0000 0.9239
+vn 0.3824 -0.0369 0.9233
+vn 0.3824 -0.0369 0.9232
+vn 0.9233 -0.0369 0.3824
+vn 0.9232 -0.0369 0.3824
+vn 0.9233 -0.0369 -0.3824
+vn 0.9232 -0.0369 -0.3824
+vn 0.3824 -0.0369 -0.9233
+vn 0.3824 -0.0369 -0.9232
+vn -0.3824 -0.0369 -0.9233
+vn -0.3824 -0.0369 -0.9232
+vn -0.9233 -0.0369 -0.3824
+vn -0.9232 -0.0369 -0.3824
+vn -0.9233 -0.0369 0.3824
+vn -0.9232 -0.0369 0.3824
+vn -0.3824 -0.0369 0.9233
+vn -0.3824 -0.0369 0.9232
+vn 0.9238 0.0092 -0.3827
+vn 0.3827 0.0092 -0.9238
+vn -0.9238 0.0092 0.3827
+vn -0.3827 0.0092 0.9238
+vn 0.3827 0.0092 0.9238
+vn 0.9238 0.0092 0.3827
+vn -0.3827 0.0092 -0.9238
+vn -0.9238 0.0092 -0.3827
+vt 0.000000 0.000000
+vt 0.524502 0.622883
+vt 0.579969 0.638894
+vt 0.647247 0.869476
+vt 0.845147 0.798782
+vt 0.339036 0.638922
+vt 0.405701 0.638922
+vt 0.372368 0.683365
+vt 0.405701 0.594478
+vt 0.385701 0.510035
+vt 0.419034 0.532257
+vt 0.385701 0.576701
+vt 0.750861 0.845166
+vt 0.444508 0.729542
+vt 0.499975 0.745553
+vt 0.472242 0.777607
+vt 0.499975 0.705495
+vt 0.499975 0.729542
+vt 0.555441 0.745553
+vt 0.527709 0.777607
+vt 0.555441 0.705495
+vt 0.460063 0.804271
+vt 0.500060 0.857601
+vt 0.444508 0.857601
+vt 0.439034 0.616700
+vt 0.472366 0.594478
+vt 0.472366 0.638922
+vt 0.444508 0.857725
+vt 0.407531 0.802258
+vt 0.444508 0.777607
+vt 0.389041 0.854643
+vt 0.444508 0.745553
+vt 0.389041 0.729542
+vt 0.389041 0.689484
+vt 0.416775 0.777607
+vt 0.469036 0.622883
+vt 0.524502 0.638894
+vt 0.496770 0.670947
+vt 0.789680 0.798782
+vt 0.415706 0.673929
+vt 0.389041 0.638376
+vt 0.654219 0.782771
+vt 0.469036 0.633932
+vt 0.469036 0.689484
+vt 0.707549 0.798326
+vt 0.049221 0.497652
+vt 0.037908 0.501710
+vt 0.189641 0.934922
+vt 0.200954 0.930864
+vt 0.029738 0.999922
+vt 0.021080 0.999965
+vt 0.020904 0.933303
+vt 0.029562 0.933260
+vt 0.008835 0.999997
+vt 0.008659 0.933335
+vt 0.000176 1.000000
+vt 0.000000 0.933338
+vt 0.013586 1.000000
+vt 0.004927 0.999980
+vt 0.004927 0.933315
+vt 0.013586 0.933335
+vt 0.268599 0.989431
+vt 0.257286 0.993489
+vt 0.257286 0.960157
+vt 0.268599 0.956099
+vt 0.245972 0.989431
+vt 0.245972 0.956099
+vt 0.060534 0.501710
+vt 0.212267 0.934922
+vt 0.185870 0.864995
+vt 0.200954 0.859584
+vt 0.022593 0.799986
+vt 0.034137 0.799928
+vt 0.006266 0.800029
+vt 0.025832 0.933335
+vt 0.011545 0.800016
+vt 0.027873 0.800016
+vt 0.000000 0.799989
+vt 0.109807 0.849897
+vt 0.257286 0.898111
+vt 0.272370 0.892700
+vt 0.094723 0.844486
+vt 0.216038 0.864995
+vt 0.144213 0.626951
+vt 0.295292 0.671566
+vt 0.669023 0.978464
+vt 0.648563 0.786153
+vt 0.629708 0.786153
+vt 0.639135 0.782771
+vt 0.408511 0.736016
+vt 0.400033 0.736058
+vt 0.607334 0.782807
+vt 0.614549 0.782771
+vt 0.597130 0.782834
+vt 0.228105 0.621164
+vt 0.304870 0.839590
+vt 0.549217 0.845182
+vt 0.542001 0.845166
+vt 0.257286 0.491196
+vt 0.598540 0.845166
+vt 0.668524 0.560681
+s 0
+usemtl Material.005
+f 1/1/1 3/1/1 2/1/1
+f 1/2/1 5/3/1 4/4/1
+f 1/2/1 6/5/1 5/3/1
+f 1/1/1 2/1/1 6/1/1
+f 7/1/2 9/1/2 8/1/2
+f 7/6/2 11/7/2 10/8/2
+f 7/6/2 12/9/2 11/7/2
+f 7/1/2 8/1/2 12/1/2
+f 13/1/3 15/1/3 14/1/3
+f 13/10/3 17/11/3 16/12/3
+f 13/10/3 18/13/3 17/11/3
+f 13/1/3 14/1/3 18/1/3
+f 19/1/4 21/1/4 20/1/4
+f 19/14/4 23/15/4 22/16/4
+f 19/14/4 24/17/4 23/15/4
+f 19/1/4 20/1/4 24/1/4
+f 25/1/1 27/1/1 26/1/1
+f 25/18/1 29/19/1 28/20/1
+f 25/18/1 30/21/1 29/19/1
+f 25/1/1 26/1/1 30/1/1
+f 31/1/2 33/1/2 32/1/2
+f 31/22/2 35/23/2 34/24/2
+f 31/25/2 36/26/2 35/27/2
+f 31/1/2 32/1/2 36/1/2
+f 37/1/3 39/1/3 38/1/3
+f 37/28/3 40/29/3 39/30/3
+f 37/28/3 41/31/3 40/29/3
+f 37/1/3 38/1/3 42/1/3
+f 43/1/4 45/1/4 44/1/4
+f 43/32/4 46/33/4 45/34/4
+f 43/32/4 47/35/4 46/33/4
+f 43/1/4 44/1/4 48/1/4
+f 49/1/1 51/1/1 50/1/1
+f 49/36/1 53/37/1 52/38/1
+f 49/36/1 54/39/1 53/37/1
+f 49/1/1 50/1/1 54/1/1
+f 55/40/2 57/41/2 56/42/2
+f 55/40/2 59/43/2 58/44/2
+f 55/40/2 60/45/2 59/43/2
+f 55/40/2 56/42/2 60/45/2
+f 61/46/5 62/47/5 70/48/5
+f 61/46/5 70/48/5 69/49/5
+f 62/50/6 63/51/6 71/52/6
+f 62/50/6 71/52/6 70/53/6
+f 63/51/7 64/54/7 72/55/7
+f 63/51/7 72/55/7 71/52/7
+f 64/54/8 65/56/8 73/57/8
+f 64/54/8 73/57/8 72/55/8
+f 65/58/9 66/59/9 74/60/9
+f 65/58/9 74/60/9 73/61/9
+f 66/62/10 67/63/10 75/64/10
+f 66/62/10 75/64/10 74/65/10
+f 67/63/11 68/66/11 76/67/11
+f 67/63/11 76/67/11 75/64/11
+f 68/68/12 61/46/12 69/49/12
+f 68/68/12 69/49/12 76/69/12
+f 69/49/13 70/48/13 78/70/13
+f 69/49/14 78/70/14 77/71/14
+f 70/53/15 71/52/15 79/72/15
+f 70/53/16 79/72/16 78/73/16
+f 71/52/17 72/55/17 80/74/17
+f 71/52/18 80/74/18 79/72/18
+f 72/75/19 73/61/19 81/76/19
+f 72/75/20 81/76/20 80/77/20
+f 73/61/21 74/60/21 82/78/21
+f 73/61/22 82/78/22 81/76/22
+f 74/65/23 75/64/23 83/79/23
+f 74/65/24 83/80/24 82/81/24
+f 75/64/25 76/67/25 84/82/25
+f 75/64/26 84/82/26 83/79/26
+f 76/69/27 69/49/27 77/71/27
+f 76/69/28 77/71/28 84/83/28
+f 79/72/29 80/74/29 85/84/29
+f 80/77/30 81/76/30 85/85/30
+f 83/79/31 84/82/31 86/86/31
+f 84/83/32 77/71/32 86/87/32
+f 77/71/33 78/70/33 88/88/33
+f 77/71/33 88/88/33 87/89/33
+f 78/90/34 79/91/34 89/92/34
+f 78/90/34 89/92/34 88/93/34
+f 79/91/29 85/94/29 89/92/29
+f 85/95/30 81/96/30 90/97/30
+f 81/96/35 82/78/35 91/98/35
+f 81/96/35 91/98/35 90/97/35
+f 82/81/36 83/79/36 92/99/36
+f 82/81/36 92/99/36 91/100/36
+f 83/79/31 86/86/31 92/101/31
+f 86/87/32 77/71/32 87/89/32
--- a/6/models/plant_1_1_zmn.mtl
+++ b/6/models/plant_1_1_zmn.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.002
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd image_plant_1_1.jpg
--- a/6/models/plant_1_1_zmn.obj
+++ b/6/models/plant_1_1_zmn.obj
--- a/6/models/plant_2_1.mtl
+++ b/6/models/plant_2_1.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.003
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd image_plant_2_1.jpg
--- a/6/models/plant_2_1.obj
+++ b/6/models/plant_2_1.obj
--- a/6/models/plant_2_1_med.mtl
+++ b/6/models/plant_2_1_med.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.002
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd image_plant_2_1.jpg
--- a/6/models/plant_2_1_med.obj
+++ b/6/models/plant_2_1_med.obj
--- a/6/models/plant_2_1_small.mtl
+++ b/6/models/plant_2_1_small.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd ./models/Picsart_24-02-03_16-11-13-806.jpg
--- a/6/models/plant_2_1_small.obj
+++ b/6/models/plant_2_1_small.obj
@ -0,0 +1,310 @@
+# Blender 4.0.2
+# www.blender.org
+mtllib plant_2_1_small.mtl
+o plant_2_1_small
+v 0.000000 1.343750 0.270633
+v 0.000000 1.500000 0.000000
+v 0.156250 1.395830 0.180422
+v 0.156250 1.291670 0.360844
+v 0.000000 1.187500 0.541266
+v -0.156250 1.291670 0.360844
+v -0.156250 1.395830 0.180422
+v -0.000000 1.343750 -0.270633
+v 0.000000 1.500000 0.000000
+v 0.156250 1.395830 -0.180422
+v 0.156250 1.291670 -0.360844
+v -0.000000 1.187500 -0.541266
+v -0.156250 1.291670 -0.360844
+v -0.156250 1.395830 -0.180422
+v 0.284165 2.335940 -0.000000
+v 0.000000 2.500000 0.000000
+v 0.189443 2.390620 -0.164063
+v 0.378886 2.281250 -0.164063
+v 0.568329 2.171870 -0.000000
+v 0.378886 2.281250 0.164062
+v 0.189443 2.390620 0.164062
+v -0.284165 2.335940 0.000000
+v 0.000000 2.500000 0.000000
+v -0.189443 2.390620 -0.164062
+v -0.378886 2.281250 -0.164062
+v -0.568329 2.171870 0.000000
+v -0.378886 2.281250 0.164063
+v -0.189443 2.390620 0.164063
+v -0.000000 3.335940 -0.284165
+v 0.000000 3.500000 0.000000
+v -0.164063 3.390620 -0.189443
+v -0.164063 3.281250 -0.378886
+v -0.000000 3.171870 -0.568329
+v 0.164062 3.281250 -0.378886
+v 0.164062 3.390620 -0.189443
+v 0.000000 3.335940 0.284165
+v 0.000000 3.500000 0.000000
+v -0.164062 3.390620 0.189443
+v -0.164062 3.281250 0.378886
+v 0.000000 3.171870 0.568329
+v 0.164063 3.281250 0.378886
+v 0.164063 3.390620 0.189443
+v 0.000000 0.000000 0.115000
+v 0.081317 0.000000 0.081317
+v 0.115000 0.000000 -0.000000
+v 0.081317 0.000000 -0.081317
+v -0.000000 0.000000 -0.115000
+v -0.081317 0.000000 -0.081317
+v -0.115000 0.000000 0.000000
+v -0.081317 0.000000 0.081317
+v 0.000000 0.500000 0.110000
+v 0.077782 0.500000 0.077782
+v 0.110000 0.500000 -0.000000
+v 0.077782 0.500000 -0.077782
+v -0.000000 0.500000 -0.110000
+v -0.077782 0.500000 -0.077782
+v -0.110000 0.500000 0.000000
+v -0.077782 0.500000 0.077782
+v 0.000000 1.500000 0.105000
+v 0.074246 1.500000 0.074246
+v 0.105000 1.500000 -0.000000
+v 0.074246 1.500000 -0.074246
+v -0.000000 1.500000 -0.105000
+v -0.074246 1.500000 -0.074246
+v -0.105000 1.500000 0.000000
+v -0.074246 1.500000 0.074246
+v 0.000000 2.500000 0.100000
+v 0.070711 2.500000 0.070711
+v 0.100000 2.500000 -0.000000
+v 0.070711 2.500000 -0.070711
+v -0.000000 2.500000 -0.100000
+v -0.070711 2.500000 -0.070711
+v -0.100000 2.500000 0.000000
+v -0.070711 2.500000 0.070711
+v 0.000000 3.500000 0.095000
+v 0.067175 3.500000 0.067175
+v 0.095000 3.500000 -0.000000
+v 0.067175 3.500000 -0.067175
+v -0.000000 3.500000 -0.095000
+v -0.067175 3.500000 -0.067175
+v -0.095000 3.500000 0.000000
+v -0.067175 3.500000 0.067175
+vn -0.0000 0.8660 0.5000
+vn -0.0000 -0.8660 0.5000
+vn 0.5000 0.8660 -0.0000
+vn 0.5000 -0.8660 -0.0000
+vn -0.0000 0.8660 -0.5000
+vn -0.0000 -0.8660 -0.5000
+vn 0.3827 0.0092 0.9238
+vn 0.9238 0.0092 0.3827
+vn 0.9238 0.0092 -0.3827
+vn 0.3827 0.0092 -0.9238
+vn -0.3827 0.0092 -0.9238
+vn -0.9238 0.0092 -0.3827
+vn -0.9238 0.0092 0.3827
+vn -0.3827 0.0092 0.9238
+vn 0.3827 0.0046 0.9239
+vn 0.9239 0.0046 0.3827
+vn 0.9239 0.0046 -0.3827
+vn 0.3827 0.0046 -0.9239
+vn -0.3827 0.0046 -0.9239
+vn -0.9239 0.0046 -0.3827
+vn -0.9239 0.0046 0.3827
+vn -0.3827 0.0046 0.9239
+vt 0.000000 0.000000
+vt 0.763936 0.784961
+vt 0.754802 0.837409
+vt 0.736538 0.806466
+vt 0.791334 0.831377
+vt 0.791334 0.763456
+vt 0.773071 0.732513
+vt 0.699395 0.770060
+vt 0.662253 0.786163
+vt 0.662253 0.732513
+vt 0.699397 0.850535
+vt 0.736538 0.807606
+vt 0.736538 0.753956
+vt 0.531066 0.728838
+vt 0.502298 0.706260
+vt 0.522883 0.552548
+vt 0.502298 0.777573
+vt 0.540655 0.783906
+vt 0.559831 0.751416
+vt 0.709124 0.638768
+vt 0.662253 0.670016
+vt 0.425446 0.579330
+vt 0.709124 0.732513
+vt 0.755996 0.670016
+vt 0.519190 0.579330
+vt 0.606561 0.808971
+vt 0.577791 0.786392
+vt 0.596969 0.753901
+vt 0.577791 0.857709
+vt 0.616151 0.864042
+vt 0.635328 0.831551
+vt 0.620023 0.680711
+vt 0.577792 0.685557
+vt 0.340985 0.579330
+vt 0.605946 0.734350
+vt 0.662252 0.753901
+vt 0.662252 0.675865
+vt 0.397292 0.598881
+vt 0.042925 0.999885
+vt 0.017780 0.999945
+vt 0.017985 0.857099
+vt 0.042036 0.857041
+vt -0.000000 0.999885
+vt 0.000978 0.857041
+vt 0.103629 0.999867
+vt 0.078485 1.000000
+vt 0.078277 0.857154
+vt 0.102329 0.857027
+vt 0.060705 0.999991
+vt 0.061270 0.857146
+vt 0.042927 0.999940
+vt 0.017781 1.000000
+vt 0.017986 0.857146
+vt 0.042039 0.857089
+vt -0.000000 0.999940
+vt 0.000978 0.857089
+vt 0.085854 0.999940
+vt 0.068073 1.000000
+vt 0.067868 0.857146
+vt 0.084877 0.857089
+vt 0.042927 0.999940
+vt 0.043816 0.857089
+vt 0.017848 0.571416
+vt 0.040806 0.571361
+vt 0.001614 0.571361
+vt 0.077316 0.571473
+vt 0.100274 0.571351
+vt 0.061082 0.571464
+vt 0.017849 0.571447
+vt 0.040808 0.571392
+vt 0.001614 0.571392
+vt 0.068006 0.571447
+vt 0.084241 0.571392
+vt 0.045046 0.571392
+vt 0.382787 0.959503
+vt 0.404652 0.959451
+vt 0.367326 0.959451
+vt 0.116507 0.571172
+vt 0.463295 0.959446
+vt 0.478756 0.959275
+vt 0.441431 0.959562
+vt 0.425970 0.959554
+vt 0.509649 0.893270
+vt 0.531515 0.893217
+vt 0.494187 0.893218
+vt 0.560080 0.893270
+vt 0.575542 0.893217
+vt 0.538214 0.893217
+vt 0.384060 0.552598
+vt 0.404831 0.552548
+vt 0.462650 0.552548
+vt 0.369372 0.552548
+vt 0.441879 0.552658
+vt 0.427191 0.552651
+vt 0.272705 0.579380
+vt 0.293478 0.579330
+vt 0.258016 0.579330
+vt 0.323410 0.579380
+vt 0.338099 0.579330
+vt 0.302638 0.579330
+s 0
+usemtl Material.001
+f 1/1/1 3/1/1 2/1/1
+f 1/2/1 4/3/1 3/4/1
+f 1/2/1 5/5/1 4/3/1
+f 1/2/1 6/6/1 5/5/1
+f 1/2/1 7/7/1 6/6/1
+f 1/1/1 2/1/1 7/1/1
+f 8/1/2 10/1/2 9/1/2
+f 8/8/2 11/9/2 10/10/2
+f 8/8/2 12/11/2 11/9/2
+f 8/8/2 13/12/2 12/11/2
+f 8/8/2 14/13/2 13/12/2
+f 8/1/2 9/1/2 14/1/2
+f 15/1/3 17/1/3 16/1/3
+f 15/14/3 18/15/3 17/16/3
+f 15/14/3 19/17/3 18/15/3
+f 15/14/3 20/18/3 19/17/3
+f 15/14/3 21/19/3 20/18/3
+f 15/1/3 16/1/3 21/1/3
+f 22/1/4 24/1/4 23/1/4
+f 22/20/4 25/21/4 24/22/4
+f 22/20/4 26/23/4 25/21/4
+f 22/20/4 27/24/4 26/23/4
+f 22/20/4 28/25/4 27/24/4
+f 22/1/4 23/1/4 28/1/4
+f 29/1/5 31/1/5 30/1/5
+f 29/26/5 32/27/5 31/28/5
+f 29/26/5 33/29/5 32/27/5
+f 29/26/5 34/30/5 33/29/5
+f 29/26/5 35/31/5 34/30/5
+f 29/1/5 30/1/5 35/1/5
+f 36/32/6 38/33/6 37/34/6
+f 36/32/6 39/35/6 38/33/6
+f 36/32/6 40/36/6 39/35/6
+f 36/32/6 41/37/6 40/36/6
+f 36/32/6 42/38/6 41/37/6
+f 36/32/6 37/34/6 42/38/6
+f 43/39/7 44/40/7 52/41/7
+f 43/39/7 52/41/7 51/42/7
+f 44/40/8 45/43/8 53/44/8
+f 44/40/8 53/44/8 52/41/8
+f 45/45/9 46/46/9 54/47/9
+f 45/45/9 54/47/9 53/48/9
+f 46/46/10 47/49/10 55/50/10
+f 46/46/10 55/50/10 54/47/10
+f 47/51/11 48/52/11 56/53/11
+f 47/51/11 56/53/11 55/54/11
+f 48/52/12 49/55/12 57/56/12
+f 48/52/12 57/56/12 56/53/12
+f 49/57/13 50/58/13 58/59/13
+f 49/57/13 58/59/13 57/60/13
+f 50/58/14 43/61/14 51/62/14
+f 50/58/14 51/62/14 58/59/14
+f 51/42/15 52/41/15 60/63/15
+f 51/42/15 60/63/15 59/64/15
+f 52/41/16 53/44/16 61/65/16
+f 52/41/16 61/65/16 60/63/16
+f 53/48/17 54/47/17 62/66/17
+f 53/48/17 62/66/17 61/67/17
+f 54/47/18 55/50/18 63/68/18
+f 54/47/18 63/68/18 62/66/18
+f 55/54/19 56/53/19 64/69/19
+f 55/54/19 64/69/19 63/70/19
+f 56/53/20 57/56/20 65/71/20
+f 56/53/20 65/71/20 64/69/20
+f 57/60/21 58/59/21 66/72/21
+f 57/60/21 66/72/21 65/73/21
+f 58/59/22 51/62/22 59/74/22
+f 58/59/22 59/74/22 66/72/22
+f 59/64/15 60/63/15 68/75/15
+f 59/64/15 68/75/15 67/76/15
+f 60/63/16 61/65/16 69/77/16
+f 60/78/16 69/79/16 68/80/16
+f 61/67/17 62/66/17 70/81/17
+f 61/67/17 70/81/17 69/79/17
+f 62/66/18 63/68/18 71/82/18
+f 62/66/18 71/82/18 70/81/18
+f 63/70/19 64/69/19 72/83/19
+f 63/70/19 72/83/19 71/84/19
+f 64/69/20 65/71/20 73/85/20
+f 64/69/20 73/85/20 72/83/20
+f 65/73/21 66/72/21 74/86/21
+f 65/73/21 74/86/21 73/87/21
+f 66/72/22 59/74/22 67/88/22
+f 66/72/22 67/88/22 74/86/22
+f 67/76/15 68/75/15 76/89/15
+f 67/76/15 76/89/15 75/90/15
+f 68/80/16 69/79/16 77/91/16
+f 68/75/16 77/92/16 76/89/16
+f 69/79/17 70/81/17 78/93/17
+f 69/79/17 78/93/17 77/91/17
+f 70/81/18 71/82/18 79/94/18
+f 70/81/18 79/94/18 78/93/18
+f 71/84/19 72/83/19 80/95/19
+f 71/84/19 80/95/19 79/96/19
+f 72/83/20 73/85/20 81/97/20
+f 72/83/20 81/97/20 80/95/20
+f 73/87/21 74/86/21 82/98/21
+f 73/87/21 82/98/21 81/99/21
+f 74/86/22 67/88/22 75/100/22
+f 74/86/22 75/100/22 82/98/22
--- a/6/models/plants/red.jpg
+++ b/6/models/plants/red.jpg
--- a/6/models/plants/test5.mtl
+++ b/6/models/plants/test5.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd red.jpg
--- a/6/models/plants/test5.obj
+++ b/6/models/plants/test5.obj
--- a/6/models/red.jpg
+++ b/6/models/red.jpg
--- a/6/models/ros2.png
+++ b/6/models/ros2.png
--- a/6/models/roslina1.mtl
+++ b/6/models/roslina1.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl material_0.014
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd C:/Users/neryt/meshlab_pl/Picsart_24-03-18_14-50-34-891.jpg
--- a/6/models/roslina1.obj
+++ b/6/models/roslina1.obj
--- a/6/models/roslina1001.mtl
+++ b/6/models/roslina1001.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl material_0.001
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd tex2.png
--- a/6/models/roslina1001.obj
+++ b/6/models/roslina1001.obj
--- a/6/models/roslina1001_obj.mtl
+++ b/6/models/roslina1001_obj.mtl
@ -0,0 +1,13 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl Material.001
+Ns 250.000000
+Ka 1.000000 1.000000 1.000000
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd ./models/tex2.jpg
+
--- a/6/models/roslina13.mtl
+++ b/6/models/roslina13.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl material_0.024
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd C:/Users/neryt/meshlab_pl/ros13.png
--- a/6/models/roslina13.obj
+++ b/6/models/roslina13.obj
--- a/6/models/roslina19.mtl
+++ b/6/models/roslina19.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl material_0.026
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd C:/Users/neryt/meshlab_pl/ros19.png
--- a/6/models/roslina19.obj
+++ b/6/models/roslina19.obj
--- a/6/models/roslina2.mtl
+++ b/6/models/roslina2.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl material_0.015
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd ./models/ros2.png
--- a/6/models/roslina2.obj
+++ b/6/models/roslina2.obj
--- a/6/models/roslina20.mtl
+++ b/6/models/roslina20.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl material_0.027
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd C:/Users/neryt/meshlab_pl/ros20.png
--- a/6/models/roslina20.obj
+++ b/6/models/roslina20.obj
--- a/6/models/roslina21.mtl
+++ b/6/models/roslina21.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl material_0.028
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd C:/Users/neryt/meshlab_pl/ros21.png
--- a/6/models/roslina21.obj
+++ b/6/models/roslina21.obj
--- a/6/models/roslina22.mtl
+++ b/6/models/roslina22.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl material_0.029
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd C:/Users/neryt/meshlab_pl/ros22.png
--- a/6/models/roslina22.obj
+++ b/6/models/roslina22.obj
--- a/6/models/roslina23.mtl
+++ b/6/models/roslina23.mtl
@ -0,0 +1,12 @@
+# Blender 4.0.2 MTL File: 'None'
+# www.blender.org
+
+newmtl material_0.030
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Ks 1.000000 1.000000 1.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd C:/Users/neryt/meshlab_pl/ros23.png
--- a/6/models/roslina23.obj
+++ b/6/models/roslina23.obj
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
s473621	8af4e5b15d	las	2024-03-18 17:34:06 +01:00
s473621	380479f9df	Merge branch 'master' of https://git.wmi.amu.edu.pl/s473559/Grafika2023	2024-03-18 17:14:32 +01:00
s473621	5179989830	last_c	2024-03-18 16:51:38 +01:00
s473621	a0c5486450	fixxxi	2024-03-18 14:21:18 +01:00
s473621	7d17f45ea7	skript	2024-03-04 23:13:45 +01:00
s473621	bdcd7163be	fix push_back	2024-03-04 19:36:46 +01:00
s473621	1d263b5887	comm1	2024-03-04 19:22:50 +01:00
dompia5	31d2af576d	Merge branch 'master' of https://git.wmi.amu.edu.pl/s473559/Grafika2023	2024-03-04 16:44:38 +01:00
dompia5	7652ce3e9f	fixed plant placement for planets not on the (0,0,0)	2024-03-04 16:33:16 +01:00
Maryia Sauko	5b34df6782	update 'Readme.md'	2024-02-08 22:19:07 +01:00
s473621	e5ffb856ef	image1	2024-02-08 22:16:44 +01:00
dompia5	2cc420e957	code cleanup	2024-02-08 19:09:21 +01:00
Dominik Piasecki	2e4bbb6443	Update 'README.md'	2024-02-08 19:02:11 +01:00
Dominik Piasecki	7cecfeecb4	Update 'README.md'	2024-02-08 19:01:47 +01:00
Dominik Piasecki	33e179fe4e	Update 'README.md'	2024-02-08 18:56:13 +01:00
Dominik Piasecki	f66d7a9bd3	Update 'README.md'	2024-02-08 18:55:32 +01:00
Dominik Piasecki	462e240127	Update 'README.md'	2024-02-08 18:54:51 +01:00
Dominik Piasecki	68cb26d33e	Upload files to 'PlanetCreator/cw 6/img'	2024-02-08 18:46:41 +01:00
Dominik Piasecki	2b023559a9	Update 'README.md'	2024-02-08 18:43:33 +01:00
dompia5	4a27bc5ac4	skybox, bloom, instancing presentation	2024-02-08 10:10:49 +01:00
dompia5	1a8b4cd64e	merge	2024-02-08 03:27:49 +01:00
dompia5	06fe86f652	correct models get picked and rendered	2024-02-08 03:09:40 +01:00
dompia5	966f3fdc39	sorting works	2024-02-08 02:52:23 +01:00
dompia5	41ac514aa1	probability finished	2024-02-08 02:28:11 +01:00
dompia5	10ad09a79a	.	2024-02-08 01:46:40 +01:00
dompia5	3f1644dbdb	WIP placeObject uses material depending on plant	2024-02-08 00:40:47 +01:00
dompia5	50f790fbe7	pbr connected	2024-02-07 22:51:50 +01:00
dompia5	ad3be0a00b	shader + plants spawn on whole planet	2024-02-07 22:32:03 +01:00
dompia5	4823629510	scale fixed.	2024-02-07 22:09:59 +01:00
dompia5	ac6a01d5be	instancing but scale is messed up	2024-02-07 21:58:19 +01:00
dompia5	3f757feb4a	.	2024-02-07 20:15:05 +01:00
s473621	339afe2b97	dtzip	2024-02-07 19:55:04 +01:00
dompia5	de646292bd	Revert "Revert "WIP objects appear as dots"" This reverts commit `bde2409b59`.	2024-02-07 18:32:04 +01:00
dompia5	bde2409b59	Revert "WIP objects appear as dots" This reverts commit `968295dc3d`.	2024-02-07 18:29:06 +01:00
dompia5	968295dc3d	WIP objects appear as dots	2024-02-07 18:28:36 +01:00
s473621	349ba83ec3	upd	2024-02-07 15:36:10 +01:00
s473621	c20788feaa	Merge branch 'merge_with_textures' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 into merge_with_textures # Conflicts: # PlanetCreator/cw 6/shaders/shader_5_1_tex.frag	2024-02-07 15:33:56 +01:00
s473621	bb40477d86	upd shader_tex 2	2024-02-07 15:31:46 +01:00
s473621	e571743eb1	upd shader_tex	2024-02-07 15:22:05 +01:00
Deni	66a4f36be1	return texture to planet	2024-02-07 14:55:02 +01:00
Deni	66d6374d53	Merge branch 'importing_ply' into merge_with_textures # Conflicts: # PlanetCreator/cw 6/grk-cw6.vcxproj.filters # PlanetCreator/cw 6/imgui.ini # PlanetCreator/cw 6/src/ex_6_1.hpp	2024-02-07 13:50:55 +01:00
dompia5	b5e8ccca12	Almost working instancing . but total number of uniform components exceeds the limitatin of gl_MaxUniformComponents.	2024-02-07 02:59:34 +01:00
dompia5	93f8e5583b	plant placement optimisation	2024-02-05 23:53:09 +01:00
dompia5	0444c26667	Merge branch 'populating_with_plants' of https://git.wmi.amu.edu.pl/s473559/Grafika2023 into populating_with_plants	2024-02-04 22:49:39 +01:00
dompia5	ba77304023	cleaning up	2024-02-04 22:42:58 +01:00
s473621	576776b996	test	2024-02-04 22:10:48 +01:00
s473621	cb7385bc1b	adding pbr shader for plants.......?...?..?	2024-02-03 21:03:12 +01:00
s473621	6e525f8a6e	adding plant growth	2024-02-03 17:42:50 +01:00
dompia5	97e8b8a8df	plants are placed on planet but only on positive coords	2024-02-02 22:08:38 +01:00
dompia5	b364a755fc	added plants vector to PlanetParams	2024-02-02 19:59:24 +01:00
dompia5	1195ec1b91	plant_placement on planet that is in center of the world	2024-02-01 19:49:53 +01:00
dompia5	e514ce6699	moved loadMTL Texture to init to improve performance	2024-02-01 17:01:03 +01:00
s473621	d28c6eecb9	adding texture to plants	2024-01-31 16:09:43 +01:00
Deni	c8d8f9bd38	Some fixing	2024-01-31 10:12:40 +01:00
Dominik Piasecki	00471a1b93	changed percipation to temperature, plant calculates probability of spawning on new planet	2024-01-29 12:53:03 +01:00
s473621	06362ba989	changes	2024-01-29 12:12:16 +01:00