From a86623004ba91baef76dac9275e9b79366acce16 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 28 Nov 2013 14:23:30 +0200 Subject: [PATCH] Fix some incorrect whitespace --- source/batch.cpp | 2 +- source/bloom.h | 2 +- source/colorcurve.h | 2 +- source/font.h | 6 +++--- source/framebuffer.cpp | 2 +- source/material.h | 2 +- source/renderer.h | 2 +- source/technique.h | 2 +- source/texture2d.h | 2 +- source/texture3d.h | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/source/batch.cpp b/source/batch.cpp index 956fe130..34bd83c0 100644 --- a/source/batch.cpp +++ b/source/batch.cpp @@ -97,7 +97,7 @@ void Batch::set_data_type(DataType t) Batch &Batch::append(unsigned i) { append_index(i); - + update_offset(); dirty = true; diff --git a/source/bloom.h b/source/bloom.h index 9f1d93dc..b96fddfc 100644 --- a/source/bloom.h +++ b/source/bloom.h @@ -35,7 +35,7 @@ private: public: Bloom(unsigned, unsigned); - + /** Sets the σ value of the gaussian blur. Values much larger than 4.0 are likely to cause artifacts. */ void set_radius(float); diff --git a/source/colorcurve.h b/source/colorcurve.h index 82a8526f..74a19d04 100644 --- a/source/colorcurve.h +++ b/source/colorcurve.h @@ -9,7 +9,7 @@ namespace Msp { namespace GL { /** -Processes oversaturated colors to preserve hues. When one color component +Processes oversaturated colors to preserve hues. When one color component exceeds 1.0, the others are scaled towards white. A transition curve is also applied near 1.0 to prevent the abrupt change in the gradient. diff --git a/source/font.h b/source/font.h index 5fcc63c4..fea97a11 100644 --- a/source/font.h +++ b/source/font.h @@ -41,9 +41,9 @@ public: }; unsigned code; - float x1,y1; - float x2,y2; - float w,h; + float x1, y1; + float x2, y2; + float w, h; float off_x, off_y; float advance; }; diff --git a/source/framebuffer.cpp b/source/framebuffer.cpp index 8f540200..ae8f4dd4 100644 --- a/source/framebuffer.cpp +++ b/source/framebuffer.cpp @@ -279,7 +279,7 @@ void Framebuffer::bind() const } const Framebuffer *Framebuffer::current() -{ +{ if(!cur_obj) cur_obj = &system(); return cur_obj; diff --git a/source/material.h b/source/material.h index a787a6d3..f2446368 100644 --- a/source/material.h +++ b/source/material.h @@ -19,7 +19,7 @@ public: { public: Loader(Material &); - + private: void ambient(float, float, float, float); void diffuse(float, float, float, float); diff --git a/source/renderer.h b/source/renderer.h index 1254b7ad..a4663df8 100644 --- a/source/renderer.h +++ b/source/renderer.h @@ -83,7 +83,7 @@ private: public: MtxStack(Renderer &); - private: + private: virtual void update(); }; diff --git a/source/technique.h b/source/technique.h index ad988c27..d1fab38f 100644 --- a/source/technique.h +++ b/source/technique.h @@ -32,7 +32,7 @@ private: { public: InheritLoader(Technique &, Collection &); - + private: void texture(const std::string &, const std::string &); }; diff --git a/source/texture2d.h b/source/texture2d.h index 485867dd..6c089ed2 100644 --- a/source/texture2d.h +++ b/source/texture2d.h @@ -45,7 +45,7 @@ public: /** Allocates storage for the texture. The contents are initially undefined. If storage has already been allocated, does nothing. */ void allocate(unsigned level); - + /** Uploads an image to the texture. Storage must be defined beforehand. The image data must have dimensions and format compatible with the defined storage. */ diff --git a/source/texture3d.h b/source/texture3d.h index 0a03cd5d..25c96c5c 100644 --- a/source/texture3d.h +++ b/source/texture3d.h @@ -32,7 +32,7 @@ public: /** Allocates storage for the texture. The contents are initially undefined. If storage has already been allocated, does nothing. */ void allocate(unsigned level); - + /** Uploads an image to the texture. Storage must be defined beforehand. The image data must have dimensions and format compatible with the defined storage. */ -- 2.45.2