Different kinds of tree

This commit is contained in:
Joshua Barretto 2022-05-09 09:25:36 +01:00
parent 7cce892cff
commit cf346d05c1
9 changed files with 576 additions and 283 deletions

282
assets/voxygen/lod/oak.obj Normal file
View File

@ -0,0 +1,282 @@
# Blender v3.0.0 OBJ File: ''
# www.blender.org
o Cube.003
v -1.814604 0.110646 -2.712528
v 0.002174 1.562753 10.609200
v 0.161417 2.086320 -2.749529
v 2.137438 0.110646 -2.712528
v 1.363824 0.201342 10.634696
v 0.161417 -1.865030 -2.675528
v 0.002174 -1.160069 10.660192
v -1.359475 0.201342 10.634696
v -1.765975 -11.462813 12.558847
v -9.522135 0.240962 9.193778
v -0.028484 -9.251023 9.371544
v 0.054180 11.978812 11.981747
v -0.028484 9.732947 9.016011
v 9.465164 0.240963 9.193778
v 6.263892 0.262988 10.369893
v -0.028484 6.554262 10.252069
v 13.535484 1.245526 12.154263
v 0.141971 15.367683 17.018692
v 17.032104 -0.355504 16.854349
v -13.233879 1.081083 12.744585
v -2.845845 -13.345329 16.876486
v -16.808716 2.270498 18.296967
v 0.126243 -16.232351 34.672588
v 9.797964 0.393772 43.178391
v -1.009909 -8.386520 43.555328
v -0.173310 -16.022852 25.351990
v -16.800144 1.228834 36.291180
v -17.068426 4.313082 29.872881
v 18.031403 -0.333628 25.101107
v -0.441979 17.624346 33.618435
v -2.185088 17.178898 26.278412
v -0.217867 0.757482 46.887856
v -10.273464 1.652588 42.715527
v -0.009768 10.158854 43.467457
v 18.309916 -0.061841 34.471123
v -0.028484 -6.028285 10.487717
v -6.320862 0.262988 10.369893
vt 0.375000 0.250000
vt 0.625000 0.500000
vt 0.375000 0.500000
vt 0.375000 0.750000
vt 0.625000 0.750000
vt 0.375000 1.000000
vt 0.125000 0.750000
vt 0.125000 0.500000
vt 0.625000 0.000000
vt 0.375000 0.000000
vt 0.625000 0.250000
vt 0.625000 1.000000
vt 0.625000 0.000000
vt 0.375000 0.250000
vt 0.375000 0.000000
vt 0.625000 0.500000
vt 0.375000 0.500000
vt 0.375000 0.750000
vt 0.375000 0.750000
vt 0.375000 0.500000
vt 0.625000 0.750000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.625000 1.000000
vt 0.375000 1.000000
vt 0.625000 0.250000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.625000 1.000000
vt 0.625000 1.000000
vt 0.625000 0.750000
vt 0.625000 1.000000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.625000 0.250000
vt 0.625000 0.750000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.625000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.250000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.625000 0.000000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.125000 0.750000
vt 0.125000 0.500000
vt 0.375000 0.250000
vt 0.375000 0.000000
vt 0.625000 0.250000
vt 0.625000 0.000000
vt 0.375000 1.000000
vn -0.8982 0.1977 -0.3926
vn -0.1957 0.9770 -0.0849
vn -0.2131 0.7630 -0.6102
vn 0.1967 0.9772 -0.0803
vn 0.8552 0.3379 -0.3931
vn 0.2154 0.7654 -0.6064
vn 0.9333 -0.3569 -0.0394
vn 0.3325 -0.7936 -0.5095
vn 0.9076 -0.0678 -0.4144
vn 0.0007 0.5089 -0.8608
vn 0.1244 -0.5841 -0.8021
vn -0.7101 -0.0125 -0.7040
vn -0.3554 -0.9334 -0.0499
vn -0.8968 -0.2104 -0.3893
vn -0.0834 -0.8360 -0.5423
vn -0.9801 0.1947 -0.0394
vn 0.9986 0.0293 -0.0449
vn 0.0310 -0.9983 -0.0485
vn 0.6820 0.1365 -0.7185
vn -0.9799 -0.1963 -0.0368
vn -0.1047 -0.7127 -0.6936
vn -0.3089 -0.1712 -0.9356
vn -0.1300 -0.2706 -0.9539
vn -0.2470 0.1434 -0.9583
vn -0.1780 0.6972 -0.6945
vn -0.2592 0.3056 -0.9162
vn 0.1669 0.6961 -0.6983
vn 0.2768 0.0738 -0.9581
vn 0.1987 0.3154 -0.9279
vn -0.1214 -0.0001 -0.9926
vn -0.2247 -0.1041 -0.9689
vn -0.0725 -0.2173 -0.9734
vn 0.7438 0.2654 -0.6135
vn 0.2350 0.8544 -0.4635
vn 0.9042 0.0051 -0.4270
vn 0.3107 -0.2158 -0.9257
vn 0.2374 -0.7967 -0.5558
vn 0.2813 -0.4432 -0.8511
vn -0.7591 -0.1502 -0.6335
vn -0.4072 -0.8234 -0.3951
vn -0.9229 -0.0267 -0.3841
vn 0.1886 -0.8079 -0.5583
vn 0.7833 -0.3512 -0.5129
vn -0.1126 -0.9448 -0.3078
vn -0.7071 0.1989 -0.6786
vn -0.0664 0.8813 -0.4679
vn -0.1683 0.7076 -0.6863
vn 0.2439 -0.8272 0.5061
vn 0.5553 -0.1423 0.8194
vn 0.0140 -0.5574 0.8302
vn -0.2733 -0.9576 -0.0906
vn -0.9047 -0.2867 0.3150
vn -0.9932 -0.0872 -0.0771
vn 0.9866 -0.1395 -0.0846
vn 0.2877 -0.8932 0.3456
vn 0.1001 -0.9890 -0.1086
vn -0.9635 0.2397 0.1192
vn -0.1639 0.8943 0.4164
vn -0.2322 0.9699 -0.0732
vn 0.0700 -0.0737 0.9948
vn -0.1342 0.8431 0.5207
vn -0.5588 0.2547 0.7892
vn -0.1235 0.5952 0.7940
vn 0.1829 0.8408 0.5095
vn 0.5658 0.1546 0.8099
vn 0.8460 0.1746 0.5037
vn -0.8071 -0.2478 0.5358
vn -0.2499 -0.5501 0.7968
vn -0.5650 0.0129 0.8250
vn -0.0990 0.1021 0.9898
vn 0.1744 0.5999 0.7808
vn 0.0762 0.0989 0.9922
vn 0.0109 -0.1327 -0.9911
vn 0.0118 0.0955 -0.9954
vn 0.1247 -0.0175 -0.9920
vn -0.1006 -0.0560 -0.9933
vn -0.2248 0.0624 -0.9724
vn 0.0907 0.0329 -0.9953
vn -0.0303 -0.0927 -0.9952
vn 0.0943 -0.2169 -0.9716
vn 0.2093 -0.1005 -0.9727
vn -0.0305 0.0800 -0.9963
vn 0.0952 0.1804 -0.9790
vn 0.0727 -0.0562 -0.9958
vn 0.9569 0.2750 -0.0931
vn 0.2075 0.9180 0.3379
vn 0.9105 0.1897 0.3675
vn -0.1131 -0.0570 0.9919
vn 0.2730 0.9004 -0.3387
vn 0.9558 0.2750 -0.1037
vn 0.9088 0.0088 -0.4172
vn -0.8783 0.3374 -0.3389
vn -0.2442 0.9587 -0.1456
vn -0.0508 0.8954 -0.4424
vn 0.8355 -0.4000 -0.3769
vn 0.0658 -0.9773 -0.2014
vn -0.1405 -0.8932 -0.4272
vn -0.4410 -0.8550 -0.2730
vn -0.9891 -0.1415 0.0401
vn -0.9600 -0.0622 -0.2730
vn -0.7339 -0.1307 -0.6666
vn -0.6694 0.1674 -0.7238
vn 0.6284 0.1915 -0.7539
vn 0.0908 -0.1410 -0.9858
vn 0.1128 0.6894 -0.7156
vn 0.6835 -0.1212 -0.7198
vn -0.1345 -0.7455 -0.6528
vn 0.6776 -0.0633 -0.7327
vn -0.8444 0.3164 -0.4323
vn 0.8474 -0.1663 0.5043
vn -0.0669 -0.9124 0.4037
vn 0.9056 -0.2115 0.3676
vn -0.8522 0.0535 0.5205
vn -0.8359 0.0692 0.5445
vn -0.0516 -0.8756 0.4803
vn -0.1403 -0.0212 -0.9899
vn -0.0716 0.1807 -0.9809
vn 0.0510 -0.0002 -0.9987
vn 0.2093 0.0662 -0.9756
vn 0.0792 0.9866 -0.1429
vn 0.0927 0.9939 -0.0595
vn -0.9731 0.2301 -0.0088
vn 0.9913 -0.1099 -0.0723
vn -0.2942 -0.9516 -0.0888
s 1
f 1/1/1 2/2/2 3/3/3
f 2/2/4 4/4/5 3/3/6
f 5/5/7 6/6/8 4/4/9
f 3/3/10 6/7/11 1/8/12
f 7/9/13 1/1/14 6/10/15
f 1/1/1 8/11/16 2/2/2
f 2/2/4 5/5/17 4/4/5
f 5/5/7 7/12/18 6/6/8
f 3/3/10 4/4/19 6/7/11
f 7/9/13 8/11/20 1/1/14
f 9/13/21 10/14/22 11/15/23
f 10/14/24 12/16/25 13/17/26
f 12/16/27 14/18/28 13/17/29
f 13/17/30 15/19/31 16/20/32
f 17/21/33 18/22/34 19/23/35
f 14/18/36 9/24/37 11/25/38
f 20/26/39 21/27/40 22/28/41
f 9/24/42 19/23/43 21/29/44
f 20/26/45 18/22/46 12/16/47
f 23/30/48 24/31/49 25/32/50
f 26/33/51 27/34/52 28/35/53
f 29/36/54 23/30/55 26/37/56
f 28/35/57 30/38/58 31/39/59
f 25/32/50 24/31/49 32/40/60
f 30/38/61 33/41/62 34/42/63
f 30/38/64 24/31/65 35/43/66
f 27/34/67 25/44/68 33/41/69
f 33/41/62 32/45/70 34/42/63
f 34/42/71 32/46/72 24/31/65
f 16/20/73 36/47/74 37/48/75
f 11/25/76 15/19/77 14/18/78
f 10/14/79 16/20/80 37/49/81
f 10/14/82 36/50/83 11/15/84
f 29/36/85 30/38/86 35/43/87
f 25/44/68 32/51/88 33/41/69
f 18/22/89 29/36/90 19/23/91
f 22/28/92 31/39/93 18/22/94
f 19/23/95 26/37/96 21/29/97
f 21/27/98 28/35/99 22/28/100
f 9/13/21 20/26/101 10/14/22
f 10/14/24 20/26/102 12/16/25
f 12/16/27 17/21/103 14/18/28
f 13/17/30 14/18/104 15/19/31
f 17/21/33 12/16/105 18/22/34
f 14/18/36 17/21/106 9/24/37
f 20/26/39 9/13/107 21/27/40
f 9/24/42 17/21/108 19/23/43
f 20/26/45 22/28/109 18/22/46
f 23/30/48 35/43/110 24/31/49
f 26/33/51 23/52/111 27/34/52
f 29/36/54 35/43/112 23/30/55
f 28/35/57 27/34/113 30/38/58
f 30/38/61 27/34/114 33/41/62
f 30/38/64 34/42/71 24/31/65
f 27/34/67 23/52/115 25/44/68
f 16/20/73 15/19/116 36/47/74
f 11/25/76 36/53/117 15/19/77
f 10/14/79 13/17/118 16/20/80
f 10/14/82 37/49/119 36/50/83
f 29/36/85 31/39/120 30/38/86
f 18/22/89 31/39/121 29/36/90
f 22/28/92 28/35/122 31/39/93
f 19/23/95 29/36/123 26/37/96
f 21/27/98 26/33/124 28/35/99

282
assets/voxygen/lod/pine.obj Normal file
View File

@ -0,0 +1,282 @@
# Blender v3.0.0 OBJ File: ''
# www.blender.org
o Cube.005
v -1.814604 0.118198 -2.712210
v 0.002174 1.533206 10.613510
v 0.161417 2.093968 -2.743709
v 2.137438 0.118198 -2.712210
v 1.363824 0.171729 10.635216
v 0.161417 -1.857573 -2.680711
v 0.002174 -1.189747 10.656921
v -1.359475 0.171729 10.635216
v -0.028485 -3.759396 23.071415
v -9.522135 0.215361 9.194413
v -0.028484 -9.277081 9.345748
v -4.223946 0.435532 23.004536
v -0.028484 9.707805 9.043077
v -0.028485 4.630460 22.937658
v 9.465164 0.215362 9.194413
v 6.263892 0.234112 10.370585
v -0.028484 6.525690 10.270280
v 4.166976 0.435531 23.004536
v -0.028484 6.975379 21.070749
v 6.541358 0.406372 21.175476
v -6.598328 0.406372 21.175476
v -0.028485 -6.162636 21.280205
v -0.028485 -4.685975 30.123705
v 2.329653 0.670892 37.767403
v -0.028485 -1.686946 37.804993
v -0.028485 -2.886088 31.833960
v -5.262825 0.547700 30.040266
v -3.490429 0.575417 31.778772
v 3.433459 0.575417 31.778772
v -0.028485 5.781376 29.956827
v -0.028485 4.036922 31.723587
v -0.217867 0.626920 46.889782
v -0.028485 3.028730 37.729813
v 5.205855 0.547701 30.040266
v -2.386622 0.670891 37.767403
v -0.028484 -6.057464 10.470890
v -6.320862 0.234112 10.370585
vt 0.375000 0.250000
vt 0.625000 0.500000
vt 0.375000 0.500000
vt 0.375000 0.750000
vt 0.625000 0.750000
vt 0.375000 1.000000
vt 0.125000 0.750000
vt 0.125000 0.500000
vt 0.625000 0.000000
vt 0.375000 0.000000
vt 0.625000 0.250000
vt 0.625000 1.000000
vt 0.625000 0.000000
vt 0.375000 0.250000
vt 0.375000 0.000000
vt 0.625000 0.250000
vt 0.375000 0.500000
vt 0.625000 0.500000
vt 0.375000 0.750000
vt 0.375000 0.750000
vt 0.375000 0.500000
vt 0.625000 0.750000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.625000 1.000000
vt 0.375000 1.000000
vt 0.625000 0.250000
vt 0.625000 1.000000
vt 0.625000 1.000000
vt 0.625000 0.750000
vt 0.625000 1.000000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.625000 0.250000
vt 0.625000 0.750000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.625000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.125000 0.750000
vt 0.125000 0.500000
vt 0.375000 0.250000
vt 0.375000 0.000000
vt 0.625000 0.250000
vt 0.625000 0.000000
vt 0.625000 0.000000
vt 0.375000 1.000000
vn -0.9098 0.3850 -0.1552
vn -0.3826 0.9233 0.0342
vn -0.4235 0.7712 -0.4752
vn 0.3820 0.9232 0.0433
vn 0.8349 0.5226 -0.1727
vn 0.4251 0.7751 -0.4675
vn 0.8498 -0.5247 0.0514
vn 0.5200 -0.7889 -0.3275
vn 0.9491 -0.2490 -0.1929
vn -0.0001 0.2970 -0.9549
vn 0.1320 -0.4105 -0.9023
vn -0.5897 -0.0130 -0.8075
vn -0.5257 -0.8499 0.0363
vn -0.9084 -0.3896 -0.1519
vn -0.2866 -0.8812 -0.3759
vn -0.9233 0.3829 0.0300
vn 0.9716 0.2302 0.0554
vn 0.2295 -0.9719 0.0514
vn 0.5357 0.1652 -0.8281
vn -0.9235 -0.3823 0.0330
vn -0.2406 -0.9459 -0.2176
vn -0.6348 -0.6281 -0.4501
vn -0.5976 -0.6255 -0.5017
vn -0.7077 0.5374 -0.4587
vn -0.6634 0.6735 -0.3261
vn -0.7543 0.3547 -0.5524
vn 0.6371 0.7645 -0.0983
vn 0.9214 0.3860 -0.0451
vn 0.2036 0.8812 -0.4267
vn -0.4074 0.0521 -0.9118
vn -0.3052 -0.1803 -0.9351
vn -0.1319 -0.2867 -0.9489
vn -0.4389 -0.2877 -0.8512
vn -0.1205 -0.3195 -0.9399
vn 0.1232 -0.6502 -0.7497
vn 0.9214 -0.3872 -0.0327
vn 0.5703 -0.8006 -0.1842
vn 0.4320 -0.7035 -0.5643
vn 0.5443 -0.1442 -0.8264
vn 0.1392 0.6129 -0.7778
vn 0.0926 0.3553 -0.9301
vn -0.4389 0.2605 -0.8600
vn -0.6252 0.1270 -0.7700
vn -0.1502 -0.1700 -0.9739
vn 0.0968 -0.2571 -0.9615
vn 0.4390 -0.2892 -0.8507
vn 0.6760 0.1387 -0.7237
vn 0.5455 -0.6954 -0.4679
vn 0.8810 -0.3670 0.2987
vn 0.2823 -0.9090 0.3066
vn 0.7082 0.1905 -0.6798
vn -0.0958 0.6299 -0.7708
vn 0.2832 -0.1319 -0.9500
vn -0.2013 0.6974 -0.6879
vn -0.2899 0.1482 -0.9455
vn 0.1167 0.2680 -0.9563
vn 0.2013 -0.7189 -0.6653
vn 0.7277 -0.2126 -0.6521
vn -0.1167 -0.2983 -0.9473
vn 0.4489 -0.4444 0.7752
vn -0.7792 0.5992 -0.1840
vn -0.4567 0.8492 0.2651
vn 0.0797 0.9166 -0.3918
vn 0.8333 0.5083 -0.2172
vn 0.8798 0.3742 0.2931
vn 0.5376 0.3335 -0.7744
vn -0.9574 -0.1971 -0.2112
vn -0.4581 -0.8442 0.2783
vn -0.8868 -0.3687 0.2788
vn -0.8858 0.3751 0.2732
vn -0.4567 0.4611 0.7608
vn 0.2812 0.9141 0.2922
vn 0.4428 0.4551 0.7725
vn 0.0343 -0.1189 -0.9923
vn 0.0343 0.0872 -0.9956
vn 0.1152 -0.0158 -0.9932
vn -0.2463 0.0625 -0.9672
vn -0.3052 0.1504 -0.9403
vn 0.4400 0.2184 -0.8710
vn 0.0384 -0.3071 -0.9509
vn 0.1994 -0.2835 -0.9380
vn 0.2818 -0.1806 -0.9423
vn 0.0401 0.0355 -0.9986
vn 0.1994 0.2534 -0.9466
vn 0.0948 0.0642 -0.9934
vn -0.7082 -0.2121 -0.6734
vn -0.4213 -0.5139 -0.7473
vn -0.2832 0.1016 -0.9537
vn -0.4628 -0.4506 0.7634
vn 0.7035 0.4738 -0.5297
vn 0.5159 0.8117 -0.2741
vn 0.9659 0.1443 -0.2150
vn -0.5589 0.7644 -0.3215
vn -0.8159 0.5116 -0.2693
vn -0.3492 0.6246 -0.6985
vn 0.7580 -0.6331 -0.1569
vn 0.8159 -0.5199 -0.2528
vn 0.0602 -0.8810 -0.4692
vn -0.7694 -0.5638 -0.3003
vn -0.5159 -0.8200 -0.2481
vn -0.8734 -0.0679 -0.4822
vn -0.7681 -0.4219 -0.4818
vn -0.1195 0.9847 -0.1266
vn 0.3562 0.6474 -0.6738
vn 0.4400 -0.2461 -0.8636
vn -0.0107 0.1882 -0.9821
vn 0.3562 -0.6686 -0.6528
vn -0.0734 0.1622 -0.9840
vn 0.1599 0.0204 -0.9869
vn 0.1779 0.0577 -0.9824
vn 0.3305 -0.8243 -0.4597
vn 0.3995 0.1420 -0.9057
vn -0.4846 0.0881 -0.8703
vn -0.1236 -0.1633 -0.9788
vn -0.4328 -0.7480 -0.5033
vn -0.1391 -0.0158 -0.9901
vn -0.1319 0.2564 -0.9575
vn -0.0577 0.0570 -0.9967
vn 0.2818 0.1505 -0.9476
vn 0.1469 -0.3066 -0.9404
vn -0.0333 0.8844 -0.4655
vn -0.8917 -0.0405 -0.4507
vn 0.8917 0.0261 -0.4518
vn 0.0333 -0.8988 -0.4370
s 1
f 1/1/1 2/2/2 3/3/3
f 2/2/4 4/4/5 3/3/6
f 5/5/7 6/6/8 4/4/9
f 3/3/10 6/7/11 1/8/12
f 7/9/13 1/1/14 6/10/15
f 1/1/1 8/11/16 2/2/2
f 2/2/4 5/5/17 4/4/5
f 5/5/7 7/12/18 6/6/8
f 3/3/10 4/4/19 6/7/11
f 7/9/13 8/11/20 1/1/14
f 9/13/21 10/14/22 11/15/23
f 12/16/24 13/17/25 10/14/26
f 14/18/27 15/19/28 13/17/29
f 13/17/30 16/20/31 17/21/32
f 18/22/33 19/23/34 20/24/35
f 15/19/36 9/25/37 11/26/38
f 9/13/39 21/27/40 12/16/41
f 18/22/42 22/28/43 9/25/44
f 12/16/45 19/23/46 14/18/47
f 23/29/48 24/30/49 25/31/50
f 26/32/51 27/33/52 28/34/53
f 29/35/54 23/29/55 26/36/56
f 28/34/57 30/37/58 31/38/59
f 25/31/50 24/30/49 32/39/60
f 27/33/61 33/40/62 30/37/63
f 30/37/64 24/30/65 34/41/66
f 27/33/67 25/42/68 35/43/69
f 35/43/70 32/44/71 33/40/62
f 33/40/72 32/45/73 24/30/65
f 17/21/74 36/46/75 37/47/76
f 11/26/77 16/20/78 15/19/79
f 10/14/80 17/21/81 37/48/82
f 10/14/83 36/49/84 11/15/85
f 31/38/86 34/41/87 29/35/88
f 25/42/68 32/50/89 35/43/69
f 19/23/90 29/35/91 20/24/92
f 21/27/93 31/38/94 19/23/95
f 20/24/96 26/36/97 22/28/98
f 22/51/99 28/34/100 21/27/101
f 9/13/21 12/16/102 10/14/22
f 12/16/24 14/18/103 13/17/25
f 14/18/27 18/22/104 15/19/28
f 13/17/30 15/19/105 16/20/31
f 18/22/33 14/18/106 19/23/34
f 15/19/36 18/22/107 9/25/37
f 9/13/39 22/51/108 21/27/40
f 18/22/42 20/24/109 22/28/43
f 12/16/45 21/27/110 19/23/46
f 23/29/48 34/41/111 24/30/49
f 26/32/51 23/52/112 27/33/52
f 29/35/54 34/41/113 23/29/55
f 28/34/57 27/33/114 30/37/58
f 27/33/61 35/43/70 33/40/62
f 30/37/64 33/40/72 24/30/65
f 27/33/67 23/52/115 25/42/68
f 17/21/74 16/20/116 36/46/75
f 11/26/77 36/53/117 16/20/78
f 10/14/80 13/17/118 17/21/81
f 10/14/83 37/48/119 36/49/84
f 31/38/86 30/37/120 34/41/87
f 19/23/90 31/38/121 29/35/91
f 21/27/93 28/34/122 31/38/94
f 20/24/96 29/35/123 26/36/97
f 22/51/99 26/32/124 28/34/100

View File

@ -1,32 +0,0 @@
# Blender MTL File: 'None'
# Material Count: 3
newmtl Material
Ns 323.999994
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
newmtl Material.006
Ns 225.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2
newmtl Material.009
Ns 225.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.450000
d 1.000000
illum 2

View File

@ -1,244 +0,0 @@
# Blender v3.0.0 OBJ File: ''
# www.blender.org
o Cube
v 1.000000 1.000000 1.000000
v 1.000000 1.000000 -1.000000
v 1.000000 -1.000000 1.000000
v 1.000000 -1.000000 -1.000000
v -1.000000 1.000000 1.000000
v -1.000000 1.000000 -1.000000
v -1.000000 -1.000000 1.000000
v -1.000000 -1.000000 -1.000000
vt 0.875000 0.500000
vt 0.625000 0.750000
vt 0.625000 0.500000
vt 0.375000 1.000000
vt 0.375000 0.750000
vt 0.625000 0.000000
vt 0.375000 0.250000
vt 0.375000 0.000000
vt 0.375000 0.500000
vt 0.125000 0.750000
vt 0.125000 0.500000
vt 0.625000 0.250000
vt 0.875000 0.750000
vt 0.625000 1.000000
vn 0.0000 0.0000 1.0000
vn 0.0000 -1.0000 0.0000
vn -1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 1.0000 0.0000
s off
f 5/1/1 3/2/1 1/3/1
f 3/2/2 8/4/2 4/5/2
f 7/6/3 6/7/3 8/8/3
f 2/9/4 8/10/4 6/11/4
f 1/3/5 4/5/5 2/9/5
f 5/12/6 2/9/6 6/7/6
f 5/1/1 7/13/1 3/2/1
f 3/2/2 7/14/2 8/4/2
f 7/6/3 5/12/3 6/7/3
f 2/9/4 4/5/4 8/10/4
f 1/3/5 3/2/5 4/5/5
f 5/12/6 1/3/6 2/9/6
o Cube.001
v -1.814604 0.161418 -2.709981
v -1.359475 0.002174 10.636601
v 0.002174 1.363824 10.636601
v 0.161417 2.137439 -2.709981
v 1.363824 0.002174 10.636601
v 2.137438 0.161418 -2.709981
v 0.002174 -1.359475 10.636601
v 0.161417 -1.814604 -2.709981
v -0.028484 -9.424881 9.196677
v -0.028485 -4.126693 23.008556
v -4.223946 0.068768 23.008556
v -9.522135 0.068768 9.196677
v -0.028485 4.264229 23.008556
v -0.028484 9.562418 9.196677
v 4.166976 0.068767 23.008556
v 9.465164 0.068769 9.196677
v 6.263892 0.068768 10.372999
v -0.028484 6.361145 10.372999
v -0.028484 6.638610 21.179264
v 6.541358 0.068768 21.179264
v -0.028485 -6.501075 21.179264
v -6.598328 0.068768 21.179264
v -0.028485 -5.165573 30.045181
v 5.205855 0.068768 30.045181
v 2.329653 0.068768 37.773296
v -0.028485 -2.289370 37.773296
v -3.490429 0.068768 31.783909
v -0.028485 -3.393177 31.783909
v -5.262825 0.068767 30.045181
v 3.433459 0.068768 31.783909
v -0.028485 3.530712 31.783909
v -0.028485 5.303108 30.045181
v -0.217867 -0.120616 46.893818
v -2.386622 0.068767 37.773296
v -0.028485 2.426905 37.773296
v -6.320862 0.068768 10.372999
v -0.028484 -6.223608 10.372999
vt 0.375000 0.250000
vt 0.625000 0.500000
vt 0.375000 0.500000
vt 0.375000 0.750000
vt 0.625000 0.750000
vt 0.375000 1.000000
vt 0.125000 0.750000
vt 0.125000 0.500000
vt 0.625000 0.000000
vt 0.375000 0.000000
vt 0.625000 0.250000
vt 0.625000 1.000000
vt 0.625000 0.000000
vt 0.375000 0.250000
vt 0.375000 0.000000
vt 0.625000 0.250000
vt 0.375000 0.500000
vt 0.625000 0.500000
vt 0.375000 0.750000
vt 0.375000 0.750000
vt 0.375000 0.500000
vt 0.625000 0.750000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.625000 1.000000
vt 0.375000 1.000000
vt 0.625000 0.250000
vt 0.625000 1.000000
vt 0.625000 1.000000
vt 0.625000 0.750000
vt 0.625000 1.000000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.625000 0.250000
vt 0.625000 0.750000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.625000 0.500000
vt 0.625000 1.000000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.625000 0.000000
vt 0.625000 0.250000
vt 0.625000 0.500000
vt 0.625000 0.750000
vt 0.125000 0.750000
vt 0.125000 0.500000
vt 0.375000 0.250000
vt 0.375000 0.000000
vt 0.625000 0.250000
vt 0.625000 0.000000
vt 0.625000 0.000000
vt 0.375000 1.000000
vn -0.7067 0.7067 0.0325
vn 0.7062 0.7062 0.0494
vn 0.7067 -0.7067 0.0325
vn 0.0000 0.0000 -1.0000
vn -0.7070 -0.7070 0.0157
vn -0.6824 -0.6824 0.2618
vn -0.6824 0.6824 0.2618
vn 0.6824 0.6824 0.2618
vn -0.3261 -0.3261 -0.8873
vn -0.5209 -0.5210 -0.6762
vn 0.6824 -0.6824 0.2618
vn 0.5209 0.5210 -0.6762
vn 0.5210 0.5209 -0.6762
vn -0.5210 0.5209 -0.6762
vn -0.5210 0.5210 -0.6762
vn -0.5209 0.5210 -0.6762
vn 0.5210 -0.5210 -0.6762
vn 0.5209 -0.5210 -0.6762
vn 0.6838 -0.6838 0.2545
vn 0.6894 -0.6894 0.2227
vn 0.6895 -0.6895 0.2219
vn 0.5736 0.5736 -0.5847
vn -0.5736 0.5736 -0.5847
vn 0.5736 -0.5736 -0.5847
vn 0.6956 -0.6956 0.1798
vn -0.6838 0.6838 0.2545
vn -0.6894 0.6894 0.2227
vn 0.6838 0.6838 0.2545
vn 0.6874 0.6874 0.2342
vn -0.6838 -0.6838 0.2545
vn -0.6913 -0.6913 0.2102
vn -0.6895 0.6895 0.2219
vn -0.6956 0.6956 0.1798
vn 0.6917 0.6917 0.2076
vn -0.3261 0.3261 -0.8873
vn 0.3261 -0.3261 -0.8873
vn 0.3261 0.3261 -0.8873
vn -0.5736 -0.5736 -0.5847
vn -0.6989 -0.6989 0.1517
vn 0.6924 0.6924 0.2029
vn -0.6924 0.6924 0.2029
vn 0.6924 -0.6924 0.2029
vn -0.6924 -0.6924 0.2029
vn 0.5210 -0.5209 -0.6762
s 1
f 9/15/7 11/16/7 12/17/7
f 11/16/8 14/18/8 12/17/8
f 13/19/9 16/20/9 14/18/9
f 12/17/10 16/21/10 9/22/10
f 15/23/11 9/15/11 16/24/11
f 9/15/7 10/25/7 11/16/7
f 11/16/8 13/19/8 14/18/8
f 13/19/9 15/26/9 16/20/9
f 12/17/10 14/18/10 16/21/10
f 15/23/11 10/25/11 9/15/11
f 18/27/12 20/28/12 17/29/12
f 19/30/13 22/31/13 20/28/13
f 21/32/14 24/33/14 22/31/14
f 22/31/15 25/34/15 26/35/15
f 23/36/16 27/37/16 28/38/16
f 24/33/17 18/39/17 17/40/17
f 18/27/18 30/41/19 19/30/19
f 23/36/20 29/42/21 18/39/22
f 19/30/23 27/37/24 21/32/24
f 31/43/25 33/44/26 34/45/27
f 36/46/28 37/47/28 35/48/28
f 38/49/29 31/43/29 36/50/29
f 35/48/30 40/51/30 39/52/30
f 34/45/27 33/44/26 41/53/31
f 37/47/32 43/54/33 40/51/32
f 40/51/34 33/44/35 32/55/34
f 37/47/36 34/56/37 42/57/37
f 42/57/38 41/58/39 43/54/33
f 43/54/35 41/59/40 33/44/35
f 26/35/10 45/60/10 44/61/10
f 17/40/41 25/34/41 24/33/41
f 20/28/42 26/35/42 44/62/42
f 20/28/43 45/63/43 17/29/43
f 39/52/44 32/55/44 38/49/44
f 34/56/37 41/64/45 42/57/37
f 27/37/46 38/49/46 28/38/46
f 30/41/47 39/52/47 27/37/47
f 28/38/48 36/50/48 29/42/48
f 29/65/49 35/48/49 30/41/49
f 18/27/12 19/30/12 20/28/12
f 19/30/13 21/32/13 22/31/13
f 21/32/14 23/36/14 24/33/14
f 22/31/15 24/33/15 25/34/15
f 23/36/16 21/32/16 27/37/16
f 24/33/17 23/36/17 18/39/17
f 18/27/18 29/65/18 30/41/19
f 23/36/20 28/38/20 29/42/21
f 19/30/23 30/41/50 27/37/24
f 31/43/25 32/55/25 33/44/26
f 36/46/28 31/66/28 37/47/28
f 38/49/29 32/55/29 31/43/29
f 35/48/30 37/47/30 40/51/30
f 37/47/32 42/57/38 43/54/33
f 40/51/34 43/54/35 33/44/35
f 37/47/36 31/66/36 34/56/37
f 26/35/10 25/34/10 45/60/10
f 17/40/41 45/67/41 25/34/41
f 20/28/42 22/31/42 26/35/42
f 20/28/43 44/62/43 45/63/43
f 39/52/44 40/51/44 32/55/44
f 27/37/46 39/52/46 38/49/46
f 30/41/47 35/48/47 39/52/47
f 28/38/48 38/49/48 36/50/48
f 29/65/49 36/46/49 35/48/49

View File

@ -29,11 +29,11 @@ layout(location = 2) out vec4 f_col;
void main() {
f_pos = inst_pos + v_pos - focus_off.xyz;
float pull_down = 1.0 / pow(distance(focus_pos.xy, f_pos.xy) / (view_distance.x * 0.95), 20.0);
float pull_down = 1.0 / pow(distance(focus_pos.xy, f_pos.xy) / (view_distance.x * 0.95), 50.0);
f_pos.z -= pull_down;
f_norm = v_norm;
f_col = vec4(vec3(0, 0.035, 0.025), 1.0);//vec4(v_col, 1.0);
f_col = vec4(vec3(0.01, 0.04, 0.0) * 1, 1.0);//vec4(v_col, 1.0);
gl_Position =
all_mat *

View File

@ -12,7 +12,8 @@ pub const ZONE_SIZE: u32 = 32;
#[derive(Copy, Clone, Hash, PartialEq, Eq, Debug, Serialize, Deserialize, EnumIter)]
#[repr(u16)]
pub enum ObjectKind {
Tree,
Oak,
Pine,
}
#[derive(Clone, Debug, Serialize, Deserialize)]

View File

@ -8,8 +8,6 @@ use bytemuck::{Pod, Zeroable};
use std::mem;
use vek::*;
pub const VERT_PAGE_SIZE: u32 = 256;
#[repr(C)]
#[derive(Copy, Clone, Debug, Zeroable, Pod)]
pub struct Vertex {

View File

@ -50,7 +50,8 @@ impl Lod {
Self {
zone_objects: HashMap::new(),
object_data: [
(lod::ObjectKind::Tree, make_lod_object("tree", renderer, global_model, &data)),
(lod::ObjectKind::Oak, make_lod_object("oak", renderer, global_model, &data)),
(lod::ObjectKind::Pine, make_lod_object("pine", renderer, global_model, &data)),
]
.into_iter()
.collect(),

View File

@ -484,7 +484,12 @@ impl World {
.map_or(false, |col| layer::tree::tree_valid_at(&col, attr.seed))
})
.map(|tree| lod::Object {
kind: lod::ObjectKind::Tree,
kind: match tree.forest_kind {
all::ForestKind::Oak => lod::ObjectKind::Oak,
all::ForestKind::Pine
| all::ForestKind::Frostpine=> lod::ObjectKind::Pine,
_ => lod::ObjectKind::Oak,
},
pos: (tree.pos - min_wpos)
.map(|e| e as u16)
.with_z(self.sim().get_alt_approx(tree.pos).unwrap_or(0.0) as u16),