This commit is contained in:
Damian 2022-01-23 23:22:10 +01:00
parent 3a2c4da701
commit 0422d83324
54 changed files with 2838908 additions and 1755410 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,985 @@
# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
# File Created: 01.02.2012 21:08:49
mtllib TropicalFish10.mtl
#
# object TropicalFish10
#
v 5.2346 -70.7017 -53.4496
v 5.2346 -55.2003 -72.8555
v 24.6329 -62.5993 -46.6415
v 5.2346 -82.3936 -23.0479
v 31.2932 -77.5700 17.4170
v 5.2346 -88.4888 14.0519
v 36.0627 -77.5700 59.0774
v 36.0627 -76.5224 100.2061
v 5.2346 -90.8682 108.9794
v 5.2346 -88.5814 52.6909
v 34.6255 -66.1628 127.0737
v 29.2321 -58.0539 153.6038
v 5.2346 -80.3471 154.6075
v 5.2346 -84.4215 139.5478
v 5.2346 -28.0670 -94.8863
v 34.3092 -34.3267 -67.3833
v 45.9941 -46.5403 13.5655
v 52.9496 -50.7212 57.6883
v 48.4970 -48.6789 92.6967
v 39.2497 -46.1487 125.0750
v 33.3077 -40.7090 156.0096
v 9.3920 -16.5509 -94.1003
v 34.3092 -15.5017 -73.8509
v 40.4386 -14.1061 10.2577
v 46.5680 -12.7105 55.2349
v 48.0775 -26.0626 94.9591
v 40.1468 -26.4111 122.5275
v 29.2320 -20.3914 158.1338
v 7.3133 1.7580 -95.9793
v 19.7719 8.4937 -72.0010
v 22.8366 17.6237 9.3622
v 25.9013 25.8640 53.2810
v 25.9013 26.3821 98.3590
v 24.7108 22.0503 127.8147
v 21.3916 19.7953 156.9074
v -6.7998 -70.7017 -53.4496
v -6.7998 -82.3936 -23.0479
v -26.1980 -62.5993 -46.6415
v -6.7998 -55.2003 -72.8555
v -6.7998 -88.4888 14.0519
v -32.8583 -77.5700 17.4171
v -6.7998 -90.8682 108.9794
v -37.6278 -76.5224 100.2061
v -37.6278 -77.5700 59.0774
v -6.7998 -88.5814 52.6909
v -6.7998 -80.3471 154.6075
v -30.7972 -58.0539 153.6038
v -36.1907 -66.1628 127.0737
v -6.7998 -84.4215 139.5478
v -35.8744 -34.3267 -67.3833
v -6.7998 -28.0670 -94.8863
v -47.5593 -46.5403 13.5655
v -49.3223 -48.6789 92.6967
v -54.5148 -50.7212 57.6883
v -34.8729 -40.7090 156.0096
v -40.0750 -46.1487 125.0750
v -35.8744 -15.5017 -73.8509
v -10.9572 -16.5509 -94.1003
v -42.0038 -14.1061 10.2577
v -48.9028 -26.0626 94.9591
v -48.1332 -12.7105 55.2349
v -30.7973 -20.3914 158.1338
v -40.9721 -26.4110 122.5275
v -21.3371 8.4937 -72.0010
v -8.8785 1.7580 -95.9793
v -24.4018 17.6237 9.3622
v -27.4665 26.3822 98.3590
v -27.4665 25.8640 53.2810
v -22.9568 19.7953 156.9074
v -26.2760 22.0503 127.8147
v 0.5309 -82.6428 -78.1788
v 0.5309 -92.9531 -34.1026
v -2.0961 -92.9531 -34.1026
v -2.0961 -82.6428 -78.1788
v 0.5309 -97.9455 4.2709
v -2.0961 -97.9455 4.2709
v 0.5309 -94.1653 89.8187
v -2.0961 -94.1653 89.8187
v -2.0961 -92.2807 45.7841
v 0.5309 -92.2807 45.7841
v 5.2346 -39.8278 218.0183
v 5.2346 -33.6489 221.3018
v -6.7998 -33.6489 221.3018
v -6.7998 -39.8278 218.0183
v 9.3118 -29.1423 217.8900
v -10.8770 -29.1423 217.8900
v 8.9043 -25.6064 223.8388
v -10.4695 -25.6064 223.8388
v 5.2346 -18.3579 225.1472
v -6.7998 -18.3579 225.1472
v 5.2346 -4.4410 205.7152
v -6.7998 -4.4410 205.7152
v -6.7998 -12.6833 219.7787
v 5.2346 -12.6833 219.7787
v 0.5309 97.9455 45.2803
v -2.0961 97.9455 45.2804
v -2.0961 97.1668 80.4867
v 0.5309 97.1668 80.4867
v 0.5309 67.9508 -82.7944
v 0.5309 55.2956 -108.5227
v -2.0961 55.2956 -108.5227
v -2.0961 67.9508 -82.7944
v 2.0728 23.2152 -225.1472
v -3.6380 23.2152 -225.1472
v -3.6380 34.2303 -219.2077
v 2.0728 34.2303 -219.2077
v 1.9669 -30.6028 -207.5578
v 2.7545 -51.4903 -202.1292
v -4.3197 -51.4903 -202.1292
v -3.5321 -30.6028 -207.5578
v 0.5309 -47.2095 -127.4642
v 0.5309 -61.6486 -120.4257
v -2.0961 -61.6486 -120.4257
v -2.0961 -47.2095 -127.4642
v 15.5918 -42.7322 191.1392
v 5.2346 -55.6268 185.7704
v 18.2588 -34.6051 191.7686
v 15.5918 -18.2560 195.6498
v 10.4132 -9.4808 198.2385
v -17.1570 -42.7322 191.1392
v -6.7998 -55.6268 185.7704
v -19.8240 -34.6051 191.7686
v -17.1570 -18.2560 195.6498
v -11.9784 -9.4808 198.2385
v 5.2346 36.7851 187.8731
v -6.7998 36.7851 187.8731
v 23.8386 -49.9450 170.6385
v 5.2346 -73.5581 164.9763
v 26.8484 -36.8795 171.5216
v 23.8386 -16.4122 174.5684
v 18.0725 17.5404 177.7811
v -25.4038 -49.9450 170.6385
v -6.7998 -73.5581 164.9763
v -28.4136 -36.8795 171.5216
v -25.4038 -16.4122 174.5684
v -19.6377 17.5404 177.7811
v 5.2346 68.0881 162.8387
v -6.7998 68.0881 162.8387
v 5.2346 83.9251 137.9173
v 5.2346 80.8660 88.3734
v 0.5309 91.6971 10.8132
v -2.0961 91.6971 10.8132
v 5.2346 -26.7753 -110.2328
v 7.9984 -15.6718 -110.4436
v -9.5636 -15.6718 -110.4436
v -6.7998 -26.7753 -110.2328
v -8.1817 -1.9607 -114.8135
v 0.5309 32.8935 -128.2544
v -2.0961 32.8935 -128.2544
v 6.6165 -1.9607 -114.8135
v 5.2346 7.0901 -118.0237
v 5.2346 20.1912 -93.8108
v 4.2346 -31.0528 -123.6014
v 6.7683 -19.7369 -129.9879
v -8.3334 -19.7369 -129.9879
v -5.7998 -31.0528 -123.6014
v -7.0666 -4.5048 -137.9876
v -6.7998 7.0901 -118.0237
v 4.2346 12.7726 -137.8388
v -5.7998 12.7726 -137.8388
v 5.5014 -4.5048 -137.9876
v 4.2346 -39.0770 -145.9970
v 4.2346 -27.5575 -155.7451
v -5.7998 -39.0770 -145.9970
v -5.7998 -27.5575 -155.7451
v -5.7998 0.9168 -161.8605
v 4.2346 17.5713 -158.5477
v -5.7998 17.5713 -158.5477
v 4.2346 0.9168 -161.8605
v 4.2346 -53.1295 -183.7427
v 2.7545 -33.0294 -186.1547
v -5.7998 -53.1295 -183.7427
v -4.3197 -33.0294 -186.1547
v -3.5321 11.7145 -195.2188
v 1.9669 28.5048 -194.3257
v -3.5321 28.5048 -194.3257
v 1.9669 11.7145 -195.2188
v 5.2346 37.3887 -72.4987
v 5.2346 68.1114 -4.9916
v 5.2346 76.6909 46.0142
v -6.7998 37.3887 -72.4987
v -6.7998 20.1912 -93.8108
v -6.7998 76.6909 46.0142
v -6.7998 68.1114 -4.9916
v -6.7998 80.8660 88.3734
v -6.7998 83.9251 137.9173
v 0.5309 25.3268 -96.4862
v 0.5309 46.2544 -75.5065
v 0.5309 16.3059 -127.4110
v -2.0961 16.3059 -127.4110
v -2.0961 25.3268 -96.4862
v -2.0961 46.2544 -75.5065
v -2.0961 77.2852 -8.4161
v -2.0961 90.1848 72.4372
v -2.0961 87.8165 38.4595
v -2.0961 94.2471 109.2207
v 0.5309 94.2471 109.2207
v 0.5309 90.1848 72.4372
v 0.5309 87.8165 38.4595
v 0.5309 77.2852 -8.4161
v 0.5309 85.7834 -30.1487
v -2.0961 85.7834 -30.1487
v 0.5309 -97.3407 27.9753
v -2.0961 -97.3407 27.9753
v -59.4404 -29.0315 96.9504
v -58.4783 -44.5968 91.1680
v -63.0388 -29.0315 97.4005
v -61.9350 -44.5968 91.6180
v -55.7192 -13.5462 110.8922
v -59.1759 -13.5462 111.3422
v -65.9746 1.0720 67.2910
v -67.3060 1.0720 67.2884
v -65.0198 55.6509 76.1503
v -63.6884 55.6509 76.1529
v -62.7075 -13.9798 82.1207
v -59.7038 32.1356 93.2715
v -64.2465 -42.1504 78.6406
v -61.8525 -42.1504 78.4169
v -65.1724 -13.9798 82.3444
v -62.0978 32.1356 93.4952
v -65.2266 -39.7039 65.6658
v -66.5580 -39.7039 65.6632
v 59.4403 -29.0315 96.9504
v 58.4783 -44.5969 91.1680
v 61.9351 -44.5969 91.6180
v 63.0389 -29.0315 97.4005
v 59.1759 -13.5462 111.3422
v 55.7192 -13.5462 110.8922
v 65.9746 1.0720 67.2910
v 63.6884 55.6509 76.1529
v 65.0198 55.6509 76.1504
v 67.3060 1.0720 67.2884
v 59.7038 32.1356 93.2715
v 62.7075 -13.9798 82.1207
v 61.8525 -42.1504 78.4169
v 64.2465 -42.1504 78.6406
v 65.1724 -13.9798 82.3444
v 62.0978 32.1356 93.4952
v 65.2266 -39.7039 65.6658
v 66.5580 -39.7039 65.6632
# 240 vertices
vn -0.2761 -0.8091 0.5188
vn -0.3712 -0.8437 0.3877
vn -0.3531 -0.6744 0.6485
vn -0.1632 -0.7694 0.6176
vn -0.1445 -0.6688 0.7293
vn -0.0544 -0.6948 0.7172
vn -0.0316 -0.6427 0.7655
vn 0.1392 -0.7152 0.6849
vn 0.1420 -0.2900 0.9464
vn 0.0869 -0.3004 0.9499
vn 0.2899 -0.8188 0.4956
vn 0.3665 -0.8043 0.4678
vn 0.3952 -0.3179 0.8619
vn 0.2405 -0.2882 0.9269
vn -0.3736 -0.8835 0.2827
vn -0.4559 -0.8224 0.3403
vn -0.1603 -0.9740 0.1603
vn -0.0231 -0.9835 0.1797
vn 0.0596 -0.9525 0.2985
vn 0.3204 -0.9325 0.1669
vn 0.3154 -0.9466 0.0671
vn -0.4956 -0.8611 0.1130
vn -0.4563 -0.8779 -0.1452
vn -0.1080 -0.9406 -0.3219
vn -0.0413 -0.9501 -0.3091
vn -0.3612 -0.7989 -0.4810
vn 0.4179 -0.8819 -0.2182
vn 0.2630 -0.9480 -0.1791
vn -0.3291 -0.9308 -0.1590
vn -0.2751 -0.8495 -0.4502
vn -0.1182 -0.9081 -0.4018
vn -0.0593 -0.9094 -0.4116
vn 0.0406 -0.9281 -0.3701
vn 0.1375 -0.9473 -0.2894
vn 0.1804 -0.9501 -0.2544
vn -0.2765 0.8196 0.5019
vn -0.1595 0.7740 0.6127
vn -0.3531 0.6744 0.6485
vn -0.3701 0.8515 0.3713
vn -0.0527 0.6952 0.7169
vn -0.1445 0.6688 0.7293
vn 0.1420 0.2900 0.9464
vn 0.1402 0.7206 0.6790
vn -0.0316 0.6427 0.7655
vn 0.0869 0.3004 0.9499
vn 0.3952 0.3179 0.8619
vn 0.3617 0.8082 0.4647
vn 0.2884 0.8273 0.4821
vn 0.2405 0.2882 0.9269
vn -0.4559 0.8224 0.3403
vn -0.3845 0.8819 0.2728
vn -0.1603 0.9740 0.1603
vn 0.0748 0.9567 0.2812
vn -0.0158 0.9841 0.1767
vn 0.3048 0.9501 0.0664
vn 0.3085 0.9392 0.1510
vn -0.4563 0.8779 -0.1452
vn -0.5049 0.8547 0.1210
vn -0.1080 0.9406 -0.3219
vn -0.1232 0.8767 -0.4650
vn -0.0353 0.9511 -0.3069
vn 0.2562 0.9501 -0.1777
vn 0.3659 0.9056 -0.2143
vn -0.2751 0.8495 -0.4502
vn -0.3291 0.9308 -0.1590
vn -0.1182 0.9081 -0.4018
vn 0.0417 0.9296 -0.3661
vn -0.0593 0.9094 -0.4116
vn 0.1804 0.9501 -0.2544
vn 0.1354 0.9489 -0.2851
vn -0.2797 -0.6125 0.7393
vn -0.1620 -0.5737 0.8029
vn -0.1533 0.5606 0.8138
vn -0.2799 0.6011 0.7485
vn -0.0559 -0.5328 0.8444
vn -0.0519 0.5281 0.8476
vn -0.0428 0.0000 0.9991
vn 0.6360 -0.4740 0.6090
vn 0.9178 -0.3968 0.0096
vn 0.9178 0.3968 0.0096
vn 0.6360 0.4740 0.6090
vn 0.5132 -0.7783 0.3617
vn 0.5132 0.7783 0.3617
vn 0.7225 -0.6143 0.3172
vn 0.7225 0.6143 0.3172
vn 0.8424 -0.4254 -0.3307
vn 0.8424 0.4254 -0.3307
vn 0.6367 -0.5377 -0.5527
vn 0.6367 0.5377 -0.5527
vn 0.5406 0.5327 -0.6511
vn 0.5406 -0.5327 -0.6511
vn -0.0572 -0.6852 -0.7261
vn -0.0572 0.6852 -0.7261
vn 0.0441 0.6983 -0.7144
vn 0.0441 -0.6983 -0.7144
vn -0.2754 -0.6927 -0.6665
vn -0.4533 -0.6658 -0.5926
vn -0.4533 0.6658 -0.5926
vn -0.2754 0.6927 -0.6665
vn -0.7739 -0.6295 -0.0690
vn -0.7739 0.6295 -0.0690
vn -0.3310 0.5943 -0.7330
vn -0.3310 -0.5943 -0.7330
vn -0.6881 -0.7016 0.1850
vn -0.5371 -0.5918 0.6011
vn -0.5420 0.5807 0.6074
vn -0.6914 0.6996 0.1803
vn -0.6611 -0.6776 0.3223
vn -0.5711 -0.6001 0.5601
vn -0.5717 0.6041 0.5552
vn -0.6533 0.6827 0.3273
vn 0.4156 -0.7670 0.4889
vn 0.5284 -0.3353 0.7800
vn 0.3915 -0.9112 0.1286
vn 0.3820 -0.9063 -0.1808
vn 0.4620 -0.8371 -0.2929
vn 0.4156 0.7670 0.4889
vn 0.5284 0.3353 0.7800
vn 0.3915 0.9112 0.1286
vn 0.3820 0.9063 -0.1808
vn 0.4620 0.8371 -0.2929
vn 0.7310 -0.4887 -0.4763
vn 0.7310 0.4887 -0.4763
vn 0.4646 -0.7692 0.4387
vn 0.5667 -0.3242 0.7575
vn 0.3818 -0.9225 0.0572
vn 0.3150 -0.9409 -0.1246
vn 0.3331 -0.8989 -0.2845
vn 0.4646 0.7692 0.4387
vn 0.5667 0.3242 0.7575
vn 0.3818 0.9225 0.0572
vn 0.3150 0.9409 -0.1246
vn 0.3331 0.8989 -0.2845
vn 0.5487 -0.5453 -0.6337
vn 0.5487 0.5453 -0.6337
vn 0.3183 -0.5842 -0.7465
vn -0.0328 -0.9290 -0.3686
vn -0.1129 -0.7112 -0.6939
vn -0.1129 0.7112 -0.6939
vn -0.0298 -0.9650 0.2605
vn -0.0679 -0.9952 0.0701
vn -0.0593 0.9949 0.0816
vn -0.0138 0.9712 0.2377
vn -0.0651 0.9926 -0.1030
vn -0.7323 -0.6313 -0.2555
vn -0.7323 0.6313 -0.2554
vn -0.0651 -0.9926 -0.1030
vn -0.1633 -0.9483 -0.2721
vn -0.3077 -0.8711 -0.3829
vn 0.1596 -0.8111 0.5627
vn -0.0397 -0.9972 0.0633
vn -0.0506 0.9948 0.0888
vn 0.1328 0.8222 0.5536
vn -0.0564 0.9972 -0.0497
vn -0.1535 0.9417 -0.2993
vn 0.1590 -0.6778 -0.7178
vn 0.1590 0.6778 -0.7178
vn -0.0564 -0.9972 -0.0497
vn 0.2205 -0.6901 0.6893
vn -0.0495 -0.9987 0.0077
vn 0.2332 0.7111 0.6632
vn -0.0453 0.9986 0.0286
vn -0.0483 0.9988 -0.0082
vn 0.1555 -0.7223 -0.6738
vn 0.1555 0.7223 -0.6738
vn -0.0483 -0.9988 -0.0082
vn 0.0661 -0.6895 0.7213
vn -0.0523 -0.9981 -0.0315
vn 0.0792 0.6896 0.7199
vn -0.0375 0.9987 -0.0342
vn -0.0307 0.9995 -0.0029
vn 0.1702 -0.6935 -0.7001
vn 0.1702 0.6935 -0.7001
vn -0.0307 -0.9995 -0.0029
vn -0.2358 -0.8873 -0.3964
vn -0.1237 -0.9230 -0.3644
vn -0.0434 -0.9305 -0.3637
vn -0.2181 0.8923 -0.3953
vn -0.3434 0.8622 -0.3723
vn -0.0410 0.9293 -0.3671
vn -0.1237 0.9230 -0.3644
vn -0.0336 0.9289 -0.3687
vn 0.3183 0.5842 -0.7465
vn -0.1743 -0.9289 -0.3268
vn -0.1161 -0.9774 -0.1767
vn -0.7712 -0.5816 0.2589
vn -0.7620 0.5914 0.2639
vn -0.2163 0.9313 -0.2929
vn -0.1132 0.9763 -0.1846
vn -0.0671 0.9782 -0.1966
vn -0.0197 0.9791 -0.2026
vn -0.0244 0.9837 -0.1781
vn 0.1344 0.5373 -0.8326
vn 0.1344 -0.5373 -0.8326
vn -0.0164 -0.9775 -0.2104
vn -0.0259 -0.9836 -0.1787
vn -0.0671 -0.9782 -0.1966
vn -0.1692 -0.6871 -0.7066
vn -0.1692 0.6871 -0.7066
vn 0.1214 -0.4747 0.8717
vn 0.1214 0.4747 0.8717
vn -0.0117 0.9766 0.2150
vn -0.0117 -0.9766 0.2150
vn -0.5680 -0.7396 -0.3610
vn -0.8578 -0.3619 0.3650
vn 0.3702 0.9083 0.1949
vn 0.3759 0.5768 0.7252
vn 0.3245 -0.7562 -0.5682
vn 0.7713 0.6217 -0.1362
vn -0.7909 -0.6082 -0.0673
vn -0.6553 0.7505 -0.0850
vn -0.1852 0.5614 -0.8066
vn -0.2115 -0.5215 -0.8266
vn -0.2114 -0.9773 -0.0136
vn 0.5134 -0.7734 -0.3717
vn -0.0275 0.6897 0.7236
vn -0.2926 -0.6947 0.6571
vn 0.1542 0.9880 0.0014
vn 0.7329 0.5808 -0.3544
vn -0.6968 -0.5113 0.5031
vn -0.5875 0.6266 0.5121
vn -0.7148 0.6383 -0.2858
vn -0.8567 0.3522 0.3769
vn 0.3802 -0.5724 0.7264
vn 0.3776 -0.9038 0.2012
vn 0.7743 -0.6196 -0.1289
vn 0.3596 0.6279 -0.6903
vn -0.7909 0.6082 -0.0673
vn -0.2115 0.5215 -0.8266
vn -0.1852 -0.5614 -0.8066
vn -0.6553 -0.7505 -0.0850
vn 0.5134 0.7734 -0.3717
vn -0.2114 0.9773 -0.0136
vn -0.2926 0.6947 0.6571
vn -0.0275 -0.6897 0.7236
vn 0.1542 -0.9880 0.0014
vn 0.7329 -0.5808 -0.3544
vn -0.6968 0.5113 0.5031
vn -0.5875 -0.6266 0.5121
vn -0.0315 0.6513 0.7582
vn -0.4722 0.0000 -0.8815
vn -0.0315 -0.6513 0.7582
vn 0.1696 -0.0000 0.9855
# 243 vertex normals
vt 0.3771 0.2236 0.4612
vt 0.3394 0.2851 0.4612
vt 0.3903 0.2557 0.3172
vt 0.4361 0.1771 0.4612
vt 0.5147 0.1963 0.2678
vt 0.5082 0.1529 0.4612
vt 0.5956 0.1963 0.2324
vt 0.6755 0.2004 0.2324
vt 0.6925 0.1434 0.4612
vt 0.5832 0.1525 0.4612
vt 0.7277 0.2416 0.2430
vt 0.7792 0.2738 0.2831
vt 0.7811 0.1852 0.4612
vt 0.7519 0.1691 0.4612
vt 0.2966 0.3929 0.4612
vt 0.3500 0.3681 0.2454
vt 0.5072 0.3195 0.1587
vt 0.5929 0.3029 0.1070
vt 0.6609 0.3110 0.1401
vt 0.7238 0.3211 0.2087
vt 0.7811 0.3435 0.2786
vt 0.2981 0.4387 0.4303
vt 0.3375 0.4428 0.2454
vt 0.5008 0.4484 0.1999
vt 0.5882 0.4539 0.1544
vt 0.6653 0.4009 0.1432
vt 0.7188 0.3995 0.2021
vt 0.7903 0.4261 0.2802
vt 0.2945 0.5114 0.4457
vt 0.3411 0.5382 0.3533
vt 0.4991 0.5744 0.3305
vt 0.5844 0.6072 0.3078
vt 0.6719 0.6092 0.3078
vt 0.7291 0.5920 0.3166
vt 0.7856 0.5831 0.3412
vt 0.3771 0.2236 0.5505
vt 0.4361 0.1771 0.5505
vt 0.3903 0.2557 0.6944
vt 0.3394 0.2851 0.5505
vt 0.5082 0.1529 0.5505
vt 0.5147 0.1963 0.7439
vt 0.6925 0.1434 0.5505
vt 0.6755 0.2004 0.7792
vt 0.5956 0.1963 0.7792
vt 0.5832 0.1525 0.5505
vt 0.7811 0.1852 0.5505
vt 0.7792 0.2738 0.7286
vt 0.7277 0.2416 0.7686
vt 0.7519 0.1691 0.5505
vt 0.3500 0.3681 0.7662
vt 0.2966 0.3929 0.5505
vt 0.5072 0.3195 0.8530
vt 0.6609 0.3110 0.8660
vt 0.5929 0.3029 0.9046
vt 0.7812 0.3435 0.7328
vt 0.7238 0.3211 0.7974
vt 0.3375 0.4428 0.7662
vt 0.2981 0.4387 0.5813
vt 0.5008 0.4484 0.8117
vt 0.6653 0.4009 0.8629
vt 0.5882 0.4539 0.8572
vt 0.7907 0.4260 0.7311
vt 0.7188 0.3995 0.8041
vt 0.3411 0.5382 0.6583
vt 0.2945 0.5114 0.5659
vt 0.4991 0.5744 0.6811
vt 0.6719 0.6092 0.7038
vt 0.5844 0.6072 0.7038
vt 0.7856 0.5831 0.6704
vt 0.7291 0.5920 0.6950
vt 0.3291 0.1761 0.4961
vt 0.4147 0.1352 0.4961
vt 0.4147 0.1352 0.5156
vt 0.3291 0.1761 0.5156
vt 0.4892 0.1153 0.4961
vt 0.4892 0.1153 0.5156
vt 0.6553 0.1304 0.4961
vt 0.6553 0.1304 0.5156
vt 0.5698 0.1378 0.5156
vt 0.5698 0.1378 0.4961
vt 0.9043 0.3462 0.4612
vt 0.9107 0.3708 0.4612
vt 0.9107 0.3708 0.5505
vt 0.9043 0.3462 0.5505
vt 0.9027 0.3899 0.4442
vt 0.9022 0.3891 0.5680
vt 0.9146 0.4014 0.4463
vt 0.9163 0.4029 0.5632
vt 0.9181 0.4315 0.4612
vt 0.9181 0.4315 0.5505
vt 0.9000 0.5183 0.4612
vt 0.8804 0.4868 0.5505
vt 0.9077 0.4540 0.5505
vt 0.9273 0.4855 0.4612
vt 0.5688 0.8935 0.4961
vt 0.5688 0.8935 0.5156
vt 0.6372 0.8904 0.5156
vt 0.6372 0.8904 0.4961
vt 0.3201 0.7744 0.4961
vt 0.2701 0.7241 0.4961
vt 0.2701 0.7241 0.5156
vt 0.3201 0.7744 0.5156
vt 0.0436 0.5966 0.4846
vt 0.0436 0.5966 0.5270
vt 0.0552 0.6404 0.5270
vt 0.0552 0.6404 0.4846
vt 0.0778 0.3829 0.4854
vt 0.0884 0.2999 0.4796
vt 0.0884 0.2999 0.5321
vt 0.0778 0.3829 0.5262
vt 0.2334 0.3169 0.4961
vt 0.2470 0.2595 0.4961
vt 0.2470 0.2595 0.5156
vt 0.2334 0.3169 0.5156
vt 0.8513 0.3381 0.3902
vt 0.8417 0.2834 0.4612
vt 0.8532 0.3677 0.3859
vt 0.8606 0.4308 0.3941
vt 0.8659 0.4668 0.4227
vt 0.8513 0.3381 0.6213
vt 0.8417 0.2834 0.5505
vt 0.8532 0.3677 0.6257
vt 0.8599 0.4299 0.6177
vt 0.8659 0.4668 0.5889
vt 0.8653 0.6820 0.4612
vt 0.8457 0.6506 0.5505
vt 0.8106 0.3120 0.3332
vt 0.8013 0.2122 0.4612
vt 0.8101 0.3601 0.3333
vt 0.8216 0.4416 0.3222
vt 0.8261 0.5741 0.3659
vt 0.8103 0.3113 0.6784
vt 0.8013 0.2122 0.5505
vt 0.8105 0.3609 0.6778
vt 0.8209 0.4399 0.6896
vt 0.8261 0.5741 0.6457
vt 0.8167 0.8064 0.4612
vt 0.7971 0.7749 0.5505
vt 0.7683 0.8693 0.4612
vt 0.6525 0.8257 0.4612
vt 0.5019 0.8687 0.4961
vt 0.5019 0.8687 0.5156
vt 0.2668 0.3981 0.4612
vt 0.2664 0.4422 0.4406
vt 0.2664 0.4422 0.5710
vt 0.2668 0.3981 0.5505
vt 0.2579 0.4966 0.5607
vt 0.2318 0.6351 0.4961
vt 0.2318 0.6351 0.5156
vt 0.2579 0.4966 0.4509
vt 0.2517 0.5326 0.4612
vt 0.2987 0.5846 0.4612
vt 0.2409 0.3811 0.4686
vt 0.2284 0.4260 0.4498
vt 0.2284 0.4260 0.5618
vt 0.2409 0.3811 0.5430
vt 0.2129 0.4865 0.5524
vt 0.2517 0.5326 0.5505
vt 0.2132 0.5552 0.4686
vt 0.2132 0.5552 0.5430
vt 0.2129 0.4865 0.4592
vt 0.1974 0.3492 0.4686
vt 0.1784 0.3950 0.4686
vt 0.1974 0.3492 0.5430
vt 0.1784 0.3950 0.5430
vt 0.1666 0.5081 0.5430
vt 0.1730 0.5742 0.4686
vt 0.1730 0.5742 0.5430
vt 0.1666 0.5081 0.4686
vt 0.1241 0.2934 0.4686
vt 0.1194 0.3732 0.4796
vt 0.1241 0.2934 0.5430
vt 0.1194 0.3732 0.5321
vt 0.1018 0.5510 0.5262
vt 0.1035 0.6177 0.4854
vt 0.1035 0.6177 0.5262
vt 0.1018 0.5510 0.4854
vt 0.3401 0.6530 0.4612
vt 0.4712 0.7750 0.4612
vt 0.5702 0.8091 0.4612
vt 0.3401 0.6530 0.5505
vt 0.2987 0.5846 0.5505
vt 0.5702 0.8091 0.5505
vt 0.4712 0.7750 0.5505
vt 0.6525 0.8257 0.5505
vt 0.7487 0.8378 0.5505
vt 0.2935 0.6050 0.4961
vt 0.3343 0.6882 0.4961
vt 0.2335 0.5692 0.4961
vt 0.2335 0.5692 0.5156
vt 0.2935 0.6050 0.5156
vt 0.3343 0.6882 0.5156
vt 0.4645 0.8114 0.5156
vt 0.6216 0.8627 0.5156
vt 0.5556 0.8533 0.5156
vt 0.6930 0.8788 0.5156
vt 0.6930 0.8788 0.4961
vt 0.6216 0.8627 0.4961
vt 0.5556 0.8533 0.4961
vt 0.4645 0.8114 0.4961
vt 0.4223 0.8452 0.4961
vt 0.4223 0.8452 0.5156
vt 0.5352 0.1177 0.4961
vt 0.5352 0.1177 0.5156
vt 0.6692 0.3891 0.9411
vt 0.6579 0.3273 0.9340
vt 0.6700 0.3891 0.9678
vt 0.6588 0.3273 0.9596
vt 0.6962 0.4506 0.9135
vt 0.6971 0.4506 0.9392
vt 0.6116 0.5087 0.9896
vt 0.6116 0.5087 0.9995
vt 0.6288 0.7255 0.9825
vt 0.6288 0.7255 0.9727
vt 0.6404 0.4489 0.9654
vt 0.6620 0.6321 0.9431
vt 0.6336 0.3370 0.9768
vt 0.6332 0.3370 0.9590
vt 0.6408 0.4489 0.9837
vt 0.6625 0.6321 0.9608
vt 0.6084 0.3467 0.9841
vt 0.6084 0.3467 0.9939
vt 0.6692 0.3891 0.0589
vt 0.6579 0.3273 0.0660
vt 0.6588 0.3273 0.0404
vt 0.6700 0.3891 0.0322
vt 0.6971 0.4506 0.0608
vt 0.6962 0.4506 0.0865
vt 0.6116 0.5087 0.0104
vt 0.6288 0.7255 0.0273
vt 0.6288 0.7255 0.0175
vt 0.6116 0.5087 0.0005
vt 0.6620 0.6321 0.0569
vt 0.6404 0.4489 0.0346
vt 0.6332 0.3370 0.0410
vt 0.6336 0.3370 0.0232
vt 0.6408 0.4489 0.0163
vt 0.6625 0.6321 0.0392
vt 0.6084 0.3467 0.0159
vt 0.6084 0.3467 0.0061
# 240 texture coords
g TropicalFish10
usemtl 10___Default
s 1
f 1/1/1 2/2/2 3/3/3 4/4/4
f 4/4/4 3/3/3 5/5/5 6/6/6
f 7/7/7 8/8/8 9/9/9 10/10/10
f 11/11/11 12/12/12 13/13/13 14/14/14
f 2/2/2 15/15/15 16/16/16 3/3/3
f 3/3/3 16/16/16 17/17/17 5/5/5
f 18/18/18 19/19/19 8/8/8 7/7/7
f 20/20/20 21/21/21 12/12/12 11/11/11
f 15/15/15 22/22/22 23/23/23 16/16/16
f 23/23/23 24/24/24 17/17/17 16/16/16
f 25/25/25 26/26/26 19/19/19 18/18/18
f 27/27/27 28/28/28 21/21/21 20/20/20
f 29/29/29 30/30/30 23/23/23 22/22/22
f 23/23/23 30/30/30 31/31/31 24/24/24
f 25/25/25 32/32/32 33/33/33 26/26/26
f 34/34/34 35/35/35 28/28/28 27/27/27
f 36/36/36 37/37/37 38/38/38 39/39/39
f 37/37/37 40/40/40 41/41/41 38/38/38
f 42/42/42 43/43/43 44/44/44 45/45/45
f 46/46/46 47/47/47 48/48/48 49/49/49
f 39/39/39 38/38/38 50/50/50 51/51/51
f 38/38/38 41/41/41 52/52/52 50/50/50
f 43/43/43 53/53/53 54/54/54 44/44/44
f 47/47/47 55/55/55 56/56/56 48/48/48
f 51/51/51 50/50/50 57/57/57 58/58/58
f 52/52/52 59/59/59 57/57/57 50/50/50
f 53/53/53 60/60/60 61/61/61 54/54/54
f 55/55/55 62/62/62 63/63/63 56/56/56
f 57/57/57 64/64/64 65/65/65 58/58/58
f 57/57/57 59/59/59 66/66/66 64/64/64
f 61/61/61 60/60/60 67/67/67 68/68/68
f 62/62/62 69/69/69 70/70/70 63/63/63
f 71/71/71 72/72/72 73/73/73 74/74/74
f 75/75/75 76/76/76 73/73/73 72/72/72
f 77/77/77 78/78/77 79/79/77 80/80/77
f 13/13/13 46/46/46 49/49/49 14/14/14
f 81/81/78 82/82/79 83/83/80 84/84/81
f 82/82/79 85/85/82 86/86/83 83/83/80
f 85/85/82 87/87/84 88/88/85 86/86/83
f 89/89/86 90/90/87 88/88/85 87/87/84
f 91/91/88 92/92/89 93/93/90 94/94/91
f 95/95/92 96/96/93 97/97/94 98/98/95
f 99/99/96 100/100/97 101/101/98 102/102/99
f 103/103/100 104/104/101 105/105/102 106/106/103
f 107/107/104 108/108/105 109/109/106 110/110/107
f 111/111/108 112/112/109 113/113/110 114/114/111
f 112/112/109 71/71/71 74/74/74 113/113/110
f 115/115/112 82/82/79 81/81/78 116/116/113
f 117/117/114 85/85/82 82/82/79 115/115/112
f 118/118/115 87/87/84 85/85/82 117/117/114
f 119/119/116 91/91/88 94/94/91 89/89/86
f 84/84/81 83/83/80 120/120/117 121/121/118
f 122/122/119 120/120/117 83/83/80 86/86/83
f 86/86/83 88/88/85 123/123/120 122/122/119
f 88/88/85 90/90/87 124/124/121 123/123/120
f 81/81/78 84/84/81 121/121/118 116/116/113
f 125/125/122 126/126/123 92/92/89 91/91/88
f 127/127/124 115/115/112 116/116/113 128/128/125
f 117/117/114 115/115/112 127/127/124 129/129/126
f 118/118/115 117/117/114 129/129/126 130/130/127
f 91/91/88 119/119/116 131/131/128 125/125/122
f 121/121/118 120/120/117 132/132/129 133/133/130
f 132/132/129 120/120/117 122/122/119 134/134/131
f 134/134/131 122/122/119 123/123/120 135/135/132
f 123/123/120 124/124/121 136/136/133 135/135/132
f 116/116/113 121/121/118 133/133/130 128/128/125
f 137/137/134 138/138/135 126/126/123 125/125/122
f 8/8/8 11/11/11 14/14/14 9/9/9
f 19/19/19 20/20/20 11/11/11 8/8/8
f 139/139/136 34/34/34 33/33/33 140/140/137
f 49/49/49 48/48/48 43/43/43 42/42/42
f 48/48/48 56/56/56 53/53/53 43/43/43
f 60/60/60 63/63/63 70/70/70 67/67/67
f 14/14/14 49/49/49 42/42/42 9/9/9
f 141/141/138 142/142/139 96/96/93 95/95/92
f 22/22/22 15/15/15 143/143/140 144/144/141
f 51/51/51 58/58/58 145/145/142 146/146/143
f 58/58/58 65/65/65 147/147/144 145/145/142
f 101/101/98 100/100/97 148/148/145 149/149/146
f 29/29/29 150/150/147 151/151/148 152/152/149
f 144/144/141 143/143/140 153/153/150 154/154/151
f 146/146/143 145/145/142 155/155/152 156/156/153
f 147/147/144 157/157/154 155/155/152 145/145/142
f 158/158/155 151/151/148 159/159/156 160/160/157
f 151/151/148 150/150/147 161/161/158 159/159/156
f 154/154/151 153/153/150 162/162/159 163/163/160
f 153/153/150 156/156/153 164/164/161 162/162/159
f 156/156/153 155/155/152 165/165/162 164/164/161
f 157/157/154 166/166/163 165/165/162 155/155/152
f 160/160/157 159/159/156 167/167/164 168/168/165
f 159/159/156 161/161/158 169/169/166 167/167/164
f 163/163/160 162/162/159 170/170/167 171/171/168
f 162/162/159 164/164/161 172/172/169 170/170/167
f 164/164/161 165/165/162 173/173/170 172/172/169
f 166/166/163 174/174/171 173/173/170 165/165/162
f 168/168/165 167/167/164 175/175/172 176/176/173
f 167/167/164 169/169/166 177/177/174 175/175/172
f 171/171/168 170/170/167 108/108/105 107/107/104
f 170/170/167 172/172/169 109/109/106 108/108/105
f 172/172/169 173/173/170 110/110/107 109/109/106
f 174/174/171 104/104/101 110/110/107 173/173/170
f 176/176/173 175/175/172 106/106/103 105/105/102
f 175/175/172 177/177/174 103/103/100 106/106/103
f 152/152/149 178/178/175 30/30/30 29/29/29
f 178/178/175 179/179/176 31/31/31 30/30/30
f 180/180/177 140/140/137 33/33/33 32/32/32
f 34/34/34 139/139/136 137/137/134 35/35/35
f 64/64/64 181/181/178 182/182/179 65/65/65
f 68/68/68 183/183/180 184/184/181 66/66/66
f 67/67/67 185/185/182 183/183/180 68/68/68
f 126/126/123 138/138/135 69/69/69 136/136/133
f 94/94/91 93/93/90 90/90/87 89/89/86
f 107/107/104 110/110/107 104/104/101 103/103/100
f 87/87/84 118/118/115 119/119/116 89/89/86
f 124/124/121 90/90/87 93/93/90 92/92/89
f 118/118/115 130/130/127 131/131/128 119/119/116
f 92/92/89 126/126/123 136/136/133 124/124/121
f 34/34/34 27/27/27 26/26/26 33/33/33
f 186/186/183 185/185/182 67/67/67 70/70/70
f 65/65/65 182/182/179 158/158/155 147/147/144
f 22/22/22 144/144/141 150/150/147 29/29/29
f 158/158/155 160/160/157 157/157/154 147/147/144
f 150/150/147 144/144/141 154/154/151 161/161/158
f 160/160/157 168/168/165 166/166/163 157/157/154
f 161/161/158 154/154/151 163/163/160 169/169/166
f 168/168/165 176/176/173 174/174/171 166/166/163
f 169/169/166 163/163/160 171/171/168 177/177/174
f 176/176/173 105/105/102 104/104/101 174/174/171
f 177/177/174 171/171/168 107/107/104 103/103/100
f 178/178/175 152/152/149 187/187/184 188/188/185
f 152/152/149 151/151/148 189/189/186 187/187/184
f 151/151/148 158/158/155 190/190/187 189/189/186
f 158/158/155 182/182/179 191/191/188 190/190/187
f 182/182/179 181/181/178 192/192/189 191/191/188
f 184/184/181 193/193/190 192/192/189 181/181/178
f 183/183/180 185/185/182 194/194/191 195/195/192
f 185/185/182 186/186/183 196/196/193 194/194/191
f 186/186/183 139/139/136 197/197/194 196/196/193
f 197/197/194 139/139/136 140/140/137 198/198/195
f 140/140/137 180/180/177 199/199/196 198/198/195
f 179/179/176 200/200/197 199/199/196 180/180/177
f 198/198/195 199/199/196 141/141/138 95/95/92
f 200/200/197 201/201/198 141/141/138 199/199/196
f 188/188/185 187/187/184 100/100/97 99/99/96
f 187/187/184 189/189/186 148/148/145 100/100/97
f 189/189/186 190/190/187 149/149/146 148/148/145
f 149/149/146 190/190/187 191/191/188 101/101/98
f 191/191/188 192/192/189 102/102/99 101/101/98
f 192/192/189 193/193/190 202/202/199 102/102/99
f 195/195/192 194/194/191 96/96/93 142/142/139
f 142/142/139 141/141/138 201/201/198 202/202/199
f 7/7/7 10/10/10 6/6/6 5/5/5
f 18/18/18 7/7/7 5/5/5 17/17/17
f 24/24/24 25/25/25 18/18/18 17/17/17
f 32/32/32 25/25/25 24/24/24 31/31/31
f 40/40/40 45/45/45 44/44/44 41/41/41
f 41/41/41 44/44/44 54/54/54 52/52/52
f 54/54/54 61/61/61 59/59/59 52/52/52
f 59/59/59 61/61/61 68/68/68 66/66/66
f 203/203/200 204/204/201 76/76/76 75/75/75
f 99/99/96 102/102/99 202/202/199 201/201/198
f 179/179/176 180/180/177 32/32/32 31/31/31
f 181/181/178 64/64/64 66/66/66 184/184/181
f 184/184/181 183/183/180 195/195/192 193/193/190
f 179/179/176 178/178/175 188/188/185 200/200/197
f 188/188/185 99/99/96 201/201/198 200/200/197
f 193/193/190 195/195/192 142/142/139 202/202/199
f 194/194/191 196/196/193 97/97/94 96/96/93
f 196/196/193 197/197/194 98/98/95 97/97/94
f 98/98/95 197/197/194 198/198/195 95/95/92
f 2/2/2 1/1/1 71/71/71 112/112/109
f 1/1/1 4/4/4 72/72/72 71/71/71
f 4/4/4 6/6/6 75/75/75 72/72/72
f 6/6/6 10/10/10 203/203/200 75/75/75
f 10/10/10 45/45/45 204/204/201 203/203/200
f 204/204/201 45/45/45 40/40/40 76/76/76
f 40/40/40 37/37/37 73/73/73 76/76/76
f 37/37/37 36/36/36 74/74/74 73/73/73
f 36/36/36 39/39/39 113/113/110 74/74/74
f 39/39/39 51/51/51 114/114/111 113/113/110
f 15/15/15 2/2/2 112/112/109 111/111/108
f 12/12/12 127/127/124 128/128/125 13/13/13
f 21/21/21 129/129/126 127/127/124 12/12/12
f 28/28/28 130/130/127 129/129/126 21/21/21
f 35/35/35 131/131/128 130/130/127 28/28/28
f 133/133/130 132/132/129 47/47/47 46/46/46
f 132/132/129 134/134/131 55/55/55 47/47/47
f 134/134/131 135/135/132 62/62/62 55/55/55
f 135/135/132 136/136/133 69/69/69 62/62/62
f 128/128/125 133/133/130 46/46/46 13/13/13
f 139/139/136 186/186/183 138/138/135 137/137/134
f 125/125/122 131/131/128 35/35/35 137/137/134
f 138/138/135 186/186/183 70/70/70 69/69/69
s off
f 51/51/202 146/146/202 156/156/202 114/114/202
f 143/143/203 15/15/203 111/111/203 153/153/203
s 1
f 205/205/204 60/60/60 53/53/53 206/206/205
f 53/53/53 56/56/56 207/207/206 208/208/207
f 206/206/205 53/53/53 208/208/207
f 209/209/208 210/210/209 63/63/63
f 211/211/210 212/212/211 213/213/212 214/214/213
f 209/209/208 205/205/204 215/215/214 216/216/215
f 208/208/207 217/217/216 218/218/217 206/206/205
f 207/207/206 219/219/218 217/217/216 208/208/207
f 210/210/209 209/209/208 216/216/215 220/220/219
f 63/63/63 60/60/60 205/205/204 209/209/208
f 63/63/63 210/210/209 207/207/206 56/56/56
f 221/221/220 222/222/221 212/212/211 211/211/210
f 205/205/204 206/206/205 218/218/217 215/215/214
f 210/210/209 220/220/219 219/219/218 207/207/206
f 223/223/222 224/224/223 19/19/19 26/26/26
f 19/19/19 225/225/224 226/226/225 20/20/20
f 224/224/223 225/225/224 19/19/19
f 27/27/27 227/227/226 228/228/227
f 229/229/228 230/230/229 231/231/230 232/232/231
f 228/228/227 233/233/232 234/234/233 223/223/222
f 235/235/234 236/236/235 225/225/224 224/224/223
f 236/236/235 237/237/236 226/226/225 225/225/224
f 227/227/226 238/238/237 233/233/232 228/228/227
f 228/228/227 223/223/222 26/26/26 27/27/27
f 27/27/27 20/20/20 226/226/225 227/227/226
f 239/239/238 229/229/228 232/232/231 240/240/239
f 223/223/222 234/234/233 235/235/234 224/224/223
f 237/237/236 238/238/237 227/227/226 226/226/225
f 211/211/210 214/214/213 216/216/215 215/215/214
f 217/217/216 222/222/221 221/221/220 218/218/217
f 219/219/218 212/212/211 222/222/221 217/217/216
f 214/214/213 213/213/212 220/220/219 216/216/215
f 221/221/220 211/211/210 215/215/214 218/218/217
f 220/220/219 213/213/212 212/212/211 219/219/218
f 233/233/232 230/230/229 229/229/228 234/234/233
f 239/239/238 240/240/239 236/236/235 235/235/234
f 240/240/239 232/232/231 237/237/236 236/236/235
f 238/238/237 231/231/230 230/230/229 233/233/232
f 234/234/233 229/229/228 239/239/238 235/235/234
f 232/232/231 231/231/230 238/238/237 237/237/236
s off
f 42/42/240 45/45/240 79/79/240 78/78/240
f 45/45/241 10/10/241 80/80/241 79/79/241
f 10/10/242 9/9/242 77/77/242 80/80/242
f 9/9/243 42/42/243 78/78/243 77/77/243
# 235 polygons - 4 triangles

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

1755391
cw 6/models/old_ground.obj Normal file

File diff suppressed because it is too large Load Diff

1051638
cw 6/models/terobj.obj Normal file

File diff suppressed because it is too large Load Diff

View File

@ -16,13 +16,15 @@ in vec3 lightDirTS;
float near = 0.25f;
float far = 100.0f;
float steepness = 0.5f;
float offset = 4.0f;
float linearizeDepth(float depth)
{
return (2.0 * near * far) / (far + near - (depth * 2.0 - 1.0) * (far - near));
}
float logisticDepth(float depth, float steepness = 0.5f, float offset = 4.0f)
float logisticDepth(float depth)
{
float zVal = linearizeDepth(depth);
return (1 / (1 + exp(-steepness * (zVal - offset))));

View File

@ -29,6 +29,10 @@ GLuint Fish::getTextureId() {
return object.textureId;
}
GLuint Fish::getNormalId() {
return object.normalId;
}
glm::mat4 Fish::getInitialRotation() {
glm::vec3 tragetVec = glm::normalize(glm::vec3(2) - glm::vec3(0));
glm::quat rotQuat = glm::rotationCamera(glm::vec3(0, 0, 1), tragetVec);

View File

@ -23,5 +23,6 @@ public:
Fish(Core::RenderObject object, std::vector<KeyPointRotation> _keyPoints, float _speed, float _scale);
Core::RenderContext getContext();
GLuint getTextureId();
GLuint getNormalId();
glm::mat4 animationMatrix(float time);
};

View File

@ -26,6 +26,7 @@ namespace Core
struct RenderObject {
RenderContext context;
GLuint textureId;
GLuint normalId;
glm::mat4 initialTransformation;
};

View File

@ -53,7 +53,7 @@ float mouseY = 0;
float prevX = 0;
float prevY = 0;
GLuint sharkTexture;
GLuint orcaTexture, orcaNormal, groundTexture, groundNormal;
float randRange(float start, float end) {
return start + ((float)std::rand()) / ((float)RAND_MAX) * (end - start);
@ -171,7 +171,7 @@ void drawBubbles()
void drawFish(float time)
{
for (Fish& fishElem : fish) {
drawObjectTexture(fishElem.getContext(), fishElem.animationMatrix(time) * glm::rotate(glm::radians(90.0f), glm::vec3(0,0,1)), fishElem.getTextureId());
drawObjectTextureWithNormal(fishElem.getContext(), fishElem.animationMatrix(time) * glm::rotate(glm::radians(90.0f), glm::vec3(0,0,1)), fishElem.getTextureId(), fishElem.getNormalId());
}
}
@ -192,7 +192,7 @@ void renderScene()
glm::mat4 shipModelMatrix = glm::translate(cameraPos + cameraDir * 0.5f) * glm::mat4_cast(glm::inverse(rotationX * rotationY * rotationZ)) * shipInitialTransformation;
drawObjectTexture(orcaContext, shipModelMatrix, orcaTexture);
drawObjectTextureWithNormal(groundContext, glm::mat4() * glm::rotate(glm::radians(180.0f), glm::vec3(1,0,0)) * glm::scale(glm::vec3(10)), groundTexture, groundNormal);
drawObjectTextureWithNormal(groundContext, glm::mat4() * glm::rotate(glm::radians(-90.0f), glm::vec3(1,0,0)) * glm::scale(glm::vec3(100)), groundTexture, groundNormal);
drawObjectTextureWithNormal(orcaContext, glm::mat4() * glm::scale(glm::vec3(0.25f)), orcaTexture, orcaNormal);
drawFish(time);
drawBubbles();
@ -218,29 +218,26 @@ void initBubbles(int n) {
}
}
Core::RenderObject createRenderObject(std::string modelFileName, std::string textureFileName, glm::mat4 initialTransformation) {
Core::RenderObject createRenderObject(std::string modelFileName, std::string textureFileName, std::string normalFileName, glm::mat4 initialTransformation) {
Core::RenderObject object;
loadModelToContext("models/" + modelFileName, object.context);
object.textureId = Core::LoadTexture(("textures/" + textureFileName).c_str());
object.normalId = Core::LoadTexture(("textures/" + normalFileName).c_str());
object.initialTransformation = initialTransformation;
return object;
}
void initFish() {
Core::RenderObject fishYellow = createRenderObject("fish_yellow.obj", "fish_yellow.jpg", glm::rotate(glm::radians(90.0f), glm::vec3(1, 0, 0)) * glm::scale(glm::vec3(0.01f)));
Core::RenderObject fishGolden = createRenderObject("fish_golden.obj", "fish_golden.jpg", glm::rotate(glm::radians(90.0f), glm::vec3(0, 1, 0)) * glm::rotate(glm::radians(90.0f), glm::vec3(0, 0, 1)) * glm::rotate(glm::radians(180.0f), glm::vec3(1, 0, 0)) * glm::scale(glm::vec3(0.002f)));
Core::RenderObject fishTropical1 = createRenderObject("fish_tropical1.obj", "fish_tropical1.jpg", glm::rotate(glm::radians(90.0f), glm::vec3(0, 1, 0)) * glm::rotate(glm::radians(90.0f), glm::vec3(0, 0, 1)) * glm::rotate(glm::radians(90.0f), glm::vec3(1, 0, 0)) * glm::scale(glm::vec3(0.0002f)));
Core::RenderObject fishTropical2 = createRenderObject("fish_tropical2.obj", "fish_tropical2.jpg", glm::rotate(glm::radians(90.0f), glm::vec3(0, 1, 0)) * glm::rotate(glm::radians(90.0f), glm::vec3(0, 0, 1)) * glm::rotate(glm::radians(90.0f), glm::vec3(1, 0, 0)) * glm::scale(glm::vec3(0.0002f)));
Core::RenderObject tropicalFish[15];
fish.insert(fish.end(), {
Fish(fishYellow, keyPoints[0], 7.0f, 1.0f),
Fish(fishGolden, keyPoints[1], 3.0f, 1.0f),
Fish(fishTropical1, keyPoints[1], 1.0f, 1.0f),
Fish(fishTropical2, keyPoints[0], 2.0f, 1.5f)
}
);
for (int i = 1; i <= 15; i++) {
char fileNameBuffer[64];
snprintf(fileNameBuffer, sizeof(fileNameBuffer), "TropicalFish%02d", i);
std::string fileName = fileNameBuffer;
tropicalFish[i-1] = createRenderObject(fileName + ".obj", fileName + ".jpg", fileName + "_NormalMap.jpg", glm::rotate(glm::radians(90.0f), glm::vec3(0, 1, 0)) * glm::rotate(glm::radians(90.0f), glm::vec3(0, 0, 1)) * glm::rotate(glm::radians(90.0f), glm::vec3(1, 0, 0)) * glm::scale(glm::vec3(0.0002f)));
fish.push_back(Fish(tropicalFish[i - 1], keyPoints[0], randRange(0.5f, 3.0f), randRange(0.5f, 2.0f)));
}
}
void init()
@ -255,12 +252,13 @@ void init()
programTexture = shaderLoader.CreateProgram("shaders/shader_tex.vert", "shaders/shader_tex.frag");
loadModelToContext("models/orca.obj", orcaContext);
loadModelToContext("models/sphere.obj", sphereContext);
loadModelToContext("models/ground.obj", groundContext);
loadModelToContext("models/terobj.obj", groundContext);
orcaTexture = Core::LoadTexture("textures/Orca_Diffuse.jpg");
orcaNormal = Core::LoadTexture("textures/orca_normal.jpg");
groundTexture = Core::LoadTexture("textures/ground_texture.jpg");
groundNormal = Core::LoadTexture("textures/ground_normal.jpg");
initBubbles();
initBubbles(40);
initFish();
/*initRenderables();
initPhysicsScene();*/
/*for (int i = 0; i < 10; i++) {

View File

Before

Width:  |  Height:  |  Size: 211 KiB

After

Width:  |  Height:  |  Size: 211 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

View File

Before

Width:  |  Height:  |  Size: 163 KiB

After

Width:  |  Height:  |  Size: 163 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 200 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 164 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 161 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

BIN
cw 6/textures/ground.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 MiB