From c514e44b73b3fc4db492e4bd333fa223c6c1eef5 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Mon, 8 Jan 2018 14:09:43 +0000 Subject: [Engine] Adding entity/component system --- yage/render/batch.h | 8 ++++++++ yage/render/drawable.h | 8 ++++++++ yage/render/ellipse.h | 10 ++++++++-- yage/render/rectangle.cpp | 12 ++++++++++-- yage/render/rectangle.h | 8 ++++++++ yage/render/shader.h | 2 +- yage/render/shape.h | 8 ++++++++ yage/render/spritebatch.cpp | 2 +- 8 files changed, 52 insertions(+), 6 deletions(-) (limited to 'yage/render') diff --git a/yage/render/batch.h b/yage/render/batch.h index 6694fbcb..45bf4b31 100644 --- a/yage/render/batch.h +++ b/yage/render/batch.h @@ -1,3 +1,11 @@ +/** --------------------------------------------------------------------------- + * @file: batch.h + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + #ifndef YAGE_CORE_BATCH_H #define YAGE_CORE_BATCH_H diff --git a/yage/render/drawable.h b/yage/render/drawable.h index c126bb09..774aa451 100644 --- a/yage/render/drawable.h +++ b/yage/render/drawable.h @@ -1,3 +1,11 @@ +/** --------------------------------------------------------------------------- + * @file: drawable.h + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + #ifndef YAGE_CORE_DRAWABLE_H #define YAGE_CORE_DRAWABLE_H diff --git a/yage/render/ellipse.h b/yage/render/ellipse.h index bd0b0d3e..2a7552ba 100644 --- a/yage/render/ellipse.h +++ b/yage/render/ellipse.h @@ -1,6 +1,12 @@ +/** --------------------------------------------------------------------------- + * @file: ellipse.h + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + #ifndef YAGE_RENDER_ELLIPSE_H #define YAGE_RENDER_ELLIPSE_H - - #endif diff --git a/yage/render/rectangle.cpp b/yage/render/rectangle.cpp index 632c7ceb..f48f79db 100644 --- a/yage/render/rectangle.cpp +++ b/yage/render/rectangle.cpp @@ -1,3 +1,11 @@ +/** --------------------------------------------------------------------------- + * @file: rectangle.cpp + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + #include "rectangle.h" #include "../data/vertex.h" @@ -29,10 +37,10 @@ void Rectangle::render() const glEnableVertexAttribArray(1); // set the vertex attribute pointers - glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), (void *)offsetof(Vertex, position)); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), + (void *)offsetof(Vertex, position)); glBindVertexArray(0); } } // namepsace yage - diff --git a/yage/render/rectangle.h b/yage/render/rectangle.h index ad38caa5..bf87731b 100644 --- a/yage/render/rectangle.h +++ b/yage/render/rectangle.h @@ -1,3 +1,11 @@ +/** --------------------------------------------------------------------------- + * @file: rectangle.h + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + #ifndef YAGE_RENDER_RECTANGLE_H #define YAGE_RENDER_RECTANGLE_H diff --git a/yage/render/shader.h b/yage/render/shader.h index 7f4d2f9d..086b7b70 100644 --- a/yage/render/shader.h +++ b/yage/render/shader.h @@ -9,8 +9,8 @@ #ifndef YAGE_RENDER_SHADER_H #define YAGE_RENDER_SHADER_H -#include #include +#include #include diff --git a/yage/render/shape.h b/yage/render/shape.h index 1fdf1c4f..0ac72ba8 100644 --- a/yage/render/shape.h +++ b/yage/render/shape.h @@ -1,3 +1,11 @@ +/** --------------------------------------------------------------------------- + * @file: shape.h + * + * Copyright (c) 2017 Yann Herklotz Grave + * MIT License, see LICENSE file for more details. + * ---------------------------------------------------------------------------- + */ + #ifndef YAGE_RENDER_SHAPE_H #define YAGE_RENDER_SHAPE_H diff --git a/yage/render/spritebatch.cpp b/yage/render/spritebatch.cpp index 90958246..25ad6da4 100644 --- a/yage/render/spritebatch.cpp +++ b/yage/render/spritebatch.cpp @@ -114,7 +114,7 @@ void SpriteBatch::render() glActiveTexture(GL_TEXTURE0); for (auto &&batch : render_batches_) { yLogDebug << "Drawing " << batch.num_vertices - << " vertices bound to texture: " << batch.texture; + << " vertices bound to texture: " << batch.texture; glBindTexture(GL_TEXTURE_2D, batch.texture); glDrawArrays(GL_TRIANGLES, batch.offset, batch.num_vertices); } -- cgit