diff --git a/PlanetCreator/Release/grk-cw6.exe b/PlanetCreator/Release/grk-cw6.exe new file mode 100644 index 0000000..deca6bf Binary files /dev/null and b/PlanetCreator/Release/grk-cw6.exe differ diff --git a/PlanetCreator/Release/grk-cw6.pdb b/PlanetCreator/Release/grk-cw6.pdb new file mode 100644 index 0000000..7ecfafb Binary files /dev/null and b/PlanetCreator/Release/grk-cw6.pdb differ diff --git a/PlanetCreator/cw 6/Release/Box.obj b/PlanetCreator/cw 6/Release/Box.obj index 2c5e490..040e76e 100644 Binary files a/PlanetCreator/cw 6/Release/Box.obj and b/PlanetCreator/cw 6/Release/Box.obj differ diff --git a/PlanetCreator/cw 6/Release/Camera.obj b/PlanetCreator/cw 6/Release/Camera.obj index cfdcb89..54bc5f9 100644 Binary files a/PlanetCreator/cw 6/Release/Camera.obj and b/PlanetCreator/cw 6/Release/Camera.obj differ diff --git a/PlanetCreator/cw 6/Release/Distribution.obj b/PlanetCreator/cw 6/Release/Distribution.obj new file mode 100644 index 0000000..31730d5 Binary files /dev/null and b/PlanetCreator/cw 6/Release/Distribution.obj differ diff --git a/PlanetCreator/cw 6/Release/Render_Utils.obj b/PlanetCreator/cw 6/Release/Render_Utils.obj index 720ee0c..c1c0abd 100644 Binary files a/PlanetCreator/cw 6/Release/Render_Utils.obj and b/PlanetCreator/cw 6/Release/Render_Utils.obj differ diff --git a/PlanetCreator/cw 6/Release/SOIL.obj b/PlanetCreator/cw 6/Release/SOIL.obj index 59960a7..d59502f 100644 Binary files a/PlanetCreator/cw 6/Release/SOIL.obj and b/PlanetCreator/cw 6/Release/SOIL.obj differ diff --git a/PlanetCreator/cw 6/Release/Shader_Loader.obj b/PlanetCreator/cw 6/Release/Shader_Loader.obj index bb23f3e..f0f5618 100644 Binary files a/PlanetCreator/cw 6/Release/Shader_Loader.obj and b/PlanetCreator/cw 6/Release/Shader_Loader.obj differ diff --git a/PlanetCreator/cw 6/Release/Texture.obj b/PlanetCreator/cw 6/Release/Texture.obj index ff01234..cce84b9 100644 Binary files a/PlanetCreator/cw 6/Release/Texture.obj and b/PlanetCreator/cw 6/Release/Texture.obj differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.exe.recipe b/PlanetCreator/cw 6/Release/grk-cw6.exe.recipe index 2258c0d..f644042 100644 --- a/PlanetCreator/cw 6/Release/grk-cw6.exe.recipe +++ b/PlanetCreator/cw 6/Release/grk-cw6.exe.recipe @@ -2,7 +2,7 @@ - D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\grk\Release\grk-cw6.exe + C:\Users\neryt\Grafika2023\PlanetCreator\Release\grk-cw6.exe diff --git a/PlanetCreator/cw 6/Release/grk-cw6.iobj b/PlanetCreator/cw 6/Release/grk-cw6.iobj index 5366175..04cac4e 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.iobj and b/PlanetCreator/cw 6/Release/grk-cw6.iobj differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.ipdb b/PlanetCreator/cw 6/Release/grk-cw6.ipdb index fae1400..5ee0ac6 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.ipdb and b/PlanetCreator/cw 6/Release/grk-cw6.ipdb differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.log b/PlanetCreator/cw 6/Release/grk-cw6.log index 6b7e64b..3b86c85 100644 --- a/PlanetCreator/cw 6/Release/grk-cw6.log +++ b/PlanetCreator/cw 6/Release/grk-cw6.log @@ -1 +1,189 @@ -C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(439,5): error MSB8020: Не удается найти средства сборки для v143 (набор инструментов платформы = "v143"). Чтобы выполнить сборку с использованием средств сборки v143 установите средства сборки v143. Кроме того, можно выполнить обновление до текущей версии средств Visual Studio, перейдя в меню "Проект" или щелкнув решение правой кнопкой мыши и выбрав "Обновить решение...". + main.cpp +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", возможна потеря данных + with + [ + _Ty=float + ] + and + [ + _Ty=int + ] +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_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::tuple(_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(245): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple(_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::tuple(_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(860): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple(_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::tuple(_Tag,_Tpl &&,std::integer_sequence)" + with + [ + _Ty=std::tuple, + _Tag=std::_Unpack_tuple_t, + _Tpl=std::tuple + ] +C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(252): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple(_Tag,_Tpl &&,std::integer_sequence)" + with + [ + _Ty=std::tuple, + _Tag=std::_Unpack_tuple_t, + _Tpl=std::tuple + ] +C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(379): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple,0>(_Tag,_Tpl &&)" + with + [ + _Tag=std::_Unpack_tuple_t, + _Tpl=std::tuple + ] +C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(379): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple,0>(_Tag,_Tpl &&)" + with + [ + _Tag=std::_Unpack_tuple_t, + _Tpl=std::tuple + ] +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(185): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple(std::tuple &&) noexcept" +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(185): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple(std::tuple &&) 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", возможна потеря данных + with + [ + _Ty=float + ] +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(_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_val<_This>::_Tuple_val(_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::tuple(_Tag,_This2)" + 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(245): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple(_Tag,_This2)" + 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::tuple(_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::tuple(_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::tuple(_Tag,_Tpl,std::integer_sequence)" + with + [ + _Ty=std::tuple, + _Tag=std::_Unpack_tuple_t, + _Tpl=const std::tuple & + ] +C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(252): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple(_Tag,_Tpl,std::integer_sequence)" + with + [ + _Ty=std::tuple, + _Tag=std::_Unpack_tuple_t, + _Tpl=const std::tuple & + ] +C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(356): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple&,0>(_Tag,_Tpl)" + with + [ + _Tag=std::_Unpack_tuple_t, + _Tpl=const std::tuple & + ] +C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\tuple(356): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple&,0>(_Tag,_Tpl)" + with + [ + _Tag=std::_Unpack_tuple_t, + _Tpl=const std::tuple & + ] +C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\algorithm(6926): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple(const std::tuple &) noexcept" +C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\algorithm(6926): message : выполняется компиляция ссылки на экземпляр шаблон функции "std::tuple::tuple(const std::tuple &) 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,std::tuple)>(const _BidIt,const _BidIt,_Pr)" + with + [ + _BidIt=std::tuple *, + _RanIt=std::tuple *, + _Pr=bool (__cdecl *)(std::tuple,std::tuple) + ] +C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.29.30133\include\algorithm(7080): message : выполняется компиляция ссылки на экземпляр шаблон функции "void std::_Sort_unchecked*,bool(__cdecl *)(std::tuple,std::tuple)>(_RanIt,_RanIt,int,_Pr)" + with + [ + _RanIt=std::tuple *, + _Pr=bool (__cdecl *)(std::tuple,std::tuple) + ] +C:\Users\neryt\Grafika2023\PlanetCreator\cw 6\src\ex_6_1.hpp(193): message : выполняется компиляция ссылки на экземпляр шаблон функции "void std::sort>>,bool(__cdecl *)(std::tuple,std::tuple)>(const _RanIt,const _RanIt,_Pr)" + with + [ + _Ty=std::tuple, + _RanIt=std::_Vector_iterator>>>, + _Pr=bool (__cdecl *)(std::tuple,std::tuple) + ] + Создание кода + 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 diff --git a/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.command.1.tlog b/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.command.1.tlog index 22a1d58..a9c7484 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.command.1.tlog and b/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.command.1.tlog differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.read.1.tlog b/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.read.1.tlog index a64afbe..4af190b 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.read.1.tlog and b/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.read.1.tlog differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.write.1.tlog b/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.write.1.tlog index 9fe5bf6..54a411b 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.write.1.tlog and b/PlanetCreator/cw 6/Release/grk-cw6.tlog/CL.write.1.tlog differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.tlog/grk-cw6.lastbuildstate b/PlanetCreator/cw 6/Release/grk-cw6.tlog/grk-cw6.lastbuildstate index 294e321..3357945 100644 --- a/PlanetCreator/cw 6/Release/grk-cw6.tlog/grk-cw6.lastbuildstate +++ b/PlanetCreator/cw 6/Release/grk-cw6.tlog/grk-cw6.lastbuildstate @@ -1,2 +1,2 @@ -PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.36.32532:TargetPlatformVersion=10.0.22621.0: -Release|Win32|D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\grk\| +PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.22000.0: +Release|Win32|C:\Users\neryt\Grafika2023\PlanetCreator\| diff --git a/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.command.1.tlog b/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.command.1.tlog index 5caf110..308b961 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.command.1.tlog and b/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.command.1.tlog differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.read.1.tlog b/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.read.1.tlog index 226df38..a637f30 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.read.1.tlog and b/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.read.1.tlog differ diff --git a/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.write.1.tlog b/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.write.1.tlog index ae5a638..d01a702 100644 Binary files a/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.write.1.tlog and b/PlanetCreator/cw 6/Release/grk-cw6.tlog/link.write.1.tlog differ diff --git a/PlanetCreator/cw 6/Release/image_DXT.obj b/PlanetCreator/cw 6/Release/image_DXT.obj index 461634a..73f94a0 100644 Binary files a/PlanetCreator/cw 6/Release/image_DXT.obj and b/PlanetCreator/cw 6/Release/image_DXT.obj differ diff --git a/PlanetCreator/cw 6/Release/image_helper.obj b/PlanetCreator/cw 6/Release/image_helper.obj index 59d4548..4d6ff2b 100644 Binary files a/PlanetCreator/cw 6/Release/image_helper.obj and b/PlanetCreator/cw 6/Release/image_helper.obj differ diff --git a/PlanetCreator/cw 6/Release/imgui.obj b/PlanetCreator/cw 6/Release/imgui.obj new file mode 100644 index 0000000..7c1ce1e Binary files /dev/null and b/PlanetCreator/cw 6/Release/imgui.obj differ diff --git a/PlanetCreator/cw 6/Release/imgui_demo.obj b/PlanetCreator/cw 6/Release/imgui_demo.obj new file mode 100644 index 0000000..3538404 Binary files /dev/null and b/PlanetCreator/cw 6/Release/imgui_demo.obj differ diff --git a/PlanetCreator/cw 6/Release/imgui_draw.obj b/PlanetCreator/cw 6/Release/imgui_draw.obj new file mode 100644 index 0000000..9d2b3db Binary files /dev/null and b/PlanetCreator/cw 6/Release/imgui_draw.obj differ diff --git a/PlanetCreator/cw 6/Release/imgui_impl_glfw.obj b/PlanetCreator/cw 6/Release/imgui_impl_glfw.obj new file mode 100644 index 0000000..8422fe1 Binary files /dev/null and b/PlanetCreator/cw 6/Release/imgui_impl_glfw.obj differ diff --git a/PlanetCreator/cw 6/Release/imgui_impl_opengl3.obj b/PlanetCreator/cw 6/Release/imgui_impl_opengl3.obj new file mode 100644 index 0000000..2d608b4 Binary files /dev/null and b/PlanetCreator/cw 6/Release/imgui_impl_opengl3.obj differ diff --git a/PlanetCreator/cw 6/Release/imgui_tables.obj b/PlanetCreator/cw 6/Release/imgui_tables.obj new file mode 100644 index 0000000..e9fae10 Binary files /dev/null and b/PlanetCreator/cw 6/Release/imgui_tables.obj differ diff --git a/PlanetCreator/cw 6/Release/imgui_widgets.obj b/PlanetCreator/cw 6/Release/imgui_widgets.obj new file mode 100644 index 0000000..783fb43 Binary files /dev/null and b/PlanetCreator/cw 6/Release/imgui_widgets.obj differ diff --git a/PlanetCreator/cw 6/Release/main.obj b/PlanetCreator/cw 6/Release/main.obj index 30e3f1b..7086335 100644 Binary files a/PlanetCreator/cw 6/Release/main.obj and b/PlanetCreator/cw 6/Release/main.obj differ diff --git a/PlanetCreator/cw 6/Release/stb_image_aug.obj b/PlanetCreator/cw 6/Release/stb_image_aug.obj index dde72d2..fdfdfb5 100644 Binary files a/PlanetCreator/cw 6/Release/stb_image_aug.obj and b/PlanetCreator/cw 6/Release/stb_image_aug.obj differ diff --git a/PlanetCreator/cw 6/Release/vc142.pdb b/PlanetCreator/cw 6/Release/vc142.pdb new file mode 100644 index 0000000..fb22438 Binary files /dev/null and b/PlanetCreator/cw 6/Release/vc142.pdb differ diff --git a/PlanetCreator/cw 6/src/ex_6_1.hpp b/PlanetCreator/cw 6/src/ex_6_1.hpp index 4e60a8b..c498060 100644 --- a/PlanetCreator/cw 6/src/ex_6_1.hpp +++ b/PlanetCreator/cw 6/src/ex_6_1.hpp @@ -439,7 +439,7 @@ void drawObjectTexture(Core::RenderContext& context, glm::mat4 modelMatrix, GLui } -void drawObjectTexture_plant(Core::RenderContext& context, glm::mat4 modelMatrix, Material& material, GLuint program) { +void drawObjectTexture_plant(Core::RenderContext& context, glm::mat4 modelMatrix, const Material& material, GLuint program) { glUseProgram(program); Core::SetActiveTexture(material.textureID, "colorTexture", program, 0); glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix(); @@ -507,7 +507,13 @@ Material plant3Material; Material plant2_1Material; PlanetParams TestPlanet = PlanetParams(); - +struct TexturePlantData { + Core::RenderContext thirdTreeContext; + glm::mat4 plantModelMatrix; + Material plant3Material; + GLuint program_pbr; +}; +std::vector texturePlantDataList; #include float thirdTreeStartScale = 0.0f; void animateGrowingTree(float& elapsedTime, float deltaTime, float firstTreeDuration, float secondTreeDuration, float thirdTreeDuration, @@ -521,6 +527,7 @@ void animateGrowingTree(float& elapsedTime, float deltaTime, float firstTreeDura plantModelMatrix = glm::translate(plantPosition) * glm::scale(glm::vec3(scaleFactor + (elapsedTime / firstTreeDuration) * scaleFactor)); drawObjectTexture_plant(plant_1_1_small_Context, plantModelMatrix, plant3Material, program_pbr); + elapsedTime += deltaTime; } // drugie drzewo else if (elapsedTime < firstTreeDuration + secondTreeDuration) { @@ -534,6 +541,7 @@ void animateGrowingTree(float& elapsedTime, float deltaTime, float firstTreeDura thirdTreeStartScale = scaleFactor + growthStage2 * scaleFactor; //std::cout << "thirdTreeStartScale: " << thirdTreeStartScale << std::endl; } + elapsedTime += deltaTime; } //trzecie drzewo else if (elapsedTime < firstTreeDuration + secondTreeDuration + thirdTreeDuration) { @@ -541,16 +549,28 @@ void animateGrowingTree(float& elapsedTime, float deltaTime, float firstTreeDura float growthStage3 = ((elapsedTime - firstTreeDuration - secondTreeDuration) / thirdTreeDuration); plantModelMatrix = glm::translate(plantPosition) * glm::scale(glm::vec3(thirdTreeStartScale*2 + growthStage3 * scaleFactor)); drawObjectTexture_plant(thirdTreeContext, plantModelMatrix, plant3Material, program_pbr); + elapsedTime += deltaTime; } else { - + //plantModelMatrix = glm::translate(plantPosition) * glm::scale(glm::vec3(scaleFactor + scaleFactor)); plantModelMatrix = glm::translate(plantPosition) * glm::scale(glm::vec3(thirdTreeStartScale*2 + scaleFactor)); - drawObjectTexture_plant(thirdTreeContext, plantModelMatrix, plant3Material, program_pbr); + TexturePlantData newData; + newData.thirdTreeContext = thirdTreeContext; + newData.plantModelMatrix = plantModelMatrix; + newData.plant3Material = plant3Material; + newData.program_pbr = program_pbr; + texturePlantDataList.push_back(newData); + // drawObjectTexture_plant(thirdTreeContext, plantModelMatrix, plant3Material, program_pbr); + elapsedTime = 0; } - - elapsedTime += deltaTime; + for (const auto& newData : texturePlantDataList) { + drawObjectTexture_plant(const_cast(newData.thirdTreeContext), newData.plantModelMatrix, newData.plant3Material, newData.program_pbr); + } + + + } @@ -571,10 +591,13 @@ void renderScene(GLFWwindow* window) float deltaTime = static_cast(time - lastFrameTime); lastFrameTime = time; + static float elapsedTime = 0.0f; + + std::cout << "delta " << time<<"chuj"<< lastFrameTime <<"elapsed"<