Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 343 vs 350 for /trunk/Source Code/Geometry/Animations/Headers/Bone.h

Diff revisions: vs.
  @@ -4,18 +4,27 @@
4 4
5 5 This file is part of DIVIDE Framework.
6 6
7 - Permission is hereby granted, free of charge, to any person obtaining a copy of this software
8 - and associated documentation files (the "Software"), to deal in the Software without restriction,
9 - including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
10 - and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
7 + Permission is hereby granted, free of charge, to any person obtaining a copy
8 + of this software
9 + and associated documentation files (the "Software"), to deal in the Software
10 + without restriction,
11 + including without limitation the rights to use, copy, modify, merge, publish,
12 + distribute, sublicense,
13 + and/or sell copies of the Software, and to permit persons to whom the
14 + Software is furnished to do so,
11 15 subject to the following conditions:
12 16
13 - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
17 + The above copyright notice and this permission notice shall be included in
18 + all copies or substantial portions of the Software.
14 19
15 - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
16 - INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
17 - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
18 - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
20 + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
21 + IMPLIED,
22 + INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
23 + PARTICULAR PURPOSE AND NONINFRINGEMENT.
24 + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
25 + DAMAGES OR OTHER LIABILITY,
26 + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
27 + IN CONNECTION WITH THE SOFTWARE
19 28 OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
20 29
21 30 */
  @@ -32,8 +41,7 @@
32 41 namespace Divide {
33 42
34 43 class Bone {
35 - public:
36 -
44 + public:
37 45 stringImpl _name;
38 46
39 47 aiMatrix4x4 _offsetMatrix;
  @@ -44,21 +52,14 @@
44 52 Bone* _parent;
45 53 vectorImpl<Bone*> _children;
46 54
47 - //index in the current animation's channel array.
48 - Bone(const stringImpl& name) : _name(name), _parent(0)
49 - {
50 - }
51 -
52 - Bone() : Bone("")
53 - {
54 - }
55 -
56 - ~Bone()
57 - {
58 - MemoryManager::DELETE_VECTOR( _children );
59 - }
55 + // index in the current animation's channel array.
56 + Bone(const stringImpl& name) : _name(name), _parent(0) {}
57 +
58 + Bone() : Bone("") {}
59 +
60 + ~Bone() { MemoryManager::DELETE_VECTOR(_children); }
60 61 };
61 62
62 - }; //namespace Divide
63 + }; // namespace Divide
63 64
64 65 #endif