diff --git a/assets/desertmap.mtl b/assets/desertmap.mtl index f21a8eb..474c7d4 100644 --- a/assets/desertmap.mtl +++ b/assets/desertmap.mtl @@ -1,5 +1,5 @@ # Blender MTL File: 'None' -# Material Count: 10 +# Material Count: 11 newmtl BarrelBrown Ns 225.000000 @@ -71,6 +71,16 @@ Ni 1.450000 d 1.000000 illum 2 +newmtl Sand.001 +Ns 225.000000 +Ka 1.000000 1.000000 1.000000 +Kd 0.488281 0.394531 0.117188 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 2 + newmtl TireGrey Ns 225.000000 Ka 1.000000 1.000000 1.000000 diff --git a/assets/desertmap.obj b/assets/desertmap.obj index 95cafe9..4610019 100644 --- a/assets/desertmap.obj +++ b/assets/desertmap.obj @@ -2,10 +2,10 @@ # www.blender.org mtllib desertmap.mtl o Plane -v -999.999939 -3.410473 -1000.000061 -v -1000.000061 -3.412755 999.999939 -v 999.999939 -3.412429 1000.000061 -v 1000.000061 -3.410147 -999.999939 +v 9.900085 -3.409659 -2500.000000 +v 9.899963 -3.413569 2499.999512 +v 2009.899902 -3.413243 2500.000000 +v 2009.900146 -3.409333 -2499.999512 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -15,14 +15,14 @@ usemtl Sand s 1 f 1/1/1 2/2/1 3/3/1 4/4/1 o Cube_Cube.002 -v -9.999956 -3.435730 -1000.000000 -v -9.089351 -2.935730 -1000.000061 -v 9.089438 -2.935727 -999.999939 -v 10.000044 -3.435727 -1000.000000 -v 9.089351 -2.938009 1000.000061 -v 9.999956 -3.438009 1000.000000 -v -9.089438 -2.938012 999.999939 -v -10.000044 -3.438012 1000.000000 +v -9.999956 -3.434916 -2499.999756 +v -9.089351 -2.934916 -2500.000000 +v 9.089438 -2.934913 -2499.999512 +v 10.000044 -3.434913 -2499.999756 +v 9.089351 -2.938823 2500.000000 +v 9.999956 -3.438823 2499.999756 +v -9.089438 -2.938826 2499.999512 +v -10.000044 -3.438826 2499.999756 vt 0.375000 0.000000 vt 0.625000 0.000000 vt 0.625000 0.250000 @@ -39,7 +39,7 @@ vt 0.875000 0.500000 vt 0.875000 0.750000 vn 0.0000 0.0000 -1.0000 vn 0.4813 0.8766 0.0000 -vn 0.0000 0.0000 1.0000 +vn -0.0000 0.0000 1.0000 vn -0.4813 0.8766 0.0000 vn 0.0000 -1.0000 -0.0000 vn -0.0000 1.0000 0.0000 @@ -52,70 +52,70 @@ f 12/12/5 11/11/5 6/13/5 5/14/5 f 8/15/6 10/10/6 12/12/6 5/16/6 f 9/9/7 7/17/7 6/18/7 11/11/7 o Cylinder.001 -v 1.874354 -2.565436 8.921887 -v 1.819549 -2.565436 9.130808 -v 1.624991 -3.025499 9.079767 -v 1.679796 -3.025499 8.870852 -v 1.235875 -3.025499 8.977695 -v 1.290679 -3.025499 8.768772 -v 1.041317 -2.565436 8.926661 -v 1.096121 -2.565435 8.717741 -v 1.235875 -2.105372 8.977695 -v 1.290679 -2.105372 8.768777 -v 1.624991 -2.105372 9.079772 -v 1.679795 -2.105372 8.870852 -v 1.420571 -2.565440 11.243089 -v 1.365766 -2.565440 11.452008 -v 1.171208 -3.025504 11.400970 -v 1.226012 -3.025504 11.192045 -v 0.782092 -3.025504 11.298891 -v 0.836896 -3.025504 11.089971 -v 0.587533 -2.565440 11.247859 -v 0.642338 -2.565440 11.038939 -v 0.782091 -2.105377 11.298897 -v 0.836896 -2.105377 11.089977 -v 1.171208 -2.105377 11.400970 -v 1.226012 -2.105377 11.192051 -v -1.235890 -2.565441 10.486849 -v -1.290694 -2.565441 10.695768 -v -1.485252 -3.025504 10.644725 -v -1.430448 -3.025504 10.435805 -v -1.874368 -3.025504 10.542651 -v -1.819564 -3.025504 10.333735 -v -2.068927 -2.565441 10.491619 -v -2.014122 -2.565441 10.282700 -v -1.874368 -2.105378 10.542657 -v -1.819564 -2.105378 10.333737 -v -1.485252 -2.105376 10.644731 -v -1.430448 -2.105376 10.435811 -v -0.687657 -2.565435 8.218823 -v -0.742461 -2.565435 8.427743 -v -0.937019 -3.025499 8.376703 -v -0.882214 -3.025499 8.167783 -v -1.326135 -3.025499 8.274632 -v -1.271331 -3.025499 8.065707 -v -1.520694 -2.565435 8.223596 -v -1.465889 -2.565434 8.014677 -v -1.326136 -2.105372 8.274632 -v -1.271331 -2.105372 8.065712 -v -0.937019 -2.105372 8.376708 -v -0.882215 -2.105372 8.167788 -v -1.893557 -2.668583 8.133513 -v -1.893558 -1.678466 8.133514 -v 2.363159 -1.678470 9.250152 -v 2.363159 -2.668583 9.250152 -v 1.815114 -1.678472 11.339345 -v 1.815114 -2.668588 11.339345 -v -2.441602 -1.678472 10.222709 -v -2.441602 -2.668589 10.222709 -v -1.011147 -1.736194 8.368137 -v -0.345176 -0.949096 8.542838 -v 1.096173 -0.949095 8.920938 -v 1.762146 -1.736194 9.095637 -v 0.548129 -0.949102 11.010131 -v 1.214102 -1.736200 11.184831 -v -0.893220 -0.949103 10.632031 -v -1.559191 -1.736201 10.457331 +v 1.874354 -2.565439 8.921887 +v 1.819549 -2.565439 9.130808 +v 1.624991 -3.025502 9.079765 +v 1.679796 -3.025502 8.870852 +v 1.235875 -3.025502 8.977695 +v 1.290679 -3.025502 8.768770 +v 1.041317 -2.565439 8.926661 +v 1.096121 -2.565437 8.717741 +v 1.235875 -2.105374 8.977695 +v 1.290679 -2.105374 8.768777 +v 1.624991 -2.105374 9.079772 +v 1.679795 -2.105374 8.870852 +v 1.420571 -2.565444 11.243089 +v 1.365766 -2.565444 11.452008 +v 1.171208 -3.025508 11.400970 +v 1.226012 -3.025508 11.192043 +v 0.782092 -3.025508 11.298889 +v 0.836896 -3.025508 11.089969 +v 0.587533 -2.565444 11.247859 +v 0.642338 -2.565444 11.038939 +v 0.782091 -2.105381 11.298897 +v 0.836896 -2.105381 11.089977 +v 1.171208 -2.105381 11.400970 +v 1.226012 -2.105381 11.192051 +v -1.235890 -2.565445 10.486849 +v -1.290694 -2.565445 10.695768 +v -1.485252 -3.025508 10.644723 +v -1.430448 -3.025508 10.435803 +v -1.874368 -3.025508 10.542649 +v -1.819564 -3.025508 10.333735 +v -2.068927 -2.565445 10.491619 +v -2.014122 -2.565445 10.282700 +v -1.874368 -2.105382 10.542657 +v -1.819564 -2.105382 10.333737 +v -1.485252 -2.105380 10.644731 +v -1.430448 -2.105380 10.435811 +v -0.687657 -2.565437 8.218823 +v -0.742461 -2.565437 8.427743 +v -0.937019 -3.025502 8.376701 +v -0.882214 -3.025502 8.167781 +v -1.326135 -3.025502 8.274632 +v -1.271331 -3.025502 8.065705 +v -1.520694 -2.565437 8.223596 +v -1.465889 -2.565436 8.014677 +v -1.326136 -2.105374 8.274632 +v -1.271331 -2.105374 8.065712 +v -0.937019 -2.105374 8.376708 +v -0.882215 -2.105374 8.167788 +v -1.893557 -2.668586 8.133513 +v -1.893558 -1.678468 8.133514 +v 2.363159 -1.678474 9.250152 +v 2.363159 -2.668586 9.250152 +v 1.815114 -1.678476 11.339345 +v 1.815114 -2.668592 11.339345 +v -2.441602 -1.678476 10.222709 +v -2.441602 -2.668593 10.222709 +v -1.011147 -1.736196 8.368137 +v -0.345176 -0.949098 8.542838 +v 1.096173 -0.949097 8.920938 +v 1.762146 -1.736196 9.095637 +v 0.548129 -0.949106 11.010131 +v 1.214102 -1.736204 11.184831 +v -0.893220 -0.949107 10.632031 +v -1.559191 -1.736205 10.457331 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.833333 1.000000 @@ -308,114 +308,114 @@ f 76/144/19 75/143/19 70/145/19 69/146/19 f 72/147/9 74/142/9 76/144/9 69/148/9 f 73/141/13 71/149/13 70/150/13 75/143/13 o Cylinder.004_Cylinder.014 -v -20.652620 0.513075 -0.500000 -v -20.652620 2.355085 -0.500000 -v -20.219608 2.355085 -0.250000 -v -20.219608 0.513075 -0.250000 -v -20.219608 2.355085 0.250000 -v -20.219608 0.513075 0.250000 -v -20.652620 2.355085 0.500000 -v -20.652620 0.513075 0.500000 -v -21.085632 2.355085 0.250000 -v -21.085632 0.513075 0.250000 -v -21.085632 2.355085 -0.250000 -v -21.085632 0.513075 -0.250000 -v -18.384640 -3.439923 -1.000007 -v -18.384640 3.054037 -1.000000 -v -17.518616 3.054037 -0.499994 -v -17.518616 -3.439923 -0.500007 -v -17.518616 3.054037 0.500000 -v -17.518616 -3.439923 0.499993 -v -18.384640 3.054037 1.000000 -v -18.384640 -3.439923 0.999993 -v -19.250666 3.054037 0.500000 -v -19.250666 -3.439923 0.499993 -v -19.250666 3.054037 -0.499994 -v -19.250666 -3.439923 -0.500007 -v -21.087086 0.503809 -0.500000 -v -19.245075 0.503809 -0.500000 -v -19.245075 0.070796 -0.250000 -v -21.087086 0.070796 -0.250000 -v -19.245075 0.070796 0.250000 -v -21.087086 0.070796 0.250000 -v -19.245075 0.503809 0.500000 -v -21.087086 0.503809 0.500000 -v -19.245075 0.936822 0.250000 -v -21.087086 0.936822 0.250000 -v -19.245075 0.936822 -0.250000 -v -21.087086 0.936822 -0.250000 -v -17.524208 -0.428985 -0.500000 -v -15.682198 -0.428985 -0.500000 -v -15.682198 -0.861997 -0.250000 -v -17.524208 -0.861997 -0.250000 -v -15.682198 -0.861997 0.250000 -v -17.524208 -0.861997 0.250000 -v -15.682198 -0.428985 0.500000 -v -17.524208 -0.428985 0.500000 -v -15.682198 0.004028 0.250000 -v -17.524208 0.004028 0.250000 -v -15.682198 0.004028 -0.250000 -v -17.524208 0.004028 -0.250000 -v -16.116661 -0.391690 -0.500000 -v -16.116661 1.450320 -0.500000 -v -15.683647 1.450320 -0.250000 -v -15.683647 -0.391690 -0.250000 -v -15.683647 1.450320 0.250000 -v -15.683647 -0.391690 0.250000 -v -16.116661 1.450320 0.500000 -v -16.116661 -0.391690 0.500000 -v -16.549673 1.450320 0.250000 -v -16.549673 -0.391690 0.250000 -v -16.549673 1.450320 -0.250000 -v -16.549673 -0.391690 -0.250000 -v -18.384640 -3.439923 -1.000007 -v -18.384640 3.054037 -1.000000 -v -17.518616 3.054037 -0.499994 -v -17.518616 -3.439923 -0.500007 -v -17.518616 3.054037 0.500000 -v -17.518616 -3.439923 0.499993 -v -18.384640 3.054037 1.000000 -v -18.384640 -3.439923 0.999993 -v -19.250666 3.054037 0.500000 -v -19.250666 -3.439923 0.499993 -v -19.250666 3.054037 -0.499994 -v -19.250666 -3.439923 -0.500007 -v -21.087086 0.503809 -0.500000 -v -19.245075 0.503809 -0.500000 -v -19.245075 0.070796 -0.250000 -v -21.087086 0.070796 -0.250000 -v -19.245075 0.070796 0.250000 -v -21.087086 0.070796 0.250000 -v -19.245075 0.503809 0.500000 -v -21.087086 0.503809 0.500000 -v -19.245075 0.936822 0.250000 -v -21.087086 0.936822 0.250000 -v -19.245075 0.936822 -0.250000 -v -21.087086 0.936822 -0.250000 -v -16.116661 -0.391690 -0.500000 -v -16.116661 1.450320 -0.500000 -v -15.683647 1.450320 -0.250000 -v -15.683647 -0.391690 -0.250000 -v -15.683647 1.450320 0.250000 -v -15.683647 -0.391690 0.250000 -v -16.116661 1.450320 0.500000 -v -16.116661 -0.391690 0.500000 -v -16.549673 1.450320 0.250000 -v -16.549673 -0.391690 0.250000 -v -16.549673 1.450320 -0.250000 -v -16.549673 -0.391690 -0.250000 -v -17.524208 -0.428985 -0.500000 -v -15.682198 -0.428985 -0.500000 -v -15.682198 -0.861997 -0.250000 -v -17.524208 -0.861997 -0.250000 -v -15.682198 -0.861997 0.250000 -v -17.524208 -0.861997 0.250000 -v -15.682198 -0.428985 0.500000 -v -17.524208 -0.428985 0.500000 -v -15.682198 0.004028 0.250000 -v -17.524208 0.004028 0.250000 -v -15.682198 0.004028 -0.250000 -v -17.524208 0.004028 -0.250000 +v -13.444137 0.513075 14.531882 +v -13.444137 2.355085 14.531882 +v -13.923638 2.355085 14.673577 +v -13.923638 0.513075 14.673577 +v -14.286101 2.355085 14.329164 +v -14.286101 0.513075 14.329165 +v -14.169063 2.355085 13.843056 +v -14.169063 0.513075 13.843056 +v -13.689561 2.355085 13.701361 +v -13.689561 0.513075 13.701361 +v -13.327098 2.355085 14.045774 +v -13.327098 0.513075 14.045774 +v -14.643912 -3.439923 16.520420 +v -14.643919 3.054037 16.520414 +v -15.602926 3.054037 16.803801 +v -15.602916 -3.439923 16.803810 +v -16.327848 3.054037 16.114977 +v -16.327841 -3.439923 16.114985 +v -16.093771 3.054037 15.142761 +v -16.093765 -3.439923 15.142767 +v -15.134767 3.054037 14.859369 +v -15.134760 -3.439923 14.859375 +v -14.409844 3.054037 15.548191 +v -14.409834 -3.439923 15.548202 +v -13.144865 0.503809 14.216927 +v -14.413691 0.503809 15.552249 +v -14.594922 0.070796 15.380042 +v -13.326097 0.070796 14.044721 +v -14.957385 0.070796 15.035628 +v -13.688560 0.070796 13.700307 +v -15.138617 0.503809 14.863422 +v -13.869791 0.503809 13.528101 +v -14.957385 0.936822 15.035628 +v -13.688560 0.936822 13.700307 +v -14.594922 0.936822 15.380042 +v -13.326097 0.936822 14.044721 +v -15.599070 -0.428985 16.799751 +v -16.867895 -0.428985 18.135073 +v -17.049126 -0.861997 17.962866 +v -15.780301 -0.861997 16.627544 +v -17.411591 -0.861997 17.618452 +v -16.142765 -0.861997 16.283131 +v -17.592821 -0.428985 17.446245 +v -16.323996 -0.428985 16.110924 +v -17.411591 0.004028 17.618452 +v -16.142765 0.004028 16.283131 +v -17.049128 0.004028 17.962866 +v -15.780301 0.004028 16.627544 +v -16.568624 -0.391690 17.820118 +v -16.568624 1.450320 17.820118 +v -17.048128 1.450320 17.961815 +v -17.048128 -0.391690 17.961815 +v -17.410591 1.450320 17.617401 +v -17.410591 -0.391690 17.617401 +v -17.293552 1.450320 17.131290 +v -17.293552 -0.391690 17.131292 +v -16.814051 1.450320 16.989597 +v -16.814049 -0.391690 16.989597 +v -16.451588 1.450320 17.334009 +v -16.451586 -0.391690 17.334009 +v -14.643912 -3.439923 16.520420 +v -14.643919 3.054037 16.520414 +v -15.602926 3.054037 16.803801 +v -15.602916 -3.439923 16.803810 +v -16.327848 3.054037 16.114977 +v -16.327841 -3.439923 16.114985 +v -16.093771 3.054037 15.142761 +v -16.093765 -3.439923 15.142767 +v -15.134767 3.054037 14.859369 +v -15.134760 -3.439923 14.859375 +v -14.409844 3.054037 15.548191 +v -14.409834 -3.439923 15.548202 +v -13.144865 0.503809 14.216927 +v -14.413691 0.503809 15.552249 +v -14.594922 0.070796 15.380042 +v -13.326097 0.070796 14.044721 +v -14.957385 0.070796 15.035628 +v -13.688560 0.070796 13.700307 +v -15.138617 0.503809 14.863422 +v -13.869791 0.503809 13.528101 +v -14.957385 0.936822 15.035628 +v -13.688560 0.936822 13.700307 +v -14.594922 0.936822 15.380042 +v -13.326097 0.936822 14.044721 +v -16.568624 -0.391690 17.820118 +v -16.568624 1.450320 17.820118 +v -17.048128 1.450320 17.961815 +v -17.048128 -0.391690 17.961815 +v -17.410591 1.450320 17.617401 +v -17.410591 -0.391690 17.617401 +v -17.293552 1.450320 17.131290 +v -17.293552 -0.391690 17.131292 +v -16.814051 1.450320 16.989597 +v -16.814049 -0.391690 16.989597 +v -16.451588 1.450320 17.334009 +v -16.451586 -0.391690 17.334009 +v -15.599070 -0.428985 16.799751 +v -16.867895 -0.428985 18.135073 +v -17.049126 -0.861997 17.962866 +v -15.780301 -0.861997 16.627544 +v -17.411591 -0.861997 17.618452 +v -16.142765 -0.861997 16.283131 +v -17.592821 -0.428985 17.446245 +v -16.323996 -0.428985 16.110924 +v -17.411591 0.004028 17.618452 +v -16.142765 0.004028 16.283131 +v -17.049128 0.004028 17.962866 +v -15.780301 0.004028 16.627544 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.833333 1.000000 @@ -650,18 +650,18 @@ vt 0.957846 0.130000 vt 0.750000 0.010000 vt 0.542154 0.130000 vt 0.542154 0.370000 -vn 0.5000 0.0000 -0.8660 -vn 1.0000 -0.0000 0.0000 -vn 0.5000 0.0000 0.8660 -vn -0.5000 -0.0000 0.8660 +vn 0.2834 0.0000 0.9590 +vn -0.6888 0.0000 0.7249 +vn -0.9722 -0.0000 -0.2341 +vn -0.2834 0.0000 -0.9590 vn 0.0000 1.0000 0.0000 -vn -1.0000 0.0000 0.0000 -vn -0.5000 0.0000 -0.8660 -vn 0.0000 -1.0000 -0.0000 -vn 0.0000 -0.5000 -0.8660 -vn 0.0000 -0.5000 0.8660 -vn 0.0000 0.5000 0.8660 -vn 0.0000 0.5000 -0.8660 +vn 0.6888 0.0000 -0.7249 +vn 0.9722 0.0000 0.2341 +vn 0.0000 -1.0000 0.0000 +vn 0.6278 -0.5000 0.5965 +vn -0.6278 -0.5000 -0.5965 +vn -0.6278 0.5000 -0.5965 +vn 0.6278 0.5000 0.5965 usemtl CactusGreen s off f 77/151/20 78/152/20 79/153/20 80/154/20 @@ -737,114 +737,114 @@ f 182/368/24 181/367/24 183/375/24 184/376/24 f 184/376/31 183/375/31 174/377/31 173/378/31 f 173/379/25 176/380/25 178/381/25 180/382/25 182/383/25 184/384/25 o Cylinder.005_Cylinder.014 -v 17.306248 0.505755 25.113844 -v 17.306248 2.347765 25.113844 -v 17.806166 2.347765 25.104740 -v 17.806166 0.505754 25.104740 -v 18.064009 2.347765 25.533129 -v 18.064009 0.505754 25.533129 -v 17.821934 2.347765 25.970623 -v 17.821934 0.505754 25.970623 -v 17.322018 2.347765 25.979725 -v 17.322018 0.505755 25.979725 -v 17.064175 2.347765 25.551338 -v 17.064173 0.505755 25.551338 -v 18.991560 -3.447243 23.515892 -v 18.991562 3.046717 23.515892 -v 19.991396 3.046716 23.497681 -v 19.991394 -3.447244 23.497681 -v 20.507080 3.046716 24.354460 -v 20.507080 -3.447244 24.354460 -v 20.022932 3.046716 25.229445 -v 20.022930 -3.447244 25.229445 -v 19.023098 3.046716 25.247656 -v 19.023098 -3.447244 25.247656 -v 18.507414 3.046717 24.390877 -v 18.507412 -3.447243 24.390877 -v 16.934010 0.496489 25.337893 -v 18.512201 0.496488 24.387995 -v 18.641123 0.063475 24.602188 -v 17.062931 0.063476 25.552086 -v 18.898966 0.063475 25.030579 -v 17.320774 0.063476 25.980474 -v 19.027887 0.496488 25.244770 -v 17.449694 0.496489 26.194668 -v 18.898966 0.929501 25.030579 -v 17.320774 0.929502 25.980474 -v 18.641123 0.929501 24.602188 -v 17.062931 0.929502 25.552086 -v 19.986603 -0.436306 23.500565 -v 21.564795 -0.436306 22.550669 -v 21.693716 -0.869318 22.764864 -v 20.115524 -0.869318 23.714762 -v 21.951559 -0.869318 23.193251 -v 20.373367 -0.869318 24.143152 -v 22.080481 -0.436306 23.407448 -v 20.502289 -0.436306 24.357344 -v 21.951561 -0.003293 23.193251 -v 20.373367 -0.003293 24.143152 -v 21.693716 -0.003293 22.764864 -v 20.115524 -0.003293 23.714762 -v 21.192556 -0.399011 22.774715 -v 21.192556 1.442999 22.774715 -v 21.692474 1.442999 22.765612 -v 21.692474 -0.399011 22.765612 -v 21.950317 1.442999 23.194000 -v 21.950317 -0.399011 23.194000 -v 21.708242 1.442999 23.631491 -v 21.708242 -0.399011 23.631491 -v 21.208326 1.442999 23.640596 -v 21.208324 -0.399011 23.640596 -v 20.950483 1.442999 23.212208 -v 20.950481 -0.399011 23.212206 -v 18.991560 -3.447243 23.515892 -v 18.991562 3.046717 23.515892 -v 19.991396 3.046716 23.497681 -v 19.991394 -3.447244 23.497681 -v 20.507080 3.046716 24.354460 -v 20.507080 -3.447244 24.354460 -v 20.022932 3.046716 25.229445 -v 20.022930 -3.447244 25.229445 -v 19.023098 3.046716 25.247656 -v 19.023098 -3.447244 25.247656 -v 18.507414 3.046717 24.390877 -v 18.507412 -3.447243 24.390877 -v 16.934010 0.496489 25.337893 -v 18.512201 0.496488 24.387995 -v 18.641123 0.063475 24.602188 -v 17.062931 0.063476 25.552086 -v 18.898966 0.063475 25.030579 -v 17.320774 0.063476 25.980474 -v 19.027887 0.496488 25.244770 -v 17.449694 0.496489 26.194668 -v 18.898966 0.929501 25.030579 -v 17.320774 0.929502 25.980474 -v 18.641123 0.929501 24.602188 -v 17.062931 0.929502 25.552086 -v 21.192556 -0.399011 22.774715 -v 21.192556 1.442999 22.774715 -v 21.692474 1.442999 22.765612 -v 21.692474 -0.399011 22.765612 -v 21.950317 1.442999 23.194000 -v 21.950317 -0.399011 23.194000 -v 21.708242 1.442999 23.631491 -v 21.708242 -0.399011 23.631491 -v 21.208326 1.442999 23.640596 -v 21.208324 -0.399011 23.640596 -v 20.950483 1.442999 23.212208 -v 20.950481 -0.399011 23.212206 -v 19.986603 -0.436306 23.500565 -v 21.564795 -0.436306 22.550669 -v 21.693716 -0.869318 22.764864 -v 20.115524 -0.869318 23.714762 -v 21.951559 -0.869318 23.193251 -v 20.373367 -0.869318 24.143152 -v 22.080481 -0.436306 23.407448 -v 20.502289 -0.436306 24.357344 -v 21.951561 -0.003293 23.193251 -v 20.373367 -0.003293 24.143152 -v 21.693716 -0.003293 22.764864 -v 20.115524 -0.003293 23.714762 +v 17.306248 0.505747 25.113844 +v 17.306248 2.347757 25.113844 +v 17.806166 2.347757 25.104740 +v 17.806166 0.505746 25.104740 +v 18.064009 2.347757 25.533129 +v 18.064009 0.505746 25.533129 +v 17.821934 2.347757 25.970623 +v 17.821934 0.505746 25.970623 +v 17.322018 2.347757 25.979725 +v 17.322018 0.505747 25.979725 +v 17.064175 2.347757 25.551338 +v 17.064173 0.505747 25.551338 +v 18.991560 -3.447251 23.515892 +v 18.991562 3.046709 23.515892 +v 19.991396 3.046708 23.497681 +v 19.991394 -3.447252 23.497681 +v 20.507080 3.046708 24.354460 +v 20.507080 -3.447252 24.354460 +v 20.022932 3.046708 25.229445 +v 20.022930 -3.447252 25.229445 +v 19.023098 3.046708 25.247656 +v 19.023098 -3.447252 25.247656 +v 18.507414 3.046709 24.390877 +v 18.507412 -3.447251 24.390877 +v 16.934010 0.496481 25.337893 +v 18.512201 0.496480 24.387995 +v 18.641123 0.063467 24.602188 +v 17.062931 0.063468 25.552086 +v 18.898966 0.063467 25.030579 +v 17.320774 0.063468 25.980474 +v 19.027887 0.496480 25.244770 +v 17.449694 0.496481 26.194668 +v 18.898966 0.929493 25.030579 +v 17.320774 0.929494 25.980474 +v 18.641123 0.929493 24.602188 +v 17.062931 0.929494 25.552086 +v 19.986603 -0.436314 23.500565 +v 21.564795 -0.436314 22.550669 +v 21.693716 -0.869326 22.764864 +v 20.115524 -0.869326 23.714762 +v 21.951559 -0.869326 23.193251 +v 20.373367 -0.869326 24.143152 +v 22.080481 -0.436314 23.407448 +v 20.502289 -0.436314 24.357344 +v 21.951561 -0.003301 23.193251 +v 20.373367 -0.003301 24.143152 +v 21.693716 -0.003301 22.764864 +v 20.115524 -0.003301 23.714762 +v 21.192556 -0.399019 22.774715 +v 21.192556 1.442991 22.774715 +v 21.692474 1.442991 22.765612 +v 21.692474 -0.399019 22.765612 +v 21.950317 1.442991 23.194000 +v 21.950317 -0.399019 23.194000 +v 21.708242 1.442991 23.631491 +v 21.708242 -0.399019 23.631491 +v 21.208326 1.442991 23.640596 +v 21.208324 -0.399019 23.640596 +v 20.950483 1.442991 23.212208 +v 20.950481 -0.399019 23.212206 +v 18.991560 -3.447251 23.515892 +v 18.991562 3.046709 23.515892 +v 19.991396 3.046708 23.497681 +v 19.991394 -3.447252 23.497681 +v 20.507080 3.046708 24.354460 +v 20.507080 -3.447252 24.354460 +v 20.022932 3.046708 25.229445 +v 20.022930 -3.447252 25.229445 +v 19.023098 3.046708 25.247656 +v 19.023098 -3.447252 25.247656 +v 18.507414 3.046709 24.390877 +v 18.507412 -3.447251 24.390877 +v 16.934010 0.496481 25.337893 +v 18.512201 0.496480 24.387995 +v 18.641123 0.063467 24.602188 +v 17.062931 0.063468 25.552086 +v 18.898966 0.063467 25.030579 +v 17.320774 0.063468 25.980474 +v 19.027887 0.496480 25.244770 +v 17.449694 0.496481 26.194668 +v 18.898966 0.929493 25.030579 +v 17.320774 0.929494 25.980474 +v 18.641123 0.929493 24.602188 +v 17.062931 0.929494 25.552086 +v 21.192556 -0.399019 22.774715 +v 21.192556 1.442991 22.774715 +v 21.692474 1.442991 22.765612 +v 21.692474 -0.399019 22.765612 +v 21.950317 1.442991 23.194000 +v 21.950317 -0.399019 23.194000 +v 21.708242 1.442991 23.631491 +v 21.708242 -0.399019 23.631491 +v 21.208326 1.442991 23.640596 +v 21.208324 -0.399019 23.640596 +v 20.950483 1.442991 23.212208 +v 20.950481 -0.399019 23.212206 +v 19.986603 -0.436314 23.500565 +v 21.564795 -0.436314 22.550669 +v 21.693716 -0.869326 22.764864 +v 20.115524 -0.869326 23.714762 +v 21.951559 -0.869326 23.193251 +v 20.373367 -0.869326 24.143152 +v 22.080481 -0.436314 23.407448 +v 20.502289 -0.436314 24.357344 +v 21.951561 -0.003301 23.193251 +v 20.373367 -0.003301 24.143152 +v 21.693716 -0.003301 22.764864 +v 20.115524 -0.003301 23.714762 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.833333 1.000000 @@ -1167,10 +1167,10 @@ f 290/602/36 289/601/36 291/609/36 292/610/36 f 292/610/43 291/609/43 282/611/43 281/612/43 f 281/613/37 284/614/37 286/615/37 288/616/37 290/617/37 292/618/37 o Plane.001 -v -32.273621 1.228992 52.337704 -v -32.273621 -3.551700 52.337704 -v -32.581696 -3.551689 43.080944 -v -32.581696 1.229004 43.080944 +v -32.273621 1.228974 52.337704 +v -32.273621 -3.551718 52.337704 +v -32.581696 -3.551703 43.080944 +v -32.581696 1.228990 43.080944 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -1180,10 +1180,10 @@ usemtl WoodBrown s off f 293/619/45 294/620/45 295/621/45 296/622/45 o Plane.002 -v -14.186427 1.228993 56.397263 -v -14.186427 -3.551700 56.397263 -v -32.274204 -3.551701 56.999252 -v -32.274204 1.228991 56.999252 +v -14.186427 1.228975 56.397263 +v -14.186427 -3.551718 56.397263 +v -32.274204 -3.551719 56.999252 +v -32.274204 1.228973 56.999252 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -1193,10 +1193,10 @@ usemtl WoodBrown s off f 297/623/46 298/624/46 299/625/46 300/626/46 o Plane.003 -v -14.649375 1.229005 42.487160 -v -14.649375 -3.551688 42.487160 -v -32.737152 -3.551689 43.089149 -v -32.737152 1.229003 43.089149 +v -14.649375 1.228991 42.487160 +v -14.649375 -3.551702 42.487160 +v -32.737152 -3.551703 43.089149 +v -32.737152 1.228989 43.089149 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -1206,10 +1206,10 @@ usemtl WoodBrown s off f 301/627/47 302/628/47 303/629/47 304/630/47 o Plane.004 -v -14.417338 5.183053 49.459148 -v -14.184873 1.148131 56.443962 -v -32.272648 1.148131 57.045948 -v -32.505116 5.183053 50.061134 +v -14.417338 5.183037 49.459148 +v -14.184873 1.148113 56.443962 +v -32.272648 1.148113 57.045948 +v -32.505116 5.183037 50.061134 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -1219,10 +1219,10 @@ usemtl WoodBrown s off f 305/631/48 306/632/48 307/633/48 308/634/48 o Plane.005 -v -14.416126 5.195728 49.495602 -v -14.650051 1.135468 42.466908 -v -32.737827 1.135468 43.068897 -v -32.503902 5.195728 50.097591 +v -14.416126 5.195712 49.495602 +v -14.650051 1.135454 42.466908 +v -32.737827 1.135454 43.068897 +v -32.503902 5.195712 50.097591 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -1232,9 +1232,9 @@ usemtl WoodBrown s off f 309/635/49 310/636/49 311/637/49 312/638/49 o Plane.006 -v -32.309101 1.215463 56.986008 -v -32.410992 5.256052 50.026894 -v -32.709499 1.215475 43.116959 +v -32.309101 1.215445 56.986008 +v -32.410992 5.256036 50.026894 +v -32.709499 1.215461 43.116959 vt 0.000000 1.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -1243,114 +1243,114 @@ usemtl WoodBrown s off f 313/639/50 314/640/50 315/641/50 o Cylinder.005_Cylinder.001_Cylinder.005_Cylinder.014 -v 25.447414 0.512960 130.639725 -v 25.447414 2.354970 130.639725 -v 25.610973 2.354968 131.112213 -v 25.610973 0.512960 131.112213 -v 25.283562 2.354968 131.490112 -v 25.283562 0.512960 131.490112 -v 24.792591 2.354968 131.395508 -v 24.792591 0.512960 131.395508 -v 24.629036 2.354970 130.923019 -v 24.629036 0.512960 130.923019 -v 24.956444 2.354970 130.545120 -v 24.956444 0.512960 130.545120 -v 27.488926 -3.440039 131.746948 -v 27.488926 3.053921 131.746948 -v 27.816044 3.053917 132.691940 -v 27.816044 -3.440043 132.691940 -v 27.161221 3.053917 133.447723 -v 27.161221 -3.440043 133.447723 -v 26.179283 3.053917 133.258514 -v 26.179283 -3.440043 133.258514 -v 25.852165 3.053921 132.313538 -v 25.852165 -3.440039 132.313538 -v 26.506989 3.053921 131.557755 -v 26.506989 -3.440039 131.557755 -v 25.119053 0.503694 130.355225 -v 26.511211 0.503694 131.561417 -v 26.347507 0.070681 131.750366 -v 24.955349 0.070681 130.544174 -v 26.020096 0.070676 132.128250 -v 24.627937 0.070681 130.922058 -v 25.856392 0.503689 132.317200 -v 24.464233 0.503694 131.111008 -v 26.020096 0.936702 132.128250 -v 24.627937 0.936707 130.922058 -v 26.347507 0.936707 131.750366 -v 24.955349 0.936707 130.544174 -v 27.811817 -0.429105 132.688278 -v 29.203976 -0.429105 133.894455 -v 29.040268 -0.862117 134.083405 -v 27.648109 -0.862117 132.877213 -v 28.712860 -0.862117 134.461304 -v 27.320698 -0.862117 133.255112 -v 28.549152 -0.429105 134.650238 -v 27.156994 -0.429105 133.444061 -v 28.712860 0.003908 134.461304 -v 27.320698 0.003908 133.255112 -v 29.040268 0.003908 134.083405 -v 27.648109 0.003908 132.877228 -v 28.875614 -0.391810 133.609970 -v 28.875614 1.450200 133.609970 -v 29.039173 1.450200 134.082458 -v 29.039173 -0.391810 134.082458 -v 28.711761 1.450200 134.460358 -v 28.711761 -0.391810 134.460342 -v 28.220795 1.450200 134.365753 -v 28.220795 -0.391810 134.365753 -v 28.057236 1.450200 133.893265 -v 28.057236 -0.391810 133.893250 -v 28.384647 1.450200 133.515366 -v 28.384647 -0.391810 133.515366 -v 27.488926 -3.440039 131.746948 -v 27.488926 3.053921 131.746948 -v 27.816044 3.053917 132.691940 -v 27.816044 -3.440043 132.691940 -v 27.161221 3.053917 133.447723 -v 27.161221 -3.440043 133.447723 -v 26.179283 3.053917 133.258514 -v 26.179283 -3.440043 133.258514 -v 25.852165 3.053921 132.313538 -v 25.852165 -3.440039 132.313538 -v 26.506989 3.053921 131.557755 -v 26.506989 -3.440039 131.557755 -v 25.119053 0.503694 130.355225 -v 26.511211 0.503694 131.561417 -v 26.347507 0.070681 131.750366 -v 24.955349 0.070681 130.544174 -v 26.020096 0.070676 132.128250 -v 24.627937 0.070681 130.922058 -v 25.856392 0.503689 132.317200 -v 24.464233 0.503694 131.111008 -v 26.020096 0.936702 132.128250 -v 24.627937 0.936707 130.922058 -v 26.347507 0.936707 131.750366 -v 24.955349 0.936707 130.544174 -v 28.875614 -0.391810 133.609970 -v 28.875614 1.450200 133.609970 -v 29.039173 1.450200 134.082458 -v 29.039173 -0.391810 134.082458 -v 28.711761 1.450200 134.460358 -v 28.711761 -0.391810 134.460342 -v 28.220795 1.450200 134.365753 -v 28.220795 -0.391810 134.365753 -v 28.057236 1.450200 133.893265 -v 28.057236 -0.391810 133.893250 -v 28.384647 1.450200 133.515366 -v 28.384647 -0.391810 133.515366 -v 27.811817 -0.429105 132.688278 -v 29.203976 -0.429105 133.894455 -v 29.040268 -0.862117 134.083405 -v 27.648109 -0.862117 132.877213 -v 28.712860 -0.862117 134.461304 -v 27.320698 -0.862117 133.255112 -v 28.549152 -0.429105 134.650238 -v 27.156994 -0.429105 133.444061 -v 28.712860 0.003908 134.461304 -v 27.320698 0.003908 133.255112 -v 29.040268 0.003908 134.083405 -v 27.648109 0.003908 132.877228 +v 25.447414 0.512918 130.639725 +v 25.447414 2.354928 130.639725 +v 25.610973 2.354926 131.112213 +v 25.610973 0.512918 131.112213 +v 25.283562 2.354926 131.490112 +v 25.283562 0.512918 131.490112 +v 24.792591 2.354926 131.395508 +v 24.792591 0.512918 131.395508 +v 24.629036 2.354928 130.923019 +v 24.629036 0.512918 130.923019 +v 24.956444 2.354928 130.545120 +v 24.956444 0.512918 130.545120 +v 27.488926 -3.440081 131.746948 +v 27.488926 3.053879 131.746948 +v 27.816044 3.053873 132.691940 +v 27.816044 -3.440087 132.691940 +v 27.161221 3.053873 133.447723 +v 27.161221 -3.440087 133.447723 +v 26.179283 3.053873 133.258514 +v 26.179283 -3.440087 133.258514 +v 25.852165 3.053879 132.313538 +v 25.852165 -3.440081 132.313538 +v 26.506989 3.053879 131.557755 +v 26.506989 -3.440081 131.557755 +v 25.119053 0.503652 130.355225 +v 26.511211 0.503652 131.561417 +v 26.347507 0.070639 131.750366 +v 24.955349 0.070639 130.544174 +v 26.020096 0.070632 132.128250 +v 24.627937 0.070639 130.922058 +v 25.856392 0.503645 132.317200 +v 24.464233 0.503652 131.111008 +v 26.020096 0.936659 132.128250 +v 24.627937 0.936665 130.922058 +v 26.347507 0.936665 131.750366 +v 24.955349 0.936665 130.544174 +v 27.811817 -0.429149 132.688278 +v 29.203976 -0.429149 133.894455 +v 29.040268 -0.862161 134.083405 +v 27.648109 -0.862161 132.877213 +v 28.712860 -0.862161 134.461304 +v 27.320698 -0.862161 133.255112 +v 28.549152 -0.429149 134.650238 +v 27.156994 -0.429149 133.444061 +v 28.712860 0.003864 134.461304 +v 27.320698 0.003864 133.255112 +v 29.040268 0.003864 134.083405 +v 27.648109 0.003864 132.877228 +v 28.875614 -0.391854 133.609970 +v 28.875614 1.450156 133.609970 +v 29.039173 1.450156 134.082458 +v 29.039173 -0.391854 134.082458 +v 28.711761 1.450156 134.460358 +v 28.711761 -0.391854 134.460342 +v 28.220795 1.450156 134.365753 +v 28.220795 -0.391854 134.365753 +v 28.057236 1.450156 133.893265 +v 28.057236 -0.391854 133.893250 +v 28.384647 1.450156 133.515366 +v 28.384647 -0.391854 133.515366 +v 27.488926 -3.440081 131.746948 +v 27.488926 3.053879 131.746948 +v 27.816044 3.053873 132.691940 +v 27.816044 -3.440087 132.691940 +v 27.161221 3.053873 133.447723 +v 27.161221 -3.440087 133.447723 +v 26.179283 3.053873 133.258514 +v 26.179283 -3.440087 133.258514 +v 25.852165 3.053879 132.313538 +v 25.852165 -3.440081 132.313538 +v 26.506989 3.053879 131.557755 +v 26.506989 -3.440081 131.557755 +v 25.119053 0.503652 130.355225 +v 26.511211 0.503652 131.561417 +v 26.347507 0.070639 131.750366 +v 24.955349 0.070639 130.544174 +v 26.020096 0.070632 132.128250 +v 24.627937 0.070639 130.922058 +v 25.856392 0.503645 132.317200 +v 24.464233 0.503652 131.111008 +v 26.020096 0.936659 132.128250 +v 24.627937 0.936665 130.922058 +v 26.347507 0.936665 131.750366 +v 24.955349 0.936665 130.544174 +v 28.875614 -0.391854 133.609970 +v 28.875614 1.450156 133.609970 +v 29.039173 1.450156 134.082458 +v 29.039173 -0.391854 134.082458 +v 28.711761 1.450156 134.460358 +v 28.711761 -0.391854 134.460342 +v 28.220795 1.450156 134.365753 +v 28.220795 -0.391854 134.365753 +v 28.057236 1.450156 133.893265 +v 28.057236 -0.391854 133.893250 +v 28.384647 1.450156 133.515366 +v 28.384647 -0.391854 133.515366 +v 27.811817 -0.429149 132.688278 +v 29.203976 -0.429149 133.894455 +v 29.040268 -0.862161 134.083405 +v 27.648109 -0.862161 132.877213 +v 28.712860 -0.862161 134.461304 +v 27.320698 -0.862161 133.255112 +v 28.549152 -0.429149 134.650238 +v 27.156994 -0.429149 133.444061 +v 28.712860 0.003864 134.461304 +v 27.320698 0.003864 133.255112 +v 29.040268 0.003864 134.083405 +v 27.648109 0.003864 132.877228 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.833333 1.000000 @@ -1672,30 +1672,30 @@ f 421/859/55 420/858/55 422/866/55 423/867/55 f 423/867/62 422/866/62 413/868/62 412/869/62 f 412/870/56 415/871/56 417/872/56 419/873/56 421/874/56 423/875/56 o Cylinder.004 -v -15.100559 -2.853598 41.063721 -v -15.100559 -2.184018 41.200592 -v -14.747005 -2.184018 41.347038 -v -14.649399 -2.853598 41.250256 -v -14.600559 -2.184018 41.700592 -v -14.462521 -2.853598 41.700592 -v -14.747005 -2.184018 42.054146 -v -14.649399 -2.853598 42.150928 -v -15.100559 -2.184018 42.200592 -v -15.100559 -2.853598 42.337463 -v -15.454113 -2.184018 42.054146 -v -15.551720 -2.853598 42.150928 -v -15.600559 -2.184018 41.700592 -v -15.738598 -2.853598 41.700592 -v -15.454113 -2.184018 41.347038 -v -15.551720 -2.853598 41.250256 -v -15.100559 -3.523178 41.200592 -v -14.747005 -3.523178 41.347038 -v -14.600559 -3.523178 41.700592 -v -14.747005 -3.523178 42.054146 -v -15.100559 -3.523178 42.200592 -v -15.454113 -3.523178 42.054146 -v -15.600559 -3.523178 41.700592 -v -15.454113 -3.523178 41.347038 +v -15.100559 -2.853612 41.063721 +v -15.100559 -2.184032 41.200592 +v -14.747005 -2.184032 41.347038 +v -14.649399 -2.853612 41.250256 +v -14.600559 -2.184032 41.700592 +v -14.462521 -2.853612 41.700592 +v -14.747005 -2.184032 42.054146 +v -14.649399 -2.853612 42.150928 +v -15.100559 -2.184032 42.200592 +v -15.100559 -2.853612 42.337463 +v -15.454113 -2.184032 42.054146 +v -15.551720 -2.853612 42.150928 +v -15.600559 -2.184032 41.700592 +v -15.738598 -2.853612 41.700592 +v -15.454113 -2.184032 41.347038 +v -15.551720 -2.853612 41.250256 +v -15.100559 -3.523192 41.200592 +v -14.747005 -3.523192 41.347038 +v -14.600559 -3.523192 41.700592 +v -14.747005 -3.523192 42.054146 +v -15.100559 -3.523192 42.200592 +v -15.454113 -3.523192 42.054146 +v -15.600559 -3.523192 41.700592 +v -15.454113 -3.523192 41.347038 vt 1.000000 0.750000 vt 1.000000 1.000000 vt 0.875000 1.000000 @@ -1748,7 +1748,7 @@ vn -0.9075 0.1869 0.3763 vn 0.0000 1.0000 0.0000 vn -0.9075 0.1869 -0.3763 vn -0.3757 0.1858 -0.9079 -vn 0.0000 -1.0000 0.0000 +vn 0.0000 -1.0000 -0.0000 vn -0.3757 -0.1858 -0.9079 vn -0.9075 -0.1869 -0.3763 vn -0.9075 -0.1869 0.3763 @@ -1778,30 +1778,30 @@ f 442/916/78 429/881/78 431/883/78 443/915/78 f 441/917/79 427/879/79 429/881/79 442/916/79 f 440/918/80 424/876/80 427/879/80 441/917/80 o Cylinder.005_Cylinder.004 -v -16.555862 -2.853598 41.076019 -v -16.555862 -2.184018 41.212891 -v -16.202309 -2.184018 41.359337 -v -16.104702 -2.853598 41.262554 -v -16.055862 -2.184018 41.712891 -v -15.917824 -2.853598 41.712891 -v -16.202309 -2.184018 42.066444 -v -16.104702 -2.853598 42.163227 -v -16.555862 -2.184018 42.212891 -v -16.555862 -2.853598 42.349762 -v -16.909416 -2.184018 42.066444 -v -17.007023 -2.853598 42.163227 -v -17.055862 -2.184018 41.712891 -v -17.193901 -2.853598 41.712891 -v -16.909416 -2.184018 41.359337 -v -17.007023 -2.853598 41.262554 -v -16.555862 -3.523178 41.212891 -v -16.202309 -3.523178 41.359337 -v -16.055862 -3.523178 41.712891 -v -16.202309 -3.523178 42.066444 -v -16.555862 -3.523178 42.212891 -v -16.909416 -3.523178 42.066444 -v -17.055862 -3.523178 41.712891 -v -16.909416 -3.523178 41.359337 +v -16.555862 -2.853612 41.076019 +v -16.555862 -2.184032 41.212891 +v -16.202309 -2.184032 41.359337 +v -16.104702 -2.853612 41.262554 +v -16.055862 -2.184032 41.712891 +v -15.917824 -2.853612 41.712891 +v -16.202309 -2.184032 42.066444 +v -16.104702 -2.853612 42.163227 +v -16.555862 -2.184032 42.212891 +v -16.555862 -2.853612 42.349762 +v -16.909416 -2.184032 42.066444 +v -17.007023 -2.853612 42.163227 +v -17.055862 -2.184032 41.712891 +v -17.193901 -2.853612 41.712891 +v -16.909416 -2.184032 41.359337 +v -17.007023 -2.853612 41.262554 +v -16.555862 -3.523192 41.212891 +v -16.202309 -3.523192 41.359337 +v -16.055862 -3.523192 41.712891 +v -16.202309 -3.523192 42.066444 +v -16.555862 -3.523192 42.212891 +v -16.909416 -3.523192 42.066444 +v -17.055862 -3.523192 41.712891 +v -16.909416 -3.523192 41.359337 vt 1.000000 0.750000 vt 1.000000 1.000000 vt 0.875000 1.000000 @@ -1884,70 +1884,70 @@ f 466/959/96 453/924/96 455/926/96 467/958/96 f 465/960/97 451/922/97 453/924/97 466/959/97 f 464/961/98 448/919/98 451/922/98 465/960/98 o Cylinder.003_Cylinder.005 -v 6.884112 -2.508767 112.389359 -v 6.668306 -2.508767 112.380470 -v 6.676583 -2.968830 112.179497 -v 6.892389 -2.968830 112.188385 -v 6.693141 -2.968830 111.777557 -v 6.908946 -2.968830 111.786446 -v 6.701416 -2.508767 111.576591 -v 6.917222 -2.508767 111.585480 -v 6.693141 -2.048703 111.777557 -v 6.908946 -2.048703 111.786446 -v 6.676583 -2.048704 112.179497 -v 6.892389 -2.048703 112.188385 -v 4.519560 -2.508768 112.442139 -v 4.303755 -2.508768 112.433243 -v 4.312034 -2.968832 112.232277 -v 4.527840 -2.968832 112.241165 -v 4.328589 -2.968832 111.830338 -v 4.544394 -2.968832 111.839226 -v 4.336867 -2.508768 111.629364 -v 4.552673 -2.508768 111.638252 -v 4.328588 -2.048705 111.830338 -v 4.544394 -2.048705 111.839226 -v 4.312033 -2.048705 112.232277 -v 4.527839 -2.048705 112.241165 -v 4.690601 -2.508768 109.685432 -v 4.474796 -2.508769 109.676544 -v 4.483076 -2.968831 109.475571 -v 4.698881 -2.968831 109.484459 -v 4.499631 -2.968831 109.073631 -v 4.715436 -2.968831 109.082520 -v 4.507909 -2.508768 108.872658 -v 4.723714 -2.508768 108.881546 -v 4.499630 -2.048706 109.073631 -v 4.715435 -2.048705 109.082520 -v 4.483075 -2.048704 109.475571 -v 4.698880 -2.048704 109.484459 -v 7.023392 -2.508767 109.736282 -v 6.807587 -2.508767 109.727394 -v 6.815863 -2.968831 109.526428 -v 7.031669 -2.968831 109.535316 -v 6.832420 -2.968831 109.124489 -v 7.048226 -2.968831 109.133377 -v 6.840697 -2.508767 108.923515 -v 7.056502 -2.508767 108.932404 -v 6.832420 -2.048704 109.124481 -v 7.048226 -2.048704 109.133377 -v 6.815863 -2.048703 109.526428 -v 7.031669 -2.048703 109.535316 -v 6.849011 -2.611915 108.540016 -v 6.849011 -1.621799 108.540016 -v 6.667898 -1.621798 112.937027 -v 6.667898 -2.611915 112.937027 -v 4.509848 -1.621800 112.848137 -v 4.509848 -2.611916 112.848137 -v 4.690959 -1.621800 108.451126 -v 4.690960 -2.611916 108.451126 -v 6.808393 -1.679527 109.452179 -v 6.780057 -0.892429 110.140099 -v 6.718731 -0.892428 111.628952 -v 6.690397 -1.679526 112.316879 -v 4.560681 -0.892430 111.540062 -v 4.532347 -1.679528 112.227989 -v 4.622006 -0.892431 110.051208 -v 4.650343 -1.679529 109.363289 +v 6.884112 -2.508803 112.389359 +v 6.668306 -2.508803 112.380470 +v 6.676583 -2.968866 112.179497 +v 6.892389 -2.968866 112.188385 +v 6.693141 -2.968866 111.777557 +v 6.908946 -2.968866 111.786446 +v 6.701416 -2.508803 111.576591 +v 6.917222 -2.508803 111.585480 +v 6.693141 -2.048739 111.777557 +v 6.908946 -2.048739 111.786446 +v 6.676583 -2.048740 112.179497 +v 6.892389 -2.048739 112.188385 +v 4.519560 -2.508804 112.442139 +v 4.303755 -2.508804 112.433243 +v 4.312034 -2.968868 112.232277 +v 4.527840 -2.968868 112.241165 +v 4.328589 -2.968868 111.830338 +v 4.544394 -2.968868 111.839226 +v 4.336867 -2.508804 111.629364 +v 4.552673 -2.508804 111.638252 +v 4.328588 -2.048741 111.830338 +v 4.544394 -2.048741 111.839226 +v 4.312033 -2.048741 112.232277 +v 4.527839 -2.048741 112.241165 +v 4.690601 -2.508804 109.685432 +v 4.474796 -2.508805 109.676544 +v 4.483076 -2.968867 109.475571 +v 4.698881 -2.968867 109.484459 +v 4.499631 -2.968867 109.073631 +v 4.715436 -2.968867 109.082520 +v 4.507909 -2.508804 108.872658 +v 4.723714 -2.508804 108.881546 +v 4.499630 -2.048742 109.073631 +v 4.715435 -2.048741 109.082520 +v 4.483075 -2.048740 109.475571 +v 4.698880 -2.048740 109.484459 +v 7.023392 -2.508803 109.736282 +v 6.807587 -2.508803 109.727394 +v 6.815863 -2.968867 109.526428 +v 7.031669 -2.968867 109.535316 +v 6.832420 -2.968867 109.124489 +v 7.048226 -2.968867 109.133377 +v 6.840697 -2.508803 108.923515 +v 7.056502 -2.508803 108.932404 +v 6.832420 -2.048740 109.124481 +v 7.048226 -2.048740 109.133377 +v 6.815863 -2.048739 109.526428 +v 7.031669 -2.048739 109.535316 +v 6.849011 -2.611951 108.540016 +v 6.849011 -1.621835 108.540016 +v 6.667898 -1.621834 112.937027 +v 6.667898 -2.611951 112.937027 +v 4.509848 -1.621836 112.848137 +v 4.509848 -2.611952 112.848137 +v 4.690959 -1.621836 108.451126 +v 4.690960 -2.611952 108.451126 +v 6.808393 -1.679563 109.452179 +v 6.780057 -0.892465 110.140099 +v 6.718731 -0.892464 111.628952 +v 6.690397 -1.679562 112.316879 +v 4.560681 -0.892466 111.540062 +v 4.532347 -1.679564 112.227989 +v 4.622006 -0.892467 110.051208 +v 4.650343 -1.679565 109.363289 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.833333 1.000000 @@ -2140,32 +2140,32 @@ f 535/1087/110 534/1086/110 529/1088/110 528/1089/110 f 531/1090/100 533/1085/100 535/1087/100 528/1091/100 f 532/1084/104 530/1092/104 529/1093/104 534/1086/104 o Plane.007_Plane.001_Plane.007_Plane.008 -v 29.973515 0.975934 52.131775 -v 30.018955 4.966446 55.348099 -v 30.152088 0.975929 58.541698 -v 38.039860 0.944258 51.807137 -v 38.039860 -3.836435 51.807137 -v 38.177254 -3.836440 58.376583 -v 38.177254 0.944253 58.376583 -v 29.973248 0.944263 52.132374 -v 29.973248 -3.836433 52.132378 -v 38.040119 -3.836431 51.854153 -v 38.040119 0.944261 51.854149 -v 30.179716 0.944258 58.561275 -v 30.179716 -3.836435 58.561275 -v 38.246586 -3.836436 58.283051 -v 38.246586 0.944260 58.283051 -v 30.076231 4.898315 55.338997 -v 29.972555 0.863401 52.110794 -v 38.039425 0.863401 51.832569 -v 38.143101 4.898315 55.060772 -v 30.075691 4.910990 55.322147 -v 30.180017 0.850721 58.570633 -v 38.246887 0.850725 58.292408 -v 38.142563 4.910990 55.043922 -v 38.055683 0.930733 51.860271 -v 38.101124 4.971314 55.076599 -v 38.234253 0.930732 58.270195 +v 29.973515 0.975918 52.131775 +v 30.018955 4.966428 55.348099 +v 30.152088 0.975909 58.541698 +v 38.039860 0.944242 51.807137 +v 38.039860 -3.836451 51.807137 +v 38.177254 -3.836460 58.376583 +v 38.177254 0.944233 58.376583 +v 29.973248 0.944247 52.132374 +v 29.973248 -3.836451 52.132378 +v 38.040119 -3.836447 51.854153 +v 38.040119 0.944245 51.854149 +v 30.179716 0.944238 58.561275 +v 30.179716 -3.836455 58.561275 +v 38.246586 -3.836456 58.283051 +v 38.246586 0.944242 58.283051 +v 30.076231 4.898297 55.338997 +v 29.972555 0.863385 52.110794 +v 38.039425 0.863385 51.832569 +v 38.143101 4.898297 55.060772 +v 30.075691 4.910972 55.322147 +v 30.180017 0.850701 58.570633 +v 38.246887 0.850707 58.292408 +v 38.142563 4.910972 55.043922 +v 38.055683 0.930717 51.860271 +v 38.101124 4.971296 55.076599 +v 38.234253 0.930714 58.270195 vt 0.000000 1.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -2208,30 +2208,30 @@ f 551/1109/114 552/1110/114 553/1111/114 554/1112/114 f 555/1113/115 556/1114/115 557/1115/115 558/1116/115 f 559/1117/116 560/1118/116 561/1119/116 o Cylinder.005_Cylinder.001_Cylinder.005_Cylinder.004 -v 38.722275 -2.853610 58.380230 -v 38.722275 -2.184030 58.517101 -v 39.075829 -2.184030 58.663548 -v 39.173439 -2.853610 58.566765 -v 39.222275 -2.184030 59.017101 -v 39.360313 -2.853610 59.017101 -v 39.075829 -2.184030 59.370655 -v 39.173439 -2.853610 59.467438 -v 38.722275 -2.184030 59.517101 -v 38.722275 -2.853610 59.653973 -v 38.368721 -2.184030 59.370655 -v 38.271118 -2.853610 59.467438 -v 38.222275 -2.184030 59.017101 -v 38.084236 -2.853610 59.017101 -v 38.368721 -2.184030 58.663548 -v 38.271118 -2.853610 58.566765 -v 38.722275 -3.523190 58.517101 -v 39.075829 -3.523190 58.663548 -v 39.222275 -3.523190 59.017101 -v 39.075829 -3.523190 59.370655 -v 38.722275 -3.523190 59.517101 -v 38.368721 -3.523190 59.370655 -v 38.222275 -3.523190 59.017101 -v 38.368721 -3.523190 58.663548 +v 38.722275 -2.853630 58.380230 +v 38.722275 -2.184050 58.517101 +v 39.075829 -2.184050 58.663548 +v 39.173439 -2.853630 58.566765 +v 39.222275 -2.184050 59.017101 +v 39.360313 -2.853630 59.017101 +v 39.075829 -2.184050 59.370655 +v 39.173439 -2.853630 59.467438 +v 38.722275 -2.184050 59.517101 +v 38.722275 -2.853630 59.653973 +v 38.368721 -2.184050 59.370655 +v 38.271118 -2.853630 59.467438 +v 38.222275 -2.184050 59.017101 +v 38.084236 -2.853630 59.017101 +v 38.368721 -2.184050 58.663548 +v 38.271118 -2.853630 58.566765 +v 38.722275 -3.523210 58.517101 +v 39.075829 -3.523210 58.663548 +v 39.222275 -3.523210 59.017101 +v 39.075829 -3.523210 59.370655 +v 38.722275 -3.523210 59.517101 +v 38.368721 -3.523210 59.370655 +v 38.222275 -3.523210 59.017101 +v 38.368721 -3.523210 58.663548 vt 1.000000 0.750000 vt 1.000000 1.000000 vt 0.875000 1.000000 @@ -2284,7 +2284,7 @@ vn -0.9075 0.1869 0.3763 vn 0.0000 1.0000 0.0000 vn -0.9075 0.1869 -0.3763 vn -0.3757 0.1858 -0.9079 -vn 0.0000 -1.0000 -0.0000 +vn 0.0000 -1.0000 0.0000 vn -0.3757 -0.1858 -0.9079 vn -0.9075 -0.1869 -0.3763 vn -0.9075 -0.1869 0.3763 @@ -2314,30 +2314,30 @@ f 580/1160/132 567/1125/132 569/1127/132 581/1159/132 f 579/1161/133 565/1123/133 567/1125/133 580/1160/133 f 578/1162/134 562/1120/134 565/1123/134 579/1161/134 o Cylinder.005_Cylinder.002_Cylinder.005_Cylinder.001 -v 29.700911 -2.853606 52.261829 -v 29.700911 -2.184025 52.398701 -v 30.054464 -2.184025 52.545147 -v 30.152071 -2.853606 52.448364 -v 30.200911 -2.184025 52.898701 -v 30.338949 -2.853606 52.898701 -v 30.054464 -2.184025 53.252254 -v 30.152071 -2.853606 53.349037 -v 29.700911 -2.184025 53.398701 -v 29.700911 -2.853606 53.535572 -v 29.347357 -2.184025 53.252254 -v 29.249750 -2.853606 53.349037 -v 29.200911 -2.184025 52.898701 -v 29.062872 -2.853606 52.898701 -v 29.347357 -2.184025 52.545147 -v 29.249750 -2.853606 52.448364 -v 29.700911 -3.523185 52.398701 -v 30.054464 -3.523185 52.545147 -v 30.200911 -3.523185 52.898701 -v 30.054464 -3.523185 53.252254 -v 29.700911 -3.523185 53.398701 -v 29.347357 -3.523185 53.252254 -v 29.200911 -3.523185 52.898701 -v 29.347357 -3.523185 52.545147 +v 29.700911 -2.853624 52.261829 +v 29.700911 -2.184043 52.398701 +v 30.054464 -2.184043 52.545147 +v 30.152071 -2.853624 52.448364 +v 30.200911 -2.184043 52.898701 +v 30.338949 -2.853624 52.898701 +v 30.054464 -2.184043 53.252254 +v 30.152071 -2.853624 53.349037 +v 29.700911 -2.184043 53.398701 +v 29.700911 -2.853624 53.535572 +v 29.347357 -2.184043 53.252254 +v 29.249750 -2.853624 53.349037 +v 29.200911 -2.184043 52.898701 +v 29.062872 -2.853624 52.898701 +v 29.347357 -2.184043 52.545147 +v 29.249750 -2.853624 52.448364 +v 29.700911 -3.523203 52.398701 +v 30.054464 -3.523203 52.545147 +v 30.200911 -3.523203 52.898701 +v 30.054464 -3.523203 53.252254 +v 29.700911 -3.523203 53.398701 +v 29.347357 -3.523203 53.252254 +v 29.200911 -3.523203 52.898701 +v 29.347357 -3.523203 52.545147 vt 1.000000 0.750000 vt 1.000000 1.000000 vt 0.875000 1.000000 @@ -2420,30 +2420,30 @@ f 604/1203/150 591/1168/150 593/1170/150 605/1202/150 f 603/1204/151 589/1166/151 591/1168/151 604/1203/151 f 602/1205/152 586/1163/152 589/1166/152 603/1204/152 o Cylinder.005_Cylinder.003_Cylinder.005_Cylinder.002 -v 29.700911 -2.853606 53.526058 -v 29.700911 -2.184026 53.662930 -v 30.054464 -2.184026 53.809376 -v 30.152071 -2.853606 53.712593 -v 30.200911 -2.184026 54.162930 -v 30.338949 -2.853606 54.162930 -v 30.054464 -2.184026 54.516483 -v 30.152071 -2.853606 54.613266 -v 29.700911 -2.184026 54.662930 -v 29.700911 -2.853606 54.799801 -v 29.347357 -2.184026 54.516483 -v 29.249750 -2.853606 54.613266 -v 29.200911 -2.184026 54.162930 -v 29.062872 -2.853606 54.162930 -v 29.347357 -2.184026 53.809376 -v 29.249750 -2.853606 53.712593 -v 29.700911 -3.523186 53.662930 -v 30.054464 -3.523186 53.809376 -v 30.200911 -3.523186 54.162930 -v 30.054464 -3.523186 54.516483 -v 29.700911 -3.523186 54.662930 -v 29.347357 -3.523186 54.516483 -v 29.200911 -3.523186 54.162930 -v 29.347357 -3.523186 53.809376 +v 29.700911 -2.853624 53.526058 +v 29.700911 -2.184044 53.662930 +v 30.054464 -2.184044 53.809376 +v 30.152071 -2.853624 53.712593 +v 30.200911 -2.184044 54.162930 +v 30.338949 -2.853624 54.162930 +v 30.054464 -2.184044 54.516483 +v 30.152071 -2.853624 54.613266 +v 29.700911 -2.184044 54.662930 +v 29.700911 -2.853624 54.799801 +v 29.347357 -2.184044 54.516483 +v 29.249750 -2.853624 54.613266 +v 29.200911 -2.184044 54.162930 +v 29.062872 -2.853624 54.162930 +v 29.347357 -2.184044 53.809376 +v 29.249750 -2.853624 53.712593 +v 29.700911 -3.523204 53.662930 +v 30.054464 -3.523204 53.809376 +v 30.200911 -3.523204 54.162930 +v 30.054464 -3.523204 54.516483 +v 29.700911 -3.523204 54.662930 +v 29.347357 -3.523204 54.516483 +v 29.200911 -3.523204 54.162930 +v 29.347357 -3.523204 53.809376 vt 1.000000 0.750000 vt 1.000000 1.000000 vt 0.875000 1.000000 @@ -2496,7 +2496,7 @@ vn -0.9075 0.1869 0.3763 vn 0.0000 1.0000 0.0000 vn -0.9075 0.1869 -0.3763 vn -0.3757 0.1858 -0.9079 -vn 0.0000 -1.0000 -0.0000 +vn 0.0000 -1.0000 0.0000 vn -0.3757 -0.1858 -0.9079 vn -0.9075 -0.1869 -0.3763 vn -0.9075 -0.1869 0.3763 @@ -2526,14 +2526,14 @@ f 628/1246/168 615/1211/168 617/1213/168 629/1245/168 f 627/1247/169 613/1209/169 615/1211/169 628/1246/169 f 626/1248/170 610/1206/170 613/1209/170 627/1247/170 o Cylinder.002 -v -20.279623 -3.262365 102.553711 -v -20.763765 10.601675 102.069275 -v -20.153152 10.651441 102.883377 -v -19.669010 -3.212596 103.367813 -v -20.765749 10.658495 103.697479 -v -20.281607 -3.205542 104.181915 -v -21.376362 10.608726 102.883377 -v -20.892220 -3.255311 103.367813 +v -20.279623 -3.262399 102.553711 +v -20.763765 10.601643 102.069275 +v -20.153152 10.651406 102.883377 +v -19.669010 -3.212630 103.367813 +v -20.765749 10.658461 103.697479 +v -20.281607 -3.205576 104.181915 +v -21.376362 10.608691 102.883377 +v -20.892220 -3.255345 103.367813 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.750000 1.000000 @@ -2567,14 +2567,14 @@ f 639/1254/174 638/1253/174 640/1259/174 641/1260/174 f 641/1260/175 640/1259/175 635/1261/175 634/1262/175 f 634/1263/176 637/1264/176 639/1265/176 641/1266/176 o Cylinder.003 -v -25.611681 -3.262365 102.553711 -v -25.127539 10.601675 102.069275 -v -24.514942 10.608726 102.883377 -v -24.999084 -3.255311 103.367813 -v -25.125555 10.658495 103.697479 -v -25.609697 -3.205542 104.181915 -v -25.738152 10.651441 102.883377 -v -26.222294 -3.212596 103.367813 +v -25.611681 -3.262399 102.553711 +v -25.127539 10.601643 102.069275 +v -24.514942 10.608691 102.883377 +v -24.999084 -3.255345 103.367813 +v -25.125555 10.658461 103.697479 +v -25.609697 -3.205576 104.181915 +v -25.738152 10.651406 102.883377 +v -26.222294 -3.212630 103.367813 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.750000 1.000000 @@ -2608,14 +2608,14 @@ f 647/1272/180 646/1271/180 648/1277/180 649/1278/180 f 649/1278/181 648/1277/181 643/1279/181 642/1280/181 f 642/1281/182 645/1282/182 647/1283/182 649/1284/182 o Cylinder.005 -v -20.281607 -3.205534 95.615540 -v -20.765749 10.658503 96.099976 -v -20.153152 10.651444 96.914078 -v -19.669010 -3.212592 96.429642 -v -20.763765 10.601675 97.728180 -v -20.279623 -3.262361 97.243744 -v -21.376362 10.608729 96.914078 -v -20.892220 -3.255307 96.429642 +v -20.281607 -3.205564 95.615540 +v -20.765749 10.658472 96.099976 +v -20.153152 10.651412 96.914078 +v -19.669010 -3.212624 96.429642 +v -20.763765 10.601643 97.728180 +v -20.279623 -3.262393 97.243744 +v -21.376362 10.608697 96.914078 +v -20.892220 -3.255339 96.429642 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.750000 1.000000 @@ -2649,26 +2649,26 @@ f 655/1290/186 654/1289/186 656/1295/186 657/1296/186 f 657/1296/187 656/1295/187 651/1297/187 650/1298/187 f 650/1299/188 653/1300/188 655/1301/188 657/1302/188 o Cylinder_Cylinder.007 -v -22.945652 10.749183 97.398727 -v -22.945652 15.272202 97.398727 -v -21.476189 15.272202 97.876183 -v -21.476189 10.749183 97.876183 -v -20.568010 15.272202 99.126183 -v -20.568010 10.749183 99.126183 -v -20.568010 15.272202 100.671272 -v -20.568010 10.749183 100.671272 -v -21.476189 15.272202 101.921272 -v -21.476189 10.749183 101.921272 -v -22.945652 15.272202 102.398727 -v -22.945652 10.749183 102.398727 -v -24.415115 15.272202 101.921272 -v -24.415115 10.749183 101.921272 -v -25.323294 15.272202 100.671272 -v -25.323294 10.749183 100.671272 -v -25.323294 15.272202 99.126183 -v -25.323294 10.749183 99.126183 -v -24.415115 15.272202 97.876183 -v -24.415115 10.749183 97.876183 +v -22.945652 10.749149 97.398727 +v -22.945652 15.272169 97.398727 +v -21.476189 15.272169 97.876183 +v -21.476189 10.749149 97.876183 +v -20.568010 15.272169 99.126183 +v -20.568010 10.749149 99.126183 +v -20.568010 15.272169 100.671272 +v -20.568010 10.749149 100.671272 +v -21.476189 15.272169 101.921272 +v -21.476189 10.749149 101.921272 +v -22.945652 15.272169 102.398727 +v -22.945652 10.749149 102.398727 +v -24.415115 15.272169 101.921272 +v -24.415115 10.749149 101.921272 +v -25.323294 15.272169 100.671272 +v -25.323294 10.749149 100.671272 +v -25.323294 15.272169 99.126183 +v -25.323294 10.749149 99.126183 +v -24.415115 15.272169 97.876183 +v -24.415115 10.749149 97.876183 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.900000 1.000000 @@ -2738,26 +2738,26 @@ f 675/1320/198 674/1319/198 676/1331/198 677/1332/198 f 677/1332/199 676/1331/199 659/1333/199 658/1334/199 f 658/1335/200 661/1336/200 663/1337/200 665/1338/200 667/1339/200 669/1340/200 671/1341/200 673/1342/200 675/1343/200 677/1344/200 o Cylinder.007_Cylinder.008 -v -21.899910 10.188636 96.037842 -v -21.899910 10.871028 96.037842 -v -19.830259 10.871024 97.389877 -v -19.830259 10.188632 97.389877 -v -18.950581 10.871024 99.700211 -v -18.950581 10.188632 99.700211 -v -19.596886 10.871024 102.086365 -v -19.596886 10.188632 102.086365 -v -21.522305 10.871019 103.636917 -v -21.522305 10.188628 103.636917 -v -23.991394 10.871019 103.759613 -v -23.991394 10.188628 103.759613 -v -26.061047 10.871024 102.407578 -v -26.061047 10.188632 102.407578 -v -26.940723 10.871024 100.097244 -v -26.940723 10.188632 100.097244 -v -26.294418 10.871024 97.711090 -v -26.294418 10.188632 97.711090 -v -24.369001 10.871028 96.160538 -v -24.369001 10.188636 96.160538 +v -21.899910 10.188605 96.037842 +v -21.899910 10.870997 96.037842 +v -19.830259 10.870992 97.389877 +v -19.830259 10.188600 97.389877 +v -18.950581 10.870992 99.700211 +v -18.950581 10.188600 99.700211 +v -19.596886 10.870992 102.086365 +v -19.596886 10.188600 102.086365 +v -21.522305 10.870985 103.636917 +v -21.522305 10.188594 103.636917 +v -23.991394 10.870985 103.759613 +v -23.991394 10.188594 103.759613 +v -26.061047 10.870992 102.407578 +v -26.061047 10.188600 102.407578 +v -26.940723 10.870992 100.097244 +v -26.940723 10.188600 100.097244 +v -26.294418 10.870992 97.711090 +v -26.294418 10.188600 97.711090 +v -24.369001 10.870997 96.160538 +v -24.369001 10.188605 96.160538 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.900000 1.000000 @@ -2827,14 +2827,14 @@ f 695/1362/210 694/1361/210 696/1373/210 697/1374/210 f 697/1374/211 696/1373/211 679/1375/211 678/1376/211 f 678/1377/212 681/1378/212 683/1379/212 685/1380/212 687/1381/212 689/1382/212 691/1383/212 693/1384/212 695/1385/212 697/1386/212 o Cylinder.008_Cylinder.009 -v -25.609697 -3.205534 95.615540 -v -25.125555 10.658503 96.099976 -v -24.514942 10.608729 96.914078 -v -24.999084 -3.255307 96.429642 -v -25.127539 10.601675 97.728180 -v -25.611681 -3.262361 97.243744 -v -25.738152 10.651444 96.914078 -v -26.222294 -3.212592 96.429642 +v -25.609697 -3.205564 95.615540 +v -25.125555 10.658472 96.099976 +v -24.514942 10.608697 96.914078 +v -24.999084 -3.255339 96.429642 +v -25.127539 10.601643 97.728180 +v -25.611681 -3.262393 97.243744 +v -25.738152 10.651412 96.914078 +v -26.222294 -3.212624 96.429642 vt 1.000000 0.500000 vt 1.000000 1.000000 vt 0.750000 1.000000 @@ -2868,10 +2868,10 @@ f 703/1392/216 702/1391/216 704/1397/216 705/1398/216 f 705/1398/217 704/1397/217 699/1399/217 698/1400/217 f 698/1401/218 701/1402/218 703/1403/218 705/1404/218 o Plane.007 -v -31.728918 -3.285808 46.548553 -v -29.728918 -3.285808 46.548553 -v -29.728918 -3.285806 44.548553 -v -31.728918 -3.285806 44.548553 +v -31.728918 -3.285824 46.548553 +v -29.728918 -3.285824 46.548553 +v -29.728918 -3.285820 44.548553 +v -31.728918 -3.285820 44.548553 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -2881,10 +2881,10 @@ usemtl EnemySpawn s 1 f 706/1405/219 707/1406/219 708/1407/219 709/1408/219 o Plane.008 -v -35.176292 -3.285810 51.956867 -v -33.176292 -3.285810 51.956867 -v -33.176292 -3.285808 49.956867 -v -35.176292 -3.285808 49.956867 +v -35.176292 -3.285828 51.956867 +v -33.176292 -3.285828 51.956867 +v -33.176292 -3.285824 49.956867 +v -35.176292 -3.285824 49.956867 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -2894,10 +2894,10 @@ usemtl EnemySpawn s off f 710/1409/220 711/1410/220 712/1411/220 713/1412/220 o Plane.009 -v -25.381832 2.854562 56.385948 -v -23.381832 2.854562 56.385948 -v -23.381832 2.854562 54.385948 -v -25.381832 2.854562 54.385948 +v -25.381832 2.854544 56.385948 +v -23.381832 2.854544 56.385948 +v -23.381832 2.854544 54.385948 +v -25.381832 2.854544 54.385948 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -2907,10 +2907,10 @@ usemtl EnemySpawn s off f 714/1413/221 715/1414/221 716/1415/221 717/1416/221 o Plane.010 -v 33.937183 -3.285810 54.687302 -v 35.937183 -3.285810 54.687302 -v 35.937183 -3.285810 52.687302 -v 33.937183 -3.285810 52.687302 +v 33.937183 -3.285828 54.687302 +v 35.937183 -3.285828 54.687302 +v 35.937183 -3.285828 52.687302 +v 33.937183 -3.285828 52.687302 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -2920,10 +2920,10 @@ usemtl EnemySpawn s off f 718/1417/222 719/1418/222 720/1419/222 721/1420/222 o Plane.011 -v 39.253201 -3.285810 56.105961 -v 41.253201 -3.285810 56.105961 -v 41.253201 -3.285810 54.105961 -v 39.253201 -3.285810 54.105961 +v 39.253201 -3.285828 56.105961 +v 41.253201 -3.285828 56.105961 +v 41.253201 -3.285828 54.105961 +v 39.253201 -3.285828 54.105961 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -2933,10 +2933,10 @@ usemtl EnemySpawn s off f 722/1421/223 723/1422/223 724/1423/223 725/1424/223 o Plane.012 -v 27.816395 -3.285836 135.293716 -v 29.816395 -3.285836 135.293716 -v 29.816395 -3.285836 133.293716 -v 27.816395 -3.285836 133.293716 +v 27.816395 -3.285880 135.293716 +v 29.816395 -3.285880 135.293716 +v 29.816395 -3.285880 133.293716 +v 27.816395 -3.285880 133.293716 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -2946,10 +2946,10 @@ usemtl EnemySpawn s off f 726/1425/224 727/1426/224 728/1427/224 729/1428/224 o Plane.013 -v 6.965681 -2.935365 115.258972 -v 8.965681 -2.935365 115.258972 -v 8.965681 -2.935364 113.258972 -v 6.965681 -2.935364 113.258972 +v 6.965681 -2.935403 115.258972 +v 8.965681 -2.935403 115.258972 +v 8.965681 -2.935400 113.258972 +v 6.965681 -2.935400 113.258972 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -2959,10 +2959,10 @@ usemtl EnemySpawn s off f 730/1429/225 731/1430/225 732/1431/225 733/1432/225 o Plane.014 -v -27.789780 -3.285824 99.986740 -v -25.789780 -3.285824 99.986740 -v -25.789780 -3.285824 97.986740 -v -27.789780 -3.285824 97.986740 +v -27.789780 -3.285856 99.986740 +v -25.789780 -3.285856 99.986740 +v -25.789780 -3.285856 97.986740 +v -27.789780 -3.285856 97.986740 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -2972,10 +2972,10 @@ usemtl EnemySpawn s off f 734/1433/226 735/1434/226 736/1435/226 737/1436/226 o Plane.015 -v -26.163361 11.085602 103.587730 -v -24.163361 11.085602 103.587730 -v -24.163361 11.085604 101.587730 -v -26.163361 11.085604 101.587730 +v -26.163361 11.085567 103.587730 +v -24.163361 11.085567 103.587730 +v -24.163361 11.085572 101.587730 +v -26.163361 11.085572 101.587730 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 @@ -2985,14 +2985,14 @@ usemtl EnemySpawn s off f 738/1437/227 739/1438/227 740/1439/227 741/1440/227 o Cube_Cube.001 -v 29.870564 -3.398280 51.904179 -v 29.870564 -1.698280 51.904179 -v 30.080585 -3.398280 50.217201 -v 30.080585 -1.698280 50.217201 -v 31.557541 -3.398280 52.114197 -v 31.557541 -1.698280 52.114197 -v 31.767563 -3.398280 50.427219 -v 31.767563 -1.698280 50.427219 +v 29.870564 -3.398296 51.659676 +v 29.870564 -1.698296 51.659676 +v 30.080585 -1.698296 49.972698 +v 30.080585 -3.398296 49.972698 +v 31.767563 -1.698296 50.182716 +v 31.767563 -3.398296 50.182716 +v 31.557541 -1.698297 51.869694 +v 31.557541 -3.398297 51.869694 vt 0.375000 0.000000 vt 0.625000 0.000000 vt 0.625000 0.250000 @@ -3011,25 +3011,25 @@ vn -0.9923 0.0000 -0.1235 vn 0.1235 0.0000 -0.9923 vn 0.9923 0.0000 0.1235 vn -0.1235 0.0000 0.9923 -vn 0.0000 -1.0000 -0.0000 +vn -0.0000 -1.0000 0.0000 vn 0.0000 1.0000 0.0000 usemtl BarrelBrown s off -f 742/1441/228 743/1442/228 745/1443/228 744/1444/228 -f 744/1444/229 745/1443/229 749/1445/229 748/1446/229 -f 748/1446/230 749/1445/230 747/1447/230 746/1448/230 -f 746/1448/231 747/1447/231 743/1449/231 742/1450/231 -f 744/1451/232 748/1446/232 746/1448/232 742/1452/232 -f 749/1445/233 745/1453/233 743/1454/233 747/1447/233 +f 742/1441/228 743/1442/228 744/1443/228 745/1444/228 +f 745/1444/229 744/1443/229 746/1445/229 747/1446/229 +f 747/1446/230 746/1445/230 748/1447/230 749/1448/230 +f 749/1448/231 748/1447/231 743/1449/231 742/1450/231 +f 745/1451/232 747/1446/232 749/1448/232 742/1452/232 +f 746/1445/233 744/1453/233 743/1454/233 748/1447/233 o Cube.001 -v 30.060268 -3.398280 50.268753 -v 30.060268 -1.698280 50.268753 -v 29.886738 -3.398280 48.577633 -v 29.886738 -1.698280 48.577633 -v 31.751389 -3.398280 50.095219 -v 31.751389 -1.698280 50.095219 -v 31.577858 -3.398280 48.404099 -v 31.577858 -1.698280 48.404099 +v 30.060268 -3.398296 50.024250 +v 30.060268 -1.698296 50.024250 +v 29.886738 -1.698296 48.333130 +v 29.886738 -3.398296 48.333130 +v 31.577858 -1.698296 48.159595 +v 31.577858 -3.398296 48.159595 +v 31.751389 -1.698296 49.850716 +v 31.751389 -3.398296 49.850716 vt 0.375000 0.000000 vt 0.625000 0.000000 vt 0.625000 0.250000 @@ -3048,25 +3048,25 @@ vn -0.9948 0.0000 0.1021 vn -0.1021 0.0000 -0.9948 vn 0.9948 0.0000 -0.1021 vn 0.1021 0.0000 0.9948 -vn 0.0000 -1.0000 0.0000 -vn 0.0000 1.0000 0.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 0.0000 usemtl BarrelBrown s off -f 750/1455/234 751/1456/234 753/1457/234 752/1458/234 -f 752/1458/235 753/1457/235 757/1459/235 756/1460/235 -f 756/1460/236 757/1459/236 755/1461/236 754/1462/236 -f 754/1462/237 755/1461/237 751/1463/237 750/1464/237 -f 752/1465/238 756/1460/238 754/1462/238 750/1466/238 -f 757/1459/239 753/1467/239 751/1468/239 755/1461/239 +f 750/1455/234 751/1456/234 752/1457/234 753/1458/234 +f 753/1458/235 752/1457/235 754/1459/235 755/1460/235 +f 755/1460/236 754/1459/236 756/1461/236 757/1462/236 +f 757/1462/237 756/1461/237 751/1463/237 750/1464/237 +f 753/1465/238 755/1460/238 757/1462/238 750/1466/238 +f 754/1459/239 752/1467/239 751/1468/239 756/1461/239 o Cube.002_Cube.001 -v 30.004444 -3.415900 48.380486 -v 30.004444 -2.015899 48.380486 -v 29.935097 -3.415900 46.681900 -v 29.935097 -2.015899 46.681900 -v 31.703030 -3.415900 48.311142 -v 31.703030 -2.015899 48.311142 -v 31.633682 -3.415900 46.612556 -v 31.633682 -2.015899 46.612556 +v 30.004444 -3.415916 48.135983 +v 30.004444 -2.015915 48.135983 +v 29.935097 -2.015914 46.437397 +v 29.935097 -3.415915 46.437397 +v 31.633682 -2.015914 46.368053 +v 31.633682 -3.415915 46.368053 +v 31.703030 -2.015915 48.066639 +v 31.703030 -3.415916 48.066639 vt 0.375000 0.000000 vt 0.625000 0.000000 vt 0.625000 0.250000 @@ -3085,25 +3085,25 @@ vn -0.9992 0.0000 0.0408 vn -0.0408 0.0000 -0.9992 vn 0.9992 0.0000 -0.0408 vn 0.0408 0.0000 0.9992 -vn 0.0000 -1.0000 0.0000 +vn -0.0000 -1.0000 -0.0000 vn 0.0000 1.0000 0.0000 usemtl BarrelBrown s off -f 758/1469/240 759/1470/240 761/1471/240 760/1472/240 -f 760/1472/241 761/1471/241 765/1473/241 764/1474/241 -f 764/1474/242 765/1473/242 763/1475/242 762/1476/242 -f 762/1476/243 763/1475/243 759/1477/243 758/1478/243 -f 760/1479/244 764/1474/244 762/1476/244 758/1480/244 -f 765/1473/245 761/1481/245 759/1482/245 763/1475/245 +f 758/1469/240 759/1470/240 760/1471/240 761/1472/240 +f 761/1472/241 760/1471/241 762/1473/241 763/1474/241 +f 763/1474/242 762/1473/242 764/1475/242 765/1476/242 +f 765/1476/243 764/1475/243 759/1477/243 758/1478/243 +f 761/1479/244 763/1474/244 765/1476/244 758/1480/244 +f 762/1473/245 760/1481/245 759/1482/245 764/1475/245 o Cube.003_Cube.001 -v 30.040190 -1.709373 50.216812 -v 30.040190 -0.009373 50.216812 -v 29.903446 -1.709373 48.522320 -v 29.903446 -0.009373 48.522320 -v 31.734680 -1.709373 50.080067 -v 31.734680 -0.009373 50.080067 -v 31.597937 -1.709373 48.385574 -v 31.597937 -0.009373 48.385574 +v 30.040190 -1.709389 49.972309 +v 30.040190 -0.009389 49.972309 +v 29.903446 -0.009389 48.277817 +v 29.903446 -1.709389 48.277817 +v 31.597937 -0.009389 48.141071 +v 31.597937 -1.709389 48.141071 +v 31.734680 -0.009389 49.835564 +v 31.734680 -1.709389 49.835564 vt 0.375000 0.000000 vt 0.625000 0.000000 vt 0.625000 0.250000 @@ -3122,25 +3122,25 @@ vn -0.9968 0.0000 0.0804 vn -0.0804 0.0000 -0.9968 vn 0.9968 0.0000 -0.0804 vn 0.0804 0.0000 0.9968 -vn 0.0000 -1.0000 0.0000 -vn 0.0000 1.0000 0.0000 +vn 0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 0.0000 usemtl BarrelBrown s off -f 766/1483/246 767/1484/246 769/1485/246 768/1486/246 -f 768/1486/247 769/1485/247 773/1487/247 772/1488/247 -f 772/1488/248 773/1487/248 771/1489/248 770/1490/248 -f 770/1490/249 771/1489/249 767/1491/249 766/1492/249 -f 768/1493/250 772/1488/250 770/1490/250 766/1494/250 -f 773/1487/251 769/1495/251 767/1496/251 771/1489/251 +f 766/1483/246 767/1484/246 768/1485/246 769/1486/246 +f 769/1486/247 768/1485/247 770/1487/247 771/1488/247 +f 771/1488/248 770/1487/248 772/1489/248 773/1490/248 +f 773/1490/249 772/1489/249 767/1491/249 766/1492/249 +f 769/1493/250 771/1488/250 773/1490/250 766/1494/250 +f 770/1487/251 768/1495/251 767/1496/251 772/1489/251 o Cube.004_Cube.001 -v 30.067175 -1.709373 52.029953 -v 30.067175 -0.009373 52.029953 -v 29.881159 -1.709373 50.340160 -v 29.881159 -0.009373 50.340160 -v 31.756968 -1.709373 51.843937 -v 31.756968 -0.009373 51.843937 -v 31.570951 -1.709373 50.154144 -v 31.570951 -0.009373 50.154144 +v 30.067175 -1.709389 51.785450 +v 30.067175 -0.009390 51.785450 +v 29.881159 -0.009389 50.095657 +v 29.881159 -1.709389 50.095657 +v 31.570951 -0.009389 49.909641 +v 31.570951 -1.709389 49.909641 +v 31.756968 -0.009389 51.599434 +v 31.756968 -1.709389 51.599434 vt 0.375000 0.000000 vt 0.625000 0.000000 vt 0.625000 0.250000 @@ -3159,13 +3159,26 @@ vn -0.9940 0.0000 0.1094 vn -0.1094 0.0000 -0.9940 vn 0.9940 0.0000 -0.1094 vn 0.1094 0.0000 0.9940 -vn 0.0000 -1.0000 0.0000 -vn 0.0000 1.0000 0.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 0.0000 usemtl BarrelBrown s off -f 774/1497/252 775/1498/252 777/1499/252 776/1500/252 -f 776/1500/253 777/1499/253 781/1501/253 780/1502/253 -f 780/1502/254 781/1501/254 779/1503/254 778/1504/254 -f 778/1504/255 779/1503/255 775/1505/255 774/1506/255 -f 776/1507/256 780/1502/256 778/1504/256 774/1508/256 -f 781/1501/257 777/1509/257 775/1510/257 779/1503/257 +f 774/1497/252 775/1498/252 776/1499/252 777/1500/252 +f 777/1500/253 776/1499/253 778/1501/253 779/1502/253 +f 779/1502/254 778/1501/254 780/1503/254 781/1504/254 +f 781/1504/255 780/1503/255 775/1505/255 774/1506/255 +f 777/1507/256 779/1502/256 781/1504/256 774/1508/256 +f 778/1501/257 776/1509/257 775/1510/257 780/1503/257 +o Plane.016 +v -9.899841 -3.410771 2500.000000 +v -9.900208 -3.412457 -2499.999512 +v -2009.900146 -3.412131 -2500.000000 +v -2009.899902 -3.410445 2499.999512 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vn 0.0000 1.0000 -0.0000 +usemtl Sand.001 +s 1 +f 782/1511/258 783/1512/258 784/1513/258 785/1514/258 diff --git a/assets/pistol.obj b/assets/pistol.obj index 5da4553..de59cc2 100644 --- a/assets/pistol.obj +++ b/assets/pistol.obj @@ -1,15 +1,15 @@ # Blender v3.0.0 OBJ File: '' # www.blender.org mtllib pistol.mtl -o Cube.001 -v 0.237370 -0.211333 0.854478 -v 0.237370 0.211333 0.854478 -v -0.237370 0.211333 0.854478 -v -0.237370 -0.211333 0.854478 -v -0.237370 0.211333 -0.854478 -v -0.237370 -0.211333 -0.854478 -v 0.237370 0.211333 -0.854478 -v 0.237370 -0.211333 -0.854478 +o Cube.003 +v 0.166159 -0.211333 0.854478 +v 0.166159 0.211333 0.854478 +v -0.166159 0.211333 0.854478 +v -0.166159 -0.211333 0.854478 +v -0.166159 0.211333 -0.854478 +v -0.166159 -0.211333 -0.854478 +v 0.166159 0.211333 -0.854478 +v 0.166159 -0.211333 -0.854478 vt 0.375000 0.000000 vt 0.625000 0.000000 vt 0.625000 0.250000 @@ -24,11 +24,11 @@ vt 0.125000 0.500000 vt 0.125000 0.750000 vt 0.875000 0.500000 vt 0.875000 0.750000 -vn 0.0000 0.0000 1.0000 +vn 0.0000 -0.0000 1.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 +vn 1.0000 -0.0000 0.0000 +vn 0.0000 -1.0000 -0.0000 vn 0.0000 1.0000 0.0000 usemtl GunBlack s 1 @@ -38,15 +38,15 @@ f 6/6/3 5/5/3 7/7/3 8/8/3 f 8/8/4 7/7/4 2/9/4 1/10/4 f 4/11/5 6/6/5 8/8/5 1/12/5 f 5/5/6 3/13/6 2/14/6 7/7/6 -o Cube.002 -v 0.195209 -0.993493 -0.522428 -v 0.195209 -0.160553 -0.278689 -v -0.195209 -0.160553 -0.278689 -v -0.195209 -0.993493 -0.522428 -v -0.195209 -0.041612 -0.685152 -v -0.195209 -0.874552 -0.928891 -v 0.195209 -0.041612 -0.685152 -v 0.195209 -0.874552 -0.928891 +o Cube.004 +v 0.136646 -0.993493 -0.522428 +v 0.136646 -0.160553 -0.278689 +v -0.136646 -0.160553 -0.278689 +v -0.136646 -0.993493 -0.522428 +v -0.136646 -0.041612 -0.685152 +v -0.136646 -0.874552 -0.928891 +v 0.136646 -0.041612 -0.685152 +v 0.136646 -0.874552 -0.928891 vt 0.375000 0.000000 vt 0.625000 0.000000 vt 0.625000 0.250000 @@ -64,8 +64,8 @@ vt 0.875000 0.750000 vn 0.0000 -0.2808 0.9598 vn -1.0000 0.0000 0.0000 vn 0.0000 0.2808 -0.9598 -vn 1.0000 -0.0000 -0.0000 -vn -0.0000 -0.9598 -0.2808 +vn 1.0000 0.0000 0.0000 +vn 0.0000 -0.9598 -0.2808 vn 0.0000 0.9598 0.2808 usemtl GunBlack s 1 @@ -75,15 +75,15 @@ f 14/20/9 13/19/9 15/21/9 16/22/9 f 16/22/10 15/21/10 10/23/10 9/24/10 f 12/25/11 14/20/11 16/22/11 9/26/11 f 13/19/12 11/27/12 10/28/12 15/21/12 -o Cube.003 -v 0.178247 0.211459 -0.860968 -v 0.089401 0.211459 -0.860968 -v 0.089401 0.285895 -0.860968 -v 0.178247 0.285895 -0.860968 -v 0.089401 0.211459 -0.747446 -v 0.089401 0.285895 -0.747446 -v 0.178247 0.211459 -0.747446 -v 0.178247 0.285895 -0.747446 +o Cube.005 +v 0.124773 0.211459 -0.860968 +v 0.062581 0.211459 -0.860968 +v 0.062581 0.285895 -0.860968 +v 0.124773 0.285895 -0.860968 +v 0.062581 0.211459 -0.747446 +v 0.062581 0.285895 -0.747446 +v 0.124773 0.211459 -0.747446 +v 0.124773 0.285895 -0.747446 vt 0.375000 0.000000 vt 0.375000 0.250000 vt 0.625000 0.250000 @@ -98,11 +98,11 @@ vt 0.125000 0.500000 vt 0.125000 0.750000 vt 0.875000 0.750000 vt 0.875000 0.500000 -vn -0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 -1.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 +vn 0.0000 0.0000 1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 -1.0000 -0.0000 vn 0.0000 1.0000 0.0000 usemtl GunBlack s 1 @@ -112,15 +112,15 @@ f 21/33/15 23/35/15 24/36/15 22/34/15 f 23/35/16 17/37/16 20/38/16 24/36/16 f 18/39/17 17/40/17 23/35/17 21/33/17 f 22/34/18 24/36/18 20/41/18 19/42/18 -o Cube.004 -v -0.089401 0.211459 -0.860968 -v -0.178247 0.211459 -0.860968 -v -0.178247 0.285895 -0.860968 -v -0.089401 0.285895 -0.860968 -v -0.178247 0.211459 -0.747446 -v -0.178247 0.285895 -0.747446 -v -0.089401 0.211459 -0.747446 -v -0.089401 0.285895 -0.747446 +o Cube.006 +v -0.062581 0.211459 -0.860968 +v -0.124773 0.211459 -0.860968 +v -0.124773 0.285895 -0.860968 +v -0.062581 0.285895 -0.860968 +v -0.124773 0.211459 -0.747446 +v -0.124773 0.285895 -0.747446 +v -0.062581 0.211459 -0.747446 +v -0.062581 0.285895 -0.747446 vt 0.375000 0.000000 vt 0.375000 0.250000 vt 0.625000 0.250000 @@ -137,9 +137,9 @@ vt 0.875000 0.750000 vt 0.875000 0.500000 vn 0.0000 0.0000 -1.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 +vn 0.0000 0.0000 1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 -1.0000 -0.0000 vn 0.0000 1.0000 0.0000 usemtl GunBlack s 1 @@ -150,10 +150,10 @@ f 31/49/22 25/51/22 28/52/22 32/50/22 f 26/53/23 25/54/23 31/49/23 29/47/23 f 30/48/24 32/50/24 28/55/24 27/56/24 o Plane -v -0.021265 0.159086 0.808509 -v -0.021265 0.259563 0.808509 -v 0.021265 0.259563 0.808509 -v 0.021265 0.159086 0.808509 +v -0.022621 0.159086 0.808509 +v -0.022621 0.259563 0.808509 +v 0.022621 0.259563 0.808509 +v 0.022621 0.159086 0.808509 vt 0.000000 0.000000 vt 1.000000 0.000000 vt 1.000000 1.000000 diff --git a/assets/smg.mtl b/assets/smg.mtl index 91d2a3a..8a1187e 100644 --- a/assets/smg.mtl +++ b/assets/smg.mtl @@ -4,7 +4,7 @@ newmtl smgBlack Ns 225.000000 Ka 1.000000 1.000000 1.000000 -Kd 0.15 0.15 0.15 +Kd 0.150000 0.150000 0.150000 Ks 0.500000 0.500000 0.500000 Ke 0.000000 0.000000 0.000000 Ni 1.450000 @@ -14,7 +14,7 @@ illum 2 newmtl smgRedDot Ns 323.999994 Ka 1.000000 1.000000 1.000000 -Kd 1.0 0.0 0.0 +Kd 1.000000 0.000000 0.000000 Ks 0.500000 0.500000 0.500000 Ke 0.000000 0.000000 0.000000 Ni 1.450000 diff --git a/game.js b/game.js index 3924e28..030e2fc 100644 --- a/game.js +++ b/game.js @@ -9,7 +9,7 @@ let [cos, sin] = [Math.cos.bind(Math), Math.sin.bind(Math)]; let gameState = "menu"; -let enemyVel = null, playerVel = null, rollSpeed = null, pitchSpeed = null, enemyRollSpeed = null, enemyPitchSpeed = null, aimAssistRange = null, playerRadius = null, hp = null, enemyHP = null, pain = null, gravity = null, jumpSpeed = null, step = null, accelFactor = null, FOV = null, trueFOV = null, cameraDistance = null, bloom = null, weaponTraits = null, aimFactor = null, gun = null, recoil = null, shotCooldown = null, sway = null, reloading = null, reloadTime = null, enemyBloom = null, enemyShotChance = null, hitShot = null, enemyDamage = null, frameBounds = null, showCrosshair = null; +let enemyVel = null, playerVel = null, rollSpeed = null, pitchSpeed = null, enemyRollSpeed = null, enemyPitchSpeed = null, aimAssistRange = null, playerRadius = null, hp = null, enemyHP = null, pain = null, gravity = null, jumpSpeed = null, step = null, accelFactor = null, FOV = null, trueFOV = null, cameraDistance = null, bloom = null, weaponTraits = null, aimFactor = null, gun = null, recoil = null, shotCooldown = null, sway = null, reloading = null, reloadTime = null, enemyBloom = null, enemyShotChance = null, hitShot = null, enemyDamage = null, frameBounds = null, showCrosshair = null, showAmmo = null, showHP = null, showFPS = null, showHits = null, mouseMovement = null, equipTimer = null; let bulletVel = null; let mapBoundaries = null; let gameActive = false; @@ -17,8 +17,8 @@ let gameActive = false; let player = null, enemy = null, map = null, fire = null, pistol = null, smg = null, shotgun = null, sniper = null; function resetValues() { - enemyVel = 1.5; playerVel = [0, 0, 0]; rollSpeed = 0.1; pitchSpeed = 0.04; enemyRollSpeed = 0.07; enemyPitchSpeed = 0.035; aimAssistRange = Math.PI/24; bulletVel = 5; playerRadius = 1.5; hp = 100; enemyHP = 100; pain = 0; showCrosshair = true; - jumpSpeed = 1.5; gravity = .4, step = 0.1; accelFactor = 1.2; trueFOV = FOV = [Math.PI/1.7, Math.PI/2.2]; cameraDistance = 0; bloom = Math.PI/10; aimFactor = 0; recoil = 0; shotCooldown = 0; sway = 0; reloading = false; reloadTime = 0; enemyBloom = Math.PI/25; enemyShotChance = .1; enemyDamage = 10; frameBounds = [11, 14]; + enemyVel = 1.5; playerVel = [0, 0, 0]; rollSpeed = 0.1; pitchSpeed = 0.04; enemyRollSpeed = 0.07; enemyPitchSpeed = 0.035; aimAssistRange = Math.PI/24; bulletVel = 5; playerRadius = 1.5; hp = 100; enemyHP = 100; pain = 0; showCrosshair = true; showAmmo = true; showHP = true; showFPS = true; showHits = true; + jumpSpeed = 1.5; gravity = .4, step = 0.1; accelFactor = 1.2; trueFOV = FOV = [/*Math.PI/1.7*/2.012742, Math.PI/2.2]; cameraDistance = 0; bloom = Math.PI/10; aimFactor = 0; recoil = 0; shotCooldown = 0; sway = 0; reloading = false; reloadTime = 0; enemyBloom = Math.PI/25; enemyShotChance = .1; enemyDamage = 10; frameBounds = [11, 14]; mouseMovement = [0, 0]; equipTimer = 0; hitShot = {state: 1, frames: 0}; shapes = []; bullets = []; enemies = []; lasers = []; player = copyShape(playerTemplate); player.move([0, 2, 4]); if (cameraDistance > 0) shapes.push(player); @@ -45,7 +45,7 @@ function resetValues() { runningBloom: 1.5, defaultBloom: Math.PI/50, normalPos: [-1.2, -.5, 2.5], - aimPos: [0, -.24, 2.5], + aimPos: [0, -.24, 2], recoil: 1, damage: 20, cooldown: 2, @@ -60,11 +60,11 @@ function resetValues() { runningBloom: .5, defaultBloom: Math.PI/120, normalPos: [-2, -1, 3], - aimPos: [0, -.79, 2], - recoil: 1.2, + aimPos: [0, -.79, 2.5], + recoil: .5, damage: 12, cooldown: 2, - fovFactor: .7, + fovFactor: .5, slot: 2, ammo: 30, totalAmmo: 30, @@ -75,7 +75,7 @@ function resetValues() { automatic: true, runningBloom: 0.2, defaultBloom: 0*Math.PI/70, - normalPos: [-3, -1.5, 8], + normalPos: [-3, -1.5, 11], aimPos: [0, -.9, 6], recoil: 10, damage: 15, @@ -92,13 +92,13 @@ function resetValues() { name: "Sniper", automatic: false, runningBloom: 3, - defaultBloom: Math.PI/200, + defaultBloom: 0*Math.PI/200, normalPos: [-3, -2, 7], - aimPos: [0, -1.57, 6], + aimPos: [0, -1.57, 8], recoil: 5, damage: 70, cooldown: 30, - fovFactor: .25, + fovFactor: .22, slot: 4, ammo: 1, totalAmmo: 1, @@ -135,7 +135,7 @@ function drawPixel(canvasData, depthBuffer, x, y, r, g, b, depth, viewmodelBuffe if ((((!viewmodel)||viewmodelBuffer[index]) && (depthBuffer[index] !== undefined && depthBuffer[index] < depth)) || (viewmodelBuffer[index]===true && !viewmodel) || depth < 0) return; depthBuffer[index] = depth; if (viewmodel) viewmodelBuffer[index] = true; - let fogIncrease = 3*Math.sqrt(depth); + let fogIncrease = 3*Math.sqrt(Math.min(depth, 500)); canvasData.data[index + 0] = Math.min(r + fogIncrease, 255); canvasData.data[index + 1] = Math.min(g + fogIncrease, 255); canvasData.data[index + 2] = Math.min(b + fogIncrease, 255); @@ -561,7 +561,8 @@ setInterval(function() { if (shapes.includes(gun)) shapes.splice(shapes.indexOf(gun), 1); shapes.push(otherGun); gun = otherGun; - shotCooldown = 20; + shotCooldown = 10; + equipTimer = shotCooldown; aimFactor = 0; } }); @@ -569,13 +570,15 @@ setInterval(function() { //manipulate bloom/spread level and position of viewmodel based on current movement and recoil let idealBloom = Math.min(distance([playerVel[0], Math.max(0, Math.abs(playerVel[1])-gravity/2)*3, playerVel[2]])/5 * weaponTraits.get(gun).runningBloom + weaponTraits.get(gun).defaultBloom * (aimFactor === 1 ? 0.5 : 1), Math.PI/6); bloom += (idealBloom-bloom)*.7 + recoil*Math.PI/150; - if (!reloading && (keys["q"] || rightMouseDown)) aimFactor = Math.min(aimFactor+0.2, 1); - else aimFactor = Math.max(aimFactor-0.25, 0); + if (equipTimer === 0 && !reloading && (keys["q"] || rightMouseDown)) aimFactor = Math.min(aimFactor+1/6, 1); + else aimFactor = Math.max(aimFactor-0.2, 0); gun.move(minus(weaponTraits.get(gun).normalPos.map((n, idx) => n+(weaponTraits.get(gun).aimPos[idx]-n)*aimFactor), gun.offset)); gun.move([0, 0, -recoil/3]); gun.move([Math.sin(sway/5)*speed/7, Math.cos(sway/2.5)*-speed/10, 0]) gun.turn(minus([0, recoil/30, 0], gun.rotate)); - gun.turn([0, 0, 0]); + gun.turn([(mouseMovement[0]*0.1+gun.rotate[0])*0.5, (-mouseMovement[1]*0.1+gun.rotate[1])*0.5, 0]); + gun.move([0, -equipTimer/1.5, 0]); + gun.turn([0, -equipTimer/20, 0]); if (reloading) { //reload animation (drop gun down then back up) gun.move([0, 15*weaponTraits.get(gun).normalPos[1]*Math.sin(reloadTime/(weaponTraits.get(gun).reloadPerShot ? @@ -592,13 +595,14 @@ setInterval(function() { recoil = Math.max((recoil-1)*.7, 0); shotCooldown = Math.max(shotCooldown-1, 0); + equipTimer = Math.max(equipTimer-1, 0); //spawn a shot - first, calculate the shot angle based on camera angle and spread. then check map for ray collisions function spawnShot(startPos, angle, laserStartPos, damage, target) { if (target === undefined) target = [map]; let shotVec = vecFromAngle(angle); let hit = findRaycast(startPos, target, shotVec); - laserBeam(laserStartPos, hit ? hit.collision : plus(startPos, times(shotVec, 200))); + laserBeam(laserStartPos, hit ? hit.collision : plus(startPos, times(shotVec, 300))); if (hit !== null) { if (hit.shape === map) { let bulletHole = copyShape(bulletHoleTemplate); @@ -778,16 +782,15 @@ setInterval(function() { } ctx.putImageData(canvasData, 0, 0); - //UI elements including crosshair, ammo, and health let difference = performance.now()-lastTime; lastTime = performance.now(); let fps = 1000/difference; - drawText(ctx, "FPS: " + Math.round(fps), canvas.width-114/canvasDivision, canvas.height-24/canvasDivision, 30/canvasDivision, "black", "left"); + if (showFPS) drawText(ctx, "FPS: " + Math.round(fps), canvas.width-114/canvasDivision, canvas.height-24/canvasDivision, 30/canvasDivision, "black", "left"); ctx.fillStyle = "rgba(0, 0, 0, .5)"; ctx.strokeStyle = `rgba(0, 0, 0, ${1-aimFactor/1})`; - let totalBloom = bloom + (weaponTraits.get(gun).spread || 0); + let totalBloom = Math.max(bloom + (weaponTraits.get(gun).spread || 0), Math.PI/500); let bloomX = project([-Math.cos(Math.PI/2-totalBloom/2), 0, Math.sin(Math.PI/2-totalBloom/2)])[0]-canvas.width/2, bloomY = project([0, -Math.cos(Math.PI/2-totalBloom/2), Math.sin(Math.PI/2-totalBloom/2)])[1]-canvas.height/2; if (gameActive && showCrosshair) ctx.ellipse(canvas.width/2, canvas.height/2, bloomX, bloomY, 0, 0, Math.PI*2); @@ -795,22 +798,26 @@ setInterval(function() { let hpColor = `rgb(${Math.min((100-hp)*255/50, 255)}, ${Math.min(hp*255/50, 255)}, 0)`; ctx.beginPath(); ctx.fillStyle = "black"; - ctx.strokeWidth = 5; - ctx.roundRect(canvas.width-143/canvasDivision, 17/canvasDivision, 126/canvasDivision, 26/canvasDivision, 13/canvasDivision); - ctx.fill(); - ctx.closePath(); - ctx.beginPath(); - ctx.fillStyle = hpColor; - ctx.roundRect(canvas.width-140/canvasDivision, 20/canvasDivision, Math.max(120*hp/100/canvasDivision, 2), 20/canvasDivision, 10/canvasDivision); - ctx.fill(); - ctx.fillStyle = "rgba(0, 0, 0, 0.5)"; - ctx.beginPath(); - ctx.roundRect(0, canvas.height-250/canvasDivision, 300/canvasDivision, 170/canvasDivision, 5); - ctx.fill(); - ctx.textAlign = "center"; - drawText(ctx, weaponTraits.get(gun).name, 150/canvasDivision, canvas.height-200/canvasDivision, 50/canvasDivision, "white"); - drawText(ctx, reloading ? "Reloading" : `${weaponTraits.get(gun).ammo}/${weaponTraits.get(gun).totalAmmo}`, 150/canvasDivision, canvas.height-130/canvasDivision, 50/canvasDivision, (reloading || weaponTraits.get(gun).ammo === 0) ? "red" : "white"); - if (hitShot.frames > 0) { + if (showHP) { + ctx.strokeWidth = 5; + ctx.roundRect(canvas.width-143/canvasDivision, 17/canvasDivision, 126/canvasDivision, 26/canvasDivision, 13/canvasDivision); + ctx.fill(); + ctx.closePath(); + ctx.beginPath(); + ctx.fillStyle = hpColor; + ctx.roundRect(canvas.width-140/canvasDivision, 20/canvasDivision, Math.max(120*hp/100/canvasDivision, 2), 20/canvasDivision, 10/canvasDivision); + ctx.fill(); + } + if (showAmmo) { + ctx.fillStyle = "rgba(0, 0, 0, 0.5)"; + ctx.beginPath(); + ctx.roundRect(0, canvas.height-250/canvasDivision, 300/canvasDivision, 170/canvasDivision, 5); + ctx.fill(); + ctx.textAlign = "center"; + drawText(ctx, weaponTraits.get(gun).name, 150/canvasDivision, canvas.height-200/canvasDivision, 50/canvasDivision, "white"); + drawText(ctx, reloading ? "Reloading" : `${weaponTraits.get(gun).ammo}/${weaponTraits.get(gun).totalAmmo}`, 150/canvasDivision, canvas.height-130/canvasDivision, 50/canvasDivision, (reloading || weaponTraits.get(gun).ammo === 0) ? "red" : "white"); + } + if (hitShot.frames > 0 && showHits) { if (hitShot.state === 1) ctx.drawImage(hitMarker, canvas.width/2+100/canvasDivision, canvas.height/2-50/canvasDivision, 100/canvasDivision, 100/canvasDivision); else ctx.drawImage(skullIcon, canvas.width/2+100/canvasDivision, canvas.height/2-50/canvasDivision, 100/canvasDivision, 100/canvasDivision); if (hitShot.headshot) ctx.drawImage(headshot, canvas.width/2+225/canvasDivision, canvas.height/2-50/canvasDivision, 100/canvasDivision, 100/canvasDivision); @@ -974,6 +981,7 @@ canvas.addEventListener("mousemove", function(e) { let factor = FOV[0] / trueFOV[0]; camAngle[0] += e.movementX/200 * factor; camAngle[1] = Math.max(Math.min(camAngle[1]-e.movementY/200*factor, Math.PI/2), -Math.PI/2); + mouseMovement = [e.movementX/200, e.movementY/200]; } else { let bd = canvas.getBoundingClientRect(); let mousePos = [(e.clientX - bd.left)*canvas.width/Number(getComputedStyle(canvas).width.replace("px", "")), (e.clientY - bd.top)*canvas.height/Number(getComputedStyle(canvas).height.replace("px", ""))];