From: LockedLunatic Date: Wed, 15 Apr 2015 04:12:55 +0000 (+0200) Subject: Positionen aus .dae werden ausgelesen X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=71cc157e6576f04f4c2dcd087570e691b9b7a52e;p=cgue_weave.git Positionen aus .dae werden ausgelesen --- diff --git a/Weave/Graphix/MetaModel.cpp b/Weave/Graphix/MetaModel.cpp index ffd6b8a..d989594 100644 --- a/Weave/Graphix/MetaModel.cpp +++ b/Weave/Graphix/MetaModel.cpp @@ -14,7 +14,7 @@ MetaModel::MetaModel(const string& modelpath) { Assimp::Importer importer; - const aiScene* scene = importer.ReadFile("../models/" + modelpath, aiProcess_GenUVCoords | aiProcess_Triangulate | aiProcess_JoinIdenticalVertices | aiProcess_SortByPType); //aiProcess_PreTransformVertices + const aiScene* scene = importer.ReadFile("../models/" + modelpath, aiProcess_GenUVCoords | aiProcess_Triangulate | aiProcess_JoinIdenticalVertices | aiProcess_SortByPType | aiProcess_PreTransformVertices); if (!scene) { Message::error("The file " + modelpath + " couldn't be read.\n" + importer.GetErrorString()); @@ -26,10 +26,7 @@ MetaModel::MetaModel(const string& modelpath) Model* tmp_model=nullptr; for (unsigned int i = 0; i < scene->mNumMeshes; i++) { - - aiMatrix4x4 transform = scene->mRootNode->mChildren[i]->mTransformation; - - models.push_back(new Model(scene->mMeshes[i]), transform); + models.push_back(new Model(scene->mMeshes[i])); } } diff --git a/Weave/Graphix/Model.h b/Weave/Graphix/Model.h index 30ba248..cdf6c91 100644 --- a/Weave/Graphix/Model.h +++ b/Weave/Graphix/Model.h @@ -20,7 +20,7 @@ class Model public: __declspec(deprecated) Model(const string& modelpath, unsigned int index=0); - Model(const aiMesh* mesh, const aiMatrix4x4 modelmatrix); + Model(const aiMesh* mesh); Model(unsigned int numvertices, unsigned int numfaces, float *vertex, float *uvs, float *normals, unsigned int *index); virtual ~Model(); diff --git a/models/Player.blend b/models/Player.blend index 8e38cba..97bf891 100644 Binary files a/models/Player.blend and b/models/Player.blend differ diff --git a/models/Player.blend1 b/models/Player.blend1 index b29cc9d..2e26699 100644 Binary files a/models/Player.blend1 and b/models/Player.blend1 differ diff --git a/models/Player.dae b/models/Player.dae index f6bc665..ba7e0a0 100644 --- a/models/Player.dae +++ b/models/Player.dae @@ -3,104 +3,13 @@ Blender User - Blender 2.73.0 commit date:2015-01-20, commit time:18:16, hash:bbf09d9 + Blender 2.70.0 commit date:2014-04-10, commit time:11:49, hash:f93bc76 - 2015-04-14T10:29:54 - 2015-04-14T10:29:54 + 2015-04-15T03:23:28 + 2015-04-15T03:23:28 Z_UP - - - - - - 49.13434 - 1.777778 - 0.1 - 100 - - - - - - 0 - 0 - 0 - - - - - - - - - 1 1 1 - 1 - 0 - 0.00111109 - - - - - 0.000999987 - 1 - 0.1 - 0.1 - 1 - 1 - 1 - 2 - 0 - 1 - 1 - 1 - 1 - 1 - 0 - 2880 - 2 - 30.002 - 1.000799 - 0.04999995 - 29.99998 - 1 - 2 - 0 - 0 - 1 - 1 - 1 - 1 - 8192 - 1 - 1 - 0 - 1 - 1 - 1 - 3 - 0 - 0 - 0 - 0 - 0 - 1 - 1 - 1 - 3 - 0.15 - 75 - 1 - 1 - 0 - 1 - 1 - 0 - - - - @@ -155,7 +64,7 @@ - 0 0 -1 0 0 1 1 -5.66244e-7 3.27825e-7 -4.76837e-7 -1 0 -1 2.08616e-7 -1.19209e-7 2.08616e-7 1 1.78814e-7 0 0 -1 0 0 1 1 0 -2.38419e-7 0 -1 -2.98023e-7 -1 2.38419e-7 -1.49012e-7 2.68221e-7 1 2.38419e-7 + 0 0 -1 0 0 1 1 -5.66244e-7 3.27825e-7 -4.76837e-7 -1 0 -1 2.08616e-7 -1.19209e-7 2.08616e-7 1 2.38419e-7 0 0 -1 0 0 1 1 0 -2.38419e-7 0 -1 -2.98023e-7 -1 2.38419e-7 -1.49012e-7 2.68221e-7 1 1.78814e-7 @@ -165,7 +74,7 @@ - 0.4162325 0.1289063 0.490885 0.1289063 0.490885 0.240885 0.2669275 0.1289063 0.34158 0.1289063 0.34158 0.240885 0.2669275 0.01692754 0.34158 0.01692748 0.34158 0.1289063 0.34158 0.01692754 0.4162325 0.01692748 0.4162325 0.1289063 0.4162325 0.01692754 0.490885 0.01692754 0.490885 0.1289063 0.4162325 0.1289063 0.4162325 0.240885 0.34158 0.240885 0.4162325 0.240885 0.4162325 0.1289063 0.490885 0.240885 0.2669275 0.240885 0.2669275 0.1289063 0.34158 0.240885 0.2669275 0.1289063 0.2669275 0.01692754 0.34158 0.1289063 0.34158 0.1289063 0.34158 0.01692754 0.4162325 0.1289063 0.4162325 0.1289063 0.4162325 0.01692754 0.490885 0.1289063 0.34158 0.1289063 0.4162325 0.1289063 0.34158 0.240885 + 0.4162325 0.1289063 0.490885 0.1289063 0.490885 0.240885 0.2669275 0.1289063 0.34158 0.1289063 0.34158 0.240885 0.2669275 0.01692754 0.34158 0.01692748 0.34158 0.1289063 0.34158 0.01692754 0.4162325 0.01692748 0.4162325 0.1289063 0.4162325 0.01692754 0.490885 0.01692754 0.490885 0.1289063 0.34158 0.1289063 0.4162325 0.1289063 0.4162325 0.240885 0.4162325 0.240885 0.4162325 0.1289063 0.490885 0.240885 0.2669275 0.240885 0.2669275 0.1289063 0.34158 0.240885 0.2669275 0.1289063 0.2669275 0.01692754 0.34158 0.1289063 0.34158 0.1289063 0.34158 0.01692754 0.4162325 0.1289063 0.4162325 0.1289063 0.4162325 0.01692754 0.490885 0.1289063 0.34158 0.240885 0.34158 0.1289063 0.4162325 0.240885 @@ -181,7 +90,7 @@ 3 3 3 3 3 3 3 3 3 3 3 3 -

0 0 0 1 0 1 2 0 2 7 1 3 6 1 4 5 1 5 4 2 6 5 2 7 1 2 8 5 3 9 6 3 10 2 3 11 2 4 12 6 4 13 7 4 14 0 5 15 3 5 16 7 5 17 3 6 18 0 6 19 2 6 20 4 7 21 7 7 22 5 7 23 0 8 24 4 8 25 1 8 26 1 9 27 5 9 28 2 9 29 3 10 30 2 10 31 7 10 32 4 11 33 0 11 34 7 11 35

+

0 0 0 1 0 1 2 0 2 7 1 3 6 1 4 5 1 5 4 2 6 5 2 7 1 2 8 5 3 9 6 3 10 2 3 11 2 4 12 6 4 13 7 4 14 4 5 15 0 5 16 3 5 17 3 6 18 0 6 19 2 6 20 4 7 21 7 7 22 5 7 23 0 8 24 4 8 25 1 8 26 1 9 27 5 9 28 2 9 29 3 10 30 2 10 31 7 10 32 7 11 33 4 11 34 3 11 35

@@ -208,7 +117,7 @@
- 0.4118204 0.617935 0.4118204 0.4367527 0.5930026 0.4367526 0.5930027 0.2555704 0.7741849 0.2555703 0.7741849 0.4367526 0.5930026 0.2555703 0.5930027 0.4367526 0.4118204 0.4367527 0.5930027 0.4367527 0.7741849 0.4367526 0.7741849 0.6179348 0.7741849 0.6179348 0.7741849 0.4367527 0.9553671 0.4367526 0.7741848 0.617935 0.7741849 0.799117 0.5930027 0.799117 0.5930026 0.6179348 0.4118204 0.617935 0.5930026 0.4367526 0.5930027 0.4367526 0.5930027 0.2555704 0.7741849 0.4367526 0.4118204 0.2555704 0.5930026 0.2555703 0.4118204 0.4367527 0.5930027 0.617935 0.5930027 0.4367527 0.7741849 0.6179348 0.9553671 0.6179348 0.7741849 0.6179348 0.9553671 0.4367526 0.5930026 0.617935 0.7741848 0.617935 0.5930027 0.799117 + 0.5930026 0.6179348 0.4118204 0.617935 0.4118204 0.4367527 0.5930027 0.4367526 0.5930027 0.2555704 0.7741849 0.2555703 0.4118204 0.2555704 0.5930026 0.2555703 0.5930027 0.4367526 0.5930027 0.617935 0.5930027 0.4367527 0.7741849 0.4367526 0.9553671 0.6179348 0.7741849 0.6179348 0.7741849 0.4367527 0.5930026 0.617935 0.7741848 0.617935 0.7741849 0.799117 0.5930026 0.4367526 0.5930026 0.6179348 0.4118204 0.4367527 0.7741849 0.4367526 0.5930027 0.4367526 0.7741849 0.2555703 0.4118204 0.4367527 0.4118204 0.2555704 0.5930027 0.4367526 0.7741849 0.6179348 0.5930027 0.617935 0.7741849 0.4367526 0.9553671 0.4367526 0.9553671 0.6179348 0.7741849 0.4367527 0.5930027 0.799117 0.5930026 0.617935 0.7741849 0.799117 @@ -224,7 +133,7 @@ 3 3 3 3 3 3 3 3 3 3 3 3 -

5 0 0 1 0 1 0 0 2 6 1 3 2 1 4 1 1 5 7 2 6 3 2 7 2 2 8 4 3 9 0 3 10 3 3 11 1 4 12 2 4 13 3 4 14 6 5 15 5 5 16 4 5 17 4 6 18 5 6 19 0 6 20 5 7 21 6 7 22 1 7 23 6 8 24 7 8 25 2 8 26 7 9 27 4 9 28 3 9 29 0 10 30 1 10 31 3 10 32 7 11 33 6 11 34 4 11 35

+

4 0 0 5 0 1 1 0 2 5 1 3 6 1 4 2 1 5 6 2 6 7 2 7 3 2 8 7 3 9 4 3 10 0 3 11 0 4 12 1 4 13 2 4 14 7 5 15 6 5 16 5 5 17 0 6 18 4 6 19 1 6 20 1 7 21 5 7 22 2 7 23 2 8 24 6 8 25 3 8 26 3 9 27 7 9 28 0 9 29 3 10 30 0 10 31 2 10 32 4 11 33 7 11 34 5 11 35

@@ -251,7 +160,7 @@
- 0.007611751 0.8255877 0.007611751 0.6665998 0.1665997 0.6665998 0.1665998 0.5076118 0.3255878 0.5076118 0.3255878 0.6665997 0.1665997 0.5076118 0.1665998 0.6665997 0.007611811 0.6665998 0.1665998 0.6665998 0.3255878 0.6665998 0.3255878 0.8255877 0.3255878 0.8255877 0.3255878 0.6665998 0.4845758 0.6665998 0.3255878 0.8255877 0.3255878 0.9845756 0.1665998 0.9845756 0.1665998 0.8255877 0.007611751 0.8255877 0.1665997 0.6665998 0.1665998 0.6665998 0.1665998 0.5076118 0.3255878 0.6665997 0.007611751 0.5076118 0.1665997 0.5076118 0.007611811 0.6665998 0.1665998 0.8255877 0.1665998 0.6665998 0.3255878 0.8255877 0.4845758 0.8255877 0.3255878 0.8255877 0.4845758 0.6665998 0.1665998 0.8255878 0.3255878 0.8255877 0.1665998 0.9845756 + 0.1665998 0.8255877 0.007611751 0.8255877 0.007611751 0.6665998 0.1665998 0.6665998 0.1665998 0.5076118 0.3255878 0.5076118 0.007611751 0.5076118 0.1665997 0.5076118 0.1665998 0.6665997 0.1665998 0.8255877 0.1665998 0.6665998 0.3255878 0.6665998 0.4845758 0.8255877 0.3255878 0.8255877 0.3255878 0.6665998 0.1665998 0.8255878 0.3255878 0.8255877 0.3255878 0.9845756 0.1665997 0.6665998 0.1665998 0.8255877 0.007611751 0.6665998 0.3255878 0.6665997 0.1665998 0.6665998 0.3255878 0.5076118 0.007611811 0.6665998 0.007611751 0.5076118 0.1665998 0.6665997 0.3255878 0.8255877 0.1665998 0.8255877 0.3255878 0.6665998 0.4845758 0.6665998 0.4845758 0.8255877 0.3255878 0.6665998 0.1665998 0.9845756 0.1665998 0.8255878 0.3255878 0.9845756 @@ -267,7 +176,7 @@ 3 3 3 3 3 3 3 3 3 3 3 3 -

5 0 0 1 0 1 0 0 2 6 1 3 2 1 4 1 1 5 7 2 6 3 2 7 2 2 8 4 3 9 0 3 10 3 3 11 1 4 12 2 4 13 3 4 14 6 5 15 5 5 16 4 5 17 4 6 18 5 6 19 0 6 20 5 7 21 6 7 22 1 7 23 6 8 24 7 8 25 2 8 26 7 9 27 4 9 28 3 9 29 0 10 30 1 10 31 3 10 32 7 11 33 6 11 34 4 11 35

+

4 0 0 5 0 1 1 0 2 5 1 3 6 1 4 2 1 5 6 2 6 7 2 7 3 2 8 7 3 9 4 3 10 0 3 11 0 4 12 1 4 13 2 4 14 7 5 15 6 5 16 5 5 17 0 6 18 4 6 19 1 6 20 1 7 21 5 7 22 2 7 23 2 8 24 6 8 25 3 8 26 3 9 27 7 9 28 0 9 29 3 10 30 0 10 31 2 10 32 4 11 33 7 11 34 5 11 35

@@ -284,7 +193,7 @@
- 0 0 -1 0 0 1 1 -5.66244e-7 3.27825e-7 -4.76837e-7 -1 0 -1 2.08616e-7 -1.19209e-7 2.08616e-7 1 1.78814e-7 0 0 -1 0 0 1 1 0 -2.38419e-7 0 -1 -2.98023e-7 -1 2.38419e-7 -1.49012e-7 2.68221e-7 1 2.38419e-7 + 0 0 -1 0 0 1 1 -5.66244e-7 3.27825e-7 -4.76837e-7 -1 0 -1 2.08616e-7 -1.19209e-7 2.08616e-7 1 2.38419e-7 0 0 -1 0 0 1 1 0 -2.38419e-7 0 -1 -2.98023e-7 -1 2.38419e-7 -1.49012e-7 2.68221e-7 1 1.78814e-7 @@ -294,7 +203,7 @@ - 0.1748473 0.1367188 0.2511045 0.1367188 0.2511045 0.2511045 0.02233308 0.1367188 0.09859019 0.1367188 0.09859019 0.2511045 0.02233302 0.02233308 0.09859019 0.02233308 0.09859019 0.1367187 0.09859019 0.02233308 0.1748473 0.02233308 0.1748473 0.1367187 0.1748473 0.02233308 0.2511045 0.02233314 0.2511045 0.1367188 0.1748473 0.1367188 0.1748473 0.2511045 0.09859019 0.2511045 0.1748473 0.2511045 0.1748473 0.1367188 0.2511045 0.2511045 0.02233302 0.2511045 0.02233308 0.1367188 0.09859019 0.2511045 0.02233302 0.1367188 0.02233302 0.02233308 0.09859019 0.1367187 0.09859019 0.1367188 0.09859019 0.02233308 0.1748473 0.1367187 0.1748473 0.1367188 0.1748473 0.02233308 0.2511045 0.1367188 0.09859019 0.1367188 0.1748473 0.1367188 0.09859019 0.2511045 + 0.1748473 0.1367188 0.2511045 0.1367188 0.2511045 0.2511045 0.02233308 0.1367188 0.09859019 0.1367188 0.09859019 0.2511045 0.02233302 0.02233308 0.09859019 0.02233308 0.09859019 0.1367187 0.09859019 0.02233308 0.1748473 0.02233308 0.1748473 0.1367187 0.1748473 0.02233308 0.2511045 0.02233314 0.2511045 0.1367188 0.09859019 0.1367188 0.1748473 0.1367188 0.1748473 0.2511045 0.1748473 0.2511045 0.1748473 0.1367188 0.2511045 0.2511045 0.02233302 0.2511045 0.02233308 0.1367188 0.09859019 0.2511045 0.02233302 0.1367188 0.02233302 0.02233308 0.09859019 0.1367187 0.09859019 0.1367188 0.09859019 0.02233308 0.1748473 0.1367187 0.1748473 0.1367188 0.1748473 0.02233308 0.2511045 0.1367188 0.09859019 0.2511045 0.09859019 0.1367188 0.1748473 0.2511045 @@ -310,7 +219,7 @@ 3 3 3 3 3 3 3 3 3 3 3 3 -

0 0 0 1 0 1 2 0 2 7 1 3 6 1 4 5 1 5 4 2 6 5 2 7 1 2 8 5 3 9 6 3 10 2 3 11 2 4 12 6 4 13 7 4 14 0 5 15 3 5 16 7 5 17 3 6 18 0 6 19 2 6 20 4 7 21 7 7 22 5 7 23 0 8 24 4 8 25 1 8 26 1 9 27 5 9 28 2 9 29 3 10 30 2 10 31 7 10 32 4 11 33 0 11 34 7 11 35

+

0 0 0 1 0 1 2 0 2 7 1 3 6 1 4 5 1 5 4 2 6 5 2 7 1 2 8 5 3 9 6 3 10 2 3 11 2 4 12 6 4 13 7 4 14 4 5 15 0 5 16 3 5 17 3 6 18 0 6 19 2 6 20 4 7 21 7 7 22 5 7 23 0 8 24 4 8 25 1 8 26 1 9 27 5 9 28 2 9 29 3 10 30 2 10 31 7 10 32 7 11 33 4 11 34 3 11 35

@@ -337,7 +246,7 @@
- 0.760312 0.1671355 0.760312 0.0906769 0.8367707 0.0906769 0.8367707 0.01421821 0.9132293 0.01421821 0.9132294 0.09067684 0.8367707 0.01421821 0.8367707 0.09067684 0.760312 0.0906769 0.8367707 0.0906769 0.9132293 0.0906769 0.9132294 0.1671355 0.9132294 0.1671355 0.9132294 0.0906769 0.989688 0.0906769 0.9132293 0.1671355 0.9132293 0.2435942 0.8367707 0.2435942 0.8367707 0.1671355 0.760312 0.1671355 0.8367707 0.0906769 0.8367707 0.0906769 0.8367707 0.01421821 0.9132294 0.09067684 0.760312 0.01421827 0.8367707 0.01421821 0.760312 0.0906769 0.8367707 0.1671355 0.8367707 0.0906769 0.9132294 0.1671355 0.989688 0.1671355 0.9132294 0.1671355 0.989688 0.0906769 0.8367707 0.1671355 0.9132293 0.1671355 0.8367707 0.2435942 + 0.8367707 0.1671355 0.760312 0.1671355 0.760312 0.0906769 0.8367707 0.0906769 0.8367707 0.01421821 0.9132293 0.01421821 0.760312 0.01421827 0.8367707 0.01421821 0.8367707 0.09067684 0.8367707 0.1671355 0.8367707 0.0906769 0.9132293 0.0906769 0.989688 0.1671355 0.9132294 0.1671355 0.9132294 0.0906769 0.8367707 0.1671355 0.9132293 0.1671355 0.9132293 0.2435942 0.8367707 0.0906769 0.8367707 0.1671355 0.760312 0.0906769 0.9132294 0.09067684 0.8367707 0.0906769 0.9132293 0.01421821 0.760312 0.0906769 0.760312 0.01421827 0.8367707 0.09067684 0.9132294 0.1671355 0.8367707 0.1671355 0.9132293 0.0906769 0.989688 0.0906769 0.989688 0.1671355 0.9132294 0.0906769 0.8367707 0.2435942 0.8367707 0.1671355 0.9132293 0.2435942 @@ -353,7 +262,7 @@ 3 3 3 3 3 3 3 3 3 3 3 3 -

5 0 0 1 0 1 0 0 2 6 1 3 2 1 4 1 1 5 7 2 6 3 2 7 2 2 8 4 3 9 0 3 10 3 3 11 1 4 12 2 4 13 3 4 14 6 5 15 5 5 16 4 5 17 4 6 18 5 6 19 0 6 20 5 7 21 6 7 22 1 7 23 6 8 24 7 8 25 2 8 26 7 9 27 4 9 28 3 9 29 0 10 30 1 10 31 3 10 32 7 11 33 6 11 34 4 11 35

+

4 0 0 5 0 1 1 0 2 5 1 3 6 1 4 2 1 5 6 2 6 7 2 7 3 2 8 7 3 9 4 3 10 0 3 11 0 4 12 1 4 13 2 4 14 7 5 15 6 5 16 5 5 17 0 6 18 4 6 19 1 6 20 1 7 21 5 7 22 2 7 23 2 8 24 6 8 25 3 8 26 3 9 27 7 9 28 0 9 29 3 10 30 0 10 31 2 10 32 4 11 33 7 11 34 5 11 35

@@ -380,7 +289,7 @@
- 0.5100628 0.1685206 0.5100628 0.08929175 0.5892918 0.08929175 0.5892918 0.01006281 0.6685208 0.01006275 0.6685208 0.08929169 0.5892918 0.01006275 0.5892918 0.08929169 0.5100628 0.08929175 0.5892918 0.08929175 0.6685208 0.08929175 0.6685208 0.1685206 0.6685208 0.1685206 0.6685208 0.08929175 0.7477497 0.08929175 0.6685207 0.1685206 0.6685208 0.2477496 0.5892918 0.2477496 0.5892918 0.1685206 0.5100628 0.1685206 0.5892918 0.08929175 0.5892918 0.08929175 0.5892918 0.01006281 0.6685208 0.08929169 0.5100628 0.01006281 0.5892918 0.01006275 0.5100628 0.08929175 0.5892918 0.1685206 0.5892918 0.08929175 0.6685208 0.1685206 0.7477497 0.1685206 0.6685208 0.1685206 0.7477497 0.08929175 0.5892918 0.1685207 0.6685207 0.1685206 0.5892918 0.2477496 + 0.5892918 0.1685206 0.5100628 0.1685206 0.5100628 0.08929175 0.5892918 0.08929175 0.5892918 0.01006281 0.6685208 0.01006275 0.5100628 0.01006281 0.5892918 0.01006275 0.5892918 0.08929169 0.5892918 0.1685206 0.5892918 0.08929175 0.6685208 0.08929175 0.7477497 0.1685206 0.6685208 0.1685206 0.6685208 0.08929175 0.5892918 0.1685207 0.6685207 0.1685206 0.6685208 0.2477496 0.5892918 0.08929175 0.5892918 0.1685206 0.5100628 0.08929175 0.6685208 0.08929169 0.5892918 0.08929175 0.6685208 0.01006275 0.5100628 0.08929175 0.5100628 0.01006281 0.5892918 0.08929169 0.6685208 0.1685206 0.5892918 0.1685206 0.6685208 0.08929175 0.7477497 0.08929175 0.7477497 0.1685206 0.6685208 0.08929175 0.5892918 0.2477496 0.5892918 0.1685207 0.6685208 0.2477496 @@ -396,7 +305,7 @@ 3 3 3 3 3 3 3 3 3 3 3 3 -

5 0 0 1 0 1 0 0 2 6 1 3 2 1 4 1 1 5 7 2 6 3 2 7 2 2 8 4 3 9 0 3 10 3 3 11 1 4 12 2 4 13 3 4 14 6 5 15 5 5 16 4 5 17 4 6 18 5 6 19 0 6 20 5 7 21 6 7 22 1 7 23 6 8 24 7 8 25 2 8 26 7 9 27 4 9 28 3 9 29 0 10 30 1 10 31 3 10 32 7 11 33 6 11 34 4 11 35

+

4 0 0 5 0 1 1 0 2 5 1 3 6 1 4 2 1 5 6 2 6 7 2 7 3 2 8 7 3 9 4 3 10 0 3 11 0 4 12 1 4 13 2 4 14 7 5 15 6 5 16 5 5 17 0 6 18 4 6 19 1 6 20 1 7 21 5 7 22 2 7 23 2 8 24 6 8 25 3 8 26 3 9 27 7 9 28 0 9 29 3 10 30 0 10 31 2 10 32 4 11 33 7 11 34 5 11 35

@@ -404,14 +313,6 @@ - - 0.6858805 -0.3173701 0.6548619 7.481132 0.7276338 0.3124686 -0.6106656 -6.50764 -0.01081678 0.8953432 0.4452454 5.343665 0 0 0 1 - - - - -0.2908646 -0.7711008 0.5663932 4.076245 0.9551712 -0.1998834 0.2183912 1.005454 -0.05518906 0.6045247 0.7946723 5.903862 0 0 0 1 - - 0.1035811 0 0 -0.147219 0 0.1001738 0 0 0 0 0.2933555 0.2979822 0 0 0 1