Minor formating fixes.
This commit is contained in:
parent
6f53b0c069
commit
4df668e68f
76 changed files with 121 additions and 121 deletions
|
|
@ -13,10 +13,10 @@ protected :
|
|||
private :
|
||||
|
||||
// Skip implementation to trigger compiler error.
|
||||
NonCopyable(const NonCopyable&);
|
||||
NonCopyable(const NonCopyable&);
|
||||
NonCopyable& operator =(const NonCopyable&);
|
||||
};
|
||||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_CORE_NONCOPYABLE_H */
|
||||
#endif /* SPECTRE_CORE_NONCOPYABLE_H */
|
||||
|
|
|
|||
|
|
@ -36,4 +36,4 @@ public :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_DISPLAY_DISPLAYMODE_H */
|
||||
#endif /* SPECTRE_DISPLAY_DISPLAYMODE_H */
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ class FPSCounter
|
|||
public :
|
||||
FPSCounter();
|
||||
|
||||
// Add a frame to the counter.
|
||||
// Add a frame to the counter.
|
||||
// Should be called whenever a frame has been rendered.
|
||||
void addFrame();
|
||||
|
||||
|
|
@ -44,4 +44,4 @@ private :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_FPS_COUNTER_H */
|
||||
#endif /* SPECTRE_FPS_COUNTER_H */
|
||||
|
|
|
|||
|
|
@ -46,4 +46,4 @@ protected :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_GAME_TIME_H */
|
||||
#endif /* SPECTRE_GAME_TIME_H */
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ protected :
|
|||
unsigned int m_VBO;
|
||||
|
||||
RenderState m_state;
|
||||
|
||||
|
||||
unsigned short m_size;
|
||||
|
||||
ShaderProgram m_textShader;
|
||||
|
|
@ -73,4 +73,4 @@ protected :
|
|||
|
||||
} // namespace
|
||||
|
||||
#endif /* SPECTRE_BATCH_RENDERER2D_H */
|
||||
#endif /* SPECTRE_BATCH_RENDERER2D_H */
|
||||
|
|
|
|||
|
|
@ -26,4 +26,4 @@ protected :
|
|||
|
||||
} // namespace
|
||||
|
||||
#endif /* SPECTRE_DEFAULT_RENDERER2D_H */
|
||||
#endif /* SPECTRE_DEFAULT_RENDERER2D_H */
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@
|
|||
|
||||
#include <Spectre/Graphics/GL/glad.h>
|
||||
|
||||
#endif /* SPECTRE_OPENGL_H */
|
||||
#endif /* SPECTRE_OPENGL_H */
|
||||
|
|
|
|||
|
|
@ -32,4 +32,4 @@ protected :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_GRAPHICS_RENDERER2D_H */
|
||||
#endif /* SPECTRE_GRAPHICS_RENDERER2D_H */
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public :
|
|||
|
||||
protected :
|
||||
|
||||
// Compile the shader.
|
||||
// Compile the shader.
|
||||
// Returns true if the shader compiled without errors. false otherwise.
|
||||
bool compile();
|
||||
|
||||
|
|
@ -55,4 +55,4 @@ protected :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_GRAPHICS_SHADER_H */
|
||||
#endif /* SPECTRE_GRAPHICS_SHADER_H */
|
||||
|
|
|
|||
|
|
@ -41,11 +41,11 @@ public :
|
|||
|
||||
// Returns true if the program was linked successfully
|
||||
bool isLinked() const;
|
||||
|
||||
// Enable this shader
|
||||
|
||||
// Enable this shader
|
||||
// All shader operations after this call will affect this shader.
|
||||
void enable() const;
|
||||
|
||||
|
||||
// Disable this shader
|
||||
// Operations will no longer affect this shader after this call.
|
||||
void disable() const;
|
||||
|
|
|
|||
|
|
@ -60,4 +60,4 @@ private :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_GRAPHICS_TRANSFORMABLE_H */
|
||||
#endif /* SPECTRE_GRAPHICS_TRANSFORMABLE_H */
|
||||
|
|
|
|||
|
|
@ -14,4 +14,4 @@ public :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_INPUT_LISTENER_H */
|
||||
#endif /* SPECTRE_INPUT_LISTENER_H */
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#include "Vector2.h"
|
||||
#include "Matrix4.h"
|
||||
|
||||
namespace sp { namespace math
|
||||
namespace sp { namespace math
|
||||
{
|
||||
float rand(float min, float max);
|
||||
|
||||
|
|
@ -50,4 +50,4 @@ namespace sp { namespace math
|
|||
|
||||
} } // namespace sp
|
||||
|
||||
#endif /* SPECTRE_MATH_MATH_H */
|
||||
#endif /* SPECTRE_MATH_MATH_H */
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ struct Matrix3
|
|||
| 0 3 6 |
|
||||
| 1 4 7 |
|
||||
| 2 5 8 |
|
||||
|_ _|
|
||||
|_ _|
|
||||
*/
|
||||
T v[9];
|
||||
};
|
||||
|
|
@ -32,8 +32,8 @@ struct Matrix3
|
|||
|
||||
inline Matrix3();
|
||||
|
||||
inline Matrix3( T a, T b, T c,
|
||||
T d, T e, T f,
|
||||
inline Matrix3( T a, T b, T c,
|
||||
T d, T e, T f,
|
||||
T g, T h, T i);
|
||||
|
||||
inline Matrix3(T *a);
|
||||
|
|
@ -83,4 +83,4 @@ typedef Matrix3<unsigned> Matrix3u;
|
|||
|
||||
#include "Matrix3.inl"
|
||||
|
||||
#endif /* SPECTRE_MATH_MATRIX3_H */
|
||||
#endif /* SPECTRE_MATH_MATRIX3_H */
|
||||
|
|
|
|||
|
|
@ -108,9 +108,9 @@ Matrix3<T> Matrix3<T>::transpose() const
|
|||
{
|
||||
Matrix3<T> t;
|
||||
|
||||
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[2] = v[6]; t.v[5] = v[7]; t.v[8] = v[8];
|
||||
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[2] = v[6]; t.v[5] = v[7]; t.v[8] = v[8];
|
||||
|
||||
return t;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,4 +109,4 @@ typedef Matrix4<unsigned> mat4u;
|
|||
// ----------------
|
||||
#include "Matrix4.inl"
|
||||
|
||||
#endif /* SPECTRE_MATH_MATRIX4_H */
|
||||
#endif /* SPECTRE_MATH_MATRIX4_H */
|
||||
|
|
|
|||
|
|
@ -155,4 +155,4 @@ inline std::ostream& operator<<(std::ostream &s, const Matrix4<T>& mat)
|
|||
return s << mat.toString();
|
||||
}
|
||||
|
||||
} // namespace sp
|
||||
} // namespace sp
|
||||
|
|
|
|||
|
|
@ -79,4 +79,4 @@ Vector2f operator*(const Transform& t, const Vector2f& v);
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_MATH_TRANSFORM_H */
|
||||
#endif /* SPECTRE_MATH_TRANSFORM_H */
|
||||
|
|
|
|||
|
|
@ -317,4 +317,4 @@ inline std::ostream& operator<<(std::ostream &s, const Vector2<T>& v)
|
|||
return s << "(" << v.x << "," << v.y << ")";
|
||||
}
|
||||
|
||||
} // namespace sp
|
||||
} // namespace sp
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ template <typename T>
|
|||
struct Vector3
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
struct {
|
||||
T x, y, z;
|
||||
};
|
||||
T v[3];
|
||||
|
|
|
|||
|
|
@ -268,4 +268,4 @@ inline std::ostream& operator<<(std::ostream &s, const Vector3<T>& v)
|
|||
return s << "(" << v.x << "," << v.y << "," << v.z << ")";
|
||||
}
|
||||
|
||||
} // namespace sp
|
||||
} // namespace sp
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ template <typename T>
|
|||
struct Vector4
|
||||
{
|
||||
union {
|
||||
struct {
|
||||
struct {
|
||||
T x, y, z, w;
|
||||
};
|
||||
T v[4];
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
// 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.
|
||||
|
||||
namespace sp {
|
||||
|
|
@ -84,4 +84,4 @@ protected :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_SCENE_CAMERA2D_H */
|
||||
#endif /* SPECTRE_SCENE_CAMERA2D_H */
|
||||
|
|
|
|||
|
|
@ -21,4 +21,4 @@ public :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_SCENE_ICAMERA_H */
|
||||
#endif /* SPECTRE_SCENE_ICAMERA_H */
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ public :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SPECTRE_SYSTEM_MESSAGEHANDLER_H */
|
||||
#endif /* SPECTRE_SYSTEM_MESSAGEHANDLER_H */
|
||||
|
|
|
|||
|
|
@ -38,4 +38,4 @@ public :
|
|||
|
||||
} // namespace sp
|
||||
|
||||
#endif /* SYSTEM_EVENT_H */
|
||||
#endif /* SYSTEM_EVENT_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue