diff options
Diffstat (limited to 'ClientHamr/extantz/CDemo.cpp')
-rw-r--r-- | ClientHamr/extantz/CDemo.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ClientHamr/extantz/CDemo.cpp b/ClientHamr/extantz/CDemo.cpp index 7fc6ac1..b5cce65 100644 --- a/ClientHamr/extantz/CDemo.cpp +++ b/ClientHamr/extantz/CDemo.cpp | |||
@@ -10,7 +10,7 @@ | |||
10 | CDemo::CDemo(GLData *gld, bool a) | 10 | CDemo::CDemo(GLData *gld, bool a) |
11 | : additive(a), | 11 | : additive(a), |
12 | device(gld->device), | 12 | device(gld->device), |
13 | currentScene(0), | 13 | currentScene(2), |
14 | quakeLevelMesh(0), quakeLevelNode(0), skyboxNode(0), model1(0), model2(0), | 14 | quakeLevelMesh(0), quakeLevelNode(0), skyboxNode(0), model1(0), model2(0), |
15 | campFire(0), metaSelector(0), mapSelector(0), sceneStartTime(0), | 15 | campFire(0), metaSelector(0), mapSelector(0), sceneStartTime(0), |
16 | timeForThisScene(0) | 16 | timeForThisScene(0) |
@@ -53,7 +53,7 @@ void CDemo::setup(GLData *gld) | |||
53 | void CDemo::preDraw(GLData *gld, u32 now) | 53 | void CDemo::preDraw(GLData *gld, u32 now) |
54 | { | 54 | { |
55 | if (((now - sceneStartTime) > timeForThisScene) && (timeForThisScene != -1)) | 55 | if (((now - sceneStartTime) > timeForThisScene) && (timeForThisScene != -1)) |
56 | switchToNextScene(); | 56 | switchToNextScene(gld); |
57 | 57 | ||
58 | createParticleImpacts(); | 58 | createParticleImpacts(); |
59 | } | 59 | } |
@@ -80,7 +80,7 @@ bool CDemo::OnEvent(const SEvent& event) | |||
80 | } | 80 | } |
81 | 81 | ||
82 | 82 | ||
83 | void CDemo::switchToNextScene() | 83 | void CDemo::switchToNextScene(GLData *gld) |
84 | { | 84 | { |
85 | currentScene++; | 85 | currentScene++; |
86 | if (currentScene > 3) | 86 | if (currentScene > 3) |
@@ -191,12 +191,15 @@ void CDemo::switchToNextScene() | |||
191 | } | 191 | } |
192 | timeForThisScene = -1; | 192 | timeForThisScene = -1; |
193 | 193 | ||
194 | camera = addExtantzCamera(sm, 0, 100.0f, .4f, -1, false, 3.f, false, true); | 194 | gld->camera = addExtantzCamera(sm, 0, 100.0f, .4f, -1, false, 3.f, false, true); |
195 | camera = gld->camera; | ||
195 | camera->setPosition(core::vector3df(150, 170, -160)); | 196 | camera->setPosition(core::vector3df(150, 170, -160)); |
196 | camera->setFarValue(5000.0f); | 197 | camera->setFarValue(5000.0f); |
198 | gld->move = getCameraMove(gld->camera); | ||
197 | 199 | ||
198 | scene::ISceneNodeAnimatorCollisionResponse* collider = | 200 | scene::ISceneNodeAnimatorCollisionResponse* collider = |
199 | sm->createCollisionResponseAnimator(metaSelector, camera, core::vector3df(25, 100, 25), core::vector3df(0, quakeLevelMesh ? -10.f : 0.0f, 0), core::vector3df(0, 45, 0), 0.005f); | 201 | // sm->createCollisionResponseAnimator(metaSelector, camera, core::vector3df(25, 100, 25), core::vector3df(0, quakeLevelMesh ? -10.f : 0.0f, 0), core::vector3df(0, 45, 0), 0.005f); |
202 | sm->createCollisionResponseAnimator(metaSelector, camera, core::vector3df(25, 50, 25), core::vector3df(0, quakeLevelMesh ? -10.f : 0.0f, 0), core::vector3df(0, 45, 0), 0.005f); | ||
200 | camera->addAnimator(collider); | 203 | camera->addAnimator(collider); |
201 | collider->drop(); | 204 | collider->drop(); |
202 | } | 205 | } |