diff --git a/src/rendering/rendering.pro b/src/rendering/rendering.pro index 3b43e57..a9ad638 100644 --- a/src/rendering/rendering.pro +++ b/src/rendering/rendering.pro @@ -16,7 +16,6 @@ linux-clang { DEFINES += HAVE_GLIB=1 SOURCES += main.c \ - zone.c \ tools.c \ system.c \ scenery.c \ @@ -54,6 +53,7 @@ SOURCES += main.c \ textures/tex_preview.c \ textures/tex_presets.c \ textures/tex_definition.c \ + tools/zone.c \ tools/texture.c \ tools/parallel.c \ tools/pack.c \ @@ -73,7 +73,6 @@ SOURCES += main.c \ water/wat_definition.c HEADERS += \ - zone.h \ tools.h \ system.h \ scenery.h \ @@ -103,6 +102,7 @@ HEADERS += \ textures/tex_preview.h \ textures/public.h \ textures/private.h \ + tools/zone.h \ tools/texture.h \ tools/parallel.h \ tools/pack.h \ diff --git a/src/rendering/textures/public.h b/src/rendering/textures/public.h index e8b6955..f4e08bc 100644 --- a/src/rendering/textures/public.h +++ b/src/rendering/textures/public.h @@ -1,10 +1,10 @@ #ifndef _PAYSAGES_TEXTURES_PUBLIC_H_ #define _PAYSAGES_TEXTURES_PUBLIC_H_ -#include "../layers.h" -#include "../zone.h" -#include "../tools/lighting.h" -#include "../terrain/public.h" +#include "rendering/layers.h" +#include "rendering/tools/zone.h" +#include "rendering/tools/lighting.h" +#include "rendering/terrain/public.h" #ifdef __cplusplus extern "C" { diff --git a/src/rendering/zone.c b/src/rendering/tools/zone.c similarity index 100% rename from src/rendering/zone.c rename to src/rendering/tools/zone.c diff --git a/src/rendering/zone.h b/src/rendering/tools/zone.h similarity index 83% rename from src/rendering/zone.h rename to src/rendering/tools/zone.h index d65d4c0..1715ad4 100644 --- a/src/rendering/zone.h +++ b/src/rendering/tools/zone.h @@ -1,9 +1,13 @@ -#ifndef _PAYSAGES_ZONE_H_ -#define _PAYSAGES_ZONE_H_ +#ifndef _RENDERING_TOOLS_ZONE_H_ +#define _RENDERING_TOOLS_ZONE_H_ -#include "tools/euclid.h" -#include "tools/curve.h" -#include "tools/pack.h" +/** + * Definition of a geographic area. + */ + +#include "rendering/tools/euclid.h" +#include "rendering/tools/curve.h" +#include "rendering/tools/pack.h" #ifdef __cplusplus extern "C" {