diff options
| author | Matthias Schiffer <matthias@gamezock.de> | 2010-04-12 04:42:26 +0200 |
|---|---|---|
| committer | Matthias Schiffer <matthias@gamezock.de> | 2010-04-12 04:42:26 +0200 |
| commit | d56001cb33d5a6d688cfd97dba71408c8fff1f7d (patch) | |
| tree | 1978c030acff234f2daef9034fc52464cdaa7985 | |
| parent | a4f2d991dacfb539a26e71002b6f244c44753b72 (diff) | |
| download | htanks-d56001cb33d5a6d688cfd97dba71408c8fff1f7d.tar htanks-d56001cb33d5a6d688cfd97dba71408c8fff1f7d.zip | |
Added lighting
| -rw-r--r-- | model/tank.obj | 1118 | ||||
| -rw-r--r-- | src/Collision.hs | 2 | ||||
| -rw-r--r-- | src/Render.hs | 45 |
3 files changed, 592 insertions, 573 deletions
diff --git a/model/tank.obj b/model/tank.obj index 1687515..2c849d5 100644 --- a/model/tank.obj +++ b/model/tank.obj @@ -1,362 +1,362 @@ -# Blender3D v249 OBJ File: panzer4.blend +# Blender3D v249 OBJ File: tank.blend # www.blender3d.org o Cube_Cube.001 -v 3.102250 2.000000 -2.000000 -v 3.102250 2.000000 2.000000 -v -3.800000 2.000000 1.999999 -v -3.799998 2.000000 -2.000001 -v 2.237351 3.000000 -1.544789 -v 2.237348 3.000000 1.544790 -v -2.935101 3.000000 1.544789 -v -2.935100 3.000000 -1.544790 -v 0.568916 2.000000 2.000000 -v -1.266667 2.000000 2.000000 -v 0.568917 2.000000 -2.000000 -v -1.266666 2.000000 -2.000000 -v 0.568914 3.000000 2.000000 -v -1.266669 3.000000 2.000000 -v 0.568918 3.000000 -2.000000 -v -1.266666 3.000000 -2.000000 -v 3.102250 2.000000 -0.666667 -v 3.102250 2.000000 0.666667 -v -3.799999 2.000000 0.666666 -v -3.799999 2.000000 -0.666667 -v 2.929683 3.000000 -0.666666 -v 2.929682 3.000000 0.666668 -v -3.627434 3.000000 0.666666 -v -3.627434 3.000000 -0.666667 -v 0.797129 1.835087 0.832436 -v 0.797129 1.835087 -0.832436 -v -1.494879 1.835087 0.832436 -v -1.494879 1.835087 -0.832437 -v 0.797128 3.491362 0.832437 -v 0.797129 3.491362 -0.832436 -v -1.494881 3.491362 0.832436 -v -1.494879 3.491362 -0.832436 -v -0.348875 4.290236 -0.000000 -v 0.461309 3.464180 -0.161156 -v 0.445741 3.625335 -0.158059 -v 0.399637 3.780298 -0.148889 -v 0.324768 3.923112 -0.133996 -v 0.224011 4.048290 -0.113954 -v 0.101239 4.151021 -0.089534 -v -0.038831 4.227357 -0.061672 -v -0.190816 4.274364 -0.031440 -v -0.199987 4.274364 -0.061672 -v -0.056820 4.227357 -0.120973 -v 0.075123 4.151021 -0.175626 -v 0.190772 4.048290 -0.223530 -v 0.285683 3.923112 -0.262843 -v 0.356208 3.780298 -0.292055 -v 0.399637 3.625335 -0.310044 -v 0.414302 3.464180 -0.316118 -v 0.337966 3.464180 -0.458933 -v 0.324768 3.625335 -0.450114 -v 0.285683 3.780298 -0.423999 -v 0.222212 3.923112 -0.381589 -v 0.136795 4.048290 -0.324515 -v 0.032713 4.151021 -0.254969 -v -0.086033 4.227357 -0.175626 -v -0.214879 4.274364 -0.089534 -v -0.234921 4.274364 -0.113954 -v -0.125346 4.227357 -0.223530 -v -0.024361 4.151021 -0.324515 -v 0.064153 4.048290 -0.413029 -v 0.136795 3.923112 -0.485670 -v 0.190772 3.780298 -0.539648 -v 0.224011 3.625335 -0.572887 -v 0.235235 3.464180 -0.584111 -v 0.110057 3.464180 -0.686841 -v 0.101239 3.625335 -0.673644 -v 0.075123 3.780298 -0.634559 -v 0.032713 3.923112 -0.571088 -v -0.024361 4.048290 -0.485670 -v -0.093906 4.151021 -0.381589 -v -0.173249 4.227357 -0.262843 -v -0.259342 4.274364 -0.133996 -v -0.287204 4.274364 -0.148889 -v -0.227902 4.227357 -0.292055 -v -0.173249 4.151021 -0.423999 -v -0.125346 4.048290 -0.539648 -v -0.086033 3.923112 -0.634559 -v -0.056820 3.780298 -0.705084 -v -0.038831 3.625335 -0.748513 -v -0.032757 3.464180 -0.763177 -v -0.187720 3.464180 -0.810184 -v -0.190816 3.625335 -0.794617 -v -0.199987 3.780298 -0.748513 -v -0.214879 3.923112 -0.673644 -v -0.234921 4.048290 -0.572887 -v -0.259342 4.151021 -0.450114 -v -0.287204 4.227357 -0.310044 -v -0.317435 4.274364 -0.158059 -v -0.348875 4.274364 -0.161156 -v -0.348875 4.227357 -0.316118 -v -0.348875 4.151021 -0.458933 -v -0.348875 4.048290 -0.584110 -v -0.348875 3.923112 -0.686841 -v -0.348875 3.780298 -0.763177 -v -0.348875 3.625335 -0.810184 -v -0.348875 3.464180 -0.826057 -v -0.510031 3.464180 -0.810184 -v -0.506934 3.625335 -0.794617 -v -0.497764 3.780298 -0.748513 -v -0.482871 3.923112 -0.673644 -v -0.462830 4.048290 -0.572887 -v -0.438409 4.151021 -0.450114 -v -0.410547 4.227357 -0.310044 -v -0.380315 4.274364 -0.158059 -v -0.410547 4.274364 -0.148889 -v -0.469849 4.227357 -0.292055 -v -0.524501 4.151021 -0.423998 -v -0.572405 4.048290 -0.539648 -v -0.611718 3.923112 -0.634558 -v -0.640930 3.780298 -0.705084 -v -0.658919 3.625335 -0.748513 -v -0.664994 3.464180 -0.763177 -v -0.807808 3.464180 -0.686841 -v -0.798990 3.625335 -0.673644 -v -0.772874 3.780298 -0.634559 -v -0.730464 3.923112 -0.571088 -v -0.673390 4.048290 -0.485670 -v -0.603845 4.151021 -0.381589 -v -0.524501 4.227357 -0.262843 -v -0.438409 4.274364 -0.133996 -v -0.462830 4.274364 -0.113954 -v -0.572405 4.227357 -0.223530 -v -0.673390 4.151021 -0.324514 -v -0.761904 4.048290 -0.413029 -v -0.834545 3.923112 -0.485670 -v -0.888523 3.780298 -0.539648 -v -0.921762 3.625335 -0.572887 -v -0.932985 3.464180 -0.584110 -v -1.035716 3.464180 -0.458932 -v -1.022519 3.625335 -0.450114 -v -0.983434 3.780298 -0.423999 -v -0.919963 3.923112 -0.381589 -v -0.834545 4.048290 -0.324514 -v -0.730464 4.151021 -0.254969 -v -0.611718 4.227357 -0.175626 -v -0.482871 4.274364 -0.089533 -v -0.497764 4.274364 -0.061672 -v -0.640930 4.227357 -0.120973 -v -0.772874 4.151021 -0.175626 -v -0.888523 4.048290 -0.223530 -v -0.983434 3.923112 -0.262843 -v -1.053959 3.780298 -0.292055 -v -1.097388 3.625335 -0.310044 -v -1.112052 3.464180 -0.316118 -v -1.159059 3.464180 -0.161156 -v -1.143492 3.625335 -0.158059 -v -1.097388 3.780298 -0.148889 -v -1.022519 3.923112 -0.133996 -v -0.921762 4.048290 -0.113954 -v -0.798989 4.151021 -0.089533 -v -0.658919 4.227357 -0.061672 -v -0.506934 4.274364 -0.031440 -v -0.510031 4.274364 -0.000000 -v -0.664993 4.227357 -0.000000 -v -0.807808 4.151021 -0.000000 -v -0.932985 4.048290 -0.000000 -v -1.035716 3.923112 -0.000000 -v -1.112052 3.780298 -0.000000 -v -1.159059 3.625336 -0.000000 -v -1.174932 3.464180 0.000000 -v -1.159059 3.464180 0.161156 -v -1.143492 3.625336 0.158059 -v -1.097388 3.780298 0.148888 -v -1.022519 3.923112 0.133996 -v -0.921762 4.048290 0.113954 -v -0.798989 4.151021 0.089533 -v -0.658919 4.227357 0.061671 -v -0.506934 4.274364 0.031440 -v -0.497764 4.274364 0.061671 -v -0.640930 4.227357 0.120973 -v -0.772873 4.151021 0.175626 -v -0.888523 4.048290 0.223529 -v -0.983433 3.923112 0.262842 -v -1.053959 3.780298 0.292055 -v -1.097388 3.625336 0.310044 -v -1.112051 3.464180 0.316118 -v -1.035716 3.464180 0.458932 -v -1.022519 3.625336 0.450114 -v -0.983433 3.780298 0.423998 -v -0.919962 3.923112 0.381588 -v -0.834545 4.048290 0.324514 -v -0.730463 4.151021 0.254969 -v -0.611718 4.227357 0.175626 -v -0.482871 4.274364 0.089533 -v -0.462830 4.274364 0.113954 -v -0.572405 4.227357 0.223529 -v -0.673389 4.151021 0.324514 -v -0.761904 4.048290 0.413028 -v -0.834545 3.923112 0.485670 -v -0.888523 3.780298 0.539647 -v -0.921762 3.625336 0.572886 -v -0.932985 3.464180 0.584110 -v -0.807807 3.464180 0.686840 -v -0.798989 3.625336 0.673643 -v -0.772874 3.780298 0.634558 -v -0.730464 3.923112 0.571087 -v -0.673390 4.048290 0.485670 -v -0.603844 4.151021 0.381588 -v -0.524501 4.227357 0.262842 -v -0.438409 4.274364 0.133996 -v -0.410547 4.274364 0.148888 -v -0.469848 4.227357 0.292055 -v -0.524501 4.151021 0.423998 -v -0.572405 4.048290 0.539647 -v -0.611718 3.923112 0.634558 -v -0.640930 3.780298 0.705083 -v -0.658919 3.625336 0.748512 -v -0.664993 3.464180 0.763176 -v -0.510030 3.464180 0.810183 -v -0.506934 3.625336 0.794616 -v -0.497764 3.780298 0.748512 -v -0.482871 3.923112 0.673643 -v -0.462830 4.048290 0.572886 -v -0.438408 4.151021 0.450114 -v -0.410547 4.227357 0.310044 -v -0.380315 4.274364 0.158059 -v -0.348875 4.274364 0.161155 -v -0.348875 4.227357 0.316118 -v -0.348875 4.151021 0.458932 -v -0.348875 4.048290 0.584110 -v -0.348875 3.923112 0.686840 -v -0.348875 3.780298 0.763176 -v -0.348875 3.625336 0.810184 -v -0.348875 3.464180 0.826056 -v -0.187719 3.464180 0.810183 -v -0.190816 3.625336 0.794616 -v -0.199987 3.780298 0.748512 -v -0.214879 3.923112 0.673643 -v -0.234921 4.048290 0.572886 -v -0.259342 4.151021 0.450114 -v -0.287204 4.227357 0.310044 -v -0.317435 4.274364 0.158059 -v -0.287204 4.274364 0.148888 -v -0.227902 4.227357 0.292055 -v -0.173249 4.151021 0.423998 -v -0.125346 4.048290 0.539647 -v -0.086033 3.923112 0.634558 -v -0.056820 3.780298 0.705083 -v -0.038831 3.625336 0.748512 -v -0.032757 3.464180 0.763176 -v 0.110057 3.464180 0.686840 -v 0.101239 3.625336 0.673643 -v 0.075123 3.780298 0.634558 -v 0.032713 3.923112 0.571087 -v -0.024361 4.048290 0.485670 -v -0.093906 4.151021 0.381588 -v -0.173249 4.227357 0.262842 -v -0.259342 4.274364 0.133996 -v -0.234921 4.274364 0.113954 -v -0.125346 4.227357 0.223529 -v -0.024361 4.151021 0.324514 -v 0.064153 4.048290 0.413028 -v 0.136794 3.923112 0.485669 -v 0.190772 3.780298 0.539647 -v 0.224011 3.625336 0.572886 -v 0.235235 3.464180 0.584109 -v 0.337965 3.464180 0.458932 -v 0.324768 3.625336 0.450114 -v 0.285683 3.780298 0.423998 -v 0.222212 3.923112 0.381588 -v 0.136795 4.048290 0.324514 -v 0.032713 4.151021 0.254969 -v -0.086033 4.227357 0.175626 -v -0.214879 4.274364 0.089533 -v -0.199987 4.274364 0.061671 -v -0.056820 4.227357 0.120973 -v 0.075123 4.151021 0.175625 -v 0.190772 4.048290 0.223529 -v 0.285683 3.923112 0.262842 -v 0.356208 3.780298 0.292055 -v 0.399637 3.625336 0.310044 -v 0.414301 3.464180 0.316117 -v 0.461308 3.464180 0.161155 -v 0.445741 3.625336 0.158059 -v 0.399637 3.780298 0.148888 -v 0.324768 3.923112 0.133996 -v 0.224011 4.048290 0.113954 -v 0.101238 4.151021 0.089533 -v -0.038831 4.227357 0.061671 -v -0.190816 4.274364 0.031440 -v -0.187720 4.274364 -0.000000 -v -0.032757 4.227357 -0.000000 -v 0.110057 4.151021 -0.000000 -v 0.235235 4.048290 -0.000000 -v 0.337965 3.923112 -0.000000 -v 0.414301 3.780298 -0.000000 -v 0.461308 3.625335 -0.000000 -v 0.477180 3.464180 -0.000001 -v 2.946716 2.638737 -0.138737 -v 2.946716 2.575084 -0.181269 -v 2.946716 2.500000 -0.196204 -v 2.946716 2.424916 -0.181269 -v 2.946716 2.361263 -0.138737 -v 2.946716 2.318731 -0.075084 -v 2.946716 2.303796 0.000000 -v 2.946716 2.318731 0.075084 -v 2.946716 2.361263 0.138738 -v 2.946716 2.424916 0.181269 -v 2.946716 2.500000 0.196205 -v 2.946716 2.575084 0.181269 -v 2.946716 2.638737 0.138738 -v 2.946716 2.681269 0.075084 -v 2.946716 2.696204 0.000000 -v 2.946716 2.681269 -0.075084 -v 7.447976 2.638737 -0.138737 -v 7.447976 2.575084 -0.181269 -v 7.447976 2.500000 -0.196204 -v 7.447976 2.424916 -0.181269 -v 7.447976 2.361263 -0.138737 -v 7.447976 2.318731 -0.075084 -v 7.447976 2.303796 0.000000 -v 7.447976 2.318731 0.075084 -v 7.447976 2.361263 0.138738 -v 7.447976 2.424916 0.181269 -v 7.447976 2.500000 0.196205 -v 7.447976 2.575084 0.181269 -v 7.447976 2.638737 0.138738 -v 7.447976 2.681269 0.075084 -v 7.447976 2.696204 0.000000 -v 7.447976 2.681269 -0.075084 -v 7.447976 2.600862 -0.243501 -v 7.447976 2.686368 -0.186367 -v 7.447976 2.500000 -0.263563 -v 7.447976 2.399138 -0.243501 -v 7.447976 2.313632 -0.186367 -v 7.447976 2.256499 -0.100861 -v 7.447976 2.236436 0.000000 -v 7.447976 2.256499 0.100862 -v 7.447976 2.313632 0.186368 -v 7.447976 2.399138 0.243501 -v 7.447976 2.500000 0.263564 -v 7.447976 2.600862 0.243501 -v 7.447976 2.686368 0.186368 -v 7.447976 2.743501 0.100862 -v 7.447976 2.763564 0.000000 -v 7.447976 2.743501 -0.100861 -v 8.218384 2.686368 -0.186367 -v 8.218384 2.600862 -0.243501 -v 8.218384 2.500000 -0.263563 -v 8.218384 2.399138 -0.243501 -v 8.218384 2.313632 -0.186367 -v 8.218384 2.256499 -0.100861 -v 8.218384 2.236436 0.000000 -v 8.218384 2.256499 0.100862 -v 8.218384 2.313632 0.186368 -v 8.218384 2.399138 0.243501 -v 8.218384 2.500000 0.263564 -v 8.218384 2.600862 0.243501 -v 8.218384 2.686368 0.186368 -v 8.218384 2.743501 0.100862 -v 8.218384 2.763564 0.000000 -v 8.218384 2.743501 -0.100861 -v 8.218384 2.500000 0.000000 +v 0.248180 0.201529 -0.160000 +v 0.248180 0.201529 0.160000 +v -0.304000 0.201529 0.160000 +v -0.304000 0.201529 -0.160000 +v 0.178988 0.281529 -0.123583 +v 0.178988 0.281529 0.123583 +v -0.234808 0.281529 0.123583 +v -0.234808 0.281529 -0.123583 +v 0.045513 0.201529 0.160000 +v -0.101333 0.201529 0.160000 +v 0.045513 0.201529 -0.160000 +v -0.101333 0.201529 -0.160000 +v 0.045513 0.281529 0.160000 +v -0.101333 0.281529 0.160000 +v 0.045513 0.281529 -0.160000 +v -0.101333 0.281529 -0.160000 +v 0.248180 0.201529 -0.053333 +v 0.248180 0.201529 0.053333 +v -0.304000 0.201529 0.053333 +v -0.304000 0.201529 -0.053333 +v 0.234375 0.281529 -0.053333 +v 0.234375 0.281529 0.053333 +v -0.290195 0.281529 0.053333 +v -0.290195 0.281529 -0.053333 +v 0.063770 0.188336 0.066595 +v 0.063770 0.188336 -0.066595 +v -0.119590 0.188336 0.066595 +v -0.119590 0.188336 -0.066595 +v 0.063770 0.320838 0.066595 +v 0.063770 0.320838 -0.066595 +v -0.119590 0.320838 0.066595 +v -0.119590 0.320838 -0.066595 +v -0.027910 0.384748 -0.000000 +v 0.036905 0.318663 -0.012892 +v 0.035659 0.331556 -0.012645 +v 0.031971 0.343953 -0.011911 +v 0.025981 0.355378 -0.010720 +v 0.017921 0.365392 -0.009116 +v 0.008099 0.373611 -0.007163 +v -0.003106 0.379718 -0.004934 +v -0.015265 0.383478 -0.002515 +v -0.015999 0.383478 -0.004934 +v -0.004546 0.379718 -0.009678 +v 0.006010 0.373611 -0.014050 +v 0.015262 0.365392 -0.017882 +v 0.022855 0.355378 -0.021027 +v 0.028497 0.343953 -0.023364 +v 0.031971 0.331556 -0.024804 +v 0.033144 0.318663 -0.025289 +v 0.027037 0.318663 -0.036715 +v 0.025981 0.331556 -0.036009 +v 0.022855 0.343953 -0.033920 +v 0.017777 0.355378 -0.030527 +v 0.010944 0.365392 -0.025961 +v 0.002617 0.373611 -0.020398 +v -0.006883 0.379718 -0.014050 +v -0.017190 0.383478 -0.007163 +v -0.018794 0.383478 -0.009116 +v -0.010028 0.379718 -0.017882 +v -0.001949 0.373611 -0.025961 +v 0.005132 0.365392 -0.033042 +v 0.010944 0.355378 -0.038854 +v 0.015262 0.343953 -0.043172 +v 0.017921 0.331556 -0.045831 +v 0.018819 0.318663 -0.046729 +v 0.008805 0.318663 -0.054947 +v 0.008099 0.331556 -0.053892 +v 0.006010 0.343953 -0.050765 +v 0.002617 0.355378 -0.045687 +v -0.001949 0.365392 -0.038854 +v -0.007512 0.373611 -0.030527 +v -0.013860 0.379718 -0.021027 +v -0.020747 0.383478 -0.010720 +v -0.022976 0.383478 -0.011911 +v -0.018232 0.379718 -0.023364 +v -0.013860 0.373611 -0.033920 +v -0.010028 0.365392 -0.043172 +v -0.006883 0.355378 -0.050765 +v -0.004546 0.343953 -0.056407 +v -0.003107 0.331556 -0.059881 +v -0.002621 0.318663 -0.061054 +v -0.015018 0.318663 -0.064815 +v -0.015265 0.331556 -0.063569 +v -0.015999 0.343953 -0.059881 +v -0.017190 0.355378 -0.053892 +v -0.018794 0.365392 -0.045831 +v -0.020747 0.373611 -0.036009 +v -0.022976 0.379718 -0.024804 +v -0.025395 0.383478 -0.012645 +v -0.027910 0.383478 -0.012892 +v -0.027910 0.379718 -0.025289 +v -0.027910 0.373611 -0.036715 +v -0.027910 0.365392 -0.046729 +v -0.027910 0.355378 -0.054947 +v -0.027910 0.343953 -0.061054 +v -0.027910 0.331556 -0.064815 +v -0.027910 0.318663 -0.066085 +v -0.040802 0.318663 -0.064815 +v -0.040555 0.331556 -0.063569 +v -0.039821 0.343953 -0.059881 +v -0.038630 0.355378 -0.053891 +v -0.037026 0.365392 -0.045831 +v -0.035073 0.373611 -0.036009 +v -0.032844 0.379718 -0.024804 +v -0.030425 0.383478 -0.012645 +v -0.032844 0.383478 -0.011911 +v -0.037588 0.379718 -0.023364 +v -0.041960 0.373611 -0.033920 +v -0.045792 0.365392 -0.043172 +v -0.048937 0.355378 -0.050765 +v -0.051274 0.343953 -0.056407 +v -0.052714 0.331556 -0.059881 +v -0.053199 0.318663 -0.061054 +v -0.064625 0.318663 -0.054947 +v -0.063919 0.331556 -0.053891 +v -0.061830 0.343953 -0.050765 +v -0.058437 0.355378 -0.045687 +v -0.053871 0.365392 -0.038854 +v -0.048308 0.373611 -0.030527 +v -0.041960 0.379718 -0.021027 +v -0.035073 0.383478 -0.010720 +v -0.037026 0.383478 -0.009116 +v -0.045792 0.379718 -0.017882 +v -0.053871 0.373611 -0.025961 +v -0.060952 0.365392 -0.033042 +v -0.066764 0.355378 -0.038854 +v -0.071082 0.343953 -0.043172 +v -0.073741 0.331556 -0.045831 +v -0.074639 0.318663 -0.046729 +v -0.082857 0.318663 -0.036715 +v -0.081802 0.331556 -0.036009 +v -0.078675 0.343953 -0.033920 +v -0.073597 0.355378 -0.030527 +v -0.066764 0.365392 -0.025961 +v -0.058437 0.373611 -0.020398 +v -0.048937 0.379718 -0.014050 +v -0.038630 0.383478 -0.007163 +v -0.039821 0.383478 -0.004934 +v -0.051274 0.379718 -0.009678 +v -0.061830 0.373611 -0.014050 +v -0.071082 0.365392 -0.017882 +v -0.078675 0.355378 -0.021027 +v -0.084317 0.343953 -0.023364 +v -0.087791 0.331556 -0.024804 +v -0.088964 0.318663 -0.025289 +v -0.092725 0.318663 -0.012892 +v -0.091479 0.331556 -0.012645 +v -0.087791 0.343953 -0.011911 +v -0.081801 0.355378 -0.010720 +v -0.073741 0.365392 -0.009116 +v -0.063919 0.373611 -0.007163 +v -0.052714 0.379718 -0.004934 +v -0.040555 0.383478 -0.002515 +v -0.040802 0.383478 -0.000000 +v -0.053199 0.379718 -0.000000 +v -0.064625 0.373611 -0.000000 +v -0.074639 0.365392 -0.000000 +v -0.082857 0.355378 -0.000000 +v -0.088964 0.343953 -0.000000 +v -0.092725 0.331556 -0.000000 +v -0.093995 0.318663 0.000000 +v -0.092725 0.318663 0.012892 +v -0.091479 0.331556 0.012645 +v -0.087791 0.343953 0.011911 +v -0.081801 0.355378 0.010720 +v -0.073741 0.365392 0.009116 +v -0.063919 0.373611 0.007163 +v -0.052714 0.379718 0.004934 +v -0.040555 0.383478 0.002515 +v -0.039821 0.383478 0.004934 +v -0.051274 0.379718 0.009678 +v -0.061830 0.373611 0.014050 +v -0.071082 0.365392 0.017882 +v -0.078675 0.355378 0.021027 +v -0.084317 0.343953 0.023364 +v -0.087791 0.331556 0.024804 +v -0.088964 0.318663 0.025289 +v -0.082857 0.318663 0.036715 +v -0.081801 0.331556 0.036009 +v -0.078675 0.343953 0.033920 +v -0.073597 0.355378 0.030527 +v -0.066764 0.365392 0.025961 +v -0.058437 0.373611 0.020398 +v -0.048937 0.379718 0.014050 +v -0.038630 0.383478 0.007163 +v -0.037026 0.383478 0.009116 +v -0.045792 0.379718 0.017882 +v -0.053871 0.373611 0.025961 +v -0.060952 0.365392 0.033042 +v -0.066764 0.355378 0.038854 +v -0.071082 0.343953 0.043172 +v -0.073741 0.331556 0.045831 +v -0.074639 0.318663 0.046729 +v -0.064625 0.318663 0.054947 +v -0.063919 0.331556 0.053891 +v -0.061830 0.343953 0.050765 +v -0.058437 0.355378 0.045687 +v -0.053871 0.365392 0.038854 +v -0.048308 0.373611 0.030527 +v -0.041960 0.379718 0.021027 +v -0.035073 0.383478 0.010720 +v -0.032844 0.383478 0.011911 +v -0.037588 0.379718 0.023364 +v -0.041960 0.373611 0.033920 +v -0.045792 0.365392 0.043172 +v -0.048937 0.355378 0.050765 +v -0.051274 0.343953 0.056407 +v -0.052714 0.331556 0.059881 +v -0.053199 0.318664 0.061054 +v -0.040802 0.318664 0.064815 +v -0.040555 0.331556 0.063569 +v -0.039821 0.343953 0.059881 +v -0.038630 0.355378 0.053891 +v -0.037026 0.365392 0.045831 +v -0.035073 0.373611 0.036009 +v -0.032844 0.379718 0.024803 +v -0.030425 0.383478 0.012645 +v -0.027910 0.383478 0.012892 +v -0.027910 0.379718 0.025289 +v -0.027910 0.373611 0.036715 +v -0.027910 0.365392 0.046729 +v -0.027910 0.355378 0.054947 +v -0.027910 0.343953 0.061054 +v -0.027910 0.331556 0.064815 +v -0.027910 0.318664 0.066084 +v -0.015018 0.318664 0.064815 +v -0.015265 0.331556 0.063569 +v -0.015999 0.343953 0.059881 +v -0.017190 0.355378 0.053891 +v -0.018794 0.365392 0.045831 +v -0.020747 0.373611 0.036009 +v -0.022976 0.379718 0.024803 +v -0.025395 0.383478 0.012645 +v -0.022976 0.383478 0.011911 +v -0.018232 0.379718 0.023364 +v -0.013860 0.373611 0.033920 +v -0.010028 0.365392 0.043172 +v -0.006883 0.355378 0.050765 +v -0.004546 0.343953 0.056407 +v -0.003106 0.331556 0.059881 +v -0.002621 0.318664 0.061054 +v 0.008805 0.318663 0.054947 +v 0.008099 0.331556 0.053891 +v 0.006010 0.343953 0.050765 +v 0.002617 0.355378 0.045687 +v -0.001949 0.365392 0.038854 +v -0.007512 0.373611 0.030527 +v -0.013860 0.379718 0.021027 +v -0.020747 0.383478 0.010720 +v -0.018794 0.383478 0.009116 +v -0.010028 0.379718 0.017882 +v -0.001949 0.373611 0.025961 +v 0.005132 0.365392 0.033042 +v 0.010944 0.355378 0.038854 +v 0.015262 0.343953 0.043172 +v 0.017921 0.331556 0.045831 +v 0.018819 0.318663 0.046729 +v 0.027037 0.318663 0.036715 +v 0.025981 0.331556 0.036009 +v 0.022855 0.343953 0.033920 +v 0.017777 0.355378 0.030527 +v 0.010944 0.365392 0.025961 +v 0.002617 0.373611 0.020397 +v -0.006883 0.379718 0.014050 +v -0.017190 0.383478 0.007163 +v -0.015999 0.383478 0.004934 +v -0.004546 0.379718 0.009678 +v 0.006010 0.373611 0.014050 +v 0.015262 0.365392 0.017882 +v 0.022855 0.355378 0.021027 +v 0.028497 0.343953 0.023364 +v 0.031971 0.331556 0.024803 +v 0.033144 0.318663 0.025289 +v 0.036905 0.318663 0.012892 +v 0.035659 0.331556 0.012645 +v 0.031971 0.343953 0.011911 +v 0.025981 0.355378 0.010720 +v 0.017921 0.365392 0.009116 +v 0.008099 0.373611 0.007163 +v -0.003107 0.379718 0.004934 +v -0.015265 0.383478 0.002515 +v -0.015018 0.383478 -0.000000 +v -0.002621 0.379718 -0.000000 +v 0.008805 0.373611 -0.000000 +v 0.018819 0.365392 -0.000000 +v 0.027037 0.355378 -0.000000 +v 0.033144 0.343953 -0.000000 +v 0.036905 0.331556 -0.000000 +v 0.038174 0.318663 -0.000000 +v 0.235737 0.252628 -0.011099 +v 0.235737 0.247536 -0.014502 +v 0.235737 0.241529 -0.015696 +v 0.235737 0.235522 -0.014502 +v 0.235737 0.230430 -0.011099 +v 0.235737 0.227028 -0.006007 +v 0.235737 0.225833 0.000000 +v 0.235737 0.227028 0.006007 +v 0.235737 0.230430 0.011099 +v 0.235737 0.235522 0.014502 +v 0.235737 0.241529 0.015696 +v 0.235737 0.247536 0.014502 +v 0.235737 0.252628 0.011099 +v 0.235737 0.256031 0.006007 +v 0.235737 0.257225 0.000000 +v 0.235737 0.256031 -0.006007 +v 0.595838 0.252628 -0.011099 +v 0.595838 0.247536 -0.014502 +v 0.595838 0.241529 -0.015696 +v 0.595838 0.235522 -0.014502 +v 0.595838 0.230430 -0.011099 +v 0.595838 0.227028 -0.006007 +v 0.595838 0.225833 0.000000 +v 0.595838 0.227028 0.006007 +v 0.595838 0.230430 0.011099 +v 0.595838 0.235522 0.014502 +v 0.595838 0.241529 0.015696 +v 0.595838 0.247536 0.014502 +v 0.595838 0.252628 0.011099 +v 0.595838 0.256031 0.006007 +v 0.595838 0.257225 0.000000 +v 0.595838 0.256031 -0.006007 +v 0.595838 0.249598 -0.019480 +v 0.595838 0.256439 -0.014909 +v 0.595838 0.241529 -0.021085 +v 0.595838 0.233460 -0.019480 +v 0.595838 0.226620 -0.014909 +v 0.595838 0.222049 -0.008069 +v 0.595838 0.220444 0.000000 +v 0.595838 0.222049 0.008069 +v 0.595838 0.226620 0.014909 +v 0.595838 0.233460 0.019480 +v 0.595838 0.241529 0.021085 +v 0.595838 0.249598 0.019480 +v 0.595838 0.256439 0.014909 +v 0.595838 0.261009 0.008069 +v 0.595838 0.262614 0.000000 +v 0.595838 0.261009 -0.008069 +v 0.657471 0.256439 -0.014909 +v 0.657471 0.249598 -0.019480 +v 0.657471 0.241529 -0.021085 +v 0.657471 0.233460 -0.019480 +v 0.657471 0.226620 -0.014909 +v 0.657471 0.222049 -0.008069 +v 0.657471 0.220444 0.000000 +v 0.657471 0.222049 0.008069 +v 0.657471 0.226620 0.014909 +v 0.657471 0.233460 0.019480 +v 0.657471 0.241529 0.021085 +v 0.657471 0.249598 0.019480 +v 0.657471 0.256439 0.014909 +v 0.657471 0.261009 0.008069 +v 0.657471 0.262614 0.000000 +v 0.657471 0.261009 -0.008069 +v 0.657471 0.241529 0.000000 vn 0.561296 0.265419 -0.783868 -vn 0.561296 0.545183 -0.622608 +vn 0.561296 0.545183 -0.622639 vn 1.000000 0.000000 0.000000 vn 0.561296 -0.054750 -0.825770 vn 0.561296 -0.366588 -0.741966 @@ -522,7 +522,7 @@ vn 0.226051 0.097934 0.969146 vn 0.190710 0.195105 0.962035 vn 0.163060 0.364360 0.916837 vn 0.174413 0.543809 0.820856 -vn 0.135685 0.707114 0.693930 +vn 0.135685 0.707114 0.693899 vn 0.105747 0.831477 0.545366 vn 0.071718 0.923887 0.375866 vn -0.002960 0.923887 0.382641 @@ -578,7 +578,7 @@ vn -0.969146 0.097934 0.226051 vn -0.962035 0.195105 0.190710 vn -0.911588 0.382519 0.150395 vn -0.809839 0.555376 0.188879 -vn -0.693930 0.707114 0.135685 +vn -0.693899 0.707114 0.135685 vn -0.545366 0.831477 0.105747 vn -0.375866 0.923887 0.071718 vn -0.382641 0.923887 -0.002960 @@ -634,7 +634,7 @@ vn -0.226051 0.097934 -0.969146 vn -0.190710 0.195105 -0.962035 vn -0.150395 0.382519 -0.911588 vn -0.188879 0.555376 -0.809839 -vn -0.135685 0.707114 -0.693930 +vn -0.135685 0.707114 -0.693899 vn -0.105747 0.831477 -0.545366 vn -0.071718 0.923887 -0.375866 vn 0.002960 0.923887 -0.382641 @@ -655,10 +655,10 @@ vn 0.149174 0.923887 -0.352367 vn 0.215064 0.831477 -0.512192 vn 0.272683 0.707114 -0.652364 vn 0.292825 0.555376 -0.778283 -vn 0.381390 0.382519 -0.841517 +vn 0.381390 0.382519 -0.841548 vn 0.375896 0.195105 -0.905881 vn 0.350444 0.097964 -0.931425 -vn 0.525437 0.097964 -0.845149 +vn 0.525437 0.097934 -0.845149 vn 0.545396 0.195105 -0.815119 vn 0.533006 0.364360 -0.763604 vn 0.457076 0.543809 -0.703757 @@ -1349,204 +1349,204 @@ f 288//117 36//334 287//119 f 289//116 34//332 35//333 f 289//116 35//333 288//117 o Circle -v 4.555572 1.331468 2.000000 -v 4.555572 1.331468 -2.000000 -v -4.555572 1.331468 2.000000 -v -4.555572 1.331468 -2.000000 -v 4.382685 1.423879 2.000000 -v 4.382685 1.423879 -2.000000 -v -4.382685 1.423879 2.000000 -v -4.382685 1.423879 -2.000000 -v 4.195092 1.480785 2.000000 -v 4.195092 1.480785 -2.000000 -v -4.195092 1.480785 2.000000 -v -4.195092 1.480785 -2.000000 -v 4.000002 1.500000 2.000000 -v 4.000002 1.500000 -2.000000 -v -4.000002 1.500000 2.000000 -v -4.000002 1.500000 -2.000000 -v 4.000000 -0.500000 2.000000 -v 4.000000 -0.500000 -2.000000 -v -4.000000 -0.500000 2.000000 -v -4.000000 -0.500000 -2.000000 -v 4.195090 -0.480785 2.000000 -v 4.195090 -0.480786 -2.000000 -v -4.195090 -0.480785 2.000000 -v -4.195090 -0.480786 -2.000000 -v 4.382683 -0.423880 2.000000 -v 4.382683 -0.423880 -2.000000 -v -4.382683 -0.423880 2.000000 -v -4.382683 -0.423880 -2.000000 -v 4.555571 -0.331470 2.000000 -v 4.555571 -0.331470 -2.000000 -v -4.555571 -0.331470 2.000000 -v -4.555571 -0.331470 -2.000000 -v 4.707107 -0.207107 2.000000 -v 4.707107 -0.207107 -2.000000 -v -4.707107 -0.207107 2.000000 -v -4.707107 -0.207107 -2.000000 -v 4.831470 -0.055570 2.000000 -v 4.831470 -0.055571 -2.000000 -v -4.831470 -0.055570 2.000000 -v -4.831470 -0.055571 -2.000000 -v 4.923880 0.117317 2.000000 -v 4.923880 0.117316 -2.000000 -v -4.923880 0.117317 2.000000 -v -4.923880 0.117316 -2.000000 -v 4.980785 0.304910 2.000000 -v 4.980785 0.304909 -2.000000 -v -4.980785 0.304910 2.000000 -v -4.980785 0.304909 -2.000000 -v 5.000000 0.500000 2.000000 -v 5.000000 0.500000 -2.000000 -v -5.000000 0.500000 2.000000 -v -5.000000 0.500000 -2.000000 -v 4.980785 0.695090 2.000000 -v 4.980785 0.695090 -2.000000 -v -4.980785 0.695090 2.000000 -v -4.980785 0.695090 -2.000000 -v 4.923880 0.882683 2.000000 -v 4.923880 0.882683 -2.000000 -v -4.923880 0.882683 2.000000 -v -4.923880 0.882683 -2.000000 -v 4.831470 1.055570 2.000000 -v 4.831470 1.055570 -2.000000 -v -4.831470 1.055570 2.000000 -v -4.831470 1.055570 -2.000000 -v 4.707107 1.207107 2.000000 -v 4.707107 1.207106 -2.000000 -v -4.707107 1.207107 2.000000 -v -4.707107 1.207106 -2.000000 -v 4.555572 1.331468 3.000000 -v 4.555572 1.331468 -3.000000 -v -4.555572 1.331468 3.000000 -v -4.555572 1.331468 -3.000000 -v 4.707107 1.207107 3.000000 -v 4.707107 1.207106 -3.000000 -v -4.707107 1.207107 3.000000 -v -4.707107 1.207106 -3.000000 -v 4.382685 1.423879 3.000000 -v 4.382685 1.423879 -3.000000 -v -4.382685 1.423879 3.000000 -v -4.382685 1.423879 -3.000000 -v 4.195092 1.480785 3.000000 -v 4.195092 1.480785 -3.000000 -v -4.195092 1.480785 3.000000 -v -4.195092 1.480785 -3.000000 -v 4.000002 1.500000 3.000000 -v 4.000002 1.500000 -3.000000 -v -4.000002 1.500000 3.000000 -v -4.000002 1.500000 -3.000000 -v 4.000000 -0.500000 3.000000 -v 4.000000 -0.500000 -3.000000 -v -4.000000 -0.500000 3.000000 -v -4.000000 -0.500000 -3.000000 -v 4.195090 -0.480785 3.000000 -v 4.195090 -0.480786 -3.000000 -v -4.195090 -0.480785 3.000000 -v -4.195090 -0.480786 -3.000000 -v 4.382683 -0.423880 3.000000 -v 4.382683 -0.423880 -3.000000 -v -4.382683 -0.423880 3.000000 -v -4.382683 -0.423880 -3.000000 -v 4.555571 -0.331470 3.000000 -v 4.555571 -0.331470 -3.000000 -v -4.555571 -0.331470 3.000000 -v -4.555571 -0.331470 -3.000000 -v 4.707107 -0.207107 3.000000 -v 4.707107 -0.207107 -3.000000 -v -4.707107 -0.207107 3.000000 -v -4.707107 -0.207107 -3.000000 -v 4.831470 -0.055570 3.000000 -v 4.831470 -0.055570 -3.000000 -v -4.831470 -0.055570 3.000000 -v -4.831470 -0.055570 -3.000000 -v 4.923880 0.117317 3.000000 -v 4.923880 0.117316 -3.000000 -v -4.923880 0.117317 3.000000 -v -4.923880 0.117316 -3.000000 -v 4.980785 0.304910 3.000000 -v 4.980785 0.304909 -3.000000 -v -4.980785 0.304910 3.000000 -v -4.980785 0.304909 -3.000000 -v 5.000000 0.500000 3.000000 -v 5.000000 0.500000 -3.000000 -v -5.000000 0.500000 3.000000 -v -5.000000 0.500000 -3.000000 -v 4.980785 0.695090 3.000000 -v 4.980785 0.695090 -3.000000 -v -4.980785 0.695090 3.000000 -v -4.980785 0.695090 -3.000000 -v 4.923880 0.882683 3.000000 -v 4.923880 0.882683 -3.000000 -v -4.923880 0.882683 3.000000 -v -4.923880 0.882683 -3.000000 -v 4.831470 1.055570 3.000000 -v 4.831470 1.055570 -3.000000 -v -4.831470 1.055570 3.000000 -v -4.831470 1.055570 -3.000000 -v 5.000000 0.000000 0.000000 -v -5.000000 0.000000 0.000000 -v 5.000000 0.000000 2.000000 -v 5.000000 -0.000000 -2.000000 -v -5.000000 0.000000 2.000000 -v -5.000000 -0.000000 -2.000000 -v 5.759337 1.601847 2.000000 -v 5.759337 1.601847 -2.000000 -v -5.759337 1.601847 2.000000 -v -5.759337 1.601847 -2.000000 -v 5.759337 1.601847 -0.000000 -v -5.759337 1.601847 -0.000000 -v 5.759337 1.000000 -0.000000 -v -5.759337 1.000000 -0.000000 -v 5.759337 1.000000 2.000000 -v 5.759337 1.000000 -2.000000 -v -5.759337 1.000000 2.000000 -v -5.759337 1.000000 -2.000000 -v 5.759337 1.601847 2.500000 -v 5.759337 1.601847 -2.500000 -v -5.759337 1.601847 2.500000 -v -5.759337 1.601847 -2.500000 -v 5.759337 1.901847 2.500000 -v 5.759337 1.901847 -2.500000 -v -5.759337 1.901847 2.500000 -v -5.759337 1.901847 -2.500000 -v 5.759337 1.901847 -0.000000 -v -5.759337 1.901847 -0.000000 -v 5.759337 1.901847 2.000000 -v 5.759337 1.901847 -2.000000 -v -5.759337 1.901847 2.000000 -v -5.759337 1.901847 -2.000000 -v 0.000000 0.000000 2.000000 -v 0.000000 -0.000000 -2.000000 -v 0.000000 0.000000 0.000000 -v 0.000000 1.601847 -0.000000 -v 0.000000 1.601847 2.000000 -v 0.000000 1.601847 -2.000000 -v 0.000000 1.000000 -0.000000 -v 0.000000 1.000000 2.000000 -v 0.000000 1.000000 -2.000000 -v 0.000000 1.601847 2.500000 -v 0.000000 1.601847 -2.500000 -v 0.000000 1.901847 2.500000 -v 0.000000 1.901847 -2.500000 -v 0.000000 1.901847 -0.000000 -v 0.000000 1.901847 2.000000 -v 0.000000 1.901847 -2.000000 -v 0.000000 1.500000 2.000000 -v 0.000000 1.500000 -2.000000 -v 0.000000 1.500000 3.000000 -v 0.000000 1.500000 -3.000000 -v 0.000000 -0.500000 2.000000 -v 0.000000 -0.500000 -2.000000 -v 0.000000 -0.500000 3.000000 -v 0.000000 -0.500000 -3.000000 -v 0.000000 0.500000 3.000000 -v 0.000000 0.500000 -3.000000 -v 4.000001 0.500000 3.000000 -v 4.000001 0.500000 -3.000000 -v -4.000001 0.500000 3.000000 -v -4.000001 0.500000 -3.000000 +v 0.364446 0.148047 0.160000 +v 0.364446 0.148047 -0.160000 +v -0.364446 0.148047 0.160000 +v -0.364446 0.148047 -0.160000 +v 0.350615 0.155439 0.160000 +v 0.350615 0.155439 -0.160000 +v -0.350615 0.155439 0.160000 +v -0.350615 0.155439 -0.160000 +v 0.335607 0.159992 0.160000 +v 0.335607 0.159992 -0.160000 +v -0.335607 0.159992 0.160000 +v -0.335607 0.159992 -0.160000 +v 0.320000 0.161529 0.160000 +v 0.320000 0.161529 -0.160000 +v -0.320000 0.161529 0.160000 +v -0.320000 0.161529 -0.160000 +v 0.320000 0.001529 0.160000 +v 0.320000 0.001529 -0.160000 +v -0.320000 0.001529 0.160000 +v -0.320000 0.001529 -0.160000 +v 0.335607 0.003066 0.160000 +v 0.335607 0.003066 -0.160000 +v -0.335607 0.003066 0.160000 +v -0.335607 0.003066 -0.160000 +v 0.350615 0.007619 0.160000 +v 0.350615 0.007619 -0.160000 +v -0.350615 0.007619 0.160000 +v -0.350615 0.007619 -0.160000 +v 0.364446 0.015012 0.160000 +v 0.364446 0.015011 -0.160000 +v -0.364446 0.015012 0.160000 +v -0.364446 0.015011 -0.160000 +v 0.376569 0.024961 0.160000 +v 0.376569 0.024961 -0.160000 +v -0.376569 0.024961 0.160000 +v -0.376569 0.024961 -0.160000 +v 0.386518 0.037083 0.160000 +v 0.386518 0.037083 -0.160000 +v -0.386518 0.037083 0.160000 +v -0.386518 0.037083 -0.160000 +v 0.393910 0.050914 0.160000 +v 0.393910 0.050914 -0.160000 +v -0.393910 0.050914 0.160000 +v -0.393910 0.050914 -0.160000 +v 0.398463 0.065922 0.160000 +v 0.398463 0.065922 -0.160000 +v -0.398463 0.065922 0.160000 +v -0.398463 0.065922 -0.160000 +v 0.400000 0.081529 0.160000 +v 0.400000 0.081529 -0.160000 +v -0.400000 0.081529 0.160000 +v -0.400000 0.081529 -0.160000 +v 0.398463 0.097136 0.160000 +v 0.398463 0.097136 -0.160000 +v -0.398463 0.097136 0.160000 +v -0.398463 0.097136 -0.160000 +v 0.393910 0.112144 0.160000 +v 0.393910 0.112144 -0.160000 +v -0.393910 0.112144 0.160000 +v -0.393910 0.112144 -0.160000 +v 0.386518 0.125975 0.160000 +v 0.386518 0.125975 -0.160000 +v -0.386518 0.125975 0.160000 +v -0.386518 0.125975 -0.160000 +v 0.376569 0.138098 0.160000 +v 0.376569 0.138098 -0.160000 +v -0.376569 0.138098 0.160000 +v -0.376569 0.138098 -0.160000 +v 0.364446 0.148047 0.240000 +v 0.364446 0.148047 -0.240000 +v -0.364446 0.148047 0.240000 +v -0.364446 0.148047 -0.240000 +v 0.376569 0.138098 0.240000 +v 0.376569 0.138098 -0.240000 +v -0.376569 0.138098 0.240000 +v -0.376569 0.138098 -0.240000 +v 0.350615 0.155439 0.240000 +v 0.350615 0.155439 -0.240000 +v -0.350615 0.155439 0.240000 +v -0.350615 0.155439 -0.240000 +v 0.335607 0.159992 0.240000 +v 0.335607 0.159992 -0.240000 +v -0.335607 0.159992 0.240000 +v -0.335607 0.159992 -0.240000 +v 0.320000 0.161529 0.240000 +v 0.320000 0.161529 -0.240000 +v -0.320000 0.161529 0.240000 +v -0.320000 0.161529 -0.240000 +v 0.320000 0.001529 0.240000 +v 0.320000 0.001529 -0.240000 +v -0.320000 0.001529 0.240000 +v -0.320000 0.001529 -0.240000 +v 0.335607 0.003066 0.240000 +v 0.335607 0.003066 -0.240000 +v -0.335607 0.003066 0.240000 +v -0.335607 0.003066 -0.240000 +v 0.350615 0.007619 0.240000 +v 0.350615 0.007619 -0.240000 +v -0.350615 0.007619 0.240000 +v -0.350615 0.007619 -0.240000 +v 0.364446 0.015012 0.240000 +v 0.364446 0.015011 -0.240000 +v -0.364446 0.015012 0.240000 +v -0.364446 0.015011 -0.240000 +v 0.376569 0.024961 0.240000 +v 0.376569 0.024961 -0.240000 +v -0.376569 0.024961 0.240000 +v -0.376569 0.024961 -0.240000 +v 0.386518 0.037083 0.240000 +v 0.386518 0.037083 -0.240000 +v -0.386518 0.037083 0.240000 +v -0.386518 0.037083 -0.240000 +v 0.393910 0.050914 0.240000 +v 0.393910 0.050914 -0.240000 +v -0.393910 0.050914 0.240000 +v -0.393910 0.050914 -0.240000 +v 0.398463 0.065922 0.240000 +v 0.398463 0.065922 -0.240000 +v -0.398463 0.065922 0.240000 +v -0.398463 0.065922 -0.240000 +v 0.400000 0.081529 0.240000 +v 0.400000 0.081529 -0.240000 +v -0.400000 0.081529 0.240000 +v -0.400000 0.081529 -0.240000 +v 0.398463 0.097136 0.240000 +v 0.398463 0.097136 -0.240000 +v -0.398463 0.097136 0.240000 +v -0.398463 0.097136 -0.240000 +v 0.393910 0.112144 0.240000 +v 0.393910 0.112144 -0.240000 +v -0.393910 0.112144 0.240000 +v -0.393910 0.112144 -0.240000 +v 0.386518 0.125975 0.240000 +v 0.386518 0.125975 -0.240000 +v -0.386518 0.125975 0.240000 +v -0.386518 0.125975 -0.240000 +v 0.400000 0.041529 -0.000000 +v -0.400000 0.041529 -0.000000 +v 0.400000 0.041529 0.160000 +v 0.400000 0.041529 -0.160000 +v -0.400000 0.041529 0.160000 +v -0.400000 0.041529 -0.160000 +v 0.460747 0.169677 0.160000 +v 0.460747 0.169677 -0.160000 +v -0.460747 0.169677 0.160000 +v -0.460747 0.169677 -0.160000 +v 0.460747 0.169677 -0.000000 +v -0.460747 0.169677 -0.000000 +v 0.460747 0.121529 -0.000000 +v -0.460747 0.121529 -0.000000 +v 0.460747 0.121529 0.160000 +v 0.460747 0.121529 -0.160000 +v -0.460747 0.121529 0.160000 +v -0.460747 0.121529 -0.160000 +v 0.460747 0.169677 0.200000 +v 0.460747 0.169677 -0.200000 +v -0.460747 0.169677 0.200000 +v -0.460747 0.169677 -0.200000 +v 0.460747 0.193677 0.200000 +v 0.460747 0.193677 -0.200000 +v -0.460747 0.193677 0.200000 +v -0.460747 0.193677 -0.200000 +v 0.460747 0.193677 -0.000000 +v -0.460747 0.193677 -0.000000 +v 0.460747 0.193677 0.160000 +v 0.460747 0.193677 -0.160000 +v -0.460747 0.193677 0.160000 +v -0.460747 0.193677 -0.160000 +v 0.000000 0.041529 0.160000 +v 0.000000 0.041529 -0.160000 +v 0.000000 0.041529 -0.000000 +v 0.000000 0.169677 -0.000000 +v 0.000000 0.169677 0.160000 +v 0.000000 0.169677 -0.160000 +v 0.000000 0.121529 -0.000000 +v 0.000000 0.121529 0.160000 +v 0.000000 0.121529 -0.160000 +v 0.000000 0.169677 0.200000 +v 0.000000 0.169677 -0.200000 +v 0.000000 0.193677 0.200000 +v 0.000000 0.193677 -0.200000 +v 0.000000 0.193677 -0.000000 +v 0.000000 0.193677 0.160000 +v 0.000000 0.193677 -0.160000 +v 0.000000 0.161529 0.160000 +v 0.000000 0.161529 -0.160000 +v 0.000000 0.161529 0.240000 +v 0.000000 0.161529 -0.240000 +v 0.000000 0.001529 0.160000 +v 0.000000 0.001529 -0.160000 +v 0.000000 0.001529 0.240000 +v 0.000000 0.001529 -0.240000 +v 0.000000 0.081529 0.240000 +v 0.000000 0.081529 -0.240000 +v 0.320000 0.081529 0.240000 +v 0.320000 0.081529 -0.240000 +v -0.320000 0.081529 0.240000 +v -0.320000 0.081529 -0.240000 vn -0.000000 -0.000000 -1.000000 vn 0.000000 -0.000000 1.000000 vn 0.000000 -1.000000 0.000000 diff --git a/src/Collision.hs b/src/Collision.hs index 30ec6e9..3138473 100644 --- a/src/Collision.hs +++ b/src/Collision.hs @@ -10,7 +10,7 @@ import Data.Fixed import Data.Ratio tankWidth :: Micro -tankWidth = 0.95 +tankWidth = 0.4 tankLength :: Micro tankLength = 0.95 diff --git a/src/Render.hs b/src/Render.hs index bf3bb39..82ad08e 100644 --- a/src/Render.hs +++ b/src/Render.hs @@ -25,9 +25,10 @@ import Bindings.GLPng import Graphics.Rendering.OpenGL.GL (($=), GLfloat, GLdouble, Capability(..), Vector3(..)) import Graphics.Rendering.OpenGL.GL.BeginEnd (unsafeRenderPrimitive, PrimitiveMode(..)) -import Graphics.Rendering.OpenGL.GL.CoordTrans (matrixMode, MatrixMode(..), viewport, Position(..), Size(..), loadIdentity, unsafePreservingMatrix, ortho, translate, rotate, scale) +import Graphics.Rendering.OpenGL.GL.CoordTrans +import Graphics.Rendering.OpenGL.GL.Colors import Graphics.Rendering.OpenGL.GL.Framebuffer (clear, ClearBuffer(..)) -import Graphics.Rendering.OpenGL.GL.PerFragment (blend, blendFunc, BlendingFactor(..)) +import Graphics.Rendering.OpenGL.GL.PerFragment (blend, blendFunc, BlendingFactor(..), depthFunc, ComparisonFunction(..)) import Graphics.Rendering.OpenGL.GL.Texturing.Application (texture) import Graphics.Rendering.OpenGL.GL.Texturing.Objects (textureBinding, TextureObject(..)) import Graphics.Rendering.OpenGL.GL.Texturing.Parameters (Repetition(..), Clamping(..), TextureFilter(..), MinificationFilter, MagnificationFilter) @@ -88,9 +89,29 @@ getModel m = do setup :: Main () setup = do + (lw, lh) <- gets (level . gameState) >>= \l -> return (fromIntegral . levelWidth $ l :: GLfloat, fromIntegral . levelHeight $ l :: GLfloat) + liftIO $ do - blend $= Enabled - blendFunc $= (SrcAlpha, OneMinusSrcAlpha) + matrixMode $= Projection + scale 1 1 (0.1 :: GLfloat) + translate $ Vector3 (lw/2) (lh/2) 0 + rotate (-30) $ Vector3 1 0 (0 :: GLfloat) + translate $ Vector3 (-lw/2) (-lh/2) 0 + matrixMode $= Modelview 0 + + blend $= Enabled + blendFunc $= (SrcAlpha, OneMinusSrcAlpha) + depthFunc $= Just Lequal + shadeModel $= Smooth + lighting $= Enabled + light (Light 0) $= Enabled + position (Light 0) $= Vertex4 (-1) (-1) 1 (0 :: GLfloat) + colorMaterial $= Just (Front, AmbientAndDiffuse) + + clientState VertexArray $= Enabled + clientState NormalArray $= Enabled + clientState TextureCoordArray $= Enabled + -- cache textures & models getTexture TextureWood @@ -121,11 +142,13 @@ render = do (lw, lh) <- gets (level . gameState) >>= \l -> return (fromIntegral . levelWidth $ l :: GLfloat, fromIntegral . levelHeight $ l :: GLfloat) liftIO $ do - clear [ColorBuffer] + clear [ColorBuffer, DepthBuffer] texture Texture2D $= Enabled textureBinding Texture2D $= Just textureWood + normal $ Normal3 0 0 (1 :: GLfloat) + unsafeRenderPrimitive Quads $ do texCoord $ TexCoord2 (0 :: GLfloat) (0 :: GLfloat) vertex $ Vertex2 0 lh @@ -141,9 +164,6 @@ render = do texture Texture2D $= Disabled - clientState VertexArray $= Enabled - clientState NormalArray $= Enabled - clientState TextureCoordArray $= Enabled bindInterleavedArrays modelTank forM_ tanklist $ \tank -> unsafePreservingMatrix $ do @@ -153,7 +173,6 @@ render = do rotAim = realToFrac . tankAim $ tank translate $ Vector3 x y (0 :: GLfloat) - scale 0.1 0.1 (0.1 :: GLfloat) rotate rotDir $ Vector3 0 0 (1 :: GLfloat) --textureBinding Texture2D $= Just textureTank @@ -212,16 +231,16 @@ render = do unsafeRenderPrimitive Quads $ do texCoord $ TexCoord2 (0 :: GLfloat) (0 :: GLfloat) - vertex $ Vertex2 (-0.1 :: GLfloat) (-0.1 :: GLfloat) + vertex $ Vertex3 (-0.1 :: GLfloat) (-0.1 :: GLfloat) 0.01 texCoord $ TexCoord2 (0 :: GLfloat) (1 :: GLfloat) - vertex $ Vertex2 (-0.1 :: GLfloat) (0.1 :: GLfloat) + vertex $ Vertex3 (-0.1 :: GLfloat) (0.1 :: GLfloat) 0.01 texCoord $ TexCoord2 (1 :: GLfloat) (1 :: GLfloat) - vertex $ Vertex2 (0.1 :: GLfloat) (0.1 :: GLfloat) + vertex $ Vertex3 (0.1 :: GLfloat) (0.1 :: GLfloat) 0.01 texCoord $ TexCoord2 (1 :: GLfloat) (0 :: GLfloat) - vertex $ Vertex2 (0.1 :: GLfloat) (-0.1 :: GLfloat) + vertex $ Vertex3 (0.1 :: GLfloat) (-0.1 :: GLfloat) 0.01 textureBinding Texture2D $= Just textureCrosshair forM_ playerlist renderPlayer |