From afd625b06702e7a25e0730601f03955832b64e65 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 27 Aug 2012 00:37:01 +0300 Subject: [PATCH] Remove alignment where it doesn't belong --- source/extension.cpp | 2 +- source/meshbuilder.h | 2 +- source/texture2d.h | 2 +- source/vertexarray.h | 18 +++++++++--------- source/vertexarraybuilder.h | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/source/extension.cpp b/source/extension.cpp index c846c59d..bc43ae8b 100644 --- a/source/extension.cpp +++ b/source/extension.cpp @@ -39,7 +39,7 @@ bool is_supported(const string &ext) } /* XXX Conceptually a bit weird place for this, but I couldn't really come up - with anything better that would still be transparent. */ + with anything better that would still be transparent. */ if(extensions.count("GL_ARB_shader_objects")) init_arb_shader_objects(); if(extensions.count("GL_ARB_vertex_shader")) diff --git a/source/meshbuilder.h b/source/meshbuilder.h index d34da63b..0755eeb2 100644 --- a/source/meshbuilder.h +++ b/source/meshbuilder.h @@ -12,7 +12,7 @@ class Mesh; class MeshBuilder: public PrimitiveBuilder { private: - Mesh &mesh; + Mesh &mesh; Batch *batch; public: diff --git a/source/texture2d.h b/source/texture2d.h index 35346e00..994c4efd 100644 --- a/source/texture2d.h +++ b/source/texture2d.h @@ -66,7 +66,7 @@ private: void image(const Graphics::Image &); public: - unsigned get_width() const { return width; } + unsigned get_width() const { return width; } unsigned get_height() const { return height; } private: diff --git a/source/vertexarray.h b/source/vertexarray.h index 039dfa8b..7e6d04f5 100644 --- a/source/vertexarray.h +++ b/source/vertexarray.h @@ -58,16 +58,16 @@ public: const VertexFormat &get_format() const { return format; } const std::vector &get_data() const { return data; } - void use_vertex_buffer(); - void use_vertex_buffer(Buffer *); - void reserve(unsigned); - unsigned size() const { return data.size()/stride; } - void clear(); - void reset(const VertexFormat &); - void apply() const; - float *append(); + void use_vertex_buffer(); + void use_vertex_buffer(Buffer *); + void reserve(unsigned); + unsigned size() const { return data.size()/stride; } + void clear(); + void reset(const VertexFormat &); + void apply() const; + float *append(); float *modify(unsigned); - const float *operator[](unsigned i) const { return &data[0]+i*stride; } + const float *operator[](unsigned i) const { return &data[0]+i*stride; } private: void set_dirty(); diff --git a/source/vertexarraybuilder.h b/source/vertexarraybuilder.h index b956660f..575a4753 100644 --- a/source/vertexarraybuilder.h +++ b/source/vertexarraybuilder.h @@ -13,7 +13,7 @@ class VertexArray; class VertexArrayBuilder: public VertexBuilder { private: - VertexArray &array; + VertexArray &array; VertexArrayBuilder(const VertexArrayBuilder &); public: -- 2.45.2