merge
This commit is contained in:
commit
1a8b4cd64e
Binary file not shown.
|
|
@ -2,7 +2,11 @@
|
|||
<Project>
|
||||
<ProjectOutputs>
|
||||
<ProjectOutput>
|
||||
<<<<<<< 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 />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
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)\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
|
||||
|
|
@ -16,6 +17,25 @@ D:\DANE\CppProjects\grk_cw1 (1)\PlanetCreator\PlanetCreator\cw 6\src\ex_6_1.hpp(
|
|||
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
|
||||
|
|
@ -24,101 +44,234 @@ C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.3253
|
|||
[
|
||||
_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
|
||||
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)\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
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -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)\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
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -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>
|
||||
|
|
@ -90,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>
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 123 KiB |
|
|
@ -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
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,23 +1,36 @@
|
|||
#version 430 core
|
||||
|
||||
float AMBIENT = 0.1;
|
||||
float AMBIENT = 0.2;
|
||||
|
||||
uniform vec3 color;
|
||||
uniform vec3 lightPos;
|
||||
uniform sampler2D colorTexture;
|
||||
|
||||
const float PI = 3.14159265359;
|
||||
|
||||
in vec3 vecNormal;
|
||||
in vec3 worldPos;
|
||||
in vec2 texCoord;
|
||||
out vec4 outColor;
|
||||
vec3 textureColorTemp;
|
||||
|
||||
void main()
|
||||
{
|
||||
vec3 lightDir = normalize(lightPos-worldPos);
|
||||
vec3 normal = normalize(vecNormal);
|
||||
float diffuse=max(0,dot(normal,lightDir));
|
||||
|
||||
vec4 textureColor = texture2D(colorTexture,texCoord);
|
||||
textureColorTemp=vec3(textureColor.r,textureColor.g,textureColor.b);
|
||||
outColor = vec4(textureColorTemp*min(1,AMBIENT+diffuse), 1.0);
|
||||
|
||||
vec3 lightDir = normalize(lightPos - worldPos);
|
||||
vec3 normal = normalize(vecNormal);
|
||||
|
||||
|
||||
float diffuse = max(0.0, dot(normal, lightDir));
|
||||
diffuse = clamp(diffuse + 0.2, 0.0, 1.0);
|
||||
|
||||
|
||||
vec3 viewDir = normalize(-worldPos);
|
||||
vec3 halfwayDir = normalize(lightDir + viewDir);
|
||||
float specularStrength = 0.7; // Increase specular strength
|
||||
float specular = pow(max(0.0, dot(normal, halfwayDir)), 32);
|
||||
|
||||
vec4 textureColor = texture(colorTexture, texCoord);
|
||||
vec3 finalColor = textureColor.rgb * (AMBIENT + diffuse) + specularStrength * specular;
|
||||
|
||||
outColor = vec4(finalColor, textureColor.a);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -158,14 +158,25 @@ struct PlanetParams {
|
|||
float size = 1.0f;
|
||||
GLuint texture;
|
||||
// Добавьте другие параметры по мере необходимости
|
||||
|
||||
float humidity = 0.0f; // Начальное значение для влажности
|
||||
float temperature = 0.0f; // Начальное значение для осадков
|
||||
std::vector < std::tuple<int, glm::vec3 >> Plant_info; // ID , position
|
||||
std::vector <int> Plant_type_count;
|
||||
};
|
||||
|
||||
struct Climate {
|
||||
float tempMin, tempMax;
|
||||
float precipMin, precipMax;
|
||||
GLuint textureID;
|
||||
};
|
||||
|
||||
|
||||
// Глобальный массив климатов
|
||||
std::vector<Climate> climates;
|
||||
|
||||
|
||||
std::vector<PlanetParams> planets; // Список всех планет
|
||||
GLuint defaultTexture;
|
||||
|
||||
|
||||
bool sortFunction(std::tuple<int, float> objA, std::tuple<int, float> objB)
|
||||
|
|
@ -247,6 +258,16 @@ PlanetParams populatePlanet(PlanetParams planet, std::vector<Plant::Plant> plant
|
|||
std::cout << std::endl;
|
||||
std::sort(planet.Plant_info.begin(), planet.Plant_info.end(), sortFunctionPlantInfo);
|
||||
|
||||
|
||||
planet.texture = defaultTexture;
|
||||
|
||||
for (const auto& climate : climates) {
|
||||
if (planet.temperature >= climate.tempMin && planet.temperature <= climate.tempMax &&
|
||||
planet.humidity >= climate.precipMin && planet.humidity <= climate.precipMax) {
|
||||
planet.texture = climate.textureID;
|
||||
}
|
||||
}
|
||||
|
||||
return planet;
|
||||
|
||||
|
||||
|
|
@ -266,7 +287,6 @@ namespace texture {
|
|||
GLuint asteroidNormal;
|
||||
}
|
||||
|
||||
|
||||
GLuint program;
|
||||
GLuint programSun;
|
||||
GLuint programTex;
|
||||
|
|
@ -293,10 +313,15 @@ Core::RenderContext plant_2_1_small_Context;
|
|||
Core::RenderContext plant_2_1_med_Context;
|
||||
|
||||
Core::RenderContext plant3Context;
|
||||
Core::RenderContext plant2Context;
|
||||
Core::RenderContext plant2_1Context;
|
||||
glm::vec3 cameraPos = glm::vec3(-4.f, 0, 0);
|
||||
glm::vec3 cameraDir = glm::vec3(1.f, 0.f, 0.f);
|
||||
|
||||
glm::vec3 sunPosition = glm::vec3(0.0f, 0.0f, 0.0f); // Позиция солнца
|
||||
glm::vec3 sunColor = glm::vec3(1.0f, 1.0f, 1.0f); // Цвет солнца
|
||||
|
||||
|
||||
|
||||
GLuint VAO,VBO;
|
||||
|
||||
|
|
@ -352,6 +377,20 @@ void DrawContextInstanced(Core::RenderContext& context, std::vector<glm::mat4> t
|
|||
|
||||
}
|
||||
|
||||
struct Vertex {
|
||||
glm::vec3 position;
|
||||
glm::vec3 normal;
|
||||
glm::vec2 texCoords;
|
||||
};
|
||||
struct ModelContext {
|
||||
std::vector<Vertex> vertices;
|
||||
std::vector<unsigned int> indices;
|
||||
GLuint VAO;
|
||||
GLuint VBO;
|
||||
GLuint EBO;
|
||||
};
|
||||
|
||||
|
||||
float aspectRatio = 1.f;
|
||||
bool DoTheImportThing(const std::string& pFile) {
|
||||
// Create an instance of the Importer class
|
||||
|
|
@ -434,12 +473,15 @@ glm::mat4 createPerspectiveMatrix()
|
|||
void drawObjectColor(Core::RenderContext& context, glm::mat4 modelMatrix, glm::vec3 color, GLuint program) {
|
||||
GLuint prog = program;
|
||||
glUseProgram(prog);
|
||||
|
||||
glm::mat4 viewProjectionMatrix = createPerspectiveMatrix() * createCameraMatrix();
|
||||
glm::mat4 transformation = viewProjectionMatrix * modelMatrix;
|
||||
glUniformMatrix4fv(glGetUniformLocation(prog, "transformation"), 1, GL_FALSE, (float*)&transformation);
|
||||
glUniformMatrix4fv(glGetUniformLocation(prog, "modelMatrix"), 1, GL_FALSE, (float*)&modelMatrix);
|
||||
glUniform3f(glGetUniformLocation(prog, "color"), color.x, color.y, color.z);
|
||||
glUniform3f(glGetUniformLocation(prog, "lightPos"), 0,0,0);
|
||||
//glUniform3f(glGetUniformLocation(prog, "lightPos"), 0,0,0);
|
||||
glUniform3f(glGetUniformLocation(program, "lightPos"), sunPosition.x, sunPosition.y, sunPosition.z);
|
||||
|
||||
|
||||
GLuint colorStartLocation = glGetUniformLocation(prog, "colorStart");
|
||||
GLuint colorEndLocation = glGetUniformLocation(prog, "colorEnd");
|
||||
|
|
@ -454,6 +496,22 @@ void drawObjectColor(Core::RenderContext& context, glm::mat4 modelMatrix, glm::v
|
|||
glUseProgram(0);
|
||||
|
||||
}
|
||||
|
||||
void renderSun() {
|
||||
glUseProgram(programSun);
|
||||
|
||||
// Установка uniform-параметров для солнца, например, позиции и цвета
|
||||
glUniform3f(glGetUniformLocation(programSun, "sunPosition"), sunPosition.x, sunPosition.y, sunPosition.z);
|
||||
glUniform3f(glGetUniformLocation(programSun, "sunColor"), sunColor.x, sunColor.y, sunColor.z);
|
||||
|
||||
|
||||
// Отрисовка объекта солнца (может быть простой сферой или кастомной моделью)
|
||||
// ...
|
||||
|
||||
glUseProgram(0);
|
||||
}
|
||||
|
||||
|
||||
void drawObjectBiomes(Core::RenderContext& context, glm::mat4 modelMatrix, GLuint program) {
|
||||
GLuint prog = program;
|
||||
glUseProgram(prog);
|
||||
|
|
@ -461,7 +519,9 @@ void drawObjectBiomes(Core::RenderContext& context, glm::mat4 modelMatrix, GLuin
|
|||
glm::mat4 transformation = viewProjectionMatrix * modelMatrix;
|
||||
glUniformMatrix4fv(glGetUniformLocation(prog, "transformation"), 1, GL_FALSE, (float*)&transformation);
|
||||
glUniformMatrix4fv(glGetUniformLocation(prog, "modelMatrix"), 1, GL_FALSE, (float*)&modelMatrix);
|
||||
glUniform3f(glGetUniformLocation(prog, "lightPos"), 0, 0, 0);
|
||||
|
||||
glUniform3f(glGetUniformLocation(program, "lightPos"), sunPosition.x, sunPosition.y, sunPosition.z);
|
||||
|
||||
Core::DrawContext(context);
|
||||
glUseProgram(0);
|
||||
|
||||
|
|
@ -474,13 +534,13 @@ void drawObjectTexture(Core::RenderContext& context, glm::mat4 modelMatrix, GLui
|
|||
glm::mat4 transformation = viewProjectionMatrix * modelMatrix;
|
||||
glUniformMatrix4fv(glGetUniformLocation(program, "transformation"), 1, GL_FALSE, (float*)&transformation);
|
||||
glUniformMatrix4fv(glGetUniformLocation(program, "modelMatrix"), 1, GL_FALSE, (float*)&modelMatrix);
|
||||
glUniform3f(glGetUniformLocation(program, "lightPos"), 0, 0, 0);
|
||||
glUniform3f(glGetUniformLocation(program, "lightPos"), sunPosition.x, sunPosition.y, sunPosition.z);
|
||||
Core::DrawContext(context);
|
||||
glUseProgram(0);
|
||||
|
||||
}
|
||||
|
||||
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();
|
||||
|
|
@ -563,7 +623,13 @@ void placeObjectOnPlanet(Core::RenderContext& objectContext, glm::mat4 objectMat
|
|||
}
|
||||
|
||||
PlanetParams TestPlanet = PlanetParams();
|
||||
|
||||
struct TexturePlantData {
|
||||
Core::RenderContext thirdTreeContext;
|
||||
glm::mat4 plantModelMatrix;
|
||||
Material plant3Material;
|
||||
GLuint program_pbr;
|
||||
};
|
||||
std::vector<TexturePlantData> texturePlantDataList;
|
||||
#include <cmath>
|
||||
float thirdTreeStartScale = 0.0f;
|
||||
void animateGrowingTree(float& elapsedTime, float deltaTime, float firstTreeDuration, float secondTreeDuration, float thirdTreeDuration,
|
||||
|
|
@ -577,6 +643,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) {
|
||||
|
|
@ -590,6 +657,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) {
|
||||
|
|
@ -597,16 +665,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<Core::RenderContext&>(newData.thirdTreeContext), newData.plantModelMatrix, newData.plant3Material, newData.program_pbr);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -630,7 +710,7 @@ void renderScene(GLFWwindow* window)
|
|||
float firstTreeDuration = 20.0f;
|
||||
float secondTreeDuration = 8.0f;
|
||||
float thirdTreeDuration = 5.0f;
|
||||
static float elapsedTime = 0.0f;
|
||||
//static float elapsedTime = 0.0f;
|
||||
glm::vec3 plantPosition = glm::vec3(1.f, 0.f, 3.5f);
|
||||
glm::vec3 plantPosition1 = glm::vec3(1.f, 0.f, 1.5f);
|
||||
glm::vec3 plantPosition2 = glm::vec3(1.f, 0.f, 0.5f);
|
||||
|
|
@ -653,7 +733,7 @@ void renderScene(GLFWwindow* window)
|
|||
//drawObjectBiomes(plantContext, glm::eulerAngleX(30.f) * glm::translate(glm::vec3(0.f, 0.f, 0.f)), programBiomes);
|
||||
for (const auto& planet : planets) {
|
||||
glm::mat4 modelMatrix = glm::translate(planet.position) * glm::scale(glm::vec3(planet.size));
|
||||
drawObjectTexture(sphereContext, modelMatrix, planet.texture, program);
|
||||
drawObjectTexture(sphereContext, modelMatrix, planet.texture, programTex);
|
||||
|
||||
std::vector<std::tuple<int,glm::vec3>>plants = planet.Plant_info;
|
||||
int plant_type_count = plants.size();
|
||||
|
|
@ -693,13 +773,15 @@ void renderScene(GLFWwindow* window)
|
|||
}
|
||||
|
||||
|
||||
|
||||
//placeObjectOnPlanet(plant2Context, glm::scale(glm::mat4(), glm::vec3(0.2)), normalize(glm::vec3(1.0, 0.0, 1.0)), sphereContext, planetMatrix);
|
||||
|
||||
renderSun();
|
||||
|
||||
|
||||
//drawObjectColor(plant2Context, plantModelMatrix, glm::vec3(1,1,1), program);
|
||||
// drawObjectColor(plant3Context,glm::translate(glm::vec3(1.0f, 0.5f, 3.0f)) *glm::scale(glm::vec3(0.03f)) *glm::rotate(glm::mat4(1.0f), glm::radians(-90.0f), glm::vec3(1.0f, 0.0f, 0.0f)),glm::vec3(1, 1, 1), program);
|
||||
//drawObjectTexture_plant(plant_1_1_small_Context, plantModelMatrix, plant3Material, program_pbr);
|
||||
drawObjectTexture_plant(plant_2_1Context, plantModelMatrix, plant2_1Material, program_pbr);
|
||||
//drawObjectTexture_plant(plant_2_1_small_Context, plantModelMatrix, plant2_1Material, program_pbr);
|
||||
|
||||
//drawObjectColor(plant2Context, plantModelMatrix, glm::vec3(1, 1, 1), program);
|
||||
|
||||
|
|
@ -732,10 +814,14 @@ void init(GLFWwindow* window)
|
|||
|
||||
glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
|
||||
|
||||
glm::vec3 lightPosition = glm::vec3(0.0f, 10.0f, 0.0f);
|
||||
glm::vec3 lightColor = glm::vec3(1.0f, 1.0f, 1.0f);
|
||||
float lightIntensity = 1.0f;
|
||||
|
||||
glEnable(GL_DEPTH_TEST);
|
||||
//program = shaderLoader.CreateProgram("shaders/shader_5_1.vert", "shaders/shader_5_1.frag");
|
||||
//programTex = shaderLoader.CreateProgram("shaders/shader_5_1_tex.vert", "shaders/shader_5_1_tex.frag");
|
||||
//programSun = shaderLoader.CreateProgram("shaders/shader_5_sun.vert", "shaders/shader_5_sun.frag");
|
||||
program = shaderLoader.CreateProgram("shaders/shader_5_1.vert", "shaders/shader_5_1.frag");
|
||||
programTex = shaderLoader.CreateProgram("shaders/shader_5_1_tex.vert", "shaders/shader_5_1_tex.frag");
|
||||
programSun = shaderLoader.CreateProgram("shaders/shader_5_sun.vert", "shaders/shader_5_sun.frag");
|
||||
programBiomes = shaderLoader.CreateProgram("shaders/shader_biomes.vert", "shaders/shader_biomes.frag");
|
||||
program_pbr = shaderLoader.CreateProgram("shaders/shader_pbr.vert", "shaders/shader_pbr.frag");
|
||||
program_pbr_instanced= shaderLoader.CreateProgram("shaders/shader_pbr_instanced.vert", "shaders/shader_pbr_instanced.frag");
|
||||
|
|
@ -752,6 +838,7 @@ void init(GLFWwindow* window)
|
|||
loadModelToContext("./models/plant_2_1.obj", plant_2_1Context);
|
||||
loadModelToContext2("./models/plant_4.ply", plant3Context);
|
||||
|
||||
// setupBuffers(plantContex_test);
|
||||
texture::earth=Core::LoadTexture("textures/earth2.png");
|
||||
texture::clouds = Core::LoadTexture("textures/clouds.jpg");
|
||||
texture::moon = Core::LoadTexture("textures/moon_normals.png");
|
||||
|
|
@ -766,13 +853,17 @@ void init(GLFWwindow* window)
|
|||
plant_specimens.push_back(Plant::Plant(7, 5, 7, 5, "plant1_s", "./models/plant_1_1.obj", plant3Material));
|
||||
plant_specimens.push_back(Plant::Plant(5, 5, 5, 5, "plant1_m", "./models/plant_2_1.obj", plant2_1Material));
|
||||
|
||||
//plant_specimens.push_back(Plant::Plant(1, 0.90, 1, 1, "testPlantCCCCCCCCCCC", "./models/plant_4.ply"));
|
||||
//plant_specimens.push_back(Plant::Plant(1, 0.5, 1, 1, "testPlantBBBBBBBBB", "./models/plant_4.ply"));
|
||||
//plant_specimens.push_back(Plant::Plant(1, 1, 1, 1, "testPlantFFFFFFFFFFFF", "./models/plant_4.ply"));
|
||||
//plant_specimens.push_back(Plant::Plant(1, 0.2, 1, 1, "testPlant!!!!!!!!!!!!!!!!", "./models/plant_4.ply"));
|
||||
//plant_specimens.push_back(Plant::Plant(1, 0.1, 1, 1, "testPlant_MAYBE", "./models/plant_4.ply"));
|
||||
|
||||
defaultTexture = Core::LoadTexture("textures/1.png");
|
||||
if (defaultTexture == 0) {
|
||||
std::cout << "Failed to load default texture" << std::endl;
|
||||
}
|
||||
|
||||
climates.push_back({ -10, 0, 0, 50, Core::LoadTexture("textures/1.png") });
|
||||
climates.push_back({ 0, 10, 50, 100, Core::LoadTexture("textures/2.png") });
|
||||
}
|
||||
|
||||
|
||||
void shutdown(GLFWwindow* window)
|
||||
{
|
||||
shaderLoader.DeleteProgram(program);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
After Width: | Height: | Size: 5.7 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 8.9 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 8.0 MiB |
Loading…
Reference in New Issue