From 2760f0c38f159b5f5e722f41d46d81cad46e8055 Mon Sep 17 00:00:00 2001 From: Anselme Date: Tue, 15 Dec 2015 20:00:34 +0100 Subject: [PATCH] refactoring : added src and shader folders --- CMakeLists.txt | 34 +++++++++---------- .../forward.frag.glsl | 0 .../forward.vert.glsl | 0 .../gbuffer.frag.glsl | 0 .../gbuffer.vert.glsl | 0 camera.h => src/camera.h | 0 crappymodule.cpp => src/crappymodule.cpp | 0 crappymodule.h => src/crappymodule.h | 0 deferredmodule.cpp => src/deferredmodule.cpp | 0 deferredmodule.h => src/deferredmodule.h | 0 entity.h => src/entity.h | 0 forwardmodule.cpp => src/forwardmodule.cpp | 0 forwardmodule.h => src/forwardmodule.h | 0 framebuffer.cpp => src/framebuffer.cpp | 0 framebuffer.h => src/framebuffer.h | 0 glassert.h => src/glassert.h | 0 image.h => src/image.h | 0 light.cpp => src/light.cpp | 0 light.h => src/light.h | 0 material.h => src/material.h | 0 mesh.h => src/mesh.h | 0 meshbuilder.cpp => src/meshbuilder.cpp | 0 meshbuilder.h => src/meshbuilder.h | 0 module.h => src/module.h | 0 parametricmesh.cpp => src/parametricmesh.cpp | 0 parametricmesh.h => src/parametricmesh.h | 0 phongentity.cpp => src/phongentity.cpp | 0 phongentity.h => src/phongentity.h | 0 phongmaterial.cpp => src/phongmaterial.cpp | 0 phongmaterial.h => src/phongmaterial.h | 0 .../posteffectmodule.cpp | 0 posteffectmodule.h => src/posteffectmodule.h | 0 scene.cpp => src/scene.cpp | 0 scene.h => src/scene.h | 0 shader.cpp => src/shader.cpp | 0 shader.h => src/shader.h | 0 shadersource.cpp => src/shadersource.cpp | 0 shadersource.h => src/shadersource.h | 0 skyboxmodule.cpp => src/skyboxmodule.cpp | 0 skyboxmodule.h => src/skyboxmodule.h | 0 .../sparrowrenderer.cpp | 0 sparrowrenderer.h => src/sparrowrenderer.h | 0 texture.cpp => src/texture.cpp | 0 texture.h => src/texture.h | 0 44 files changed, 17 insertions(+), 17 deletions(-) rename forward.frag.glsl => shaders/forward.frag.glsl (100%) rename forward.vert.glsl => shaders/forward.vert.glsl (100%) rename gbuffer.frag.glsl => shaders/gbuffer.frag.glsl (100%) rename gbuffer.vert.glsl => shaders/gbuffer.vert.glsl (100%) rename camera.h => src/camera.h (100%) rename crappymodule.cpp => src/crappymodule.cpp (100%) rename crappymodule.h => src/crappymodule.h (100%) rename deferredmodule.cpp => src/deferredmodule.cpp (100%) rename deferredmodule.h => src/deferredmodule.h (100%) rename entity.h => src/entity.h (100%) rename forwardmodule.cpp => src/forwardmodule.cpp (100%) rename forwardmodule.h => src/forwardmodule.h (100%) rename framebuffer.cpp => src/framebuffer.cpp (100%) rename framebuffer.h => src/framebuffer.h (100%) rename glassert.h => src/glassert.h (100%) rename image.h => src/image.h (100%) rename light.cpp => src/light.cpp (100%) rename light.h => src/light.h (100%) rename material.h => src/material.h (100%) rename mesh.h => src/mesh.h (100%) rename meshbuilder.cpp => src/meshbuilder.cpp (100%) rename meshbuilder.h => src/meshbuilder.h (100%) rename module.h => src/module.h (100%) rename parametricmesh.cpp => src/parametricmesh.cpp (100%) rename parametricmesh.h => src/parametricmesh.h (100%) rename phongentity.cpp => src/phongentity.cpp (100%) rename phongentity.h => src/phongentity.h (100%) rename phongmaterial.cpp => src/phongmaterial.cpp (100%) rename phongmaterial.h => src/phongmaterial.h (100%) rename posteffectmodule.cpp => src/posteffectmodule.cpp (100%) rename posteffectmodule.h => src/posteffectmodule.h (100%) rename scene.cpp => src/scene.cpp (100%) rename scene.h => src/scene.h (100%) rename shader.cpp => src/shader.cpp (100%) rename shader.h => src/shader.h (100%) rename shadersource.cpp => src/shadersource.cpp (100%) rename shadersource.h => src/shadersource.h (100%) rename skyboxmodule.cpp => src/skyboxmodule.cpp (100%) rename skyboxmodule.h => src/skyboxmodule.h (100%) rename sparrowrenderer.cpp => src/sparrowrenderer.cpp (100%) rename sparrowrenderer.h => src/sparrowrenderer.h (100%) rename texture.cpp => src/texture.cpp (100%) rename texture.h => src/texture.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index e336c7a..0bba575 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,22 +12,22 @@ else(WIN32) endif(WIN32) set(LIB_SRC_LIST - framebuffer.cpp - meshbuilder.cpp - phongentity.cpp - phongmaterial.cpp - crappymodule.cpp - shader.cpp - skyboxmodule.cpp - sparrowrenderer.cpp - parametricmesh.cpp - texture.cpp - scene.cpp - deferredmodule.cpp - forwardmodule.cpp - shadersource.cpp - light.cpp - posteffectmodule.cpp + src/framebuffer.cpp + src/meshbuilder.cpp + src/phongentity.cpp + src/phongmaterial.cpp + src/crappymodule.cpp + src/shader.cpp + src/skyboxmodule.cpp + src/sparrowrenderer.cpp + src/parametricmesh.cpp + src/texture.cpp + src/scene.cpp + src/deferredmodule.cpp + src/forwardmodule.cpp + src/shadersource.cpp + src/light.cpp + src/posteffectmodule.cpp ) set(LIBRARY_NAME ${PROJECT_NAME}) @@ -43,7 +43,7 @@ if(CMAKE_BUILD_TYPE MATCHES "Debug") set(CPP_DEFINES -DRENDER_DEBUG) endif() -file(GLOB LIBRARY_RES_FILES *.h *.glsl) +file(GLOB LIBRARY_RES_FILES *.h shaders/*.glsl) add_library(${LIBRARY_NAME} STATIC ${LIB_SRC_LIST} ${LIBRARY_RES_FILES}) add_definitions(-std=c++11 ${CPP_DEFINES}) diff --git a/forward.frag.glsl b/shaders/forward.frag.glsl similarity index 100% rename from forward.frag.glsl rename to shaders/forward.frag.glsl diff --git a/forward.vert.glsl b/shaders/forward.vert.glsl similarity index 100% rename from forward.vert.glsl rename to shaders/forward.vert.glsl diff --git a/gbuffer.frag.glsl b/shaders/gbuffer.frag.glsl similarity index 100% rename from gbuffer.frag.glsl rename to shaders/gbuffer.frag.glsl diff --git a/gbuffer.vert.glsl b/shaders/gbuffer.vert.glsl similarity index 100% rename from gbuffer.vert.glsl rename to shaders/gbuffer.vert.glsl diff --git a/camera.h b/src/camera.h similarity index 100% rename from camera.h rename to src/camera.h diff --git a/crappymodule.cpp b/src/crappymodule.cpp similarity index 100% rename from crappymodule.cpp rename to src/crappymodule.cpp diff --git a/crappymodule.h b/src/crappymodule.h similarity index 100% rename from crappymodule.h rename to src/crappymodule.h diff --git a/deferredmodule.cpp b/src/deferredmodule.cpp similarity index 100% rename from deferredmodule.cpp rename to src/deferredmodule.cpp diff --git a/deferredmodule.h b/src/deferredmodule.h similarity index 100% rename from deferredmodule.h rename to src/deferredmodule.h diff --git a/entity.h b/src/entity.h similarity index 100% rename from entity.h rename to src/entity.h diff --git a/forwardmodule.cpp b/src/forwardmodule.cpp similarity index 100% rename from forwardmodule.cpp rename to src/forwardmodule.cpp diff --git a/forwardmodule.h b/src/forwardmodule.h similarity index 100% rename from forwardmodule.h rename to src/forwardmodule.h diff --git a/framebuffer.cpp b/src/framebuffer.cpp similarity index 100% rename from framebuffer.cpp rename to src/framebuffer.cpp diff --git a/framebuffer.h b/src/framebuffer.h similarity index 100% rename from framebuffer.h rename to src/framebuffer.h diff --git a/glassert.h b/src/glassert.h similarity index 100% rename from glassert.h rename to src/glassert.h diff --git a/image.h b/src/image.h similarity index 100% rename from image.h rename to src/image.h diff --git a/light.cpp b/src/light.cpp similarity index 100% rename from light.cpp rename to src/light.cpp diff --git a/light.h b/src/light.h similarity index 100% rename from light.h rename to src/light.h diff --git a/material.h b/src/material.h similarity index 100% rename from material.h rename to src/material.h diff --git a/mesh.h b/src/mesh.h similarity index 100% rename from mesh.h rename to src/mesh.h diff --git a/meshbuilder.cpp b/src/meshbuilder.cpp similarity index 100% rename from meshbuilder.cpp rename to src/meshbuilder.cpp diff --git a/meshbuilder.h b/src/meshbuilder.h similarity index 100% rename from meshbuilder.h rename to src/meshbuilder.h diff --git a/module.h b/src/module.h similarity index 100% rename from module.h rename to src/module.h diff --git a/parametricmesh.cpp b/src/parametricmesh.cpp similarity index 100% rename from parametricmesh.cpp rename to src/parametricmesh.cpp diff --git a/parametricmesh.h b/src/parametricmesh.h similarity index 100% rename from parametricmesh.h rename to src/parametricmesh.h diff --git a/phongentity.cpp b/src/phongentity.cpp similarity index 100% rename from phongentity.cpp rename to src/phongentity.cpp diff --git a/phongentity.h b/src/phongentity.h similarity index 100% rename from phongentity.h rename to src/phongentity.h diff --git a/phongmaterial.cpp b/src/phongmaterial.cpp similarity index 100% rename from phongmaterial.cpp rename to src/phongmaterial.cpp diff --git a/phongmaterial.h b/src/phongmaterial.h similarity index 100% rename from phongmaterial.h rename to src/phongmaterial.h diff --git a/posteffectmodule.cpp b/src/posteffectmodule.cpp similarity index 100% rename from posteffectmodule.cpp rename to src/posteffectmodule.cpp diff --git a/posteffectmodule.h b/src/posteffectmodule.h similarity index 100% rename from posteffectmodule.h rename to src/posteffectmodule.h diff --git a/scene.cpp b/src/scene.cpp similarity index 100% rename from scene.cpp rename to src/scene.cpp diff --git a/scene.h b/src/scene.h similarity index 100% rename from scene.h rename to src/scene.h diff --git a/shader.cpp b/src/shader.cpp similarity index 100% rename from shader.cpp rename to src/shader.cpp diff --git a/shader.h b/src/shader.h similarity index 100% rename from shader.h rename to src/shader.h diff --git a/shadersource.cpp b/src/shadersource.cpp similarity index 100% rename from shadersource.cpp rename to src/shadersource.cpp diff --git a/shadersource.h b/src/shadersource.h similarity index 100% rename from shadersource.h rename to src/shadersource.h diff --git a/skyboxmodule.cpp b/src/skyboxmodule.cpp similarity index 100% rename from skyboxmodule.cpp rename to src/skyboxmodule.cpp diff --git a/skyboxmodule.h b/src/skyboxmodule.h similarity index 100% rename from skyboxmodule.h rename to src/skyboxmodule.h diff --git a/sparrowrenderer.cpp b/src/sparrowrenderer.cpp similarity index 100% rename from sparrowrenderer.cpp rename to src/sparrowrenderer.cpp diff --git a/sparrowrenderer.h b/src/sparrowrenderer.h similarity index 100% rename from sparrowrenderer.h rename to src/sparrowrenderer.h diff --git a/texture.cpp b/src/texture.cpp similarity index 100% rename from texture.cpp rename to src/texture.cpp diff --git a/texture.h b/src/texture.h similarity index 100% rename from texture.h rename to src/texture.h