diff options
author | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
commit | 959831f4ef5a3e797f576c3de08cd65032c997ad (patch) | |
tree | e7351908be5995f0b325b2ebeaa02d5a34b82583 /libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorRotation.cpp | |
parent | Add info about changes to Irrlicht. (diff) | |
download | SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.zip SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.gz SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.bz2 SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.xz |
Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.
Diffstat (limited to 'libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorRotation.cpp')
-rw-r--r-- | libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorRotation.cpp | 146 |
1 files changed, 73 insertions, 73 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorRotation.cpp b/libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorRotation.cpp index f3c5473..81c50a6 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorRotation.cpp +++ b/libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorRotation.cpp | |||
@@ -1,73 +1,73 @@ | |||
1 | // Copyright (C) 2002-2012 Nikolaus Gebhardt | 1 | // Copyright (C) 2002-2012 Nikolaus Gebhardt |
2 | // This file is part of the "Irrlicht Engine". | 2 | // This file is part of the "Irrlicht Engine". |
3 | // For conditions of distribution and use, see copyright notice in irrlicht.h | 3 | // For conditions of distribution and use, see copyright notice in irrlicht.h |
4 | 4 | ||
5 | #include "CSceneNodeAnimatorRotation.h" | 5 | #include "CSceneNodeAnimatorRotation.h" |
6 | 6 | ||
7 | namespace irr | 7 | namespace irr |
8 | { | 8 | { |
9 | namespace scene | 9 | namespace scene |
10 | { | 10 | { |
11 | 11 | ||
12 | 12 | ||
13 | //! constructor | 13 | //! constructor |
14 | CSceneNodeAnimatorRotation::CSceneNodeAnimatorRotation(u32 time, const core::vector3df& rotation) | 14 | CSceneNodeAnimatorRotation::CSceneNodeAnimatorRotation(u32 time, const core::vector3df& rotation) |
15 | : Rotation(rotation), StartTime(time) | 15 | : Rotation(rotation), StartTime(time) |
16 | { | 16 | { |
17 | #ifdef _DEBUG | 17 | #ifdef _DEBUG |
18 | setDebugName("CSceneNodeAnimatorRotation"); | 18 | setDebugName("CSceneNodeAnimatorRotation"); |
19 | #endif | 19 | #endif |
20 | } | 20 | } |
21 | 21 | ||
22 | 22 | ||
23 | //! animates a scene node | 23 | //! animates a scene node |
24 | void CSceneNodeAnimatorRotation::animateNode(ISceneNode* node, u32 timeMs) | 24 | void CSceneNodeAnimatorRotation::animateNode(ISceneNode* node, u32 timeMs) |
25 | { | 25 | { |
26 | if (node) // thanks to warui for this fix | 26 | if (node) // thanks to warui for this fix |
27 | { | 27 | { |
28 | const u32 diffTime = timeMs - StartTime; | 28 | const u32 diffTime = timeMs - StartTime; |
29 | 29 | ||
30 | if (diffTime != 0) | 30 | if (diffTime != 0) |
31 | { | 31 | { |
32 | // clip the rotation to small values, to avoid | 32 | // clip the rotation to small values, to avoid |
33 | // precision problems with huge floats. | 33 | // precision problems with huge floats. |
34 | core::vector3df rot = node->getRotation() + Rotation*(diffTime*0.1f); | 34 | core::vector3df rot = node->getRotation() + Rotation*(diffTime*0.1f); |
35 | if (rot.X>360.f) | 35 | if (rot.X>360.f) |
36 | rot.X=fmodf(rot.X, 360.f); | 36 | rot.X=fmodf(rot.X, 360.f); |
37 | if (rot.Y>360.f) | 37 | if (rot.Y>360.f) |
38 | rot.Y=fmodf(rot.Y, 360.f); | 38 | rot.Y=fmodf(rot.Y, 360.f); |
39 | if (rot.Z>360.f) | 39 | if (rot.Z>360.f) |
40 | rot.Z=fmodf(rot.Z, 360.f); | 40 | rot.Z=fmodf(rot.Z, 360.f); |
41 | node->setRotation(rot); | 41 | node->setRotation(rot); |
42 | StartTime=timeMs; | 42 | StartTime=timeMs; |
43 | } | 43 | } |
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | 47 | ||
48 | //! Writes attributes of the scene node animator. | 48 | //! Writes attributes of the scene node animator. |
49 | void CSceneNodeAnimatorRotation::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const | 49 | void CSceneNodeAnimatorRotation::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const |
50 | { | 50 | { |
51 | out->addVector3d("Rotation", Rotation); | 51 | out->addVector3d("Rotation", Rotation); |
52 | } | 52 | } |
53 | 53 | ||
54 | 54 | ||
55 | //! Reads attributes of the scene node animator. | 55 | //! Reads attributes of the scene node animator. |
56 | void CSceneNodeAnimatorRotation::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) | 56 | void CSceneNodeAnimatorRotation::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options) |
57 | { | 57 | { |
58 | Rotation = in->getAttributeAsVector3d("Rotation"); | 58 | Rotation = in->getAttributeAsVector3d("Rotation"); |
59 | } | 59 | } |
60 | 60 | ||
61 | 61 | ||
62 | ISceneNodeAnimator* CSceneNodeAnimatorRotation::createClone(ISceneNode* node, ISceneManager* newManager) | 62 | ISceneNodeAnimator* CSceneNodeAnimatorRotation::createClone(ISceneNode* node, ISceneManager* newManager) |
63 | { | 63 | { |
64 | CSceneNodeAnimatorRotation * newAnimator = | 64 | CSceneNodeAnimatorRotation * newAnimator = |
65 | new CSceneNodeAnimatorRotation(StartTime, Rotation); | 65 | new CSceneNodeAnimatorRotation(StartTime, Rotation); |
66 | 66 | ||
67 | return newAnimator; | 67 | return newAnimator; |
68 | } | 68 | } |
69 | 69 | ||
70 | 70 | ||
71 | } // end namespace scene | 71 | } // end namespace scene |
72 | } // end namespace irr | 72 | } // end namespace irr |
73 | 73 | ||