Commit 2606cc59c57b21a56bf917387197a24e48065457

Authored by Olav Kjartan Larseng
1 parent e9bdebef

Refactored deletions and added trees, particle succesfully added

Showing 57 changed files with 2209 additions and 104 deletions   Show diff stats
SpaceShooterV4/SpaceShooterV4.vcxproj
@@ -157,12 +157,14 @@ @@ -157,12 +157,14 @@
157 <ClInclude Include="include\Input.hpp" /> 157 <ClInclude Include="include\Input.hpp" />
158 <ClInclude Include="include\ModelDataGlmExporter.h" /> 158 <ClInclude Include="include\ModelDataGlmExporter.h" />
159 <ClInclude Include="include\ModelDataStruct.h" /> 159 <ClInclude Include="include\ModelDataStruct.h" />
  160 + <ClInclude Include="include\ParticleGenerator.hpp" />
160 <ClInclude Include="include\SceneObject.hpp" /> 161 <ClInclude Include="include\SceneObject.hpp" />
161 <ClInclude Include="include\Shader.hpp" /> 162 <ClInclude Include="include\Shader.hpp" />
162 <ClInclude Include="include\Skybox.hpp" /> 163 <ClInclude Include="include\Skybox.hpp" />
163 <ClInclude Include="include\SpaceShip.hpp" /> 164 <ClInclude Include="include\SpaceShip.hpp" />
164 <ClInclude Include="include\Spotlight.h" /> 165 <ClInclude Include="include\Spotlight.h" />
165 <ClInclude Include="include\Text.h" /> 166 <ClInclude Include="include\Text.h" />
  167 + <ClInclude Include="include\Tree.hpp" />
166 <ClInclude Include="include\Water.hpp" /> 168 <ClInclude Include="include\Water.hpp" />
167 </ItemGroup> 169 </ItemGroup>
168 <ItemGroup> 170 <ItemGroup>
@@ -173,12 +175,14 @@ @@ -173,12 +175,14 @@
173 <ClCompile Include="src\Collision.cpp" /> 175 <ClCompile Include="src\Collision.cpp" />
174 <ClCompile Include="src\Enemy.cpp" /> 176 <ClCompile Include="src\Enemy.cpp" />
175 <ClCompile Include="src\GameManager.cpp" /> 177 <ClCompile Include="src\GameManager.cpp" />
  178 + <ClCompile Include="src\ParticleGenerator.cpp" />
176 <ClCompile Include="src\SceneObject.cpp" /> 179 <ClCompile Include="src\SceneObject.cpp" />
177 <ClCompile Include="src\Shader.cpp" /> 180 <ClCompile Include="src\Shader.cpp" />
178 <ClCompile Include="src\Skybox.cpp" /> 181 <ClCompile Include="src\Skybox.cpp" />
179 <ClCompile Include="src\SpaceShip.cpp" /> 182 <ClCompile Include="src\SpaceShip.cpp" />
180 <ClCompile Include="src\Spotlight.cpp" /> 183 <ClCompile Include="src\Spotlight.cpp" />
181 <ClCompile Include="src\Text.cpp" /> 184 <ClCompile Include="src\Text.cpp" />
  185 + <ClCompile Include="src\Tree.cpp" />
182 <ClCompile Include="src\Water.cpp" /> 186 <ClCompile Include="src\Water.cpp" />
183 </ItemGroup> 187 </ItemGroup>
184 <ItemGroup> 188 <ItemGroup>
@@ -186,6 +190,8 @@ @@ -186,6 +190,8 @@
186 <None Include="assets\shaders\chess.vert" /> 190 <None Include="assets\shaders\chess.vert" />
187 <None Include="assets\shaders\enemyspaceship.frag" /> 191 <None Include="assets\shaders\enemyspaceship.frag" />
188 <None Include="assets\shaders\enemyspaceship.vert" /> 192 <None Include="assets\shaders\enemyspaceship.vert" />
  193 + <None Include="assets\shaders\particle.frag" />
  194 + <None Include="assets\shaders\particle.vert" />
189 <None Include="assets\shaders\phong.frag" /> 195 <None Include="assets\shaders\phong.frag" />
190 <None Include="assets\shaders\phong.vert" /> 196 <None Include="assets\shaders\phong.vert" />
191 <None Include="assets\shaders\red.frag" /> 197 <None Include="assets\shaders\red.frag" />
@@ -196,6 +202,8 @@ @@ -196,6 +202,8 @@
196 <None Include="assets\shaders\spaceship.vert" /> 202 <None Include="assets\shaders\spaceship.vert" />
197 <None Include="assets\shaders\terrain.frag" /> 203 <None Include="assets\shaders\terrain.frag" />
198 <None Include="assets\shaders\terrain.vert" /> 204 <None Include="assets\shaders\terrain.vert" />
  205 + <None Include="assets\shaders\tree.frag" />
  206 + <None Include="assets\shaders\tree.vert" />
199 <None Include="assets\shaders\water.frag" /> 207 <None Include="assets\shaders\water.frag" />
200 <None Include="assets\shaders\water.vert" /> 208 <None Include="assets\shaders\water.vert" />
201 </ItemGroup> 209 </ItemGroup>
SpaceShooterV4/SpaceShooterV4.vcxproj.filters
@@ -74,6 +74,12 @@ @@ -74,6 +74,12 @@
74 <ClInclude Include="include\ModelDataStruct.h"> 74 <ClInclude Include="include\ModelDataStruct.h">
75 <Filter>Header Files</Filter> 75 <Filter>Header Files</Filter>
76 </ClInclude> 76 </ClInclude>
  77 + <ClInclude Include="include\Tree.hpp">
  78 + <Filter>Header Files</Filter>
  79 + </ClInclude>
  80 + <ClInclude Include="include\ParticleGenerator.hpp">
  81 + <Filter>Header Files</Filter>
  82 + </ClInclude>
77 </ItemGroup> 83 </ItemGroup>
78 <ItemGroup> 84 <ItemGroup>
79 <ClCompile Include="app\main.cpp"> 85 <ClCompile Include="app\main.cpp">
@@ -118,6 +124,12 @@ @@ -118,6 +124,12 @@
118 <ClCompile Include="src\Water.cpp"> 124 <ClCompile Include="src\Water.cpp">
119 <Filter>Source Files</Filter> 125 <Filter>Source Files</Filter>
120 </ClCompile> 126 </ClCompile>
  127 + <ClCompile Include="src\Tree.cpp">
  128 + <Filter>Source Files</Filter>
  129 + </ClCompile>
  130 + <ClCompile Include="src\ParticleGenerator.cpp">
  131 + <Filter>Source Files</Filter>
  132 + </ClCompile>
121 </ItemGroup> 133 </ItemGroup>
122 <ItemGroup> 134 <ItemGroup>
123 <None Include="assets\shaders\chess.frag"> 135 <None Include="assets\shaders\chess.frag">
@@ -168,5 +180,17 @@ @@ -168,5 +180,17 @@
168 <None Include="assets\shaders\enemyspaceship.vert"> 180 <None Include="assets\shaders\enemyspaceship.vert">
169 <Filter>Shaders</Filter> 181 <Filter>Shaders</Filter>
170 </None> 182 </None>
  183 + <None Include="assets\shaders\tree.frag">
  184 + <Filter>Shaders</Filter>
  185 + </None>
  186 + <None Include="assets\shaders\tree.vert">
  187 + <Filter>Shaders</Filter>
  188 + </None>
  189 + <None Include="assets\shaders\particle.frag">
  190 + <Filter>Shaders</Filter>
  191 + </None>
  192 + <None Include="assets\shaders\particle.vert">
  193 + <Filter>Shaders</Filter>
  194 + </None>
171 </ItemGroup> 195 </ItemGroup>
172 </Project> 196 </Project>
173 \ No newline at end of file 197 \ No newline at end of file
SpaceShooterV4/app/main.cpp
@@ -117,8 +117,8 @@ void display() @@ -117,8 +117,8 @@ void display()
117 } 117 }
118 118
119 /* TEXT */ 119 /* TEXT */
120 - glPushMatrix();  
121 - glLoadIdentity(); 120 + //glPushMatrix();
  121 + //glLoadIdentity();
122 // Draw the text 122 // Draw the text
123 char buffer[80]; 123 char buffer[80];
124 glColor3f(1.0, 0.0, 0.0); 124 glColor3f(1.0, 0.0, 0.0);
SpaceShooterV4/assets/models/SpruceTree/Spruce trunk.jpeg 0 โ†’ 100644

202 KB

SpaceShooterV4/assets/models/SpruceTree/Spruce.mtl 0 โ†’ 100644
  1 +# Blender MTL File: 'Spruce.blend'
  2 +# Material Count: 3
  3 +newmtl SpruceBranch
  4 +Ns 96.078431
  5 +Ka 0.000000 0.000000 0.000000
  6 +Kd 0.640000 0.640000 0.640000
  7 +Ks 0.000000 0.000000 0.000000
  8 +Ni 1.000000
  9 +d 0.000000
  10 +illum 1
  11 +map_Kd Spruce branches.png
  12 +map_d Spruce branches.png
  13 +
  14 +
  15 +newmtl SpruceTrunk
  16 +Ns 96.078431
  17 +Ka 0.000000 0.000000 0.000000
  18 +Kd 0.640000 0.640000 0.640000
  19 +Ks 0.000000 0.000000 0.000000
  20 +Ni 1.000000
  21 +d 1.000000
  22 +illum 1
  23 +map_Kd Spruce trunk.jpeg
  24 +
SpaceShooterV4/assets/models/SpruceTree/Spruce.obj 0 โ†’ 100644
  1 +# Blender v2.62 (sub 0) OBJ File: 'Spruce.blend'
  2 +# www.blender.org
  3 +mtllib Spruce.mtl
  4 +o Spruce
  5 +v 0.192806 0.208769 10.735374
  6 +v 0.009730 -0.084090 10.917834
  7 +v -0.079856 -0.028087 10.917834
  8 +v 0.103221 0.264772 10.735374
  9 +v 0.000000 0.000000 11.043040
  10 +v 0.183077 0.292859 10.860580
  11 +v 0.246783 -0.062858 10.719641
  12 +v -0.079677 -0.049644 10.933707
  13 +v -0.075404 0.055921 10.933707
  14 +v 0.251056 0.042706 10.719642
  15 +v 0.000000 0.000000 11.052154
  16 +v 0.326460 -0.013215 10.838087
  17 +v -0.108877 0.208443 10.715702
  18 +v 0.095032 -0.029793 10.948595
  19 +v 0.014768 -0.098492 10.948596
  20 +v -0.189141 0.139744 10.715702
  21 +v -0.000000 -0.000000 11.062277
  22 +v -0.203909 0.238236 10.829384
  23 +v -0.255072 -0.073062 10.747328
  24 +v 0.040966 0.080832 10.950436
  25 +v 0.089696 -0.012908 10.950436
  26 +v -0.206342 -0.166802 10.747328
  27 +v -0.000000 0.000000 11.071391
  28 +v -0.296038 -0.153894 10.868284
  29 +v -0.058596 -0.245665 10.746388
  30 +v -0.050974 0.079583 10.962561
  31 +v 0.054646 0.077108 10.962561
  32 +v 0.047024 -0.248141 10.746388
  33 +v 0.000000 0.000000 11.080503
  34 +v -0.007622 -0.325248 10.864331
  35 +v 0.311028 0.003829 10.497366
  36 +v -0.066637 -0.075597 10.720162
  37 +v -0.091442 0.042352 10.720162
  38 +v 0.286223 0.121778 10.497367
  39 +v 0.000000 0.000000 10.860069
  40 +v 0.377665 0.079426 10.637273
  41 +v 0.170153 -0.290355 10.510488
  42 +v -0.091476 0.013959 10.704187
  43 +v -0.000081 0.092535 10.704186
  44 +v 0.261548 -0.211780 10.510487
  45 +v 0.000000 0.000000 10.849675
  46 +v 0.261629 -0.304315 10.655973
  47 +v -0.239648 -0.225206 10.492640
  48 +v -0.005180 0.094918 10.695426
  49 +v 0.092058 0.023698 10.695426
  50 +v -0.142411 -0.296426 10.492640
  51 +v -0.000000 0.000000 10.839277
  52 +v -0.234469 -0.320124 10.636492
  53 +v -0.007231 0.356211 10.509344
  54 +v 0.070756 -0.048724 10.678231
  55 +v -0.047599 -0.071518 10.678231
  56 +v -0.125585 0.333417 10.509344
  57 +v 0.000000 0.000000 10.827727
  58 +v -0.077987 0.404935 10.658840
  59 +v -0.322733 0.173474 10.510644
  60 +v 0.072699 0.038921 10.665905
  61 +v 0.033872 -0.075184 10.665904
  62 +v -0.361559 0.059370 10.510643
  63 +v -0.000000 0.000000 10.817330
  64 +v -0.395431 0.134553 10.662068
  65 +v -0.357304 -0.288727 10.173251
  66 +v -0.009662 0.102935 10.367911
  67 +v 0.103354 0.002620 10.367910
  68 +v -0.244288 -0.389041 10.173250
  69 +v -0.000000 -0.000000 10.557760
  70 +v -0.347642 -0.391661 10.363100
  71 +v -0.415218 0.164713 10.171621
  72 +v 0.090692 0.058106 10.383365
  73 +v 0.059533 -0.089761 10.383366
  74 +v -0.446378 0.016846 10.171621
  75 +v -0.000000 0.000000 10.570797
  76 +v -0.505911 0.106608 10.359053
  77 +v 0.193721 -0.469462 10.267544
  78 +v -0.087155 -0.001621 10.387458
  79 +v 0.042404 0.076162 10.387459
  80 +v 0.323280 -0.391680 10.267543
  81 +v 0.000000 0.000000 10.585279
  82 +v 0.280876 -0.467841 10.465364
  83 +v 0.418261 0.055587 10.173053
  84 +v -0.060579 -0.098945 10.415907
  85 +v -0.106990 0.044866 10.415908
  86 +v 0.371850 0.199398 10.173053
  87 +v 0.000000 -0.000000 10.598314
  88 +v 0.478840 0.154532 10.355460
  89 +v 0.160112 0.430871 10.227168
  90 +v 0.060842 -0.083472 10.421444
  91 +v -0.087535 -0.054834 10.421445
  92 +v 0.011735 0.459508 10.227169
  93 +v 0.000000 -0.000000 10.611346
  94 +v 0.099270 0.514343 10.417070
  95 +v -0.585940 0.162173 9.871813
  96 +v 0.103105 0.089634 10.128771
  97 +v 0.082179 -0.109140 10.128772
  98 +v -0.606866 -0.036601 9.871813
  99 +v -0.000000 -0.000000 10.379946
  100 +v -0.689045 0.072539 10.122988
  101 +v -0.120644 0.544883 9.800236
  102 +v 0.137253 -0.068620 10.121447
  103 +v -0.047002 -0.146075 10.121447
  104 +v -0.304899 0.467428 9.800235
  105 +v -0.000000 -0.000000 10.362707
  106 +v -0.257897 0.613502 10.041495
  107 +v 0.596703 0.308477 9.925213
  108 +v 0.012011 -0.114669 10.083817
  109 +v -0.105170 0.047249 10.083818
  110 +v 0.479522 0.470395 9.925214
  111 +v 0.000000 0.000000 10.345469
  112 +v 0.584692 0.423146 10.186864
  113 +v -0.170010 -0.565835 9.798341
  114 +v -0.086847 0.112930 10.078405
  115 +v 0.111542 0.088623 10.078405
  116 +v 0.028379 -0.590142 9.798342
  117 +v 0.000000 0.000000 10.326313
  118 +v -0.083163 -0.678765 10.046247
  119 +v 0.420966 -0.438138 9.800497
  120 +v -0.134552 -0.024396 10.057965
  121 +v -0.015164 0.135902 10.057965
  122 +v 0.540354 -0.277840 9.800496
  123 +v 0.000000 -0.000000 10.309072
  124 +v 0.555518 -0.413742 10.051603
  125 +v 0.815947 -0.171106 9.462076
  126 +v -0.075467 -0.119242 9.650792
  127 +v -0.061130 0.127189 9.650793
  128 +v 0.830285 0.075326 9.462077
  129 +v 0.000000 -0.000000 9.974498
  130 +v 0.891414 -0.051864 9.785781
  131 +v 0.263727 -0.810077 9.514286
  132 +v -0.135618 -0.004303 9.669770
  133 +v 0.085557 0.105312 9.669771
  134 +v 0.484903 -0.700462 9.514285
  135 +v 0.000000 0.000000 9.995790
  136 +v 0.399345 -0.805774 9.840303
  137 +v 0.406169 0.723368 9.500422
  138 +v 0.090244 -0.110146 9.696302
  139 +v -0.140580 -0.022657 9.696302
  140 +v 0.175344 0.810857 9.500422
  141 +v 0.000000 0.000000 10.019447
  142 +v 0.315925 0.833514 9.823567
  143 +v -0.612148 0.559208 9.520947
  144 +v 0.127977 0.062778 9.717661
  145 +v -0.009528 -0.142226 9.717660
  146 +v -0.749653 0.354203 9.520947
  147 +v -0.000000 0.000000 10.040739
  148 +v -0.740125 0.496430 9.844027
  149 +v -0.796418 -0.272802 9.563111
  150 +v -0.000604 0.138632 9.737253
  151 +v 0.112762 -0.080646 9.737253
  152 +v -0.683053 -0.492079 9.563111
  153 +v -0.000000 0.000000 10.062031
  154 +v -0.795815 -0.411433 9.887889
  155 +v -0.144515 -1.056123 9.099484
  156 +v -0.157165 0.078190 9.319986
  157 +v 0.155382 0.081675 9.319986
  158 +v 0.168031 -1.052638 9.099485
  159 +v 0.000000 -0.000000 9.731226
  160 +v 0.012649 -1.134312 9.510724
  161 +v -0.980855 -0.374314 9.046094
  162 +v 0.001795 0.180485 9.295177
  163 +v 0.155467 -0.091696 9.295177
  164 +v -0.827183 -0.646495 9.046094
  165 +v -0.000000 0.000000 9.704267
  166 +v -0.982650 -0.554799 9.455183
  167 +v -0.587196 0.871013 9.020104
  168 +v 0.175942 0.039419 9.268133
  169 +v -0.054351 -0.171917 9.268133
  170 +v -0.817489 0.659678 9.020104
  171 +v -0.000000 -0.000000 9.677306
  172 +v -0.763138 0.831594 9.429276
  173 +v 1.066411 -0.162551 9.037659
  174 +v -0.072290 -0.155861 9.234539
  175 +v -0.070454 0.156699 9.234538
  176 +v 1.068248 0.150009 9.037661
  177 +v 0.000000 0.000000 9.647351
  178 +v 1.138701 -0.006691 9.450472
  179 +v 0.657778 0.825659 8.971551
  180 +v 0.091952 -0.153211 9.210508
  181 +v -0.178657 0.003212 9.210508
  182 +v 0.387170 0.982082 8.971552
  183 +v 0.000000 0.000000 9.620392
  184 +v 0.565827 0.978870 9.381434
  185 +v -0.371890 1.176594 8.464923
  186 +v 0.208594 -0.010734 8.744245
  187 +v -0.119643 -0.171209 8.744245
  188 +v -0.700127 1.016119 8.464923
  189 +v -0.000000 0.000000 9.223368
  190 +v -0.580484 1.187327 8.944043
  191 +v 0.853233 0.928434 8.542196
  192 +v 0.104040 -0.171782 8.772333
  193 +v -0.197957 0.033862 8.772334
  194 +v 0.551236 1.134079 8.542196
  195 +v 0.000000 0.000000 9.254880
  196 +v 0.749193 1.100217 9.024743
  197 +v -1.227904 -0.001494 8.521675
  198 +v 0.076518 0.196380 8.811604
  199 +v 0.131315 -0.164853 8.811603
  200 +v -1.173107 -0.362727 8.521677
  201 +v -0.000000 -0.000000 9.289896
  202 +v -1.304422 -0.197874 8.999968
  203 +v -0.276652 -1.195605 8.552057
  204 +v -0.173906 0.119461 8.843215
  205 +v 0.190349 0.091001 8.843215
  206 +v 0.087603 -1.224066 8.552055
  207 +v 0.000000 0.000000 9.321409
  208 +v -0.102747 -1.315066 9.030252
  209 +v 0.930219 -0.829028 8.614466
  210 +v -0.178355 -0.101457 8.872216
  211 +v 0.022119 0.203996 8.872214
  212 +v 1.130692 -0.523574 8.614466
  213 +v 0.000000 -0.000000 9.352923
  214 +v 1.108573 -0.727571 9.095174
  215 +v 0.617564 -1.224583 8.107303
  216 +v -0.223598 -0.031837 8.391005
  217 +v 0.105049 0.199936 8.391004
  218 +v 0.946211 -0.992812 8.107303
  219 +v 0.000000 0.000000 8.920115
  220 +v 0.841162 -1.192747 8.636412
  221 +v -0.766211 -1.112417 8.038610
  222 +v -0.129806 0.192562 8.359085
  223 +v 0.231656 0.016286 8.359085
  224 +v -0.404751 -1.288693 8.038609
  225 +v -0.000000 0.000000 8.885427
  226 +v -0.636406 -1.304979 8.564952
  227 +v -1.257841 0.494468 8.005170
  228 +v 0.157671 0.170163 8.324289
  229 +v 0.067862 -0.221834 8.324289
  230 +v -1.347651 0.102471 8.005170
  231 +v -0.000000 0.000000 8.850741
  232 +v -1.415512 0.324305 8.531621
  233 +v 1.248645 0.605960 8.027757
  234 +v 0.037136 -0.217912 8.281067
  235 +v -0.189007 0.114634 8.281066
  236 +v 1.022503 0.938506 8.027758
  237 +v 0.000000 0.000000 8.812200
  238 +v 1.211510 0.823872 8.558890
  239 +v 0.094497 1.354922 7.942701
  240 +v 0.209242 -0.095249 8.250150
  241 +v -0.191659 -0.126970 8.250150
  242 +v -0.306403 1.323201 7.942702
  243 +v 0.000000 0.000000 8.777513
  244 +v -0.114745 1.450171 8.470064
  245 +v -1.240127 -0.788419 7.370968
  246 +v -0.051549 0.243343 7.703613
  247 +v 0.233682 -0.085240 7.703614
  248 +v -0.954896 -1.117002 7.370969
  249 +v -0.000000 -0.000000 8.274199
  250 +v -1.188578 -1.031762 7.941554
  251 +v -1.329844 0.697504 7.462995
  252 +v 0.165820 0.172356 7.737065
  253 +v 0.021672 -0.238187 7.737065
  254 +v -1.473991 0.286962 7.462996
  255 +v -0.000000 0.000000 8.311728
  256 +v -1.495664 0.525148 8.037659
  257 +v 0.377877 -1.412644 7.438556
  258 +v -0.249439 0.027900 7.783830
  259 +v 0.149489 0.201622 7.783830
  260 +v 0.776805 -1.238922 7.438557
  261 +v 0.000000 0.000000 8.353429
  262 +v 0.627316 -1.440543 8.008155
  263 +v 1.460681 0.047885 7.474735
  264 +v -0.084204 -0.236731 7.821476
  265 +v -0.163038 0.191181 7.821476
  266 +v 1.381847 0.475796 7.474735
  267 +v 0.000000 0.000000 8.390958
  268 +v 1.544885 0.284615 8.044217
  269 +v 0.669101 1.324483 7.549059
  270 +v 0.171397 -0.174175 7.856013
  271 +v -0.241540 -0.037038 7.856012
  272 +v 0.256164 1.461620 7.549059
  273 +v 0.000000 0.000000 8.428488
  274 +v 0.497705 1.498657 8.121533
  275 +v 1.693507 -0.733103 6.741893
  276 +v -0.203602 -0.225601 7.123621
  277 +v -0.063766 0.297125 7.123621
  278 +v 1.833344 -0.210377 6.741894
  279 +v 0.000000 -0.000000 7.835551
  280 +v 1.897110 -0.507502 7.453823
  281 +v 0.167006 -1.809790 6.649465
  282 +v -0.300083 0.087100 7.080672
  283 +v 0.225330 0.216477 7.080672
  284 +v 0.692418 -1.680413 6.649466
  285 +v 0.000000 0.000000 7.788879
  286 +v 0.467088 -1.896889 7.357673
  287 +v -1.725855 -0.573127 6.604471
  288 +v 0.016267 0.311713 7.033855
  289 +v 0.261305 -0.170732 7.033854
  290 +v -1.480818 -1.055572 6.604472
  291 +v -0.000000 0.000000 7.742208
  292 +v -1.742122 -0.884840 7.312825
  293 +v 0.767966 1.702255 6.634865
  294 +v 0.226176 -0.193159 6.975698
  295 +v -0.294093 -0.044444 6.975698
  296 +v 0.247698 1.850971 6.634865
  297 +v 0.000000 0.000000 7.690350
  298 +v 0.541791 1.895414 7.349516
  299 +v -0.065807 -0.360415 5.838205
  300 +v -0.288050 0.226401 5.838204
  301 +v 0.000000 -0.000000 6.657686
  302 +v 2.137639 0.809582 6.295649
  303 +v 1.045065 0.060302 5.566065
  304 +v 0.822822 0.647118 5.566066
  305 +v 1.056982 0.400308 6.396748
  306 +v -0.352450 -0.126735 5.913792
  307 +v 0.064898 0.368877 5.913792
  308 +v 0.000000 -0.000000 6.761636
  309 +v 1.807831 -1.522347 6.408419
  310 +v 0.587609 -0.918343 5.643504
  311 +v 1.004956 -0.422732 5.643504
  312 +v 0.894469 -0.753218 6.502394
  313 +v 0.048809 0.365463 5.973171
  314 +v 0.261741 -0.247849 5.969654
  315 +v -0.000000 0.000000 6.825603
  316 +v -2.245717 -0.778004 6.533971
  317 +v -1.121253 -0.039397 5.734763
  318 +v -0.908322 -0.652709 5.731247
  319 +v -1.113374 -0.385232 6.596692
  320 +v 0.268745 -0.259716 6.057580
  321 +v -0.362243 -0.091956 6.057579
  322 +v 0.000000 0.000000 6.913559
  323 +v 0.612706 2.304551 6.578424
  324 +v 0.587543 0.939369 5.796031
  325 +v -0.043444 1.107129 5.796030
  326 +v 0.303342 1.140951 6.662618
  327 +v 0.376957 0.130163 6.137119
  328 +v -0.010054 -0.398670 6.137118
  329 +v -0.000000 0.000000 6.985523
  330 +v -1.914596 1.401143 6.524351
  331 +v -0.615535 0.856489 5.809790
  332 +v -1.002546 0.327657 5.809790
  333 +v -0.944286 0.691049 6.671986
  334 +v -0.288863 0.275968 6.199592
  335 +v 0.359636 0.173960 6.199592
  336 +v -0.000000 0.000000 7.049492
  337 +v -0.369311 -2.347839 6.587507
  338 +v -0.480307 -0.941109 5.871686
  339 +v 0.168192 -1.043118 5.871686
  340 +v -0.182146 -1.157963 6.735402
  341 +v 0.317873 0.327417 5.233417
  342 +v 0.195401 -0.412387 5.233416
  343 +v -0.000000 0.000000 6.204237
  344 +v -2.678402 0.443398 5.676523
  345 +v -1.070562 0.557267 4.858858
  346 +v -1.193034 -0.182538 4.858859
  347 +v -1.320998 0.218686 5.845459
  348 +v 0.145216 -0.431770 5.162055
  349 +v -0.455284 0.015144 5.162055
  350 +v 0.000000 0.000000 6.131168
  351 +v 1.618018 2.174062 5.604382
  352 +v 0.983967 0.695224 4.788156
  353 +v 0.383467 1.142139 4.788156
  354 +v 0.798013 1.072256 5.773022
  355 +v -0.299125 -0.304586 5.071200
  356 +v -0.101710 0.414613 5.071199
  357 +v 0.000000 -0.000000 6.048965
  358 +v 2.626722 -0.721017 5.666148
  359 +v 1.067590 -0.679739 4.772439
  360 +v 1.265005 0.039459 4.772439
  361 +v 1.300454 -0.356965 5.762320
  362 +v 0.416998 -0.059107 4.974782
  363 +v -0.285506 -0.296695 4.970765
  364 +v -0.000000 0.000000 5.948495
  365 +v -0.868048 2.572289 5.615370
  366 +v -0.034706 1.281101 4.702456
  367 +v -0.737210 1.043514 4.698438
  368 +v -0.429806 1.275276 5.687016
  369 +v -0.141525 0.403746 4.906955
  370 +v 0.420750 -0.077516 4.906955
  371 +v -0.000000 -0.000000 5.875425
  372 +v -1.755482 -2.050997 5.471955
  373 +v -1.054362 -0.662758 4.598211
  374 +v -0.492087 -1.144019 4.598212
  375 +v -0.868568 -1.014781 5.579300
  376 +v -0.411077 0.078476 4.820614
  377 +v 0.261248 0.326943 4.820614
  378 +v 0.000000 0.000000 5.756687
  379 +v 0.905109 -2.449129 5.343141
  380 +v 0.059284 -1.194267 4.509756
  381 +v 0.731608 -0.945801 4.509756
  382 +v 0.447542 -1.211002 5.458624
  383 +v 0.231942 0.410347 3.711336
  384 +v 0.254677 -0.396637 3.711336
  385 +v -0.000000 -0.000000 4.765646
  386 +v -2.939658 -0.082821 4.299864
  387 +v -1.295717 0.367307 3.361214
  388 +v -1.272981 -0.439676 3.361214
  389 +v -1.453550 -0.040952 4.429934
  390 +v 0.481840 0.005453 3.808583
  391 +v -0.234405 -0.421015 3.808583
  392 +v -0.000000 0.000000 4.899382
  393 +v -1.555618 2.612628 4.444947
  394 +v -0.327070 1.364000 3.460842
  395 +v -1.043315 0.937532 3.460842
  396 +v -0.769680 1.292662 4.565852
  397 +v -0.213409 -0.423648 3.884978
  398 +v -0.213656 0.411616 3.880453
  399 +v 0.000000 0.000000 4.981680
  400 +v 3.057716 -0.001129 4.606479
  401 +v 1.379512 -0.424838 3.578253
  402 +v 1.379265 0.410425 3.573728
  403 +v 1.515740 -0.001147 4.687173
  404 +v -0.217166 0.428993 3.993573
  405 +v 0.479081 -0.040950 3.993573
  406 +v -0.000000 -0.000000 5.094841
  407 +v -1.716365 -2.542897 4.663670
  408 +v -1.110211 -0.894107 3.657077
  409 +v -0.413964 -1.364050 3.657077
  410 +v -0.849748 -1.258953 4.771990
  411 +v -0.513075 0.000712 4.095905
  412 +v 0.180302 0.480351 4.095905
  413 +v 0.000000 -0.000000 5.187427
  414 +v 1.736493 -2.510314 4.594102
  415 +v 0.387092 -1.300589 3.674778
  416 +v 1.080469 -0.820951 3.674778
  417 +v 0.856445 -1.238097 4.784042
  418 +v 0.234768 -0.457229 4.176280
  419 +v -0.510485 -0.059826 4.176280
  420 +v 0.000000 0.000000 5.269726
  421 +v 1.438764 2.698133 4.675355
  422 +v 0.980597 0.941433 3.754411
  423 +v 0.235344 1.338837 3.754411
  424 +v 0.709604 1.330729 4.865631
  425 +v 0.458997 -0.318452 3.130755
  426 +v -0.458997 -0.318451 3.130755
  427 +v 0.000000 0.000000 4.319233
  428 +v 0.000000 3.323527 3.673205
  429 +v 0.458997 1.404404 2.672220
  430 +v -0.458997 1.404405 2.672220
  431 +v 0.000000 1.639176 3.880017
  432 +v -0.492441 -0.261714 3.043394
  433 +v -0.072738 0.552903 3.043394
  434 +v 0.000000 -0.000000 4.229781
  435 +v 2.949256 -1.519501 3.584890
  436 +v 1.036399 -1.049395 2.585666
  437 +v 1.456102 -0.234779 2.585666
  438 +v 1.454584 -0.749424 3.791338
  439 +v -0.427675 0.300373 2.932168
  440 +v 0.480417 0.205739 2.932168
  441 +v -0.000000 -0.000000 4.129149
  442 +v -0.345631 -3.316616 3.660504
  443 +v -0.607510 -1.425302 2.566426
  444 +v 0.300581 -1.519936 2.566426
  445 +v -0.171117 -1.642011 3.778238
  446 +v 0.011987 -0.515452 2.814134
  447 +v -0.415421 0.285502 2.809216
  448 +v 0.000000 0.000000 4.006154
  449 +v 2.933157 1.562699 3.598342
  450 +v 1.540326 0.298060 2.480751
  451 +v 1.112919 1.099015 2.475834
  452 +v 1.454295 0.774081 3.686050
  453 +v 0.459332 0.251654 2.731099
  454 +v -0.009496 -0.523665 2.731099
  455 +v -0.000000 0.000000 3.916702
  456 +v -2.828108 1.710130 3.422772
  457 +v -1.011263 1.140908 2.353136
  458 +v -1.480091 0.365590 2.353136
  459 +v -1.399276 0.846129 3.554185
  460 +v 0.012590 0.512173 2.625401
  461 +v 0.447103 -0.250157 2.625401
  462 +v -0.000000 -0.000000 3.771343
  463 +v -2.776998 -1.582835 3.265079
  464 +v -1.430538 -0.310383 2.244849
  465 +v -0.996025 -1.072713 2.244849
  466 +v -1.373121 -0.782653 3.406454
  467 +v 0.477451 -0.134652 1.659876
  468 +v -0.341907 -0.359430 1.659876
  469 +v -0.000000 0.000000 2.769464
  470 +v -0.818820 2.984739 2.279261
  471 +v 0.051933 1.416434 1.291396
  472 +v -0.767425 1.191656 1.291396
  473 +v -0.404875 1.475841 2.416151
  474 +v 0.125910 -0.491258 1.762221
  475 +v -0.488974 0.134505 1.762221
  476 +v 0.000000 0.000000 2.910213
  477 +v 2.282576 2.242893 2.431952
  478 +v 1.312832 0.675030 1.396248
  479 +v 0.697949 1.300793 1.396248
  480 +v 1.129361 1.109727 2.559196
  481 +v -0.486422 0.112382 1.842621
  482 +v 0.367466 0.321232 1.837860
  483 +v 0.000000 -0.000000 2.996826
  484 +v 0.762476 -3.126402 2.601952
  485 +v -0.089825 -1.516472 1.519814
  486 +v 0.764062 -1.307623 1.515053
  487 +v 0.377366 -1.549935 2.686877
  488 +v 0.384355 0.329160 1.956911
  489 +v 0.077779 -0.500025 1.956911
  490 +v -0.000000 0.000000 3.115920
  491 +v -3.028427 1.119703 2.662142
  492 +v -1.191371 0.911755 1.602772
  493 +v -1.497947 0.082569 1.602772
  494 +v -1.499332 0.554349 2.776142
  495 +v -0.127406 0.524731 2.064609
  496 +v 0.536125 -0.064374 2.064609
  497 +v -0.000000 -0.000000 3.213360
  498 +v -2.132804 -2.402263 2.588927
  499 +v -1.233012 -0.720559 1.621402
  500 +v -0.569482 -1.309663 1.621402
  501 +v -1.051907 -1.184805 2.788826
  502 +v -0.408827 -0.354208 2.149198
  503 +v -0.188653 0.506965 2.149198
  504 +v 0.000000 -0.000000 3.299974
  505 +v 3.117807 -0.797123 2.674440
  506 +v 1.207387 -0.767422 1.705210
  507 +v 1.427562 0.093750 1.705210
  508 +v 1.537714 -0.393144 2.874692
  509 +v -0.171727 -0.469762 1.246093
  510 +v -0.379905 0.325328 1.246093
  511 +v 0.000000 0.000000 2.310153
  512 +v 2.878562 0.753695 1.731755
  513 +v 1.320467 -0.079060 0.835561
  514 +v 1.112289 0.716030 0.835561
  515 +v 1.419718 0.371725 1.916917
  516 +v -0.338348 0.367162 1.167878
  517 +v 0.462383 0.188385 1.167878
  518 +v -0.000000 -0.000000 2.230066
  519 +v -0.647246 -2.898986 1.652686
  520 +v -0.673869 -1.135620 0.758068
  521 +v 0.126862 -1.314397 0.758069
  522 +v -0.319224 -1.429791 1.837522
  523 +v 0.163172 0.438533 1.068295
  524 +v 0.287140 -0.369441 1.068295
  525 +v -0.000000 0.000000 2.139968
  526 +v -2.950957 -0.452771 1.720384
  527 +v -1.372246 0.202951 0.740841
  528 +v -1.248278 -0.605023 0.740842
  529 +v -1.460978 -0.224161 1.825793
  530 +v -0.443723 -0.127274 0.962618
  531 +v 0.153071 0.424548 0.958215
  532 +v 0.000000 -0.000000 2.029848
  533 +v 2.018649 -2.186075 1.664730
  534 +v 0.607464 -1.266511 0.664136
  535 +v 1.204258 -0.714689 0.659732
  536 +v 1.000244 -1.084047 1.743256
  537 +v 0.322127 -0.340766 0.888276
  538 +v -0.455708 -0.110530 0.888276
  539 +v 0.000000 0.000000 1.949761
  540 +v 0.839826 2.837288 1.507539
  541 +v 0.758829 1.134602 0.549880
  542 +v -0.019005 1.364839 0.549880
  543 +v 0.415524 1.403818 1.625195
  544 +v -1.070077 1.481459 6.520420
  545 +v 0.298295 0.081913 6.934098
  546 +v -0.088611 -0.296374 6.934098
  547 +v -1.456982 1.103173 6.520420
  548 +v -0.000000 0.000000 7.643678
  549 +v -1.368372 1.399546 7.230000
  550 +v 0.446457 0.105244 0.793643
  551 +v -0.115273 -0.443973 0.793643
  552 +v -0.000000 0.000000 1.819619
  553 +v -2.000676 2.046256 1.366355
  554 +v -0.593239 1.168626 0.452930
  555 +v -1.154969 0.619409 0.452930
  556 +v -0.989259 1.011796 1.492929
  557 +v 0.156964 0.271870 0.000000
  558 +v 0.156964 -0.271870 0.000000
  559 +v -0.313929 -0.000000 0.000000
  560 +v -0.000000 -0.000000 11.164840
  561 +v -0.097987 0.056573 4.848557
  562 +v 0.170843 0.098636 0.152242
  563 +v 0.097987 0.056573 4.848557
  564 +v 0.170843 -0.098636 0.152242
  565 +v 0.097987 -0.056573 4.848557
  566 +v -0.000000 -0.197273 0.152242
  567 +v -0.000000 -0.113146 4.848557
  568 +v -0.170843 -0.098636 0.152242
  569 +v -0.097987 -0.056573 4.848557
  570 +v -0.000000 0.197273 0.152242
  571 +v -0.000000 0.113146 4.848557
  572 +v 0.313929 -0.000000 0.000000
  573 +v -0.156964 -0.271870 0.000000
  574 +v -0.000000 -0.271870 -0.123511
  575 +v 0.235446 0.135935 -0.123511
  576 +v -0.239835 -0.138469 -0.115751
  577 +v 0.239835 -0.138469 -0.115751
  578 +v 0.000000 0.276937 -0.115751
  579 +v -0.000000 -0.000000 -0.156829
  580 +v 0.201123 -0.768636 -0.079889
  581 +v 0.096512 -0.723950 -0.163476
  582 +v -0.017141 -0.728775 -0.079889
  583 +v 0.086418 -0.779219 0.023142
  584 +v -0.170487 -1.213677 -0.292544
  585 +v -0.686822 0.798870 -0.361053
  586 +v -0.566738 0.492399 0.046850
  587 +v -0.437458 0.483933 -0.052696
  588 +v -0.530363 0.399565 -0.133456
  589 +v -0.655853 0.398359 -0.052696
  590 +v -0.235446 0.135935 -0.123511
  591 +v -0.156964 0.271870 0.000000
  592 +v -0.170843 0.098636 0.152242
  593 +v 0.580023 0.462976 -0.067900
  594 +v 0.613698 0.354319 -0.151487
  595 +v 0.690960 0.270827 -0.067900
  596 +v 0.662354 0.382411 0.035131
  597 +v 1.001919 0.578458 -0.347351
  598 +vt 1.000000 0.996531
  599 +vt 0.500000 0.996531
  600 +vt 0.500000 0.012400
  601 +vt 1.000000 0.012400
  602 +vt 0.000001 0.996531
  603 +vt 0.000000 0.012400
  604 +vt 1.000000 0.577794
  605 +vt 0.500000 0.577794
  606 +vt 0.000000 0.577794
  607 +vt 0.500000 1.010132
  608 +vt 1.333332 0.860277
  609 +vt 1.666665 0.860277
  610 +vt 1.089126 4.018418
  611 +vt 1.333333 -1.487882
  612 +vt 1.666667 -1.487882
  613 +vt 2.000000 0.860277
  614 +vt 0.000000 -1.487882
  615 +vt -0.000000 0.860277
  616 +vt -0.333335 0.860277
  617 +vt -0.333333 -1.487882
  618 +vt 0.333335 0.860277
  619 +vt 0.333333 -1.487882
  620 +vt 0.666668 0.860277
  621 +vt 0.666667 -1.487882
  622 +vt 1.000000 0.860277
  623 +vt 1.000000 -1.487882
  624 +vt 0.833333 -1.564002
  625 +vt 0.500000 -1.564002
  626 +vt 1.166667 -1.564002
  627 +vt 0.166667 -1.564002
  628 +vt -0.166667 -1.564002
  629 +vt -0.500000 -1.564002
  630 +vt -0.666667 -1.487882
  631 +vt 1.500000 -1.564002
  632 +vt 1.000000 0.019041
  633 +vt 0.750000 0.019041
  634 +vt 0.746979 0.144310
  635 +vt 1.000000 0.144310
  636 +vt 0.250000 0.019041
  637 +vt 0.000000 0.019041
  638 +vt 0.000000 0.144310
  639 +vt 0.253021 0.144310
  640 +vt 0.500000 0.000392
  641 +vt 0.500000 0.144310
  642 +vt 0.499997 0.267706
  643 +vt 0.000000 -1.621878
  644 +vt 1.333333 -1.621878
  645 +vt 0.666667 -1.621878
  646 +vt 0.333333 -1.625758
  647 +vt -0.333333 -1.625758
  648 +vt -0.666667 -1.621878
  649 +vt 1.000000 -1.625758
  650 +vt 0.105323 -1.642417
  651 +vn 0.881008 -0.358196 0.309030
  652 +vn 0.247597 0.396069 0.884182
  653 +vn -0.707907 0.635090 0.309030
  654 +vn 0.153478 -0.943907 0.292337
  655 +vn 0.547563 -0.022156 0.836451
  656 +vn 0.229255 0.928404 0.292337
  657 +vn 0.576281 0.767541 0.280587
  658 +vn -0.387677 0.452956 0.802789
  659 +vn -0.847285 -0.450911 0.280587
  660 +vn -0.593402 0.747459 0.298532
  661 +vn -0.461348 -0.239814 0.854152
  662 +vn 0.270882 -0.915128 0.298532
  663 +vn -0.941191 -0.171422 0.291086
  664 +vn -0.012940 -0.553270 0.832881
  665 +vn 0.932127 -0.215308 0.291086
  666 +vn 0.363811 -0.880886 0.302683
  667 +vn 0.489242 0.102878 0.866024
  668 +vn -0.021790 0.952818 0.302683
  669 +vn -0.611408 -0.726005 0.314768
  670 +vn 0.283364 -0.329600 0.900571
  671 +vn 0.809503 0.495590 0.314768
  672 +vn -0.849849 0.425306 0.311228
  673 +vn -0.268868 -0.367107 0.890439
  674 +vn 0.661885 -0.681936 0.311228
  675 +vn 0.894955 0.307260 0.323435
  676 +vn -0.071657 0.372143 0.925382
  677 +vn -0.945067 -0.047090 0.323435
  678 +vn 0.186499 0.926206 0.327616
  679 +vn -0.329844 0.112217 0.937315
  680 +vn -0.417096 -0.847743 0.327616
  681 +vn -0.781549 0.530869 0.327616
  682 +vn -0.231269 -0.260567 0.937315
  683 +vn 0.619861 -0.713034 0.327616
  684 +vn 0.063570 0.944090 0.323435
  685 +vn -0.370830 0.078127 0.925382
  686 +vn -0.322794 -0.889462 0.323435
  687 +vn -0.764641 -0.546556 0.341350
  688 +vn 0.110477 -0.183996 0.976684
  689 +vn 0.841884 0.417920 0.341350
  690 +vn 0.432325 -0.844966 0.314768
  691 +vn 0.413648 0.133488 0.900571
  692 +vn -0.143162 0.938292 0.314768
  693 +vn 0.942961 -0.058199 0.327677
  694 +vn 0.065889 0.341411 0.937590
  695 +vn -0.896908 0.296884 0.327708
  696 +vn -0.022767 0.944487 0.327677
  697 +vn -0.345805 0.036378 0.937590
  698 +vn -0.218940 -0.919034 0.327677
  699 +vn 0.804834 0.503128 0.314768
  700 +vn -0.168432 0.400708 0.900571
  701 +vn -0.922575 -0.222999 0.314768
  702 +vn 0.610065 -0.715018 0.341350
  703 +vn 0.173864 0.125828 0.976684
  704 +vn -0.488510 0.802972 0.341350
  705 +vn -0.946074 -0.017518 0.323435
  706 +vn -0.046083 -0.376171 0.925382
  707 +vn 0.913846 -0.245399 0.323435
  708 +vn -0.461959 -0.824152 0.327616
  709 +vn 0.279427 -0.208106 0.937315
  710 +vn 0.657308 0.678671 0.327616
  711 +vn 0.017731 -0.939543 0.341960
  712 +vn 0.206427 -0.011994 0.978362
  713 +vn 0.126560 0.931120 0.341960
  714 +vn -0.813044 -0.469405 0.344401
  715 +vn 0.075625 -0.152623 0.985351
  716 +vn 0.865902 0.362682 0.344401
  717 +vn 0.902676 -0.261910 0.341350
  718 +vn 0.076052 0.200690 0.976684
  719 +vn -0.849513 0.402203 0.341350
  720 +vn 0.459334 0.820063 0.341288
  721 +vn -0.178991 0.120060 0.976470
  722 +vn -0.584460 -0.736137 0.341288
  723 +vn -0.489517 0.801630 0.343089
  724 +vn -0.169469 -0.087619 0.981597
  725 +vn 0.371014 -0.862880 0.343089
  726 +vn -0.936125 -0.077120 0.343089
  727 +vn 0.002106 -0.190771 0.981597
  728 +vn 0.937590 -0.056215 0.343089
  729 +vn -0.526231 0.778832 0.341288
  730 +vn -0.187689 -0.105960 0.976470
  731 +vn 0.395032 -0.852901 0.341288
  732 +vn 0.639576 0.688742 0.341350
  733 +vn -0.145116 0.158116 0.976684
  734 +vn -0.741020 -0.578204 0.341350
  735 +vn 0.054018 -0.937254 0.344401
  736 +vn 0.170354 -0.000977 0.985351
  737 +vn 0.065035 0.936552 0.344401
  738 +vn 0.847316 -0.406293 0.341960
  739 +vn 0.103458 0.179022 0.978362
  740 +vn -0.774987 0.531449 0.341960
  741 +vn 0.809961 0.476424 0.341960
  742 +vn -0.090793 0.185766 0.978362
  743 +vn -0.873440 -0.346568 0.341960
  744 +vn 0.807917 -0.478103 0.344401
  745 +vn 0.095889 0.140812 0.985351
  746 +vn -0.740898 0.576556 0.344401
  747 +vn -0.214667 0.915067 0.341350
  748 +vn -0.212195 -0.032167