s473559/Grafika2023
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
s473621 2024-02-04 22:10:48 +01:00
parent cb7385bc1b
commit 576776b996
9 changed files with 20959 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
PlanetCreator/cw 6/Release/grk-cw6.log
View File

@ -1,43 +1 @@
 Box.cpp
Camera.cpp
main.cpp
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.
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.
Zakończono generowanie kodu
grk-cw6.vcxproj -> D:\DANE\CppProjects\grk_cw1 (1)\grk_cw1\grk\Release\grk-cw6.exe
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, перейдя в меню "Проект" или щелкнув решение правой кнопкой мыши и выбрав "Обновить решение...".

2
PlanetCreator/cw 6/imgui.ini
View File

@ -11,6 +11,6 @@ Pos=4,3
Size=218,129
[Window][Dodawanie nowej planety]
Pos=23,10
Pos=23,7
Size=282,158

12
PlanetCreator/cw 6/models/plant_1_1_med_zmn.mtl Normal file
View File

@ -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

5389
PlanetCreator/cw 6/models/plant_1_1_med_zmn.obj Normal file
View File

File diff suppressed because it is too large Load Diff

12
PlanetCreator/cw 6/models/plant_1_1_small_zmn.mtl Normal file
View File

@ -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

323
PlanetCreator/cw 6/models/plant_1_1_small_zmn.obj Normal file
View File

@ -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

12
PlanetCreator/cw 6/models/plant_1_1_zmn.mtl Normal file
View File

@ -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

15193
PlanetCreator/cw 6/models/plant_1_1_zmn.obj Normal file
View File

File diff suppressed because it is too large Load Diff

25
PlanetCreator/cw 6/src/ex_6_1.hpp
View File

@ -518,7 +518,12 @@ void renderScene(GLFWwindow* window)
float secondTreeDuration = 8.0f;
float thirdTreeDuration = 5.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);
glm::vec3 plantPosition3 = glm::vec3(1.f, 0.f, -0.5f);
float scaleFactor = 0.025f;
glm::mat4 plantModelMatrix = glm::translate(plantPosition) * glm::scale(glm::vec3(scaleFactor));
//for (int i = 0; i < 5; i++) {
// placeObjectOnPlanet(plantContext, glm::scale(glm::mat4(), glm::vec3(0.2)), normalize(glm::vec3(-0.1 * i, 0.f, 1.f)), sphereContext, planetMatrix);
// placeObjectOnPlanet(plantContext, glm::scale(glm::mat4(), glm::vec3(0.2)), normalize(glm::vec3(0.1 * i, 0.f, -1.f)), sphereContext, planetMatrix);
@ -536,18 +541,18 @@ void renderScene(GLFWwindow* window)
for (const auto& planet : planets) {
glm::mat4 modelMatrix = glm::translate(planet.position) * glm::scale(glm::vec3(planet.size));
drawObjectTexture(sphereContext, modelMatrix, planet.texture, program);
std::vector<Plant::Plant>plants = planet.plants;
for (const auto& plant : plants)
//TODO: REMOVE PLACEHOLDER
placeObjectOnPlanet(plant_1_1Context, glm::mat4(), 0.2, plant.pos, planet);
// placeObjectOnPlanet(plant_1_1Context, glm::mat4(), 0.2, plant.pos, planet);
animateGrowingTree(elapsedTime, deltaTime, firstTreeDuration, secondTreeDuration, thirdTreeDuration, plant.pos, scaleFactor, plant_2_1_small_Context, plant_2_1_med_Context, plant_2_1Context, plantModelMatrix, plant2_1Material, program_pbr);
}
glm::vec3 plantPosition = glm::vec3(1.f, 0.f, 3.5f) ;
glm::vec3 plantPosition1 = glm::vec3(1.f, 0.f, 1.5f);
float scaleFactor = 0.025f;
glm::mat4 plantModelMatrix = glm::translate(plantPosition) * glm::scale(glm::vec3(scaleFactor));
//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);
@ -561,6 +566,8 @@ void renderScene(GLFWwindow* window)
animateGrowingTree(elapsedTime, deltaTime, firstTreeDuration, secondTreeDuration, thirdTreeDuration, plantPosition1, scaleFactor, plant_2_1_small_Context, plant_2_1_med_Context, plant_2_1Context, plantModelMatrix, plant2_1Material, program_pbr);
animateGrowingTree(elapsedTime, deltaTime, firstTreeDuration, secondTreeDuration, thirdTreeDuration, plantPosition2, scaleFactor, plant_2_1_small_Context, plant_2_1_med_Context, plant_2_1Context, plantModelMatrix, plant2_1Material, program_pbr);
//glfwSwapBuffers(window);
}
void framebuffer_size_callback(GLFWwindow* window, int width, int height)
@ -607,9 +614,9 @@ void init(GLFWwindow* window)
loadModelToContext("./models/sphere.obj", sphereContext);
//plant 1-1
loadModelToContext("./models/plant_1_1.obj", plant_1_1Context);
loadModelToContext("./models/plant_1_1_med1.obj", plant_1_1_med_Context);
loadModelToContext("./models/plant_1_1_small.obj", plant_1_1_small_Context);
loadModelToContext("./models/plant_1_1_zmn.obj", plant_1_1Context);
loadModelToContext("./models/plant_1_1_med_zmn.obj", plant_1_1_med_Context);
loadModelToContext("./models/plant_1_1_small_zmn.obj", plant_1_1_small_Context);
//plant 2-2
loadModelToContext("./models/plant_2_1_small.obj", plant_2_1_small_Context);
loadModelToContext("./models/plant_2_1_med.obj", plant_2_1_med_Context);