Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 979 vs 989 for /trunk/Source Code/Scenes/WarScene/WarScene.cpp

Diff revisions: vs.
  @@ -343,8 +343,8 @@
343 343 // Add a skybox
344 344 _currentSky = addSky();
345 345 // Position camera
346 - _baseCamera->setEye(vec3<F32>(43.13f, 147.09f, -4.41f));
347 - _baseCamera->setGlobalRotation(-90.0f /*yaw*/, 59.21f /*pitch*/);
346 + Camera::utilityCamera(Camera::UtilityCamera::DEFAULT)->setEye(vec3<F32>(43.13f, 147.09f, -4.41f));
347 + Camera::utilityCamera(Camera::UtilityCamera::DEFAULT)->setGlobalRotation(-90.0f /*yaw*/, 59.21f /*pitch*/);
348 348
349 349 _sun.lock()->getNode<DirectionalLight>()->csmSplitCount(3); // 3 splits
350 350 _sun.lock()->getNode<DirectionalLight>()->csmSplitLogFactor(0.85f);
  @@ -609,7 +609,7 @@
609 609 }
610 610 }
611 611
612 - _baseCamera->setHorizontalFoV(110);
612 + Camera::utilityCamera(Camera::UtilityCamera::DEFAULT)->setHorizontalFoV(110);
613 613
614 614 _envProbePool->addInfiniteProbe(vec3<F32>(0.0f, 0.0f, 0.0f));
615 615 _envProbePool->addLocalProbe(vec3<F32>(-5.0f), vec3<F32>(-1.0f));
  @@ -703,12 +703,12 @@
703 703 bool WarScene::loadResources(bool continueOnErrors) {
704 704 // Add a first person camera
705 705 Camera* cam = Camera::createCamera("fpsCamera", Camera::CameraType::FIRST_PERSON);
706 - cam->fromCamera(*_baseCamera);
706 + cam->fromCamera(*Camera::utilityCamera(Camera::UtilityCamera::DEFAULT));
707 707 cam->setMoveSpeedFactor(10.0f);
708 708 cam->setTurnSpeedFactor(10.0f);
709 709 // Add a third person camera
710 710 cam = Camera::createCamera("tpsCamera", Camera::CameraType::THIRD_PERSON);
711 - cam->fromCamera(*_baseCamera);
711 + cam->fromCamera(*Camera::utilityCamera(Camera::UtilityCamera::DEFAULT));
712 712 cam->setMoveSpeedFactor(0.02f);
713 713 cam->setTurnSpeedFactor(0.01f);
714 714