Add camera bindings

override missing, but it's a start

3 files changed, 0 insertions, 178 deletions

diff --git a/source/rendering/CMakeLists.txt b/source/rendering/CMakeLists.txt
index 401f16e..f44f109 100644
--- a/source/rendering/CMakeLists.txt
+++ b/source/rendering/CMakeLists.txt
@@ -16,7 +16,6 @@ SET (star_rendering_HEADERS
       StarFontTextureGroup.hpp
       StarTextPainter.hpp
       StarTilePainter.hpp
-      StarWorldCamera.hpp
       StarWorldPainter.hpp
     )
 
@@ -28,7 +27,6 @@ SET (star_rendering_SOURCES
       StarFontTextureGroup.cpp
       StarTextPainter.cpp
       StarTilePainter.cpp
-      StarWorldCamera.cpp
       StarWorldPainter.cpp
     )
 
diff --git a/source/rendering/StarWorldCamera.cpp b/source/rendering/StarWorldCamera.cpp
deleted file mode 100644
index de23f3e..0000000
--- a/source/rendering/StarWorldCamera.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "StarWorldCamera.hpp"
-
-namespace Star {
-
-void WorldCamera::setCenterWorldPosition(Vec2F const& position, bool force) {
-  m_rawWorldCenter = position;
-  // Only actually move the world center if a half pixel distance has been
-  // moved in any direction.  This is sort of arbitrary, but helps prevent
-  // judder if the camera is at a boundary and floating point inaccuracy is
-  // causing the focus to jitter back and forth across the boundary.
-  if (fabs(position[0] - m_worldCenter[0]) < 1.0f / (TilePixels * m_pixelRatio * 2)
-   && fabs(position[1] - m_worldCenter[1]) < 1.0f / (TilePixels * m_pixelRatio * 2) && !force)
-    return;
-
-  // First, make sure the camera center position is inside the main x
-  // coordinate bounds, and that the top and bototm of the screen are not
-  // outside of the y coordinate bounds.
-  m_worldCenter = m_worldGeometry.xwrap(position);
-  m_worldCenter[1] = clamp(m_worldCenter[1],
-      (float)m_screenSize[1] / (TilePixels * m_pixelRatio * 2),
-      m_worldGeometry.height() - (float)m_screenSize[1] / (TilePixels * m_pixelRatio * 2));
-
-  // Then, position the camera center position so that the tile grid is as
-  // close as possible aligned to whole pixel boundaries.  This is incredibly
-  // important, because this means that even without any complicated rounding,
-  // elements drawn in world space that are aligned with TilePixels will
-  // eventually also be aligned to real screen pixels.
-
-  float ratio = TilePixels * m_pixelRatio;
-
-  if (m_screenSize[0] % 2 == 0)
-    m_worldCenter[0] = round(m_worldCenter[0] * ratio) / ratio;
-  else
-    m_worldCenter[0] = (round(m_worldCenter[0] * ratio + 0.5f) - 0.5f) / ratio;
-
-  if (m_screenSize[1] % 2 == 0)
-    m_worldCenter[1] = round(m_worldCenter[1] * ratio) / ratio;
-  else
-    m_worldCenter[1] = (round(m_worldCenter[1] * ratio + 0.5f) - 0.5f) / ratio;
-}
-
-}
diff --git a/source/rendering/StarWorldCamera.hpp b/source/rendering/StarWorldCamera.hpp
deleted file mode 100644
index aa0713b..0000000
--- a/source/rendering/StarWorldCamera.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-#pragma once
-
-#include "StarWorldGeometry.hpp"
-#include "StarGameTypes.hpp"
-#include "StarInterpolation.hpp"
-
-namespace Star {
-
-class WorldCamera {
-public:
-  void setScreenSize(Vec2U screenSize);
-  Vec2U screenSize() const;
-
-  void setTargetPixelRatio(float targetPixelRatio);
-  void setPixelRatio(float pixelRatio);
-  float pixelRatio() const;
-
-  void setWorldGeometry(WorldGeometry geometry);
-  WorldGeometry worldGeometry() const;
-
-  // Set the camera center position (in world space) to as close to the given
-  // location as possible while keeping the screen within world bounds.
-  void setCenterWorldPosition(Vec2F const& position, bool force = false);
-  // Returns the actual camera position.
-  Vec2F centerWorldPosition() const;
-
-  // Transforms world coordinates into one set of screen coordinates.  Since
-  // the world is non-euclidean, one world coordinate can transform to
-  // potentially an infinite number of screen coordinates.  This will retrun
-  // the closest to the center of the screen.
-  Vec2F worldToScreen(Vec2F const& worldCoord) const;
-
-  // Assumes top left corner of screen is (0, 0) in screen coordinates.
-  Vec2F screenToWorld(Vec2F const& screen) const;
-
-  // Returns screen dimensions in world space.
-  RectF worldScreenRect() const;
-
-  // Returns tile dimensions of the tiles that overlap with the screen
-  RectI worldTileRect() const;
-
-  // Returns the position of the lower left corner of the lower left tile of
-  // worldTileRect, in screen coordinates.
-  Vec2F tileMinScreen() const;
-
-  void update(float dt);
-
-private:
-  WorldGeometry m_worldGeometry;
-  Vec2U m_screenSize;
-  float m_pixelRatio = 1.0f;
-  float m_targetPixelRatio = 1.0f;
-  Vec2F m_worldCenter;
-  Vec2F m_rawWorldCenter;
-};
-
-inline void WorldCamera::setScreenSize(Vec2U screenSize) {
-  m_screenSize = screenSize;
-}
-
-inline Vec2U WorldCamera::screenSize() const {
-  return m_screenSize;
-}
-
-inline void WorldCamera::setTargetPixelRatio(float targetPixelRatio) {
-  m_targetPixelRatio = targetPixelRatio;
-}
-
-inline void WorldCamera::setPixelRatio(float pixelRatio) {
-  m_pixelRatio = m_targetPixelRatio = pixelRatio;
-}
-
-inline float WorldCamera::pixelRatio() const {
-  return m_pixelRatio;
-}
-
-inline void WorldCamera::setWorldGeometry(WorldGeometry geometry) {
-  m_worldGeometry = std::move(geometry);
-}
-
-inline WorldGeometry WorldCamera::worldGeometry() const {
-  return m_worldGeometry;
-}
-
-inline Vec2F WorldCamera::centerWorldPosition() const {
-  return Vec2F(m_worldCenter);
-}
-
-inline Vec2F WorldCamera::worldToScreen(Vec2F const& worldCoord) const {
-  Vec2F wrappedCoord = m_worldGeometry.nearestTo(Vec2F(m_worldCenter), worldCoord);
-  return Vec2F(
-      (wrappedCoord[0] - m_worldCenter[0]) * (TilePixels * m_pixelRatio) + (float)m_screenSize[0] / 2.0,
-      (wrappedCoord[1] - m_worldCenter[1]) * (TilePixels * m_pixelRatio) + (float)m_screenSize[1] / 2.0
-    );
-}
-
-inline Vec2F WorldCamera::screenToWorld(Vec2F const& screen) const {
-  return Vec2F(
-      (screen[0] - (float)m_screenSize[0] / 2.0) / (TilePixels * m_pixelRatio) + m_worldCenter[0],
-      (screen[1] - (float)m_screenSize[1] / 2.0) / (TilePixels * m_pixelRatio) + m_worldCenter[1]
-    );
-}
-
-inline RectF WorldCamera::worldScreenRect() const {
-  // screen dimensions in world space
-  float w = (float)m_screenSize[0] / (TilePixels * m_pixelRatio);
-  float h = (float)m_screenSize[1] / (TilePixels * m_pixelRatio);
-  return RectF::withSize(Vec2F(m_worldCenter[0] - w / 2, m_worldCenter[1] - h / 2), Vec2F(w, h));
-}
-
-inline RectI WorldCamera::worldTileRect() const {
-  RectF screen = worldScreenRect();
-  Vec2I min = Vec2I::floor(screen.min());
-  Vec2I size = Vec2I::ceil(Vec2F(m_screenSize) / (TilePixels * m_pixelRatio) + (screen.min() - Vec2F(min)));
-  return RectI::withSize(min, size);
-}
-
-inline Vec2F WorldCamera::tileMinScreen() const {
-  RectF screenRect = worldScreenRect();
-  RectI tileRect = worldTileRect();
-  return (Vec2F(tileRect.min()) - screenRect.min()) * (TilePixels * m_pixelRatio);
-}
-
-inline void WorldCamera::update(float dt) {
-  float newPixelRatio = lerp(exp(-20.0f * dt), m_targetPixelRatio, m_pixelRatio);
-  if (abs(newPixelRatio - m_targetPixelRatio) < 0.0125f)
-    newPixelRatio = m_targetPixelRatio;
-  if (m_pixelRatio != newPixelRatio) {
-    m_pixelRatio = newPixelRatio;
-    setCenterWorldPosition(m_rawWorldCenter, true);
-  }
-}
-
-}