Adapt to camera in World.cpp

GlPortal · Mar 21, 2017 · cf4c4ff · cf4c4ff · hhirsch · Mar 21, 2017
1 parent e732cc6
commit cf4c4ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/source/Game.cpp b/source/Game.cpp
@@ -44,7 +44,7 @@ void Game::initRenderers() {
   World& worldReference = static_cast<glPortal::World&>(world);
   radix::Renderer& rendererReference = *renderer.get();
   gameRenderer =
-    std::make_unique<GameRenderer>(worldReference, rendererReference, camera.get(), &dtime);
+    std::make_unique<GameRenderer>(worldReference, rendererReference, world.camera.get(), &dtime);
   uiRenderer =
     std::make_unique<UiRenderer>(worldReference, rendererReference);
  }

diff --git a/source/WorldHelper.cpp b/source/WorldHelper.cpp
@@ -13,8 +13,8 @@ using namespace radix;
 namespace glPortal {
 
 void WorldHelper::shootPortal(int button, World &world) {
-  Vector3f cameraDir = Math::toDirection(world.camera.getOrientation());
-  btVector3 btFrom = world.camera.getPosition();
+  Vector3f cameraDir = Math::toDirection(world.camera->getOrientation());
+  btVector3 btFrom = world.camera->getPosition();
   btVector3 btTo = btFrom + cameraDir*10000;
   btCollisionWorld::ClosestRayResultCallback res(btFrom, btTo);
 
@@ -35,7 +35,7 @@ void WorldHelper::shootPortal(int button, World &world) {
         Portal &portal = pEnt.getComponent<Portal>();
         portal.openSince = world.getTime();
         portal.maskTex.diffuse = TextureLoader::getTexture("portalmask.png");
-        portal.placeOnWall(world.camera.getPosition(), ipos, res.m_hitNormalWorld);
+        portal.placeOnWall(world.camera->getPosition(), ipos, res.m_hitNormalWorld);
         LightSource &pLight = pEnt.getComponent<LightSource>();
 
         if (button == 1) {