aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-01-27 11:13:51 +1000
committerDavid Walter Seikel2013-01-27 11:13:51 +1000
commit19b347a5203113c3cc92398d4249928b848bcae2 (patch)
treebc96b17a9821ef8f494ada1f6eb48206547180c0
parentGet the new camera actually working. Still some bugs to be ironed out. (diff)
downloadSledjHamr-19b347a5203113c3cc92398d4249928b848bcae2.zip
SledjHamr-19b347a5203113c3cc92398d4249928b848bcae2.tar.gz
SledjHamr-19b347a5203113c3cc92398d4249928b848bcae2.tar.bz2
SledjHamr-19b347a5203113c3cc92398d4249928b848bcae2.tar.xz
Revert to original camera position and collider.
-rw-r--r--ClientHamr/extantz/CDemo.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/ClientHamr/extantz/CDemo.cpp b/ClientHamr/extantz/CDemo.cpp
index b5cce65..72e23e5 100644
--- a/ClientHamr/extantz/CDemo.cpp
+++ b/ClientHamr/extantz/CDemo.cpp
@@ -193,12 +193,11 @@ void CDemo::switchToNextScene(GLData *gld)
193 193
194 gld->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 = gld->camera;
196 camera->setPosition(core::vector3df(150, 170, -160)); 196 camera->setPosition(core::vector3df(108, 140, -140));
197 camera->setFarValue(5000.0f); 197 camera->setFarValue(5000.0f);
198 gld->move = getCameraMove(gld->camera); 198 gld->move = getCameraMove(gld->camera);
199 199
200 scene::ISceneNodeAnimatorCollisionResponse* collider = 200 scene::ISceneNodeAnimatorCollisionResponse* collider =
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); 201 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);
203 camera->addAnimator(collider); 202 camera->addAnimator(collider);
204 collider->drop(); 203 collider->drop();