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/CSceneNodeAnimatorDelete.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 '')
-rw-r--r-- | libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorDelete.cpp | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorDelete.cpp b/libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorDelete.cpp index 2ef584d..bd793ea 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorDelete.cpp +++ b/libraries/irrlicht-1.8/source/Irrlicht/CSceneNodeAnimatorDelete.cpp | |||
@@ -1,51 +1,51 @@ | |||
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 "CSceneNodeAnimatorDelete.h" | 5 | #include "CSceneNodeAnimatorDelete.h" |
6 | #include "ISceneManager.h" | 6 | #include "ISceneManager.h" |
7 | 7 | ||
8 | namespace irr | 8 | namespace irr |
9 | { | 9 | { |
10 | namespace scene | 10 | namespace scene |
11 | { | 11 | { |
12 | 12 | ||
13 | 13 | ||
14 | //! constructor | 14 | //! constructor |
15 | CSceneNodeAnimatorDelete::CSceneNodeAnimatorDelete(ISceneManager* manager, u32 time) | 15 | CSceneNodeAnimatorDelete::CSceneNodeAnimatorDelete(ISceneManager* manager, u32 time) |
16 | : ISceneNodeAnimatorFinishing(time), SceneManager(manager) | 16 | : ISceneNodeAnimatorFinishing(time), SceneManager(manager) |
17 | { | 17 | { |
18 | #ifdef _DEBUG | 18 | #ifdef _DEBUG |
19 | setDebugName("CSceneNodeAnimatorDelete"); | 19 | setDebugName("CSceneNodeAnimatorDelete"); |
20 | #endif | 20 | #endif |
21 | } | 21 | } |
22 | 22 | ||
23 | 23 | ||
24 | //! animates a scene node | 24 | //! animates a scene node |
25 | void CSceneNodeAnimatorDelete::animateNode(ISceneNode* node, u32 timeMs) | 25 | void CSceneNodeAnimatorDelete::animateNode(ISceneNode* node, u32 timeMs) |
26 | { | 26 | { |
27 | if (timeMs > FinishTime) | 27 | if (timeMs > FinishTime) |
28 | { | 28 | { |
29 | HasFinished = true; | 29 | HasFinished = true; |
30 | if(node && SceneManager) | 30 | if(node && SceneManager) |
31 | { | 31 | { |
32 | // don't delete if scene manager is attached to an editor | 32 | // don't delete if scene manager is attached to an editor |
33 | if (!SceneManager->getParameters()->getAttributeAsBool(IRR_SCENE_MANAGER_IS_EDITOR)) | 33 | if (!SceneManager->getParameters()->getAttributeAsBool(IRR_SCENE_MANAGER_IS_EDITOR)) |
34 | SceneManager->addToDeletionQueue(node); | 34 | SceneManager->addToDeletionQueue(node); |
35 | } | 35 | } |
36 | } | 36 | } |
37 | } | 37 | } |
38 | 38 | ||
39 | 39 | ||
40 | ISceneNodeAnimator* CSceneNodeAnimatorDelete::createClone(ISceneNode* node, ISceneManager* newManager) | 40 | ISceneNodeAnimator* CSceneNodeAnimatorDelete::createClone(ISceneNode* node, ISceneManager* newManager) |
41 | { | 41 | { |
42 | CSceneNodeAnimatorDelete * newAnimator = | 42 | CSceneNodeAnimatorDelete * newAnimator = |
43 | new CSceneNodeAnimatorDelete(SceneManager, FinishTime); | 43 | new CSceneNodeAnimatorDelete(SceneManager, FinishTime); |
44 | 44 | ||
45 | return newAnimator; | 45 | return newAnimator; |
46 | } | 46 | } |
47 | 47 | ||
48 | 48 | ||
49 | } // end namespace scene | 49 | } // end namespace scene |
50 | } // end namespace irr | 50 | } // end namespace irr |
51 | 51 | ||