1
0
Fork 0

Minor formating fixes.

This commit is contained in:
Henrik Hautakoski 2019-12-29 22:26:05 +01:00
parent 6f53b0c069
commit 899cefd2e9
No known key found for this signature in database
GPG key ID: 96765B12FEAC4745
76 changed files with 121 additions and 121 deletions

View file

@ -13,10 +13,10 @@ protected :
private : private :
// Skip implementation to trigger compiler error. // Skip implementation to trigger compiler error.
NonCopyable(const NonCopyable&); NonCopyable(const NonCopyable&);
NonCopyable& operator =(const NonCopyable&); NonCopyable& operator =(const NonCopyable&);
}; };
} // namespace sp } // namespace sp
#endif /* SPECTRE_CORE_NONCOPYABLE_H */ #endif /* SPECTRE_CORE_NONCOPYABLE_H */

View file

@ -36,4 +36,4 @@ public :
} // namespace sp } // namespace sp
#endif /* SPECTRE_DISPLAY_DISPLAYMODE_H */ #endif /* SPECTRE_DISPLAY_DISPLAYMODE_H */

View file

@ -11,7 +11,7 @@ class FPSCounter
public : public :
FPSCounter(); FPSCounter();
// Add a frame to the counter. // Add a frame to the counter.
// Should be called whenever a frame has been rendered. // Should be called whenever a frame has been rendered.
void addFrame(); void addFrame();
@ -44,4 +44,4 @@ private :
} // namespace sp } // namespace sp
#endif /* SPECTRE_FPS_COUNTER_H */ #endif /* SPECTRE_FPS_COUNTER_H */

View file

@ -46,4 +46,4 @@ protected :
} // namespace sp } // namespace sp
#endif /* SPECTRE_GAME_TIME_H */ #endif /* SPECTRE_GAME_TIME_H */

View file

@ -64,7 +64,7 @@ protected :
unsigned int m_VBO; unsigned int m_VBO;
RenderState m_state; RenderState m_state;
unsigned short m_size; unsigned short m_size;
ShaderProgram m_textShader; ShaderProgram m_textShader;
@ -73,4 +73,4 @@ protected :
} // namespace } // namespace
#endif /* SPECTRE_BATCH_RENDERER2D_H */ #endif /* SPECTRE_BATCH_RENDERER2D_H */

View file

@ -26,4 +26,4 @@ protected :
} // namespace } // namespace
#endif /* SPECTRE_DEFAULT_RENDERER2D_H */ #endif /* SPECTRE_DEFAULT_RENDERER2D_H */

View file

@ -4,4 +4,4 @@
#include <Spectre/Graphics/GL/glad.h> #include <Spectre/Graphics/GL/glad.h>
#endif /* SPECTRE_OPENGL_H */ #endif /* SPECTRE_OPENGL_H */

View file

@ -32,4 +32,4 @@ protected :
} // namespace sp } // namespace sp
#endif /* SPECTRE_GRAPHICS_RENDERER2D_H */ #endif /* SPECTRE_GRAPHICS_RENDERER2D_H */

View file

@ -34,7 +34,7 @@ public :
protected : protected :
// Compile the shader. // Compile the shader.
// Returns true if the shader compiled without errors. false otherwise. // Returns true if the shader compiled without errors. false otherwise.
bool compile(); bool compile();
@ -55,4 +55,4 @@ protected :
} // namespace sp } // namespace sp
#endif /* SPECTRE_GRAPHICS_SHADER_H */ #endif /* SPECTRE_GRAPHICS_SHADER_H */

View file

@ -41,11 +41,11 @@ public :
// Returns true if the program was linked successfully // Returns true if the program was linked successfully
bool isLinked() const; bool isLinked() const;
// Enable this shader // Enable this shader
// All shader operations after this call will affect this shader. // All shader operations after this call will affect this shader.
void enable() const; void enable() const;
// Disable this shader // Disable this shader
// Operations will no longer affect this shader after this call. // Operations will no longer affect this shader after this call.
void disable() const; void disable() const;

View file

@ -60,4 +60,4 @@ private :
} // namespace sp } // namespace sp
#endif /* SPECTRE_GRAPHICS_TRANSFORMABLE_H */ #endif /* SPECTRE_GRAPHICS_TRANSFORMABLE_H */

View file

@ -14,4 +14,4 @@ public :
} // namespace sp } // namespace sp
#endif /* SPECTRE_INPUT_LISTENER_H */ #endif /* SPECTRE_INPUT_LISTENER_H */

View file

@ -6,7 +6,7 @@
#include "Vector2.h" #include "Vector2.h"
#include "Matrix4.h" #include "Matrix4.h"
namespace sp { namespace math namespace sp { namespace math
{ {
float rand(float min, float max); float rand(float min, float max);
@ -50,4 +50,4 @@ namespace sp { namespace math
} } // namespace sp } } // namespace sp
#endif /* SPECTRE_MATH_MATH_H */ #endif /* SPECTRE_MATH_MATH_H */

View file

@ -22,7 +22,7 @@ struct Matrix3
| 0 3 6 | | 0 3 6 |
| 1 4 7 | | 1 4 7 |
| 2 5 8 | | 2 5 8 |
|_ _| |_ _|
*/ */
T v[9]; T v[9];
}; };
@ -32,8 +32,8 @@ struct Matrix3
inline Matrix3(); inline Matrix3();
inline Matrix3( T a, T b, T c, inline Matrix3( T a, T b, T c,
T d, T e, T f, T d, T e, T f,
T g, T h, T i); T g, T h, T i);
inline Matrix3(T *a); inline Matrix3(T *a);
@ -83,4 +83,4 @@ typedef Matrix3<unsigned> Matrix3u;
#include "Matrix3.inl" #include "Matrix3.inl"
#endif /* SPECTRE_MATH_MATRIX3_H */ #endif /* SPECTRE_MATH_MATRIX3_H */

View file

@ -108,9 +108,9 @@ Matrix3<T> Matrix3<T>::transpose() const
{ {
Matrix3<T> t; Matrix3<T> t;
t.v[0] = v[0]; t.v[3] = v[1]; t.v[6] = v[2]; t.v[0] = v[0]; t.v[3] = v[1]; t.v[6] = v[2];
t.v[1] = v[3]; t.v[4] = v[4]; t.v[7] = v[5]; t.v[1] = v[3]; t.v[4] = v[4]; t.v[7] = v[5];
t.v[2] = v[6]; t.v[5] = v[7]; t.v[8] = v[8]; t.v[2] = v[6]; t.v[5] = v[7]; t.v[8] = v[8];
return t; return t;
} }

View file

@ -109,4 +109,4 @@ typedef Matrix4<unsigned> mat4u;
// ---------------- // ----------------
#include "Matrix4.inl" #include "Matrix4.inl"
#endif /* SPECTRE_MATH_MATRIX4_H */ #endif /* SPECTRE_MATH_MATRIX4_H */

View file

@ -155,4 +155,4 @@ inline std::ostream& operator<<(std::ostream &s, const Matrix4<T>& mat)
return s << mat.toString(); return s << mat.toString();
} }
} // namespace sp } // namespace sp

View file

@ -79,4 +79,4 @@ Vector2f operator*(const Transform& t, const Vector2f& v);
} // namespace sp } // namespace sp
#endif /* SPECTRE_MATH_TRANSFORM_H */ #endif /* SPECTRE_MATH_TRANSFORM_H */

View file

@ -317,4 +317,4 @@ inline std::ostream& operator<<(std::ostream &s, const Vector2<T>& v)
return s << "(" << v.x << "," << v.y << ")"; return s << "(" << v.x << "," << v.y << ")";
} }
} // namespace sp } // namespace sp

View file

@ -11,7 +11,7 @@ template <typename T>
struct Vector3 struct Vector3
{ {
union { union {
struct { struct {
T x, y, z; T x, y, z;
}; };
T v[3]; T v[3];

View file

@ -268,4 +268,4 @@ inline std::ostream& operator<<(std::ostream &s, const Vector3<T>& v)
return s << "(" << v.x << "," << v.y << "," << v.z << ")"; return s << "(" << v.x << "," << v.y << "," << v.z << ")";
} }
} // namespace sp } // namespace sp

View file

@ -10,7 +10,7 @@ template <typename T>
struct Vector4 struct Vector4
{ {
union { union {
struct { struct {
T x, y, z, w; T x, y, z, w;
}; };
T v[4]; T v[4];

View file

@ -10,7 +10,7 @@
// TODO: Support unprojection, from Screenspace -> Worldspace. // TODO: Support unprojection, from Screenspace -> Worldspace.
// TODO: Zoom is implemented using a scale matrix. // TODO: Zoom is implemented using a scale matrix.
// It's abit weird to control. Must be a better solution. // It's abit weird to control. Must be a better solution.
namespace sp { namespace sp {
@ -84,4 +84,4 @@ protected :
} // namespace sp } // namespace sp
#endif /* SPECTRE_SCENE_CAMERA2D_H */ #endif /* SPECTRE_SCENE_CAMERA2D_H */

View file

@ -21,4 +21,4 @@ public :
} // namespace sp } // namespace sp
#endif /* SPECTRE_SCENE_ICAMERA_H */ #endif /* SPECTRE_SCENE_ICAMERA_H */

View file

@ -16,4 +16,4 @@ public :
} // namespace sp } // namespace sp
#endif /* SPECTRE_SYSTEM_MESSAGEHANDLER_H */ #endif /* SPECTRE_SYSTEM_MESSAGEHANDLER_H */

View file

@ -38,4 +38,4 @@ public :
} // namespace sp } // namespace sp
#endif /* SYSTEM_EVENT_H */ #endif /* SYSTEM_EVENT_H */

View file

@ -151,4 +151,4 @@ void Display::onReshape(int width, int height)
m_context->setSize(width, height); m_context->setSize(width, height);
} }
} // namespace sp } // namespace sp

View file

@ -15,4 +15,4 @@ decoration (decoration)
{ {
} }
} // namespace sp } // namespace sp

View file

@ -55,4 +55,4 @@ DisplayMode DisplayMode::getDesktopMode()
return PlatformMisc::GetDesktopMode(); return PlatformMisc::GetDesktopMode();
} }
} // namespace sp } // namespace sp

View file

@ -27,7 +27,7 @@ void FPSCounter::setUpdateRate(unsigned int ups)
if (ups < 1) { if (ups < 1) {
ups = 1; ups = 1;
} }
m_updateRate = ups * 1000; m_updateRate = ups * 1000;
// Must reset the counter. // Must reset the counter.

View file

@ -60,7 +60,7 @@ void GameTime::reset()
void GameTime::accumulateTime() void GameTime::accumulateTime()
{ {
updateTime(); updateTime();
m_acc += (double) (m_current - m_lastUpdate); m_acc += (double) (m_current - m_lastUpdate);
if (m_acc > (1000.f / m_slice)) { if (m_acc > (1000.f / m_slice)) {
m_acc = 1000.f / m_slice; m_acc = 1000.f / m_slice;
@ -77,4 +77,4 @@ void GameTime::updateTime()
} }
} }
} // namespace sp } // namespace sp

View file

@ -220,7 +220,7 @@ unsigned int BatchRenderer2D::addRenderable(Vertex2D* buffer, const Renderable2D
const Transform& transform = renderable->getTransform(); const Transform& transform = renderable->getTransform();
const std::vector<Vertex2D>& vertices = renderable->getVertices(); const std::vector<Vertex2D>& vertices = renderable->getVertices();
// Pretransform vertex positions to skip setting a uniform model // Pretransform vertex positions to skip setting a uniform model
// matrix in the shader for each renderable reducing the number of draw calls. // matrix in the shader for each renderable reducing the number of draw calls.
for(size_t i = 0; i < vertices.size(); i++) { for(size_t i = 0; i < vertices.size(); i++) {

View file

@ -6,7 +6,7 @@
namespace sp { namespace sp {
DefaultRenderer2D::DefaultRenderer2D() DefaultRenderer2D::DefaultRenderer2D()
{ {
m_shader.create(); m_shader.create();
if (!m_shader.loadFromFile("assets/shaders/standard.shader.glsl")) { if (!m_shader.loadFromFile("assets/shaders/standard.shader.glsl")) {
@ -73,4 +73,4 @@ void DefaultRenderer2D::render()
m_queue.clear(); m_queue.clear();
} }
} // namespace sp } // namespace sp

View file

@ -114,7 +114,7 @@ Vector2u Font::findTextureRegion(const Image& img) const
resizeTexture(); resizeTexture();
} }
} }
pos = m_cacheTextureA.texpos; pos = m_cacheTextureA.texpos;
m_cacheTextureA.texpos.x += img.getWidth() + 1; m_cacheTextureA.texpos.x += img.getWidth() + 1;
@ -127,4 +127,4 @@ const Texture* Font::getTexture() const
return &m_cacheTextureA.texture; return &m_cacheTextureA.texture;
} }
} // namespace sp } // namespace sp

View file

@ -13,4 +13,4 @@ void FontDriver::setHinting(bool value)
m_hinting = value; m_hinting = value;
} }
} // namespace sp } // namespace sp

View file

@ -80,14 +80,14 @@ bool FreeTypeDriver::setCharacterSize(unsigned int size)
return true; return true;
} }
bool FreeTypeDriver::loadFromFile(const std::string& filename) bool FreeTypeDriver::loadFromFile(const std::string& filename)
{ {
FT_Face face; FT_Face face;
FT_Error error; FT_Error error;
error = FT_New_Face(LibWrapper::getInstance().handle, filename.c_str(), 0, &face); error = FT_New_Face(LibWrapper::getInstance().handle, filename.c_str(), 0, &face);
if (error) { if (error) {
Log::warn("FreeType: could not load file (%s): %s", Log::warn("FreeType: could not load file (%s): %s",
filename.c_str(), FT_GetErrorString(error)); filename.c_str(), FT_GetErrorString(error));
return false; return false;
} }
@ -168,4 +168,4 @@ std::string FreeTypeDriver::getName()
return m_face->family_name; return m_face->family_name;
} }
} // namespace } // namespace

View file

@ -11,7 +11,7 @@
const struct error_list { const struct error_list {
int code; int code;
const char* msg; const char* msg;
} ft_errors[] = } ft_errors[] =
#include FT_ERRORS_H #include FT_ERRORS_H
const char* FT_GetErrorString(FT_Error error) { const char* FT_GetErrorString(FT_Error error) {

View file

@ -7,4 +7,4 @@
const char* FT_GetErrorString(FT_Error error); const char* FT_GetErrorString(FT_Error error);
#endif /* SPECTRE_GRAPHICS_FONT_FREETYPE_ERROR_H */ #endif /* SPECTRE_GRAPHICS_FONT_FREETYPE_ERROR_H */

View file

@ -9,4 +9,4 @@ void glCheckError(const char *file, unsigned int line, const char *expr) {
if (err != GL_NO_ERROR) { if (err != GL_NO_ERROR) {
std::string msg; std::string msg;
} }
} }

View file

@ -4,8 +4,8 @@
#include <Spectre/Graphics/OpenGL.h> #include <Spectre/Graphics/OpenGL.h>
#define checkGLError(expr) do { expr; glCheckError(__FILE__, __LINE__, #expr); } while(false) #define checkGLError(expr) do { expr; glCheckError(__FILE__, __LINE__, #expr); } while(false)
void glCheckError(const char *file, unsigned int line, const char *expr); void glCheckError(const char *file, unsigned int line, const char *expr);
#endif /* SPECTRE_GRAPHICS_GL_CHECKERROR_H */ #endif /* SPECTRE_GRAPHICS_GL_CHECKERROR_H */

View file

@ -210,4 +210,4 @@ const unsigned char* Image::getPixels() const
return NULL; return NULL;
} }
} // namespace sp } // namespace sp

View file

@ -90,4 +90,4 @@ void Graphics::swapBuffers()
m_display->swapBuffers(); m_display->swapBuffers();
} }
} // namespace sp } // namespace sp

View file

@ -22,7 +22,7 @@ void RenderState::enableTexture(const Texture *texture)
// Enable the new texture. // Enable the new texture.
if (texture) { if (texture) {
texture->enable(); texture->enable();
} }
// No texture selected. // No texture selected.
// Must unbind cached texture if set. // Must unbind cached texture if set.
else if (m_texture) { else if (m_texture) {
@ -49,4 +49,4 @@ void RenderState::cleanup()
} }
} }
} // namespace sp } // namespace sp

View file

@ -8,7 +8,7 @@ m_zorder (0)
{ {
} }
Renderable2D::Renderable2D(const Vector2f& position) : Renderable2D::Renderable2D(const Vector2f& position) :
m_zorder (0), m_zorder (0),
Transformable (position) Transformable (position)
{ {
@ -28,4 +28,4 @@ void Renderable2D::setZOrder(unsigned char value)
m_zorder = value; m_zorder = value;
} }
} // namespace sp } // namespace sp

View file

@ -16,4 +16,4 @@ void Renderer2D::setCamera(const Camera2D& camera)
m_camera = &camera; m_camera = &camera;
} }
} // namespace sp } // namespace sp

View file

@ -101,4 +101,4 @@ std::string Shader::fetchErrorLog()
return std::string(buf); return std::string(buf);
} }
} // namespace sp } // namespace sp

View file

@ -47,7 +47,7 @@ bool ShaderProgram::loadFromFile(const std::string& filename)
std::string base_name = filename.substr(0, filename.length() - extension.length()); std::string base_name = filename.substr(0, filename.length() - extension.length());
// vert and frag are not optional. they must exist. // vert and frag are not optional. they must exist.
return loadFromFile(base_name + "vert.glsl", Shader::Type::Vertex) && return loadFromFile(base_name + "vert.glsl", Shader::Type::Vertex) &&
loadFromFile(base_name + "frag.glsl", Shader::Type::Fragment); loadFromFile(base_name + "frag.glsl", Shader::Type::Fragment);
} else if (extension == "vert.glsl") { } else if (extension == "vert.glsl") {
@ -117,7 +117,7 @@ void ShaderProgram::enable() const
{ {
glUseProgram(m_id); glUseProgram(m_id);
} }
void ShaderProgram::disable() const void ShaderProgram::disable() const
{ {
glUseProgram(0); glUseProgram(0);
@ -194,4 +194,4 @@ std::string ShaderProgram::fetchErrorLog()
return std::string(buf); return std::string(buf);
} }
} // namespace sp } // namespace sp

View file

@ -86,7 +86,7 @@ void Sprite::setTextureCoords(const vec2u& pos, const vec2u& size)
float left = pos.x / tex_size.x; float left = pos.x / tex_size.x;
float right = left + (size.x / tex_size.x); float right = left + (size.x / tex_size.x);
float top = pos.y / tex_size.y; float top = pos.y / tex_size.y;
float bottom = top + (size.y / tex_size.y); float bottom = top + (size.y / tex_size.y);
m_vertices[0].uv = Vector2f(left , top); m_vertices[0].uv = Vector2f(left , top);
m_vertices[1].uv = Vector2f(left , bottom); m_vertices[1].uv = Vector2f(left , bottom);
@ -118,4 +118,4 @@ void Sprite::render(Renderer2D& renderer) const
renderer.draw(this); renderer.draw(this);
} }
} // namespace sp } // namespace sp

View file

@ -177,4 +177,4 @@ void Text::render(Renderer2D& renderer) const
renderer.draw(this); renderer.draw(this);
} }
} // namespace sp } // namespace sp

View file

@ -60,8 +60,8 @@ void Texture::create(unsigned width, unsigned heigth, PixelFormat format)
glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
} }
glTexImage2D(GL_TEXTURE_2D, 0, glTexImage2D(GL_TEXTURE_2D, 0,
pixelFormatToInternal(format), width, heigth, 0, pixelFormatToInternal(format), width, heigth, 0,
pixelFormatToGL(format), GL_UNSIGNED_BYTE, &empty_pixels[0]); pixelFormatToGL(format), GL_UNSIGNED_BYTE, &empty_pixels[0]);
setSmooth(true); setSmooth(true);
@ -98,7 +98,7 @@ void Texture::create(const Image& image)
srcFormat = pixelFormatToGL(image.getFormat()); srcFormat = pixelFormatToGL(image.getFormat());
glFormat = pixelFormatToInternal(image.getFormat()); glFormat = pixelFormatToInternal(image.getFormat());
glTexImage2D(GL_TEXTURE_2D, 0, glFormat, m_size.x, m_size.y, glTexImage2D(GL_TEXTURE_2D, 0, glFormat, m_size.x, m_size.y,
0, srcFormat, GL_UNSIGNED_BYTE, image.getPixels()); 0, srcFormat, GL_UNSIGNED_BYTE, image.getPixels());
setSmooth(true); setSmooth(true);
@ -157,8 +157,8 @@ void Texture::update(vec2u pos, const Image& image)
format = pixelFormatToGL(image.getFormat()); format = pixelFormatToGL(image.getFormat());
glTexSubImage2D(GL_TEXTURE_2D, 0, pos.x, pos.y, glTexSubImage2D(GL_TEXTURE_2D, 0, pos.x, pos.y,
image.getWidth(), image.getHeight(), image.getWidth(), image.getHeight(),
format, GL_UNSIGNED_BYTE, image.getPixels()); format, GL_UNSIGNED_BYTE, image.getPixels());
disable(); disable();
@ -180,9 +180,9 @@ Image Texture::copyToImage() const
//glPixelStorei(GL_PACK_ALIGNMENT, 4); //glPixelStorei(GL_PACK_ALIGNMENT, 4);
glGetTexImage(GL_TEXTURE_2D, 0, glGetTexImage(GL_TEXTURE_2D, 0,
pixelFormatToGL(m_format), pixelFormatToGL(m_format),
GL_UNSIGNED_BYTE, GL_UNSIGNED_BYTE,
&pixels[0]); &pixels[0]);
img.create(m_format, m_size.x, m_size.y, &pixels[0]); img.create(m_format, m_size.x, m_size.y, &pixels[0]);
@ -255,4 +255,4 @@ bool Texture::operator!=(const Texture* other) const
return m_id != other->m_id; return m_id != other->m_id;
} }
} // namespace sp } // namespace sp

View file

@ -96,4 +96,4 @@ const Transform& Transformable::getTransform() const
return m_transform; return m_transform;
} }
} // namespace sp } // namespace sp

View file

@ -11,4 +11,4 @@ void InputDevice::init()
{ {
} }
} // namespace sp } // namespace sp

View file

@ -5,7 +5,7 @@
namespace sp { namespace sp {
InputEvent::InputEvent(Type type) : InputEvent::InputEvent(Type type) :
type (type) type (type)
{ {
} }
@ -20,4 +20,4 @@ std::string InputEvent::MouseButtonEvent::getName() const
return Mouse::getButtonName(button); return Mouse::getButtonName(button);
} }
} // namespace sp } // namespace sp

View file

@ -7,4 +7,4 @@ void InputListener::onInputEvent(const InputEvent& event)
{ {
} }
} // namespace sp } // namespace sp

View file

@ -42,7 +42,7 @@ void InputModule::registerListener(InputListener* listener)
void InputModule::removeListener(InputListener* listener) void InputModule::removeListener(InputListener* listener)
{ {
} }
Mouse* InputModule::getMouse() Mouse* InputModule::getMouse()
@ -97,4 +97,4 @@ void InputModule::dispatch()
m_buffer.clear(); m_buffer.clear();
} }
} // namespace sp } // namespace sp

View file

@ -60,7 +60,7 @@ struct keyentry table[] = {
MapSym(Key::Down, "Down"), MapSym(Key::Down, "Down"),
MapSym(Key::Left, "Left"), MapSym(Key::Left, "Left"),
MapSym(Key::Right, "Right"), MapSym(Key::Right, "Right"),
// Numpad // Numpad
MapSym(Key::NUMPAD_1, "Numpad 1"), MapSym(Key::NUMPAD_1, "Numpad 1"),
MapSym(Key::NUMPAD_2, "Numpad 2"), MapSym(Key::NUMPAD_2, "Numpad 2"),
@ -113,4 +113,4 @@ std::string Keyboard::getKeyName(Key::Type key)
return table[key].name; return table[key].name;
} }
} // namespace sp } // namespace sp

View file

@ -21,4 +21,4 @@ std::string Mouse::getButtonName(MouseButton::Type button)
} }
} }
} // namespace sp } // namespace sp

View file

@ -129,4 +129,4 @@ Color operator *(const Color& c, unsigned int s)
return Color(c.r * s, c.g * s, c.b * s, c.a * s); return Color(c.r * s, c.g * s, c.b * s, c.a * s);
} }
} // namespace sp } // namespace sp

View file

@ -29,7 +29,7 @@ namespace sp { namespace math
float bottom, float top, float bottom, float top,
float zNear, float zFar) { float zNear, float zFar) {
float rl = (right - left), float rl = (right - left),
tb = (top - bottom), tb = (top - bottom),
fn = (zFar - zNear), fn = (zFar - zNear),
rl2 = 2.0f / rl, rl2 = 2.0f / rl,

View file

@ -154,7 +154,7 @@ Transform& operator*=(Transform& a, const Transform& other)
return a; return a;
} }
Vector2f operator*(const Transform& transform, const Vector2f& vec) Vector2f operator*(const Transform& transform, const Vector2f& vec)
{ {
return transform.transformPoint(vec); return transform.transformPoint(vec);
} }

View file

@ -26,4 +26,4 @@ public :
} // namespace sp } // namespace sp
#endif /* SPECTRE_PLATFORM_H */ #endif /* SPECTRE_PLATFORM_H */

View file

@ -33,4 +33,4 @@ void PlatformDisplay::onReshape(int width, int height)
m_parent->onReshape(width, height); m_parent->onReshape(width, height);
} }
} // namespace sp } // namespace sp

View file

@ -1,6 +1,6 @@
#ifndef SPECTRE_PLATFORM_DISPLAY_H #ifndef SPECTRE_PLATFORM_DISPLAY_H
#define SPECTRE_PLATFORM_DISPLAY_H #define SPECTRE_PLATFORM_DISPLAY_H
#include <Spectre/Math/Vector2.h> #include <Spectre/Math/Vector2.h>
#include <Spectre/Display/DisplayDescription.h> #include <Spectre/Display/DisplayDescription.h>
@ -53,4 +53,4 @@ private :
} // namespace sp } // namespace sp
#endif /* SPECTRE_PLATFORM_DISPLAY_H */ #endif /* SPECTRE_PLATFORM_DISPLAY_H */

View file

@ -97,4 +97,4 @@ LRESULT Win32Application::processMessage(MSG msg)
return DispatchMessage(&msg); return DispatchMessage(&msg);
} }
} // namespace sp } // namespace sp

View file

@ -9,7 +9,7 @@
namespace sp { namespace sp {
// Can't use GLAD's standard loader function because it // Can't use GLAD's standard loader function because it
// calls wglGetProcAddress without __stdcall // calls wglGetProcAddress without __stdcall
// that results in some runtime exception. // that results in some runtime exception.
static GLADapiproc func_loader(const char *name) { static GLADapiproc func_loader(const char *name) {
@ -186,4 +186,4 @@ bool Win32GLContext::setPixelFormat()
return false; return false;
} }
} // namespace sp } // namespace sp

View file

@ -28,4 +28,4 @@ void Win32Input::update()
{ {
} }
} // namespace sp } // namespace sp

View file

@ -7,12 +7,12 @@ const char* Win32GetMessage(DWORD messageId) {
static char buf[1024] = { '\0' }; static char buf[1024] = { '\0' };
DWORD rc = FormatMessage( DWORD rc = FormatMessage(
FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_IGNORE_INSERTS |
FORMAT_MESSAGE_FROM_SYSTEM, FORMAT_MESSAGE_FROM_SYSTEM,
NULL, messageId, NULL, messageId,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
buf, 1024, NULL); buf, 1024, NULL);
if (!rc) { if (!rc) {
strcpy_s(buf, "Unkown error!\n"); strcpy_s(buf, "Unkown error!\n");
} }

View file

@ -7,4 +7,4 @@
const char* Win32GetMessage(DWORD messageId); const char* Win32GetMessage(DWORD messageId);
#endif /* PLATFORM_WIN32_INTERNAL_H */ #endif /* PLATFORM_WIN32_INTERNAL_H */

View file

@ -120,4 +120,4 @@ bool Win32Keyboard::handleMessage(MSG message)
return msg_buf.postMessage(message); return msg_buf.postMessage(message);
} }
} // namespace sp } // namespace sp

View file

@ -23,4 +23,4 @@ DisplayMode PlatformMisc::GetDesktopMode()
return DisplayMode(); return DisplayMode();
} }
} // namespace sp } // namespace sp

View file

@ -10,7 +10,7 @@ namespace sp {
static Win32MsgBuffer msg_buf; static Win32MsgBuffer msg_buf;
static Vector2f _normalizePos(int x, int y, RECT area) static Vector2f _normalizePos(int x, int y, RECT area)
{ {
Vector2f out; Vector2f out;
@ -75,8 +75,8 @@ void Win32Mouse::update(InputModule *input)
m_state[MouseButton::Middle] = event.mouseButton.pressed; m_state[MouseButton::Middle] = event.mouseButton.pressed;
input->postInputEvent(event); input->postInputEvent(event);
} else if (msg.message == WM_XBUTTONDOWN || msg.message == WM_XBUTTONUP) { } else if (msg.message == WM_XBUTTONDOWN || msg.message == WM_XBUTTONUP) {
int btn = GET_XBUTTON_WPARAM(msg.wParam); int btn = GET_XBUTTON_WPARAM(msg.wParam);
InputEvent event(InputEvent::MouseButton); InputEvent event(InputEvent::MouseButton);
@ -90,7 +90,7 @@ void Win32Mouse::update(InputModule *input)
InputEvent event(InputEvent::MousePosition); InputEvent event(InputEvent::MousePosition);
RECT area = GetClientArea(msg.hwnd); RECT area = GetClientArea(msg.hwnd);
int x = LOWORD(msg.lParam); int x = LOWORD(msg.lParam);
int y = HIWORD(msg.lParam); int y = HIWORD(msg.lParam);
@ -116,4 +116,4 @@ bool Win32Mouse::handleMessage(MSG message)
return msg_buf.postMessage(message); return msg_buf.postMessage(message);
} }
} // namespace sp } // namespace sp

View file

@ -19,4 +19,4 @@ bool Win32MsgBuffer::postMessage(MSG msg)
return false; return false;
} }
} // namespace sp } // namespace sp

View file

@ -19,4 +19,4 @@ struct Win32MsgBuffer {
} // namespace sp } // namespace sp
#endif /* PLATFORM_WIN32_MSG_BUFFER_H */ #endif /* PLATFORM_WIN32_MSG_BUFFER_H */

View file

@ -175,4 +175,4 @@ const Transform& Camera2D::getTransform() const
return m_view; return m_view;
} }
} // namespace sp } // namespace sp

View file

@ -3,7 +3,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <Spectre/System/Log.h> #include <Spectre/System/Log.h>
namespace sp namespace sp
{ {
void Log::info(const char *message, ...) { void Log::info(const char *message, ...) {

View file

@ -17,4 +17,4 @@ SysEvent SysEvent::sizeEvent(Display *display, int width, int height)
return event; return event;
} }
} // namespace sp } // namespace sp