compiled Debug
This commit is contained in:
parent
648e7119ba
commit
a913a807f3
4
.gitignore
vendored
Normal file
4
.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
.vs
|
||||||
|
Debug
|
||||||
|
Release
|
||||||
|
log.txt
|
||||||
BIN
assets/Textures_water/Water_normal_mapp1.png
Executable file
BIN
assets/Textures_water/Water_normal_mapp1.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 MiB |
BIN
assets/Textures_water/Water_normal_mapp2.png
Executable file
BIN
assets/Textures_water/Water_normal_mapp2.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
BIN
assets/Textures_water/Water_normal_mapp3.png
Executable file
BIN
assets/Textures_water/Water_normal_mapp3.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 992 KiB |
BIN
assets/ice/Textures/ice1.png
Executable file
BIN
assets/ice/Textures/ice1.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 131 KiB |
BIN
assets/ice/Textures/ice2.png
Executable file
BIN
assets/ice/Textures/ice2.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 147 KiB |
BIN
assets/ice/Textures/ice3.png
Executable file
BIN
assets/ice/Textures/ice3.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
BIN
assets/ice/Textures/texture_ice1.png
Executable file
BIN
assets/ice/Textures/texture_ice1.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 MiB |
BIN
assets/ice/Textures/texture_ice2.png
Executable file
BIN
assets/ice/Textures/texture_ice2.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 889 KiB |
BIN
assets/ice/Textures/texture_ice3.png
Executable file
BIN
assets/ice/Textures/texture_ice3.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 MiB |
634
assets/ice/ice.obj
Executable file
634
assets/ice/ice.obj
Executable file
@ -0,0 +1,634 @@
|
|||||||
|
# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
|
||||||
|
# File Created: 19.10.2018 06:31:37
|
||||||
|
|
||||||
|
#
|
||||||
|
# object Ice
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# object Ice_1
|
||||||
|
#
|
||||||
|
|
||||||
|
v 249.7259 -214.1153 7.8863
|
||||||
|
v 247.4231 -213.4892 7.5110
|
||||||
|
v 248.8877 -215.5002 7.5110
|
||||||
|
v 250.0411 -215.2909 7.5110
|
||||||
|
v 250.8434 -214.4192 7.8352
|
||||||
|
v 248.8877 -215.5002 6.3298
|
||||||
|
v 249.8081 -215.7727 6.3298
|
||||||
|
v 251.3438 -216.6923 7.5110
|
||||||
|
v 253.1286 -215.1596 7.5110
|
||||||
|
v 251.3438 -216.6923 6.3298
|
||||||
|
v 251.9728 -212.6065 7.5110
|
||||||
|
v 253.5077 -210.8802 7.5110
|
||||||
|
v 252.2605 -209.9265 7.5110
|
||||||
|
v 251.0889 -211.8627 7.1639
|
||||||
|
v 253.5667 -215.1596 6.3298
|
||||||
|
v 253.5077 -214.5762 7.5110
|
||||||
|
v 253.5077 -214.5762 6.3298
|
||||||
|
v 252.3615 -212.4325 6.3298
|
||||||
|
v 253.5077 -210.8802 6.3298
|
||||||
|
v 252.2605 -209.9265 6.3298
|
||||||
|
v 248.8877 -211.6122 7.5110
|
||||||
|
v 248.8877 -210.8802 6.3298
|
||||||
|
v 248.1723 -213.4892 6.3298
|
||||||
|
# 23 vertices
|
||||||
|
|
||||||
|
vn -0.0552 0.0219 0.9982
|
||||||
|
vn -0.9194 -0.0482 0.3904
|
||||||
|
vn -0.3889 -0.7712 0.5040
|
||||||
|
vn -0.2143 -0.5518 0.8060
|
||||||
|
vn 0.0386 -0.0507 0.9980
|
||||||
|
vn -0.5978 -0.7896 0.1383
|
||||||
|
vn -0.4568 -0.8211 0.3422
|
||||||
|
vn 0.0270 -0.8218 0.5691
|
||||||
|
vn 0.4999 -0.4641 0.7312
|
||||||
|
vn 0.0690 -0.9969 0.0381
|
||||||
|
vn 0.3570 0.1025 0.9284
|
||||||
|
vn 0.8067 0.1017 0.5822
|
||||||
|
vn 0.0517 0.7804 0.6232
|
||||||
|
vn -0.0666 0.0333 0.9972
|
||||||
|
vn 0.8700 -0.4649 0.1644
|
||||||
|
vn 0.7584 0.1075 0.6429
|
||||||
|
vn 0.9356 0.3491 0.0525
|
||||||
|
vn 0.9519 -0.1706 0.2544
|
||||||
|
vn 0.9901 0.1405 0.0000
|
||||||
|
vn 0.1129 0.9913 0.0675
|
||||||
|
vn -0.3224 0.4179 0.8493
|
||||||
|
vn -0.5216 0.7727 0.3617
|
||||||
|
vn -0.8750 -0.1460 -0.4616
|
||||||
|
# 23 vertex normals
|
||||||
|
|
||||||
|
vt 0.3748 0.3182 0.0000
|
||||||
|
vt 0.0000 0.5090 0.0000
|
||||||
|
vt 0.0000 0.0000 0.0000
|
||||||
|
vt 0.1550 0.0000 0.0000
|
||||||
|
vt 0.5567 0.2256 0.0000
|
||||||
|
vt 0.5243 0.0000 0.0000
|
||||||
|
vt 1.0000 0.0000 0.0000
|
||||||
|
vt 1.0000 0.6640 0.0000
|
||||||
|
vt 1.0000 1.0000 0.0000
|
||||||
|
vt 0.8480 1.0000 0.0000
|
||||||
|
vt 0.6293 0.6848 0.0000
|
||||||
|
vt 1.0000 0.2000 0.0000
|
||||||
|
vt 0.0000 1.0000 0.0000
|
||||||
|
# 13 texture coords
|
||||||
|
|
||||||
|
o Ice_1
|
||||||
|
g Ice_1
|
||||||
|
f 1/1/1 2/2/2 3/3/3
|
||||||
|
f 1/1/1 3/3/3 4/4/4
|
||||||
|
f 5/5/5 1/1/1 4/4/4
|
||||||
|
f 4/4/4 3/3/3 6/3/6
|
||||||
|
f 7/4/7 4/4/4 6/3/6
|
||||||
|
f 8/6/8 9/7/9 5/5/5
|
||||||
|
f 4/4/4 8/6/8 5/5/5
|
||||||
|
f 8/6/8 4/4/4 7/4/7
|
||||||
|
f 10/6/10 8/6/8 7/4/7
|
||||||
|
f 11/8/11 12/9/12 13/10/13
|
||||||
|
f 14/11/14 11/8/11 13/10/13
|
||||||
|
f 9/7/9 8/6/8 10/6/10
|
||||||
|
f 15/7/15 9/7/9 10/6/10
|
||||||
|
f 16/12/16 9/7/9 15/7/15
|
||||||
|
f 17/12/17 16/12/16 15/7/15
|
||||||
|
f 11/8/11 16/12/16 17/12/17
|
||||||
|
f 18/8/18 11/8/11 17/12/17
|
||||||
|
f 12/9/12 11/8/11 18/8/18
|
||||||
|
f 19/9/19 12/9/12 18/8/18
|
||||||
|
f 13/10/13 12/9/12 19/9/19
|
||||||
|
f 20/10/20 13/10/13 19/9/19
|
||||||
|
f 21/13/21 13/10/13 20/10/20
|
||||||
|
f 22/13/22 21/13/21 20/10/20
|
||||||
|
f 2/2/2 21/13/21 22/13/22
|
||||||
|
f 23/2/23 2/2/2 22/13/22
|
||||||
|
f 3/3/3 2/2/2 23/2/23
|
||||||
|
f 6/3/6 3/3/3 23/2/23
|
||||||
|
f 14/11/14 13/10/13 21/13/21
|
||||||
|
f 2/2/2 1/1/1 14/11/14
|
||||||
|
f 21/13/21 2/2/2 14/11/14
|
||||||
|
f 1/1/1 5/5/5 11/8/11
|
||||||
|
f 14/11/14 1/1/1 11/8/11
|
||||||
|
f 9/7/9 16/12/16 11/8/11
|
||||||
|
f 5/5/5 9/7/9 11/8/11
|
||||||
|
# 34 faces
|
||||||
|
|
||||||
|
#
|
||||||
|
# object Ice_2
|
||||||
|
#
|
||||||
|
|
||||||
|
v 239.3672 -215.9851 7.6954
|
||||||
|
v 241.0293 -216.9803 7.1686
|
||||||
|
v 245.4640 -213.4797 8.2625
|
||||||
|
v 238.3711 -215.6902 7.4455
|
||||||
|
v 240.6964 -211.7293 8.2625
|
||||||
|
v 238.3711 -215.6902 6.4266
|
||||||
|
v 239.3672 -215.9851 6.4266
|
||||||
|
v 243.4350 -217.6903 7.6954
|
||||||
|
v 246.2103 -215.9153 7.6954
|
||||||
|
v 241.0293 -216.9803 6.4266
|
||||||
|
v 243.3711 -210.6902 7.6954
|
||||||
|
v 242.0213 -209.6581 7.6954
|
||||||
|
v 243.4350 -217.6903 6.4266
|
||||||
|
v 246.2103 -215.9153 6.4266
|
||||||
|
v 245.4640 -213.4797 6.4266
|
||||||
|
v 243.3711 -210.6902 6.4266
|
||||||
|
v 242.0213 -209.6581 6.4266
|
||||||
|
v 238.3711 -210.6902 7.4088
|
||||||
|
v 238.3711 -210.6902 6.4266
|
||||||
|
v 236.7861 -213.5138 7.0433
|
||||||
|
v 236.7861 -213.5138 6.4266
|
||||||
|
# 21 vertices
|
||||||
|
|
||||||
|
vn -0.3367 -0.5325 0.7766
|
||||||
|
vn -0.3035 -0.7961 0.5235
|
||||||
|
vn 0.6399 0.2715 0.7189
|
||||||
|
vn -0.5208 -0.6174 0.5896
|
||||||
|
vn -0.1290 0.1016 0.9864
|
||||||
|
vn -0.5766 -0.8170 0.0000
|
||||||
|
vn -0.4020 -0.9156 0.0000
|
||||||
|
vn 0.0394 -0.7756 0.6299
|
||||||
|
vn 0.7945 -0.3278 0.5111
|
||||||
|
vn -0.4016 -0.9158 0.0000
|
||||||
|
vn 0.6080 0.6494 0.4569
|
||||||
|
vn 0.1446 0.8316 0.5363
|
||||||
|
vn 0.1405 -0.9901 0.0000
|
||||||
|
vn 0.9386 -0.3450 0.0000
|
||||||
|
vn 0.8913 0.4533 0.0000
|
||||||
|
vn 0.7103 0.7039 0.0000
|
||||||
|
vn 0.1875 0.9823 0.0000
|
||||||
|
vn -0.5683 0.6166 0.5448
|
||||||
|
vn -0.6190 0.7854 0.0000
|
||||||
|
vn -0.8653 -0.0453 0.4993
|
||||||
|
vn -0.9983 -0.0589 0.0000
|
||||||
|
# 21 vertex normals
|
||||||
|
|
||||||
|
vt 0.1550 0.0000 0.0000
|
||||||
|
vt 0.5243 0.0000 0.0000
|
||||||
|
vt 1.0000 0.6640 0.0000
|
||||||
|
vt 0.0000 0.0000 0.0000
|
||||||
|
vt 0.6185 0.7922 0.0000
|
||||||
|
vt 1.0000 0.0000 0.0000
|
||||||
|
vt 1.0000 0.2000 0.0000
|
||||||
|
vt 1.0000 1.0000 0.0000
|
||||||
|
vt 0.8480 1.0000 0.0000
|
||||||
|
vt 0.0000 1.0000 0.0000
|
||||||
|
vt 0.0000 0.5090 0.0000
|
||||||
|
# 11 texture coords
|
||||||
|
|
||||||
|
o Ice_2
|
||||||
|
g Ice_2
|
||||||
|
f 24/14/24 25/15/25 26/16/26
|
||||||
|
f 27/17/27 24/14/24 26/16/26
|
||||||
|
f 28/18/28 27/17/27 26/16/26
|
||||||
|
f 24/14/24 27/17/27 29/17/29
|
||||||
|
f 30/14/30 24/14/24 29/17/29
|
||||||
|
f 31/19/31 32/20/32 26/16/26
|
||||||
|
f 25/15/25 31/19/31 26/16/26
|
||||||
|
f 25/15/25 24/14/24 30/14/30
|
||||||
|
f 33/15/33 25/15/25 30/14/30
|
||||||
|
f 26/16/26 34/21/34 35/22/35
|
||||||
|
f 28/18/28 26/16/26 35/22/35
|
||||||
|
f 31/19/31 25/15/25 33/15/33
|
||||||
|
f 36/19/36 31/19/31 33/15/33
|
||||||
|
f 32/20/32 31/19/31 36/19/36
|
||||||
|
f 37/20/37 32/20/32 36/19/36
|
||||||
|
f 26/16/26 32/20/32 37/20/37
|
||||||
|
f 38/16/38 26/16/26 37/20/37
|
||||||
|
f 34/21/34 26/16/26 38/16/38
|
||||||
|
f 39/21/39 34/21/34 38/16/38
|
||||||
|
f 35/22/35 34/21/34 39/21/39
|
||||||
|
f 40/22/40 35/22/35 39/21/39
|
||||||
|
f 41/23/41 35/22/35 40/22/40
|
||||||
|
f 42/23/42 41/23/41 40/22/40
|
||||||
|
f 43/24/43 41/23/41 42/23/42
|
||||||
|
f 44/24/44 43/24/43 42/23/42
|
||||||
|
f 27/17/27 43/24/43 44/24/44
|
||||||
|
f 29/17/29 27/17/27 44/24/44
|
||||||
|
f 28/18/28 35/22/35 41/23/41
|
||||||
|
f 41/23/41 43/24/43 27/17/27
|
||||||
|
f 28/18/28 41/23/41 27/17/27
|
||||||
|
# 30 faces
|
||||||
|
|
||||||
|
#
|
||||||
|
# object Ice_3
|
||||||
|
#
|
||||||
|
|
||||||
|
v 240.4719 -226.6828 6.7284
|
||||||
|
v 241.3221 -226.6132 6.8316
|
||||||
|
v 242.6708 -225.0305 6.9175
|
||||||
|
v 240.1126 -226.4883 7.0452
|
||||||
|
v 240.9513 -223.8761 7.6752
|
||||||
|
v 240.1126 -226.4883 6.2594
|
||||||
|
v 240.4719 -226.6828 6.2594
|
||||||
|
v 242.1897 -227.0814 6.6617
|
||||||
|
v 242.9400 -226.6368 6.6617
|
||||||
|
v 241.3221 -226.6132 6.2594
|
||||||
|
v 243.2341 -223.5277 7.2379
|
||||||
|
v 241.4291 -222.5102 7.2379
|
||||||
|
v 242.1897 -227.0814 6.2594
|
||||||
|
v 242.9400 -226.6368 6.2594
|
||||||
|
v 242.6708 -225.0305 6.2594
|
||||||
|
v 243.2341 -223.5277 6.2594
|
||||||
|
v 241.4291 -222.5102 6.2594
|
||||||
|
v 240.1126 -223.1909 7.0168
|
||||||
|
v 240.1126 -223.1909 6.2594
|
||||||
|
v 239.5410 -225.0530 6.7350
|
||||||
|
v 239.5410 -225.0530 6.2594
|
||||||
|
# 21 vertices
|
||||||
|
|
||||||
|
vn -0.0652 -0.9205 0.3852
|
||||||
|
vn -0.1476 -0.5930 0.7915
|
||||||
|
vn 0.6989 -0.1947 0.6883
|
||||||
|
vn -0.4525 -0.6182 0.6427
|
||||||
|
vn -0.0831 0.0586 0.9948
|
||||||
|
vn -0.7473 -0.6645 0.0000
|
||||||
|
vn -0.2058 -0.9786 0.0000
|
||||||
|
vn 0.0492 -0.8381 0.5433
|
||||||
|
vn 0.7527 -0.3788 0.5385
|
||||||
|
vn -0.2051 -0.9787 0.0000
|
||||||
|
vn 0.7264 0.2264 0.6489
|
||||||
|
vn 0.0464 0.8143 0.5786
|
||||||
|
vn 0.0201 -0.9998 0.0000
|
||||||
|
vn 0.9069 -0.4213 0.0000
|
||||||
|
vn 0.9954 -0.0961 0.0000
|
||||||
|
vn 0.9396 0.3424 0.0000
|
||||||
|
vn 0.0181 0.9998 0.0000
|
||||||
|
vn -0.7233 0.5250 0.4486
|
||||||
|
vn -0.7676 0.6410 0.0000
|
||||||
|
vn -0.9003 -0.0273 0.4345
|
||||||
|
vn -0.9992 -0.0406 0.0000
|
||||||
|
# 21 vertex normals
|
||||||
|
|
||||||
|
vt 0.1550 0.0000 0.0000
|
||||||
|
vt 0.5243 0.0000 0.0000
|
||||||
|
vt 1.0000 0.6640 0.0000
|
||||||
|
vt 0.0000 0.0000 0.0000
|
||||||
|
vt 0.6185 0.7922 0.0000
|
||||||
|
vt 1.0000 0.0000 0.0000
|
||||||
|
vt 1.0000 0.2000 0.0000
|
||||||
|
vt 1.0000 1.0000 0.0000
|
||||||
|
vt 0.8480 1.0000 0.0000
|
||||||
|
vt 0.0000 1.0000 0.0000
|
||||||
|
vt 0.0000 0.5090 0.0000
|
||||||
|
# 11 texture coords
|
||||||
|
|
||||||
|
o Ice_3
|
||||||
|
g Ice_3
|
||||||
|
f 45/25/45 46/26/46 47/27/47
|
||||||
|
f 48/28/48 45/25/45 47/27/47
|
||||||
|
f 49/29/49 48/28/48 47/27/47
|
||||||
|
f 45/25/45 48/28/48 50/28/50
|
||||||
|
f 51/25/51 45/25/45 50/28/50
|
||||||
|
f 52/30/52 53/31/53 47/27/47
|
||||||
|
f 46/26/46 52/30/52 47/27/47
|
||||||
|
f 46/26/46 45/25/45 51/25/51
|
||||||
|
f 54/26/54 46/26/46 51/25/51
|
||||||
|
f 47/27/47 55/32/55 56/33/56
|
||||||
|
f 52/30/52 46/26/46 54/26/54
|
||||||
|
f 57/30/57 52/30/52 54/26/54
|
||||||
|
f 53/31/53 52/30/52 57/30/57
|
||||||
|
f 58/31/58 53/31/53 57/30/57
|
||||||
|
f 47/27/47 53/31/53 58/31/58
|
||||||
|
f 59/27/59 47/27/47 58/31/58
|
||||||
|
f 55/32/55 47/27/47 59/27/59
|
||||||
|
f 60/32/60 55/32/55 59/27/59
|
||||||
|
f 56/33/56 55/32/55 60/32/60
|
||||||
|
f 61/33/61 56/33/56 60/32/60
|
||||||
|
f 62/34/62 56/33/56 61/33/61
|
||||||
|
f 63/34/63 62/34/62 61/33/61
|
||||||
|
f 64/35/64 62/34/62 63/34/63
|
||||||
|
f 65/35/65 64/35/64 63/34/63
|
||||||
|
f 48/28/48 64/35/64 65/35/65
|
||||||
|
f 50/28/50 48/28/48 65/35/65
|
||||||
|
f 49/29/49 56/33/56 62/34/62
|
||||||
|
f 62/34/62 64/35/64 48/28/48
|
||||||
|
f 49/29/49 62/34/62 48/28/48
|
||||||
|
f 56/33/56 49/29/49 47/27/47
|
||||||
|
# 30 faces
|
||||||
|
|
||||||
|
#
|
||||||
|
# object Ice_4
|
||||||
|
#
|
||||||
|
|
||||||
|
v 249.9632 -226.1821 7.0497
|
||||||
|
v 251.2973 -226.5492 6.9911
|
||||||
|
v 255.1938 -224.8695 7.0922
|
||||||
|
v 248.6761 -226.4269 7.2425
|
||||||
|
v 250.4937 -223.8687 7.0562
|
||||||
|
v 248.6761 -226.4269 6.3177
|
||||||
|
v 249.4547 -226.6173 6.3177
|
||||||
|
v 253.1777 -226.4100 6.7912
|
||||||
|
v 253.9260 -226.2562 6.7912
|
||||||
|
v 251.2973 -226.5492 6.3177
|
||||||
|
v 254.2987 -222.8857 6.8854
|
||||||
|
v 251.5293 -222.8315 7.4693
|
||||||
|
v 253.1777 -226.4100 6.3177
|
||||||
|
v 253.9260 -226.6370 6.3177
|
||||||
|
v 255.1938 -224.8695 6.3177
|
||||||
|
v 254.2987 -222.8857 6.3177
|
||||||
|
v 251.5293 -222.5310 6.3177
|
||||||
|
v 248.6761 -223.1976 7.2092
|
||||||
|
v 248.6761 -223.1976 6.3177
|
||||||
|
v 247.4371 -225.0212 6.8775
|
||||||
|
v 247.4371 -225.0212 6.3177
|
||||||
|
# 21 vertices
|
||||||
|
|
||||||
|
vn 0.0558 -0.8686 0.4924
|
||||||
|
vn 0.0315 -0.7442 0.6672
|
||||||
|
vn 0.7806 -0.1084 0.6156
|
||||||
|
vn -0.2684 -0.7220 0.6378
|
||||||
|
vn -0.0050 -0.1327 0.9911
|
||||||
|
vn -0.3886 -0.9112 0.1369
|
||||||
|
vn -0.1681 -0.8246 0.5402
|
||||||
|
vn 0.1525 -0.8228 0.5475
|
||||||
|
vn 0.2307 -0.6118 0.7567
|
||||||
|
vn 0.0554 -0.9985 0.0000
|
||||||
|
vn 0.4973 0.7215 0.4818
|
||||||
|
vn -0.0313 0.5141 0.8572
|
||||||
|
vn 0.0487 -0.9888 0.1409
|
||||||
|
vn 0.1780 -0.8019 0.5703
|
||||||
|
vn 0.9951 -0.0990 0.0000
|
||||||
|
vn 0.5617 0.8264 0.0381
|
||||||
|
vn -0.0187 0.9732 0.2292
|
||||||
|
vn -0.4383 0.6197 0.6510
|
||||||
|
vn -0.5661 0.8243 0.0000
|
||||||
|
vn -0.8819 -0.0495 0.4688
|
||||||
|
vn -0.9980 -0.0628 0.0000
|
||||||
|
# 21 vertex normals
|
||||||
|
|
||||||
|
vt 0.1550 0.0000 0.0000
|
||||||
|
vt 0.5243 0.0000 0.0000
|
||||||
|
vt 1.0000 0.6640 0.0000
|
||||||
|
vt 0.0000 0.0000 0.0000
|
||||||
|
vt 0.6185 0.7922 0.0000
|
||||||
|
vt 1.0000 0.0000 0.0000
|
||||||
|
vt 1.0000 0.2000 0.0000
|
||||||
|
vt 1.0000 1.0000 0.0000
|
||||||
|
vt 0.8480 1.0000 0.0000
|
||||||
|
vt 0.0000 1.0000 0.0000
|
||||||
|
vt 0.0000 0.5090 0.0000
|
||||||
|
# 11 texture coords
|
||||||
|
|
||||||
|
o Ice_4
|
||||||
|
g Ice_4
|
||||||
|
f 66/36/66 67/37/67 68/38/68
|
||||||
|
f 69/39/69 66/36/66 68/38/68
|
||||||
|
f 70/40/70 69/39/69 68/38/68
|
||||||
|
f 66/36/66 69/39/69 71/39/71
|
||||||
|
f 72/36/72 66/36/66 71/39/71
|
||||||
|
f 73/41/73 74/42/74 68/38/68
|
||||||
|
f 67/37/67 73/41/73 68/38/68
|
||||||
|
f 67/37/67 66/36/66 72/36/72
|
||||||
|
f 75/37/75 67/37/67 72/36/72
|
||||||
|
f 68/38/68 76/43/76 77/44/77
|
||||||
|
f 73/41/73 67/37/67 75/37/75
|
||||||
|
f 78/41/78 73/41/73 75/37/75
|
||||||
|
f 74/42/74 73/41/73 78/41/78
|
||||||
|
f 79/42/79 74/42/74 78/41/78
|
||||||
|
f 68/38/68 74/42/74 79/42/79
|
||||||
|
f 80/38/80 68/38/68 79/42/79
|
||||||
|
f 76/43/76 68/38/68 80/38/80
|
||||||
|
f 81/43/81 76/43/76 80/38/80
|
||||||
|
f 77/44/77 76/43/76 81/43/81
|
||||||
|
f 82/44/82 77/44/77 81/43/81
|
||||||
|
f 83/45/83 77/44/77 82/44/82
|
||||||
|
f 84/45/84 83/45/83 82/44/82
|
||||||
|
f 85/46/85 83/45/83 84/45/84
|
||||||
|
f 86/46/86 85/46/85 84/45/84
|
||||||
|
f 69/39/69 85/46/85 86/46/86
|
||||||
|
f 71/39/71 69/39/69 86/46/86
|
||||||
|
f 70/40/70 77/44/77 83/45/83
|
||||||
|
f 83/45/83 85/46/85 69/39/69
|
||||||
|
f 70/40/70 83/45/83 69/39/69
|
||||||
|
f 77/44/77 70/40/70 68/38/68
|
||||||
|
# 30 faces
|
||||||
|
|
||||||
|
#
|
||||||
|
# object Ice_5
|
||||||
|
#
|
||||||
|
|
||||||
|
v 245.2771 -231.5131 8.3486
|
||||||
|
v 243.5435 -235.2913 7.8485
|
||||||
|
v 248.3428 -236.8709 7.2404
|
||||||
|
v 250.0585 -233.0896 8.0224
|
||||||
|
v 243.6397 -236.9857 7.4607
|
||||||
|
v 243.7497 -238.4480 7.2163
|
||||||
|
v 243.6397 -236.9857 6.2886
|
||||||
|
v 243.5178 -238.7202 6.2886
|
||||||
|
v 250.4314 -231.7220 7.4863
|
||||||
|
v 253.2363 -234.1374 7.2702
|
||||||
|
v 250.8516 -229.7729 7.0081
|
||||||
|
v 246.6379 -238.5415 7.1421
|
||||||
|
v 246.6379 -238.5415 6.2886
|
||||||
|
v 247.0308 -228.7937 7.7482
|
||||||
|
v 249.8221 -239.6790 6.8887
|
||||||
|
v 249.8221 -239.9467 6.2886
|
||||||
|
v 251.8291 -237.7732 6.8887
|
||||||
|
v 251.8291 -238.0801 6.2886
|
||||||
|
v 253.2363 -234.1374 6.2886
|
||||||
|
v 251.7204 -228.9358 6.2886
|
||||||
|
v 247.0308 -227.9075 6.2886
|
||||||
|
v 242.1992 -229.7535 7.4184
|
||||||
|
v 242.1992 -229.7535 6.2886
|
||||||
|
v 242.4257 -234.5352 6.9980
|
||||||
|
v 241.5778 -234.5352 6.2886
|
||||||
|
v 248.8761 -237.0476 7.1856
|
||||||
|
# 26 vertices
|
||||||
|
|
||||||
|
vn -0.1019 0.0446 0.9938
|
||||||
|
vn -0.3491 -0.1221 0.9291
|
||||||
|
vn 0.0398 -0.1824 0.9824
|
||||||
|
vn 0.1751 0.0112 0.9845
|
||||||
|
vn -0.5619 -0.3385 0.7547
|
||||||
|
vn -0.5296 -0.5199 0.6702
|
||||||
|
vn -0.9345 -0.3532 0.0437
|
||||||
|
vn -0.6840 -0.6544 0.3224
|
||||||
|
vn 0.2697 0.2296 0.9352
|
||||||
|
vn 0.8074 0.0266 0.5894
|
||||||
|
vn 0.3630 0.2829 0.8878
|
||||||
|
vn -0.0661 -0.6761 0.7338
|
||||||
|
vn -0.1464 -0.9889 0.0233
|
||||||
|
vn 0.0397 0.5848 0.8102
|
||||||
|
vn 0.1527 -0.6714 0.7252
|
||||||
|
vn 0.1372 -0.9030 0.4070
|
||||||
|
vn 0.5853 -0.3947 0.7083
|
||||||
|
vn 0.7627 -0.5811 0.2838
|
||||||
|
vn 0.9949 0.0682 0.0745
|
||||||
|
vn 0.4158 0.3766 0.8278
|
||||||
|
vn -0.0176 0.8735 0.4865
|
||||||
|
vn -0.7142 0.4549 0.5319
|
||||||
|
vn -0.8302 0.5533 0.0683
|
||||||
|
vn -0.6146 -0.0430 0.7876
|
||||||
|
vn -0.7004 -0.0986 0.7069
|
||||||
|
vn 0.0632 -0.1633 0.9846
|
||||||
|
# 26 vertex normals
|
||||||
|
|
||||||
|
vt 0.6185 0.7922 0.0000
|
||||||
|
vt 0.2701 0.3460 0.0000
|
||||||
|
vt 0.5332 0.2972 0.0000
|
||||||
|
vt 0.8477 0.7152 0.0000
|
||||||
|
vt 0.0000 0.0000 0.0000
|
||||||
|
vt 0.1550 0.0000 0.0000
|
||||||
|
vt 0.9313 0.8159 0.0000
|
||||||
|
vt 1.0000 0.6640 0.0000
|
||||||
|
vt 1.0000 1.0000 0.0000
|
||||||
|
vt 0.5243 0.0000 0.0000
|
||||||
|
vt 0.8480 1.0000 0.0000
|
||||||
|
vt 1.0000 0.0000 0.0000
|
||||||
|
vt 1.0000 0.2000 0.0000
|
||||||
|
vt 0.0000 1.0000 0.0000
|
||||||
|
vt 0.0000 0.5090 0.0000
|
||||||
|
vt 0.6856 0.2252 0.0000
|
||||||
|
# 16 texture coords
|
||||||
|
|
||||||
|
o Ice_5
|
||||||
|
g Ice_5
|
||||||
|
f 87/47/87 88/48/88 89/49/89
|
||||||
|
f 90/50/90 87/47/87 89/49/89
|
||||||
|
f 91/51/91 92/52/92 89/49/89
|
||||||
|
f 92/52/92 91/51/91 93/51/93
|
||||||
|
f 94/52/94 92/52/92 93/51/93
|
||||||
|
f 95/53/95 96/54/96 97/55/97
|
||||||
|
f 98/56/98 92/52/92 94/52/94
|
||||||
|
f 99/56/99 98/56/98 94/52/94
|
||||||
|
f 95/53/95 97/55/97 100/57/100
|
||||||
|
f 101/58/101 98/56/98 99/56/99
|
||||||
|
f 102/58/102 101/58/101 99/56/99
|
||||||
|
f 103/59/103 101/58/101 102/58/102
|
||||||
|
f 104/59/104 103/59/103 102/58/102
|
||||||
|
f 96/54/96 103/59/103 104/59/104
|
||||||
|
f 105/54/105 96/54/96 104/59/104
|
||||||
|
f 97/55/97 96/54/96 105/54/105
|
||||||
|
f 106/55/106 97/55/97 105/54/105
|
||||||
|
f 100/57/100 97/55/97 106/55/106
|
||||||
|
f 107/57/107 100/57/100 106/55/106
|
||||||
|
f 108/60/108 100/57/100 107/57/107
|
||||||
|
f 109/60/109 108/60/108 107/57/107
|
||||||
|
f 110/61/110 108/60/108 109/60/109
|
||||||
|
f 111/61/111 110/61/110 109/60/109
|
||||||
|
f 91/51/91 110/61/110 111/61/111
|
||||||
|
f 93/51/93 91/51/91 111/61/111
|
||||||
|
f 87/47/87 100/57/100 108/60/108
|
||||||
|
f 88/48/88 110/61/110 91/51/91
|
||||||
|
f 95/53/95 90/50/90 96/54/96
|
||||||
|
f 92/52/92 98/56/98 112/62/112
|
||||||
|
f 89/49/89 92/52/92 112/62/112
|
||||||
|
f 100/57/100 87/47/87 90/50/90
|
||||||
|
f 95/53/95 100/57/100 90/50/90
|
||||||
|
f 98/56/98 101/58/101 103/59/103
|
||||||
|
f 112/62/112 98/56/98 103/59/103
|
||||||
|
f 87/47/87 108/60/108 110/61/110
|
||||||
|
f 88/48/88 87/47/87 110/61/110
|
||||||
|
f 90/50/90 89/49/89 112/62/112
|
||||||
|
f 96/54/96 90/50/90 112/62/112
|
||||||
|
f 112/62/112 103/59/103 96/54/96
|
||||||
|
f 89/49/89 88/48/88 91/51/91
|
||||||
|
# 40 faces
|
||||||
|
|
||||||
|
#
|
||||||
|
# object Ice_6
|
||||||
|
#
|
||||||
|
|
||||||
|
v 262.5823 -214.5545 7.4714
|
||||||
|
v 263.0677 -215.2081 7.3834
|
||||||
|
v 264.9830 -213.6937 7.9394
|
||||||
|
v 262.1364 -212.8909 7.9394
|
||||||
|
v 260.4662 -216.5952 6.8925
|
||||||
|
v 259.1323 -214.9885 6.8923
|
||||||
|
v 258.8304 -215.2502 6.4266
|
||||||
|
v 260.2981 -217.1669 6.4266
|
||||||
|
v 261.6676 -216.3133 7.0380
|
||||||
|
v 263.6499 -216.8983 6.9109
|
||||||
|
v 261.6676 -216.3133 6.4266
|
||||||
|
v 263.4377 -211.8105 7.4721
|
||||||
|
v 263.6499 -216.8983 6.4266
|
||||||
|
v 265.4077 -215.4357 7.4721
|
||||||
|
v 265.9368 -215.4357 6.4266
|
||||||
|
v 265.3218 -213.4288 6.4266
|
||||||
|
v 263.5973 -211.1302 6.4266
|
||||||
|
v 262.4850 -210.7352 7.4721
|
||||||
|
v 262.4850 -210.2797 6.4266
|
||||||
|
v 260.2008 -212.7225 7.2359
|
||||||
|
v 260.2008 -212.7225 6.4266
|
||||||
|
v 258.8077 -213.4568 6.9348
|
||||||
|
v 258.8077 -213.4568 6.4266
|
||||||
|
# 23 vertices
|
||||||
|
|
||||||
|
vn -0.1045 -0.2381 0.9656
|
||||||
|
vn -0.0714 -0.2426 0.9675
|
||||||
|
vn 0.5302 0.2084 0.8219
|
||||||
|
vn -0.1230 0.0297 0.9920
|
||||||
|
vn -0.2226 -0.4339 0.8730
|
||||||
|
vn -0.5554 -0.2038 0.8062
|
||||||
|
vn -0.7109 -0.2923 0.6397
|
||||||
|
vn -0.2022 -0.6645 0.7194
|
||||||
|
vn 0.0070 -0.6796 0.7336
|
||||||
|
vn 0.1455 -0.8589 0.4910
|
||||||
|
vn 0.1348 -0.9909 0.0000
|
||||||
|
vn 0.4739 0.4574 0.7525
|
||||||
|
vn 0.1850 -0.9819 0.0419
|
||||||
|
vn 0.5567 -0.3990 0.7286
|
||||||
|
vn 0.8719 -0.3131 0.3766
|
||||||
|
vn 0.8323 0.4669 0.2988
|
||||||
|
vn 0.6623 0.6107 0.4340
|
||||||
|
vn -0.0067 0.7090 0.7051
|
||||||
|
vn -0.0422 0.9282 0.3697
|
||||||
|
vn -0.5641 0.5050 0.6532
|
||||||
|
vn -0.6068 0.7949 0.0000
|
||||||
|
vn -0.7805 0.3277 0.5323
|
||||||
|
vn -0.8948 0.4401 0.0749
|
||||||
|
# 23 vertex normals
|
||||||
|
|
||||||
|
vt 0.5392 0.3019 0.0000
|
||||||
|
vt 0.7065 0.2544 0.0000
|
||||||
|
vt 1.0000 0.6640 0.0000
|
||||||
|
vt 0.6185 0.7922 0.0000
|
||||||
|
vt 0.1550 0.0000 0.0000
|
||||||
|
vt 0.0000 0.0000 0.0000
|
||||||
|
vt 0.5243 0.0000 0.0000
|
||||||
|
vt 1.0000 0.0000 0.0000
|
||||||
|
vt 1.0000 1.0000 0.0000
|
||||||
|
vt 1.0000 0.2000 0.0000
|
||||||
|
vt 0.8480 1.0000 0.0000
|
||||||
|
vt 0.0000 1.0000 0.0000
|
||||||
|
vt 0.0000 0.5090 0.0000
|
||||||
|
# 13 texture coords
|
||||||
|
|
||||||
|
o Ice_6
|
||||||
|
g Ice_6
|
||||||
|
f 113/63/113 114/64/114 115/65/115
|
||||||
|
f 116/66/116 113/63/113 115/65/115
|
||||||
|
f 117/67/117 118/68/118 119/68/119
|
||||||
|
f 120/67/120 117/67/117 119/68/119
|
||||||
|
f 114/64/114 121/69/121 122/70/122
|
||||||
|
f 121/69/121 117/67/117 120/67/120
|
||||||
|
f 123/69/123 121/69/121 120/67/120
|
||||||
|
f 116/66/116 115/65/115 124/71/124
|
||||||
|
f 122/70/122 121/69/121 123/69/123
|
||||||
|
f 125/70/125 122/70/122 123/69/123
|
||||||
|
f 126/72/126 122/70/122 125/70/125
|
||||||
|
f 127/72/127 126/72/126 125/70/125
|
||||||
|
f 115/65/115 126/72/126 127/72/127
|
||||||
|
f 128/65/128 115/65/115 127/72/127
|
||||||
|
f 124/71/124 115/65/115 128/65/128
|
||||||
|
f 129/71/129 124/71/124 128/65/128
|
||||||
|
f 130/73/130 124/71/124 129/71/129
|
||||||
|
f 131/73/131 130/73/130 129/71/129
|
||||||
|
f 132/74/132 130/73/130 131/73/131
|
||||||
|
f 133/74/133 132/74/132 131/73/131
|
||||||
|
f 134/75/134 132/74/132 133/74/133
|
||||||
|
f 135/75/135 134/75/134 133/74/133
|
||||||
|
f 118/68/118 134/75/134 135/75/135
|
||||||
|
f 119/68/119 118/68/118 135/75/135
|
||||||
|
f 116/66/116 130/73/130 132/74/132
|
||||||
|
f 132/74/132 134/75/134 118/68/118
|
||||||
|
f 116/66/116 132/74/132 118/68/118
|
||||||
|
f 117/67/117 121/69/121 114/64/114
|
||||||
|
f 113/63/113 117/67/117 114/64/114
|
||||||
|
f 118/68/118 117/67/117 113/63/113
|
||||||
|
f 116/66/116 118/68/118 113/63/113
|
||||||
|
f 126/72/126 115/65/115 114/64/114
|
||||||
|
f 122/70/122 126/72/126 114/64/114
|
||||||
|
f 124/71/124 130/73/130 116/66/116
|
||||||
|
# 34 faces
|
||||||
|
|
||||||
BIN
assets/ice1.lm1
BIN
assets/ice1.lm1
Binary file not shown.
BIN
assets/ice2.lm1
BIN
assets/ice2.lm1
Binary file not shown.
BIN
assets/ice3.lm1
BIN
assets/ice3.lm1
Binary file not shown.
BIN
assets/ice4.lm1
BIN
assets/ice4.lm1
Binary file not shown.
BIN
assets/ice5.lm1
BIN
assets/ice5.lm1
Binary file not shown.
BIN
assets/ice6.lm1
BIN
assets/ice6.lm1
Binary file not shown.
Binary file not shown.
15660
assets/mountain/mountain.obj
Executable file
15660
assets/mountain/mountain.obj
Executable file
File diff suppressed because it is too large
Load Diff
BIN
assets/mountain/relief_NRM.png
Executable file
BIN
assets/mountain/relief_NRM.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 MiB |
157
jni/main_code.cpp
Normal file → Executable file
157
jni/main_code.cpp
Normal file → Executable file
@ -36,7 +36,7 @@ boost::mutex m2;
|
|||||||
class LoadingQueueVisitor : public boost::static_visitor<void>
|
class LoadingQueueVisitor : public boost::static_visitor<void>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void operator()(boost::function<cardinal()> f) const
|
void operator()(boost::function<size_t()> f) const
|
||||||
{
|
{
|
||||||
f();
|
f();
|
||||||
}
|
}
|
||||||
@ -56,7 +56,6 @@ TAndroidApplication::TAndroidApplication()
|
|||||||
: TApplication()
|
: TApplication()
|
||||||
, Inited(false)
|
, Inited(false)
|
||||||
, Loaded(false)
|
, Loaded(false)
|
||||||
, LiteModel(NULL)
|
|
||||||
, WaterTimer(0)
|
, WaterTimer(0)
|
||||||
, SnowTimer(0)
|
, SnowTimer(0)
|
||||||
, CloudTimer(0)
|
, CloudTimer(0)
|
||||||
@ -78,19 +77,12 @@ void TAndroidApplication::Serialize(boost::property_tree::ptree& propertyTree)
|
|||||||
float angle = v.second.get<float>("Angle", 0.f);
|
float angle = v.second.get<float>("Angle", 0.f);
|
||||||
float scale = v.second.get<float>("Scale", 1.f);
|
float scale = v.second.get<float>("Scale", 1.f);
|
||||||
|
|
||||||
mat3 m(vec4(0, cos(angle*pi/360.f), 0, sin(angle*pi/360.f)));
|
Matrix4f iceTransformation = Affine3f(Scaling(scale)).matrix();
|
||||||
|
Matrix3f rotation(Quaternionf(0, cos(angle*pi / 360.f), 0, sin(angle*pi / 360.f)).toRotationMatrix());
|
||||||
IceModel.push_back(TLiteModel());
|
iceTransformation = Affine3f(rotation).matrix() * iceTransformation;
|
||||||
IceModel[IceModel.size()-1].LoadModel(modelName);
|
iceTransformation = Affine3f(Translation3f(posx, 0, posz)).matrix() * iceTransformation;
|
||||||
IceModel[IceModel.size()-1].RotateModel(m);
|
|
||||||
IceModel[IceModel.size()-1].ScaleModel(scale);
|
|
||||||
IceModel[IceModel.size()-1].MoveModel(vec3(posx, 0, posz));
|
|
||||||
|
|
||||||
|
|
||||||
IceModel[IceModel.size()-1].UpdateVBO();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
iceTransformations.push_back(iceTransformation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -98,19 +90,20 @@ void TAndroidApplication::Serialize(boost::property_tree::ptree& propertyTree)
|
|||||||
|
|
||||||
void TAndroidApplication::LoadModels()
|
void TAndroidApplication::LoadModels()
|
||||||
{
|
{
|
||||||
mat3 m(vec4(0,1*sin(pi/8 + pi/2),0,1*cos(pi/8 + pi/2)));
|
|
||||||
|
|
||||||
LiteModel = new TLiteModel;
|
auto objData = loadObjFile("mountain/mountain.obj", "");
|
||||||
LiteModel->LoadModel("mountain.lm1");
|
mountain = ObjDataToRenderPairs(objData)[0][0];
|
||||||
LiteModel->ScaleModel(0.5f);
|
|
||||||
LiteModel->RotateModel(m);
|
mountainTransformation = Affine3f(Scaling(0.5f)).matrix();
|
||||||
LiteModel->MoveModel(vec3(0, 0, 0));
|
Matrix3f rotation(Quaternionf(0, 1 * sin(pi / 8 + pi / 2), 0, 1 * cos(pi / 8 + pi / 2)).toRotationMatrix());
|
||||||
LiteModel->UpdateVBO();
|
mountainTransformation = Affine3f(rotation).matrix() * mountainTransformation;
|
||||||
|
|
||||||
|
objData = loadObjFile("ice/ice.obj", "");
|
||||||
|
ice = ObjDataToRenderPairs(objData)[0][0];
|
||||||
|
|
||||||
std::shared_ptr<boost::property_tree::ptree> p = FileToPropertyTree("ices.xml");
|
std::shared_ptr<boost::property_tree::ptree> p = FileToPropertyTree("ices.xml");
|
||||||
|
|
||||||
Serialize(*p);
|
Serialize(*p);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TAndroidApplication::AddFrameBuffers()
|
void TAndroidApplication::AddFrameBuffers()
|
||||||
@ -139,13 +132,13 @@ void TAndroidApplication::DrawSceneWithoutWater(bool inv)
|
|||||||
{
|
{
|
||||||
glBindTexture(GL_TEXTURE_2D, ResourceManager->TexList["sky.png"]);
|
glBindTexture(GL_TEXTURE_2D, ResourceManager->TexList["sky.png"]);
|
||||||
}
|
}
|
||||||
Renderer->DrawRect(vec2(0.0f, 0.56f), vec2(1.f, 0.f), vec2(0.5f + SkyTexShift, 0.f), vec2(1.f + SkyTexShift, 1.f));
|
Renderer->DrawRect(Vector2f(0.0f, 0.56f), Vector2f(1.f, 0.f), Vector2f(0.5f + SkyTexShift, 0.f), Vector2f(1.f + SkyTexShift, 1.f));
|
||||||
|
|
||||||
if (TimeOfDayPref == 1)
|
if (TimeOfDayPref == 1)
|
||||||
{
|
{
|
||||||
glClear(GL_DEPTH_BUFFER_BIT);
|
glClear(GL_DEPTH_BUFFER_BIT);
|
||||||
glBindTexture(GL_TEXTURE_2D, ResourceManager->TexList["final_cloud.png"]);
|
glBindTexture(GL_TEXTURE_2D, ResourceManager->TexList["final_cloud.png"]);
|
||||||
Renderer->DrawRect(vec2(0.0f, 0.56f), vec2(4.f, 0.f), vec2(0.0f + SkyTexShift + CloudTimer, 0.f), vec2(1.f + SkyTexShift + CloudTimer, 0.5f));
|
Renderer->DrawRect(Vector2f(0.0f, 0.56f), Vector2f(4.f, 0.f), Vector2f(0.0f + SkyTexShift + CloudTimer, 0.f), Vector2f(1.f + SkyTexShift + CloudTimer, 0.5f));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -158,13 +151,13 @@ void TAndroidApplication::DrawSceneWithoutWater(bool inv)
|
|||||||
{
|
{
|
||||||
glBindTexture(GL_TEXTURE_2D, ResourceManager->TexList["sky.png"]);
|
glBindTexture(GL_TEXTURE_2D, ResourceManager->TexList["sky.png"]);
|
||||||
}
|
}
|
||||||
Renderer->DrawRect(vec2(0.0f, 0.54f), vec2(1.f, 1.f), vec2(0.5f + SkyTexShift, 0.f), vec2(1.f + SkyTexShift, 1.f));
|
Renderer->DrawRect(Vector2f(0.0f, 0.54f), Vector2f(1.f, 1.f), Vector2f(0.5f + SkyTexShift, 0.f), Vector2f(1.f + SkyTexShift, 1.f));
|
||||||
|
|
||||||
if (TimeOfDayPref == 1)
|
if (TimeOfDayPref == 1)
|
||||||
{
|
{
|
||||||
glClear(GL_DEPTH_BUFFER_BIT);
|
glClear(GL_DEPTH_BUFFER_BIT);
|
||||||
glBindTexture(GL_TEXTURE_2D, ResourceManager->TexList["final_cloud.png"]);
|
glBindTexture(GL_TEXTURE_2D, ResourceManager->TexList["final_cloud.png"]);
|
||||||
Renderer->DrawRect(vec2(0.0f, 0.54f), vec2(4.f, 1.f), vec2(0.0f + SkyTexShift + CloudTimer, 0.f), vec2(1.f + SkyTexShift + CloudTimer, 0.5f));
|
Renderer->DrawRect(Vector2f(0.0f, 0.54f), Vector2f(4.f, 1.f), Vector2f(0.0f + SkyTexShift + CloudTimer, 0.f), Vector2f(1.f + SkyTexShift + CloudTimer, 0.5f));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -177,31 +170,31 @@ void TAndroidApplication::DrawSceneWithoutWater(bool inv)
|
|||||||
|
|
||||||
if (inv)
|
if (inv)
|
||||||
{
|
{
|
||||||
Renderer->TranslateMatrix(vec3(0,0.1f,0));
|
Renderer->TranslateMatrix(Vector3f(0,0.1f,0));
|
||||||
Renderer->ScaleMatrix(vec3(1, -1, 1));
|
Renderer->ScaleMatrix(Vector3f(1, -1, 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
Renderer->PushShader("SimplelightShader");
|
Renderer->PushShader("SimplelightShader");
|
||||||
|
|
||||||
vec3 dayColor = vec3(0,0,0);
|
Vector3f dayColor = Vector3f(0,0,0);
|
||||||
vec3 nightColor = vec3(0, 0.1f, 0.2f);
|
Vector3f nightColor = Vector3f(0, 0.1f, 0.2f);
|
||||||
|
|
||||||
if (TimeOfDayPref == 0)
|
if (TimeOfDayPref == 0)
|
||||||
{
|
{
|
||||||
RenderUniform3fv("TimeOfDayColor", dayColor.v);
|
RenderUniform3fv("TimeOfDayColor", dayColor.data());
|
||||||
RenderUniform1f("TimeOfDayCoef1", 0.75f);
|
RenderUniform1f("TimeOfDayCoef1", 0.75f);
|
||||||
RenderUniform1f("TimeOfDayCoef2", 0.25f);
|
RenderUniform1f("TimeOfDayCoef2", 0.25f);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
if (TimeOfDayPref == 1)
|
if (TimeOfDayPref == 1)
|
||||||
{
|
{
|
||||||
RenderUniform3fv("TimeOfDayColor", dayColor.v);
|
RenderUniform3fv("TimeOfDayColor", dayColor.data());
|
||||||
RenderUniform1f("TimeOfDayCoef1", 0.5f);
|
RenderUniform1f("TimeOfDayCoef1", 0.5f);
|
||||||
RenderUniform1f("TimeOfDayCoef2", 0.25f);
|
RenderUniform1f("TimeOfDayCoef2", 0.25f);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
RenderUniform3fv("TimeOfDayColor", nightColor.v);
|
RenderUniform3fv("TimeOfDayColor", nightColor.data());
|
||||||
RenderUniform1f("TimeOfDayCoef1", 0.0f);
|
RenderUniform1f("TimeOfDayCoef1", 0.0f);
|
||||||
RenderUniform1f("TimeOfDayCoef2", 0.4f);
|
RenderUniform1f("TimeOfDayCoef2", 0.4f);
|
||||||
}
|
}
|
||||||
@ -209,11 +202,28 @@ void TAndroidApplication::DrawSceneWithoutWater(bool inv)
|
|||||||
|
|
||||||
Renderer->PushPerspectiveProjectionMatrix(pi/6, Renderer->GetMatrixWidth() / Renderer->GetMatrixHeight(), 1.f, 450.f);
|
Renderer->PushPerspectiveProjectionMatrix(pi/6, Renderer->GetMatrixWidth() / Renderer->GetMatrixHeight(), 1.f, 450.f);
|
||||||
|
|
||||||
LiteModel->DrawVBO();
|
|
||||||
|
|
||||||
for (int i=0; i<IceModel.size(); i++)
|
|
||||||
{
|
{
|
||||||
IceModel[i].DrawVBO();
|
Renderer->PushSpecialMatrix(mountainTransformation);
|
||||||
|
|
||||||
|
//RenderUniform4fv("light")
|
||||||
|
|
||||||
|
TRenderParamsSetter setter(mountain.first);
|
||||||
|
Renderer->DrawTriangleList(mountain.second);
|
||||||
|
|
||||||
|
Renderer->PopMatrix();
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
TRenderParamsSetter setter(ice.first);
|
||||||
|
|
||||||
|
for (int i = 0; i < iceTransformations.size(); i++)
|
||||||
|
{
|
||||||
|
Renderer->PushSpecialMatrix(iceTransformations[i]);
|
||||||
|
|
||||||
|
Renderer->DrawTriangleList(ice.second);
|
||||||
|
|
||||||
|
Renderer->PopMatrix();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Renderer->PopProjectionMatrix();
|
Renderer->PopProjectionMatrix();
|
||||||
@ -231,11 +241,11 @@ void TAndroidApplication::DrawSnow()
|
|||||||
const float multiply_x = 4;
|
const float multiply_x = 4;
|
||||||
const float multiply_y = 2;
|
const float multiply_y = 2;
|
||||||
|
|
||||||
Renderer->DrawRect(vec2(0, 0), vec2(1.f, 1.f), vec2(-SkyTexShift, SnowTimer), vec2(multiply_x - SkyTexShift, multiply_y + SnowTimer));
|
Renderer->DrawRect(Vector2f(0, 0), Vector2f(1.f, 1.f), Vector2f(-SkyTexShift, SnowTimer), Vector2f(multiply_x - SkyTexShift, multiply_y + SnowTimer));
|
||||||
glClear(GL_DEPTH_BUFFER_BIT);
|
glClear(GL_DEPTH_BUFFER_BIT);
|
||||||
Renderer->DrawRect(vec2(0, 0), vec2(1.f, 1.f), vec2(SnowTimer*0.7f+0.3f - SkyTexShift, SnowTimer+0.7f), vec2(multiply_x - SkyTexShift + SnowTimer*0.7f+0.3f, multiply_y + SnowTimer+0.7f));
|
Renderer->DrawRect(Vector2f(0, 0), Vector2f(1.f, 1.f), Vector2f(SnowTimer*0.7f+0.3f - SkyTexShift, SnowTimer+0.7f), Vector2f(multiply_x - SkyTexShift + SnowTimer*0.7f+0.3f, multiply_y + SnowTimer+0.7f));
|
||||||
glClear(GL_DEPTH_BUFFER_BIT);
|
glClear(GL_DEPTH_BUFFER_BIT);
|
||||||
Renderer->DrawRect(vec2(0, 0), vec2(1.f, 1.f), vec2(SnowTimer*0.4f+0.7f - SkyTexShift, SnowTimer+0.3f), vec2(multiply_x - SkyTexShift + SnowTimer*0.4f+0.7f, multiply_y + SnowTimer+0.3f));
|
Renderer->DrawRect(Vector2f(0, 0), Vector2f(1.f, 1.f), Vector2f(SnowTimer*0.4f+0.7f - SkyTexShift, SnowTimer+0.3f), Vector2f(multiply_x - SkyTexShift + SnowTimer*0.4f+0.7f, multiply_y + SnowTimer+0.3f));
|
||||||
|
|
||||||
Renderer->PopProjectionMatrix();
|
Renderer->PopProjectionMatrix();
|
||||||
}
|
}
|
||||||
@ -254,14 +264,14 @@ void TAndroidApplication::DrawAllScene(bool toScreen)
|
|||||||
|
|
||||||
Renderer->SwitchToFrameBuffer("WaterFrame");
|
Renderer->SwitchToFrameBuffer("WaterFrame");
|
||||||
Renderer->SetGLCamView();
|
Renderer->SetGLCamView();
|
||||||
Renderer->ScaleMatrix(vec3(1, -1, 1));
|
Renderer->ScaleMatrix(Vector3f(1, -1, 1));
|
||||||
|
|
||||||
|
|
||||||
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
|
glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
|
||||||
|
|
||||||
DrawSceneWithoutWater(true);
|
DrawSceneWithoutWater(true);
|
||||||
|
|
||||||
Renderer->ScaleMatrix(vec3(1, -1, 1));
|
Renderer->ScaleMatrix(Vector3f(1, -1, 1));
|
||||||
|
|
||||||
if (toScreen)
|
if (toScreen)
|
||||||
{
|
{
|
||||||
@ -295,7 +305,7 @@ void TAndroidApplication::DrawAllScene(bool toScreen)
|
|||||||
{
|
{
|
||||||
Renderer->SetFrameViewport("ScreenshotFrame");
|
Renderer->SetFrameViewport("ScreenshotFrame");
|
||||||
}
|
}
|
||||||
Renderer->DrawFramePartScreen("WaterFrame", vec2(0, 0), vec2(1.f, 0.54f));
|
Renderer->DrawFramePartScreen("WaterFrame", Vector2f(0, 0), Vector2f(1.f, 0.54f));
|
||||||
Renderer->PopShader();
|
Renderer->PopShader();
|
||||||
|
|
||||||
glClear(GL_DEPTH_BUFFER_BIT);
|
glClear(GL_DEPTH_BUFFER_BIT);
|
||||||
@ -327,13 +337,13 @@ void TAndroidApplication::InnerInit()
|
|||||||
|
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
|
|
||||||
*Console<<"Inner init go!\n";
|
GetConsole() << "Inner init go!\n";
|
||||||
|
|
||||||
#ifdef TARGET_ANDROID
|
#ifdef TARGET_ANDROID
|
||||||
ResourceManager->PathToResources = "";
|
ResourceManager->PathToResources = "";
|
||||||
#endif
|
#endif
|
||||||
#ifdef TARGET_WIN32
|
#ifdef TARGET_WIN32
|
||||||
ResourceManager->PathToResources = "../../assets/";
|
ST::PathToResources = "../../assets/";
|
||||||
#endif
|
#endif
|
||||||
ResourceManager->ShaderManager.AddShader("DefaultShader", "gui_transparent.vertex", "gui_transparent.fragment");
|
ResourceManager->ShaderManager.AddShader("DefaultShader", "gui_transparent.vertex", "gui_transparent.fragment");
|
||||||
Renderer->PushShader("DefaultShader");
|
Renderer->PushShader("DefaultShader");
|
||||||
@ -352,21 +362,12 @@ void TAndroidApplication::InnerInit()
|
|||||||
ResourceManager->TexList.AddTexture("file.bmp", "ScreenshotTexture");
|
ResourceManager->TexList.AddTexture("file.bmp", "ScreenshotTexture");
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingQueue.push_back(boost::function<cardinal()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "console_bkg.bmp", "")));
|
LoadingQueue.push_back(boost::function<size_t()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "console_bkg.bmp", "")));
|
||||||
LoadingQueue.push_back(boost::function<cardinal()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "water_nmap.png", "")));
|
LoadingQueue.push_back(boost::function<size_t()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "water_nmap.png", "")));
|
||||||
LoadingQueue.push_back(boost::function<cardinal()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "sky.png", "")));
|
LoadingQueue.push_back(boost::function<size_t()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "sky.png", "")));
|
||||||
LoadingQueue.push_back(boost::function<cardinal()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "sky_night.png", "")));
|
LoadingQueue.push_back(boost::function<size_t()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "sky_night.png", "")));
|
||||||
LoadingQueue.push_back(boost::function<cardinal()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "snow.png", "")));
|
LoadingQueue.push_back(boost::function<size_t()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "snow.png", "")));
|
||||||
LoadingQueue.push_back(boost::function<cardinal()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "final_cloud.png", "")));
|
LoadingQueue.push_back(boost::function<size_t()>(boost::bind(&TTextureListClass::AddTexture, &(ResourceManager->TexList), "final_cloud.png", "")));
|
||||||
|
|
||||||
|
|
||||||
LoadingQueue.push_back(boost::function<bool()>(boost::bind(&TModelManager::AddLiteModel, &(ResourceManager->ModelManager), "mountain.lm1", "")));
|
|
||||||
LoadingQueue.push_back(boost::function<bool()>(boost::bind(&TModelManager::AddLiteModel, &(ResourceManager->ModelManager), "ice1.lm1", "")));
|
|
||||||
LoadingQueue.push_back(boost::function<bool()>(boost::bind(&TModelManager::AddLiteModel, &(ResourceManager->ModelManager), "ice2.lm1", "")));
|
|
||||||
LoadingQueue.push_back(boost::function<bool()>(boost::bind(&TModelManager::AddLiteModel, &(ResourceManager->ModelManager), "ice3.lm1", "")));
|
|
||||||
LoadingQueue.push_back(boost::function<bool()>(boost::bind(&TModelManager::AddLiteModel, &(ResourceManager->ModelManager), "ice4.lm1", "")));
|
|
||||||
LoadingQueue.push_back(boost::function<bool()>(boost::bind(&TModelManager::AddLiteModel, &(ResourceManager->ModelManager), "ice5.lm1", "")));
|
|
||||||
LoadingQueue.push_back(boost::function<bool()>(boost::bind(&TModelManager::AddLiteModel, &(ResourceManager->ModelManager), "ice6.lm1", "")));
|
|
||||||
|
|
||||||
LoadingQueue.push_back(boost::function<void()>(boost::bind(&TAndroidApplication::LoadModels, this)));
|
LoadingQueue.push_back(boost::function<void()>(boost::bind(&TAndroidApplication::LoadModels, this)));
|
||||||
LoadingQueue.push_back(boost::function<void()>(boost::bind(&TAndroidApplication::AddFrameBuffers, this)));
|
LoadingQueue.push_back(boost::function<void()>(boost::bind(&TAndroidApplication::AddFrameBuffers, this)));
|
||||||
@ -395,9 +396,9 @@ void TAndroidApplication::InnerInit()
|
|||||||
|
|
||||||
CheckGlError();
|
CheckGlError();
|
||||||
|
|
||||||
ResourceManager->LightManager.SetLightOn();
|
//ResourceManager->LightManager.SetLightOn();
|
||||||
|
|
||||||
ResourceManager->LightManager.SetLightDirection(vec3(1, -1, 0));
|
//ResourceManager->LightManager.SetLightDirection(Vector3f(1, -1, 0));
|
||||||
|
|
||||||
//AddFrameBuffers();
|
//AddFrameBuffers();
|
||||||
|
|
||||||
@ -411,7 +412,7 @@ void TAndroidApplication::InnerInit()
|
|||||||
|
|
||||||
Renderer->PushPerspectiveProjectionMatrix(pi/6, Renderer->GetMatrixWidth() / Renderer->GetMatrixHeight(), 1.f, 400.f);
|
Renderer->PushPerspectiveProjectionMatrix(pi/6, Renderer->GetMatrixWidth() / Renderer->GetMatrixHeight(), 1.f, 400.f);
|
||||||
|
|
||||||
*Console<<"Inner init end!\n";
|
GetConsole()<<"Inner init end!\n";
|
||||||
|
|
||||||
m2.unlock();
|
m2.unlock();
|
||||||
}
|
}
|
||||||
@ -421,23 +422,25 @@ void TAndroidApplication::InnerInit()
|
|||||||
void TAndroidApplication::InnerDeinit()
|
void TAndroidApplication::InnerDeinit()
|
||||||
{
|
{
|
||||||
m2.lock();
|
m2.lock();
|
||||||
|
|
||||||
Inited = false;
|
Inited = false;
|
||||||
Loaded = false;
|
Loaded = false;
|
||||||
|
|
||||||
makeShot = true;
|
makeShot = true;
|
||||||
LoadingQueue.clear();
|
LoadingQueue.clear();
|
||||||
|
|
||||||
if (LiteModel != NULL)
|
//if (LiteModel != NULL)
|
||||||
{
|
//{
|
||||||
LiteModel->FreeModel();
|
// LiteModel->FreeModel();
|
||||||
delete LiteModel;
|
// delete LiteModel;
|
||||||
LiteModel = NULL;
|
// LiteModel = NULL;
|
||||||
}
|
//}
|
||||||
|
|
||||||
IceModel.clear();
|
//IceModel.clear();
|
||||||
|
|
||||||
|
//SimpleLand = std::shared_ptr<TSimpleLandClass>();
|
||||||
|
//SimpleLandInv = std::shared_ptr<TSimpleLandClass>();
|
||||||
|
|
||||||
SimpleLand = std::shared_ptr<TSimpleLandClass>();
|
|
||||||
SimpleLandInv = std::shared_ptr<TSimpleLandClass>();
|
|
||||||
m2.unlock();
|
m2.unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -452,7 +455,7 @@ void TAndroidApplication::InnerDraw()
|
|||||||
glBindTexture(GL_TEXTURE_2D, ResourceManager->TexList["ScreenshotTexture"]);
|
glBindTexture(GL_TEXTURE_2D, ResourceManager->TexList["ScreenshotTexture"]);
|
||||||
Renderer->PushProjectionMatrix(1,1);
|
Renderer->PushProjectionMatrix(1,1);
|
||||||
Renderer->LoadIdentity();
|
Renderer->LoadIdentity();
|
||||||
Renderer->DrawRect(vec2(0, 0), vec2(1.f, 1.f));
|
Renderer->DrawRect(Vector2f(0, 0), Vector2f(1.f, 1.f));
|
||||||
Renderer->PopProjectionMatrix();
|
Renderer->PopProjectionMatrix();
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -481,7 +484,7 @@ void TAndroidApplication::InnerDraw()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void TAndroidApplication::InnerUpdate(cardinal dt)
|
void TAndroidApplication::InnerUpdate(size_t dt)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (!Loaded)
|
if (!Loaded)
|
||||||
@ -536,12 +539,12 @@ void TAndroidApplication::InnerUpdate(cardinal dt)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TAndroidApplication::InnerOnMove(vec2 shift)
|
void TAndroidApplication::InnerOnMove(Vector2f shift)
|
||||||
{
|
{
|
||||||
|
|
||||||
shift = vec2(shift.v[0]*Renderer->GetMatrixWidth()/static_cast<float>(Renderer->GetScreenWidth()), shift.v[1]*Renderer->GetMatrixHeight()/static_cast<float>(Renderer->GetScreenHeight()));
|
shift = Vector2f(shift[0]*Renderer->GetMatrixWidth()/static_cast<float>(Renderer->GetScreenWidth()), shift[1]*Renderer->GetMatrixHeight()/static_cast<float>(Renderer->GetScreenHeight()));
|
||||||
|
|
||||||
boost::get<TPanoramicCamera>(Renderer->Camera).MoveAlpha(-pi*shift.v[0]*0.1f);
|
boost::get<TPanoramicCamera>(Renderer->Camera).MoveAlpha(-pi*shift[0]*0.1f);
|
||||||
}
|
}
|
||||||
|
|
||||||
void TAndroidApplication::OnMouseDown(TMouseState& mouseState)
|
void TAndroidApplication::OnMouseDown(TMouseState& mouseState)
|
||||||
|
|||||||
24
jni/main_code.h
Normal file → Executable file
24
jni/main_code.h
Normal file → Executable file
@ -15,6 +15,12 @@
|
|||||||
#include <GLES2/gl2ext.h>
|
#include <GLES2/gl2ext.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
//#ifdef TARGET_WIN32
|
||||||
|
//#define NOMINMAX 1
|
||||||
|
//#include <Windows.h>
|
||||||
|
//#undef NOMINMAX
|
||||||
|
//#endif
|
||||||
|
|
||||||
#include "boost/shared_ptr.hpp"
|
#include "boost/shared_ptr.hpp"
|
||||||
#include "boost/thread/thread.hpp"
|
#include "boost/thread/thread.hpp"
|
||||||
#include "boost/asio.hpp"
|
#include "boost/asio.hpp"
|
||||||
@ -39,9 +45,13 @@ public:
|
|||||||
bool Inited;
|
bool Inited;
|
||||||
bool Loaded;
|
bool Loaded;
|
||||||
|
|
||||||
std::vector<boost::variant<boost::function<cardinal()>, boost::function<bool()>, boost::function<void()> > > LoadingQueue;
|
std::vector<boost::variant<boost::function<size_t()>, boost::function<bool()>, boost::function<void()> > > LoadingQueue;
|
||||||
|
|
||||||
TLiteModel* LiteModel;
|
TRenderPair mountain;
|
||||||
|
Matrix4f mountainTransformation;
|
||||||
|
|
||||||
|
TRenderPair ice;
|
||||||
|
std::vector<Matrix4f> iceTransformations;
|
||||||
|
|
||||||
float WaterTimer;
|
float WaterTimer;
|
||||||
float SnowTimer;
|
float SnowTimer;
|
||||||
@ -49,12 +59,6 @@ public:
|
|||||||
float SkyTexShift;
|
float SkyTexShift;
|
||||||
bool WaveDir;
|
bool WaveDir;
|
||||||
|
|
||||||
std::vector<TLiteModel> IceModel;
|
|
||||||
|
|
||||||
std::shared_ptr<TSimpleLandClass> SimpleLand;
|
|
||||||
|
|
||||||
std::shared_ptr<TSimpleLandClass> SimpleLandInv;
|
|
||||||
|
|
||||||
TAndroidApplication();
|
TAndroidApplication();
|
||||||
|
|
||||||
virtual void InnerInit();
|
virtual void InnerInit();
|
||||||
@ -63,9 +67,9 @@ public:
|
|||||||
|
|
||||||
virtual void InnerDraw();
|
virtual void InnerDraw();
|
||||||
|
|
||||||
virtual void InnerUpdate(cardinal dt);
|
virtual void InnerUpdate(size_t dt);
|
||||||
|
|
||||||
virtual void InnerOnMove(vec2 shift);
|
virtual void InnerOnMove(Vector2f shift);
|
||||||
|
|
||||||
virtual void OnMouseDown(TMouseState& mouseState);
|
virtual void OnMouseDown(TMouseState& mouseState);
|
||||||
|
|
||||||
|
|||||||
@ -1,34 +1,84 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 11.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual C++ Express 2010
|
# Visual Studio 15
|
||||||
|
VisualStudioVersion = 15.0.28010.2019
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Template", "Template\Template.vcxproj", "{0080A3E1-DFBF-4557-B198-E6D5D7724393}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Template", "Template\Template.vcxproj", "{0080A3E1-DFBF-4557-B198-E6D5D7724393}"
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20} = {48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}
|
{534F100C-E611-43BF-B6F3-AD9F9925F703} = {534F100C-E611-43BF-B6F3-AD9F9925F703}
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B} = {03736B28-58F6-4AEA-9D37-B6AC4F5F853B}
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195} = {A05BADE1-D792-4620-9928-13A7AFD0F195}
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Salmon Engine", "..\..\..\Engine\Salmon Engine\Salmon Engine.vcxproj", "{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Engine", "..\..\tes-engine\windows\Engine\Engine.vcxproj", "{534F100C-E611-43BF-B6F3-AD9F9925F703}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "..\..\tes-engine\windows\libjpeg\libjpeg.vcxproj", "{A05BADE1-D792-4620-9928-13A7AFD0F195}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "..\..\tes-engine\windows\libpng\libpng.vcxproj", "{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug_nosound|Win32 = Debug_nosound|Win32
|
Debug_nosound|Win32 = Debug_nosound|Win32
|
||||||
|
Debug_nosound|x64 = Debug_nosound|x64
|
||||||
Debug|Win32 = Debug|Win32
|
Debug|Win32 = Debug|Win32
|
||||||
|
Debug|x64 = Debug|x64
|
||||||
Release|Win32 = Release|Win32
|
Release|Win32 = Release|Win32
|
||||||
|
Release|x64 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
|
||||||
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug_nosound|Win32.Build.0 = Debug|Win32
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug_nosound|Win32.Build.0 = Debug|Win32
|
||||||
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug_nosound|x64.ActiveCfg = Debug|x64
|
||||||
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug_nosound|x64.Build.0 = Debug|x64
|
||||||
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug|Win32.ActiveCfg = Debug|Win32
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug|Win32.Build.0 = Debug|Win32
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Debug|x64.Build.0 = Debug|x64
|
||||||
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Release|Win32.ActiveCfg = Release|Win32
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Release|Win32.Build.0 = Release|Win32
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Release|Win32.Build.0 = Release|Win32
|
||||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug_nosound|Win32.ActiveCfg = Debug_nosound|Win32
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Release|x64.ActiveCfg = Release|x64
|
||||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug_nosound|Win32.Build.0 = Debug_nosound|Win32
|
{0080A3E1-DFBF-4557-B198-E6D5D7724393}.Release|x64.Build.0 = Release|x64
|
||||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug|Win32.ActiveCfg = Debug|Win32
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
|
||||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Debug|Win32.Build.0 = Debug|Win32
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug_nosound|Win32.Build.0 = Debug|Win32
|
||||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Release|Win32.ActiveCfg = Release|Win32
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug_nosound|x64.ActiveCfg = Debug|x64
|
||||||
{48ADCE9F-9539-4D3A-BCFA-C2ABABAF0B20}.Release|Win32.Build.0 = Release|Win32
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug_nosound|x64.Build.0 = Debug|x64
|
||||||
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{534F100C-E611-43BF-B6F3-AD9F9925F703}.Release|x64.Build.0 = Release|x64
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug_nosound|Win32.Build.0 = Debug|Win32
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug_nosound|x64.ActiveCfg = Debug|x64
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug_nosound|x64.Build.0 = Debug|x64
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A05BADE1-D792-4620-9928-13A7AFD0F195}.Release|x64.Build.0 = Release|x64
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug_nosound|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug_nosound|Win32.Build.0 = Debug|Win32
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug_nosound|x64.ActiveCfg = Debug|x64
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug_nosound|x64.Build.0 = Debug|x64
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Release|Win32.Build.0 = Release|Win32
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{03736B28-58F6-4AEA-9D37-B6AC4F5F853B}.Release|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
|
SolutionGuid = {9DAFEF6C-98C3-44E5-BE7E-4D58A1AAFDC9}
|
||||||
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
|
|||||||
@ -5,26 +5,44 @@
|
|||||||
<Configuration>Debug</Configuration>
|
<Configuration>Debug</Configuration>
|
||||||
<Platform>Win32</Platform>
|
<Platform>Win32</Platform>
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
<ProjectConfiguration Include="Release|Win32">
|
<ProjectConfiguration Include="Release|Win32">
|
||||||
<Configuration>Release</Configuration>
|
<Configuration>Release</Configuration>
|
||||||
<Platform>Win32</Platform>
|
<Platform>Win32</Platform>
|
||||||
</ProjectConfiguration>
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<ProjectGuid>{0080A3E1-DFBF-4557-B198-E6D5D7724393}</ProjectGuid>
|
<ProjectGuid>{0080A3E1-DFBF-4557-B198-E6D5D7724393}</ProjectGuid>
|
||||||
<RootNamespace>Template</RootNamespace>
|
<RootNamespace>Template</RootNamespace>
|
||||||
|
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<UseDebugLibraries>true</UseDebugLibraries>
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
<CharacterSet>NotSet</CharacterSet>
|
<CharacterSet>NotSet</CharacterSet>
|
||||||
|
<PlatformToolset>v141</PlatformToolset>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
<ConfigurationType>Application</ConfigurationType>
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
<UseDebugLibraries>false</UseDebugLibraries>
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
<CharacterSet>NotSet</CharacterSet>
|
<CharacterSet>NotSet</CharacterSet>
|
||||||
|
<PlatformToolset>v141</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<PlatformToolset>v141</PlatformToolset>
|
||||||
|
<CharacterSet>MultiByte</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<PlatformToolset>v141</PlatformToolset>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
<ImportGroup Label="ExtensionSettings">
|
<ImportGroup Label="ExtensionSettings">
|
||||||
@ -76,6 +94,35 @@
|
|||||||
<AdditionalLibraryDirectories>$(LibsPath)\boost_1_52_0\boost_windows\libs_engine\$(Configuration);$(LibsPath)\libogg-1.3.0\win32\VS2010\Win32\$(Configuration);$(LibsPath)\libvorbis-1.3.2\win32\VS2010\Win32\$(Configuration);$(LibsPath)\sqplus\lib;$(LibsPath)\DirectXsdk\Lib\x86;$(LibsPath)\lpng1510\projects\vstudio\Release Library</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(LibsPath)\boost_1_52_0\boost_windows\libs_engine\$(Configuration);$(LibsPath)\libogg-1.3.0\win32\VS2010\Win32\$(Configuration);$(LibsPath)\libvorbis-1.3.2\win32\VS2010\Win32\$(Configuration);$(LibsPath)\sqplus\lib;$(LibsPath)\DirectXsdk\Lib\x86;$(LibsPath)\lpng1510\projects\vstudio\Release Library</AdditionalLibraryDirectories>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<AdditionalIncludeDirectories>../../jni/;../../../boost_1_67_0;../../../eigen-3.3.4;../../../tes-engine;../../../libs/jpeg-9;../../../libs/jpeg-9/vc10;../../../libs/lpng1510;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<ExceptionHandling>Sync</ExceptionHandling>
|
||||||
|
<PreprocessorDefinitions>TARGET_WIN32;DEBUG;_WIN32_WINNT=0x0600;EIGEN_DONT_ALIGN_STATICALLY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
||||||
|
<SupportJustMyCode />
|
||||||
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||||
|
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<AdditionalLibraryDirectories>../../../boost_1_67_0/stage/lib;../x64/Debug</AdditionalLibraryDirectories>
|
||||||
|
<AdditionalDependencies>libjpeg.lib;libpng.lib;Engine.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<AdditionalIncludeDirectories>../../jni/;../../../boost_1_67_0;../../../eigen-3.3.4;../../../tes-engine;../../../libs/jpeg-9;../../../libs/jpeg-9/vc10;../../../libs/lpng1510;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<ExceptionHandling>Async</ExceptionHandling>
|
||||||
|
<PreprocessorDefinitions>TARGET_WIN32;NDEBUG;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<AdditionalLibraryDirectories>../../../boost_1_67_0/stage/lib;../x64/Release</AdditionalLibraryDirectories>
|
||||||
|
<AdditionalDependencies>libjpeg.lib;libpng.lib;Engine.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\..\jni\main_code.cpp" />
|
<ClCompile Include="..\..\jni\main_code.cpp" />
|
||||||
<ClCompile Include="main.cpp" />
|
<ClCompile Include="main.cpp" />
|
||||||
|
|||||||
4
windows/Template/Template.vcxproj.user
Executable file
4
windows/Template/Template.vcxproj.user
Executable file
@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup />
|
||||||
|
</Project>
|
||||||
Loading…
Reference in New Issue
Block a user