summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--game/terrain.cpp4
-rw-r--r--gfx/gl/camera.cpp8
-rw-r--r--lib/collections.h14
-rw-r--r--lib/stream_support.h4
-rw-r--r--ui/gameMainWindow.cpp8
-rw-r--r--ui/window.cpp7
6 files changed, 22 insertions, 23 deletions
diff --git a/game/terrain.cpp b/game/terrain.cpp
index 1753dfe..f3bec1e 100644
--- a/game/terrain.cpp
+++ b/game/terrain.cpp
@@ -19,8 +19,8 @@
#include <vector>
Terrain::Terrain(std::shared_ptr<GeoData> gd) :
- geoData {std::move(gd)}, grass {Texture::cachedTexture.get("grass.png")}, water {Texture::cachedTexture.get(
- "water.png")}
+ geoData {std::move(gd)}, grass {Texture::cachedTexture.get("grass.png")},
+ water {Texture::cachedTexture.get("water.png")}
{
generateMeshes();
}
diff --git a/gfx/gl/camera.cpp b/gfx/gl/camera.cpp
index f642423..c4c9544 100644
--- a/gfx/gl/camera.cpp
+++ b/gfx/gl/camera.cpp
@@ -6,10 +6,10 @@
#include <ray.h>
Camera::Camera(glm::vec3 pos, float fov, float aspect, float zNear, float zFar) :
- position {pos}, forward {::north}, up {::up}, near {zNear}, far {zFar}, projection {glm::perspective(
- fov, aspect, zNear, zFar)},
- viewProjection {projection * glm::lookAt(position, position + forward, up)}, inverseViewProjection {
- glm::inverse(viewProjection)}
+ position {pos}, forward {::north}, up {::up}, near {zNear}, far {zFar},
+ projection {glm::perspective(fov, aspect, zNear, zFar)},
+ viewProjection {projection * glm::lookAt(position, position + forward, up)},
+ inverseViewProjection {glm::inverse(viewProjection)}
{
}
diff --git a/lib/collections.h b/lib/collections.h
index 8f5a43d..7d78ef9 100644
--- a/lib/collections.h
+++ b/lib/collections.h
@@ -8,13 +8,13 @@
template<typename T, typename E>
concept SequentialCollection = requires(T c) {
- {
- c.size()
- } -> std::integral;
- {
- c.data()
- } -> std::same_as<const E *>;
- };
+ {
+ c.size()
+ } -> std::integral;
+ {
+ c.data()
+ } -> std::same_as<const E *>;
+};
template<typename T>
concept IterableCollection = std::is_same_v<decltype(std::declval<T>().begin()), decltype(std::declval<T>().end())>;
diff --git a/lib/stream_support.h b/lib/stream_support.h
index 7fb256c..fa536f1 100644
--- a/lib/stream_support.h
+++ b/lib/stream_support.h
@@ -11,8 +11,8 @@
template<typename S>
concept stringlike = requires(const S & s) { s.substr(0); };
template<typename T>
-concept spanable = std::is_constructible_v<std::span<const typename T::value_type>, T> && !
-stringlike<T> && !std::is_same_v<std::span<typename T::value_type>, T>;
+concept spanable = std::is_constructible_v<std::span<const typename T::value_type>, T> && !stringlike<T>
+ && !std::is_same_v<std::span<typename T::value_type>, T>;
namespace std {
template<typename T, std::size_t L>
diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp
index 30cdada..a7f17dc 100644
--- a/ui/gameMainWindow.cpp
+++ b/ui/gameMainWindow.cpp
@@ -20,10 +20,10 @@
class GameMainToolbar : Mode<decltype(GameMainSelector::target)>, public Toolbar {
public:
explicit GameMainToolbar(GameMainSelector * gms_) :
- Mode<decltype(GameMainSelector::target)> {gms_->target}, Toolbar {
- {"ui/icon/network.png",
- toggle<EditNetworkOf<RailLinks>>()},
- }
+ Mode<decltype(GameMainSelector::target)> {gms_->target},
+ Toolbar {
+ {"ui/icon/network.png", toggle<EditNetworkOf<RailLinks>>()},
+ }
{
}
};
diff --git a/ui/window.cpp b/ui/window.cpp
index ad071bb..731996a 100644
--- a/ui/window.cpp
+++ b/ui/window.cpp
@@ -20,10 +20,9 @@ Window::GlewInitHelper::GlewInitHelper()
}
Window::Window(size_t width, size_t height, const std::string & title, Uint32 flags) :
- size {static_cast<int>(width), static_cast<int>(height)}, m_window {title.c_str(),
- static_cast<int>(SDL_WINDOWPOS_CENTERED),
- static_cast<int>(SDL_WINDOWPOS_CENTERED), size.x,
- size.y, flags},
+ size {static_cast<int>(width), static_cast<int>(height)},
+ m_window {title.c_str(), static_cast<int>(SDL_WINDOWPOS_CENTERED), static_cast<int>(SDL_WINDOWPOS_CENTERED), size.x,
+ size.y, flags},
glContext {m_window}, uiShader {width, height}
{
}