|
From: Yoda-JM <yo...@us...> - 2011-02-24 10:41:08
|
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Feb 24 11:45:01 2011 +0100
Fixed some whitespace typo
---
data/shaders/dancenote.vert | 2 +-
game/fbo.hh | 2 +-
game/glmath.hh | 8 ++++----
game/glshader.hh | 4 ++--
game/surface.hh | 6 +++---
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/data/shaders/dancenote.vert b/data/shaders/dancenote.vert
index 4919a05..4499620 100644
--- a/data/shaders/dancenote.vert
+++ b/data/shaders/dancenote.vert
@@ -49,7 +49,7 @@ void main() {
vTexCoord = texCoord = vertTexCoord;
vNormal = normal = normalize(gl_NormalMatrix * vertNormal);
vColor = color = vertColor;
-
+
mat4 trans = scaleMat(scale);
// Cursor arrows
diff --git a/game/fbo.hh b/game/fbo.hh
index f980faa..f3773bd 100644
--- a/game/fbo.hh
+++ b/game/fbo.hh
@@ -34,7 +34,7 @@ class FBO: boost::noncopyable {
return m_texture;
}
/// Bind the FBO into use
- void bind() {
+ void bind() {
glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_fbo);
}
/// Unbind any FBO
diff --git a/game/glmath.hh b/game/glmath.hh
index 6987b15..b95f784 100644
--- a/game/glmath.hh
+++ b/game/glmath.hh
@@ -25,14 +25,14 @@ namespace glmath {
};
static inline Vec3 operator*(float k, Vec3 const& v) { return Vec3(k * v.x, k * v.y, k * v.z); }
-
+
static inline float dot(Vec3 const& a, Vec3 const& b) {
return a.x * b.x + a.y * b.y + a.z * b.z;
- }
+ }
static inline float len(Vec3 const& v) { return std::sqrt(dot(v, v)); }
static inline Vec3 normalize(Vec3 const& v) { return (1 / len(v)) * v; }
-
+
struct Matrix {
static Matrix zero() {
Matrix ret;
@@ -150,6 +150,6 @@ namespace glmath {
ret(2,3) = 2 * f * n / d;
ret(3,3) = 0.0;
return ret;
- }
+ }
}
diff --git a/game/glshader.hh b/game/glshader.hh
index 4a2ae25..6e7eeff 100644
--- a/game/glshader.hh
+++ b/game/glshader.hh
@@ -73,7 +73,7 @@ private:
int gl_response; ///< save last return state
std::string defs;
-
+
typedef std::vector<GLuint> ShaderObjects;
ShaderObjects shader_ids;
@@ -123,7 +123,7 @@ namespace glutil {
VertexArray& Vertex(float x, float y, float z = 0.0f) {
return Vertex(glmath::Vec4(x, y, z, 1.0f));
}
-
+
VertexArray& Vertex(glmath::Vec4 const& v) {
m_vert.position = v;
m_vertices.push_back(m_vert);
diff --git a/game/surface.hh b/game/surface.hh
index adb394e..72e7fac 100644
--- a/game/surface.hh
+++ b/game/surface.hh
@@ -132,7 +132,7 @@ class UseTexture: boost::noncopyable {
/// constructor
template <GLenum Type> UseTexture(OpenGLTexture<Type> const& tex):
m_shader(/* hack of the year */ (glutil::GLErrorChecker("UseTexture"), glActiveTexture(GL_TEXTURE0), glBindTexture(Type, tex.id()), tex.shader())) {}
-
+
private:
UseShader m_shader;
};
@@ -187,8 +187,8 @@ class Texture: public OpenGLTexture<GL_TEXTURE_2D> {
class Surface {
public:
/// dimensions
- Dimensions dimensions;
- /// texture coordinates
+ Dimensions dimensions;
+ /// texture coordinates
TexCoords tex;
Surface(): m_width(0), m_height(0) {}
/// creates surface from cairo surface
|