From 8fd4d855d5505e9a2b008313f5ff644b447def17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Wed, 12 Mar 2014 15:25:39 +0100 Subject: [PATCH] move shader classes to separate folder --- include/llmr/renderer/painter.hpp | 12 ++++++------ .../shader-line.hpp => shader/line_shader.hpp} | 6 +++--- .../linejoin_shader.hpp} | 6 +++--- .../shader-outline.hpp => shader/outline_shader.hpp} | 6 +++--- .../shader-pattern.hpp => shader/pattern_shader.hpp} | 6 +++--- .../shader-plain.hpp => shader/plain_shader.hpp} | 6 +++--- .../shader-point.hpp => shader/point_shader.hpp} | 6 +++--- include/llmr/{renderer => shader}/shader.hpp | 0 src/renderer/line_bucket.cpp | 2 -- .../shader-line.cpp => shader/line_shader.cpp} | 2 +- .../linejoin_shader.cpp} | 2 +- .../shader-outline.cpp => shader/outline_shader.cpp} | 2 +- .../shader-pattern.cpp => shader/pattern_shader.cpp} | 2 +- .../shader-plain.cpp => shader/plain_shader.cpp} | 2 +- .../shader-point.cpp => shader/point_shader.cpp} | 2 +- src/{renderer => shader}/shader.cpp | 2 +- 16 files changed, 31 insertions(+), 33 deletions(-) rename include/llmr/{renderer/shader-line.hpp => shader/line_shader.hpp} (89%) rename include/llmr/{renderer/shader-linejoin.hpp => shader/linejoin_shader.hpp} (85%) rename include/llmr/{renderer/shader-outline.hpp => shader/outline_shader.hpp} (79%) rename include/llmr/{renderer/shader-pattern.hpp => shader/pattern_shader.hpp} (89%) rename include/llmr/{renderer/shader-plain.hpp => shader/plain_shader.hpp} (77%) rename include/llmr/{renderer/shader-point.hpp => shader/point_shader.hpp} (87%) rename include/llmr/{renderer => shader}/shader.hpp (100%) rename src/{renderer/shader-line.cpp => shader/line_shader.cpp} (98%) rename src/{renderer/shader-linejoin.cpp => shader/linejoin_shader.cpp} (97%) rename src/{renderer/shader-outline.cpp => shader/outline_shader.cpp} (96%) rename src/{renderer/shader-pattern.cpp => shader/pattern_shader.cpp} (98%) rename src/{renderer/shader-plain.cpp => shader/plain_shader.cpp} (96%) rename src/{renderer/shader-point.cpp => shader/point_shader.cpp} (98%) rename src/{renderer => shader}/shader.cpp (99%) diff --git a/include/llmr/renderer/painter.hpp b/include/llmr/renderer/painter.hpp index 745491f5d..0080773f2 100644 --- a/include/llmr/renderer/painter.hpp +++ b/include/llmr/renderer/painter.hpp @@ -7,12 +7,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace llmr { diff --git a/include/llmr/renderer/shader-line.hpp b/include/llmr/shader/line_shader.hpp similarity index 89% rename from include/llmr/renderer/shader-line.hpp rename to include/llmr/shader/line_shader.hpp index 848a2f9d7..bbf8d1ea5 100644 --- a/include/llmr/renderer/shader-line.hpp +++ b/include/llmr/shader/line_shader.hpp @@ -1,7 +1,7 @@ -#ifndef LLMR_RENDERER_SHADER_LINE -#define LLMR_RENDERER_SHADER_LINE +#ifndef LLMR_SHADER_SHADER_LINE +#define LLMR_SHADER_SHADER_LINE -#include "shader.hpp" +#include namespace llmr { diff --git a/include/llmr/renderer/shader-linejoin.hpp b/include/llmr/shader/linejoin_shader.hpp similarity index 85% rename from include/llmr/renderer/shader-linejoin.hpp rename to include/llmr/shader/linejoin_shader.hpp index bd65b9db9..82ec3b59a 100644 --- a/include/llmr/renderer/shader-linejoin.hpp +++ b/include/llmr/shader/linejoin_shader.hpp @@ -1,7 +1,7 @@ -#ifndef LLMR_RENDERER_SHADER_LINEJOIN -#define LLMR_RENDERER_SHADER_LINEJOIN +#ifndef LLMR_SHADER_SHADER_LINEJOIN +#define LLMR_SHADER_SHADER_LINEJOIN -#include "shader.hpp" +#include namespace llmr { diff --git a/include/llmr/renderer/shader-outline.hpp b/include/llmr/shader/outline_shader.hpp similarity index 79% rename from include/llmr/renderer/shader-outline.hpp rename to include/llmr/shader/outline_shader.hpp index 68d056e38..5b52b3005 100644 --- a/include/llmr/renderer/shader-outline.hpp +++ b/include/llmr/shader/outline_shader.hpp @@ -1,7 +1,7 @@ -#ifndef LLMR_RENDERER_SHADER_OUTLINE -#define LLMR_RENDERER_SHADER_OUTLINE +#ifndef LLMR_SHADER_SHADER_OUTLINE +#define LLMR_SHADER_SHADER_OUTLINE -#include "shader.hpp" +#include namespace llmr { diff --git a/include/llmr/renderer/shader-pattern.hpp b/include/llmr/shader/pattern_shader.hpp similarity index 89% rename from include/llmr/renderer/shader-pattern.hpp rename to include/llmr/shader/pattern_shader.hpp index d7998a7a2..d0142ebca 100644 --- a/include/llmr/renderer/shader-pattern.hpp +++ b/include/llmr/shader/pattern_shader.hpp @@ -1,7 +1,7 @@ -#ifndef LLMR_RENDERER_SHADER_PATTERN -#define LLMR_RENDERER_SHADER_PATTERN +#ifndef LLMR_SHADER_SHADER_PATTERN +#define LLMR_SHADER_SHADER_PATTERN -#include "shader.hpp" +#include namespace llmr { diff --git a/include/llmr/renderer/shader-plain.hpp b/include/llmr/shader/plain_shader.hpp similarity index 77% rename from include/llmr/renderer/shader-plain.hpp rename to include/llmr/shader/plain_shader.hpp index 01e7d81d1..bf768f884 100644 --- a/include/llmr/renderer/shader-plain.hpp +++ b/include/llmr/shader/plain_shader.hpp @@ -1,7 +1,7 @@ -#ifndef LLMR_RENDERER_SHADER_PLAIN -#define LLMR_RENDERER_SHADER_PLAIN +#ifndef LLMR_SHADER_SHADER_PLAIN +#define LLMR_SHADER_SHADER_PLAIN -#include "shader.hpp" +#include namespace llmr { diff --git a/include/llmr/renderer/shader-point.hpp b/include/llmr/shader/point_shader.hpp similarity index 87% rename from include/llmr/renderer/shader-point.hpp rename to include/llmr/shader/point_shader.hpp index 61efaa024..f0935f478 100644 --- a/include/llmr/renderer/shader-point.hpp +++ b/include/llmr/shader/point_shader.hpp @@ -1,7 +1,7 @@ -#ifndef LLMR_RENDERER_SHADER_POINT -#define LLMR_RENDERER_SHADER_POINT +#ifndef LLMR_SHADER_SHADER_POINT +#define LLMR_SHADER_SHADER_POINT -#include "shader.hpp" +#include namespace llmr { diff --git a/include/llmr/renderer/shader.hpp b/include/llmr/shader/shader.hpp similarity index 100% rename from include/llmr/renderer/shader.hpp rename to include/llmr/shader/shader.hpp diff --git a/src/renderer/line_bucket.cpp b/src/renderer/line_bucket.cpp index 1ceb2cb0a..b30fa635c 100644 --- a/src/renderer/line_bucket.cpp +++ b/src/renderer/line_bucket.cpp @@ -4,8 +4,6 @@ #include #include -#include -#include #include #include diff --git a/src/renderer/shader-line.cpp b/src/shader/line_shader.cpp similarity index 98% rename from src/renderer/shader-line.cpp rename to src/shader/line_shader.cpp index fc8e3c86f..67536be6c 100644 --- a/src/renderer/shader-line.cpp +++ b/src/shader/line_shader.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/renderer/shader-linejoin.cpp b/src/shader/linejoin_shader.cpp similarity index 97% rename from src/renderer/shader-linejoin.cpp rename to src/shader/linejoin_shader.cpp index 7e07d4c4b..980b2e408 100644 --- a/src/renderer/shader-linejoin.cpp +++ b/src/shader/linejoin_shader.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/renderer/shader-outline.cpp b/src/shader/outline_shader.cpp similarity index 96% rename from src/renderer/shader-outline.cpp rename to src/shader/outline_shader.cpp index 0131cee76..96b25c2ea 100644 --- a/src/renderer/shader-outline.cpp +++ b/src/shader/outline_shader.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/renderer/shader-pattern.cpp b/src/shader/pattern_shader.cpp similarity index 98% rename from src/renderer/shader-pattern.cpp rename to src/shader/pattern_shader.cpp index 2904fd4c4..9f140b21d 100644 --- a/src/renderer/shader-pattern.cpp +++ b/src/shader/pattern_shader.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/renderer/shader-plain.cpp b/src/shader/plain_shader.cpp similarity index 96% rename from src/renderer/shader-plain.cpp rename to src/shader/plain_shader.cpp index cb5438934..ac4b7edeb 100644 --- a/src/renderer/shader-plain.cpp +++ b/src/shader/plain_shader.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/renderer/shader-point.cpp b/src/shader/point_shader.cpp similarity index 98% rename from src/renderer/shader-point.cpp rename to src/shader/point_shader.cpp index 835728417..61e3f3abf 100644 --- a/src/renderer/shader-point.cpp +++ b/src/shader/point_shader.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/src/renderer/shader.cpp b/src/shader/shader.cpp similarity index 99% rename from src/renderer/shader.cpp rename to src/shader/shader.cpp index 966d669c4..6dc5a9038 100644 --- a/src/renderer/shader.cpp +++ b/src/shader/shader.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include