From ae19273d18cecaf6905109b0aca3b363f40ae37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Wed, 17 Apr 2013 12:29:51 +0000 Subject: [PATCH] paysages: Project tree reorganization git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@552 b1fd45b6-86a6-48da-8261-f70d1f35bdcc --- Makefile | 20 +++++----- data/.paysages_data | 0 {i18n => data/i18n}/paysages_fr.ts | 0 {images => data/images}/about.png | Bin {images => data/images}/apply.png | Bin {images => data/images}/auto.png | Bin {images => data/images}/cancel.png | Bin {images => data/images}/choice_on.png | Bin {images => data/images}/explore.png | Bin {images => data/images}/layer_add.png | Bin {images => data/images}/layer_del.png | Bin {images => data/images}/layer_down.png | Bin {images => data/images}/layer_rename.png | Bin {images => data/images}/layer_up.png | Bin {images => data/images}/load.png | Bin {images => data/images}/logo.ico | Bin {images => data/images}/logo.svg | 0 {images => data/images}/logo_16.png | Bin {images => data/images}/logo_256.png | Bin {images => data/images}/logo_32.png | Bin {images => data/images}/logo_64.png | Bin {images => data/images}/new.png | Bin {images => data/images}/render.png | Bin {images => data/images}/revert.png | Bin {images => data/images}/save.png | Bin {images => data/images}/tab_atmosphere.png | Bin {images => data/images}/tab_clouds.png | Bin {images => data/images}/tab_render.png | Bin {images => data/images}/tab_terrain.png | Bin {images => data/images}/tab_textures.png | Bin {images => data/images}/tab_water.png | Bin {images => data/images}/toggle_on.png | Bin common_post.mk => src/common_post.mk | 2 +- common_pre.mk => src/common_pre.mk | 11 +++++- {cli => src/controlling}/Makefile | 4 +- {cli => src/controlling}/main.c | 8 ++-- {gui_qt => src/editing}/baseexplorerchunk.cpp | 0 {gui_qt => src/editing}/baseexplorerchunk.h | 2 +- {gui_qt => src/editing}/baseform.cpp | 16 ++++---- {gui_qt => src/editing}/baseform.h | 12 +++--- {gui_qt => src/editing}/baseformlayer.cpp | 0 {gui_qt => src/editing}/baseformlayer.h | 2 +- {gui_qt => src/editing}/baseinput.cpp | 0 {gui_qt => src/editing}/baseinput.h | 0 {gui_qt => src/editing}/basepreview.cpp | 6 +-- {gui_qt => src/editing}/basepreview.h | 2 +- .../editing}/dialogcolorgradation.cpp | 0 .../editing}/dialogcolorgradation.h | 4 +- {gui_qt => src/editing}/dialogcurve.cpp | 14 +++---- {gui_qt => src/editing}/dialogcurve.h | 2 +- {gui_qt => src/editing}/dialogexplorer.cpp | 0 {gui_qt => src/editing}/dialogexplorer.h | 2 +- {gui_qt => src/editing}/dialogheightmap.cpp | 8 ++-- {gui_qt => src/editing}/dialogheightmap.h | 2 +- {gui_qt => src/editing}/dialoglayers.cpp | 16 ++++---- {gui_qt => src/editing}/dialoglayers.h | 2 +- {gui_qt => src/editing}/dialogmaterial.cpp | 14 +++---- {gui_qt => src/editing}/dialogmaterial.h | 2 +- {gui_qt => src/editing}/dialognoise.cpp | 8 ++-- {gui_qt => src/editing}/dialognoise.h | 2 +- {gui_qt => src/editing}/dialogrender.cpp | 6 +-- {gui_qt => src/editing}/dialogrender.h | 4 +- {gui_qt => src/editing}/explorerchunksky.cpp | 2 +- {gui_qt => src/editing}/explorerchunksky.h | 4 +- .../editing}/explorerchunkterrain.cpp | 2 +- .../editing}/explorerchunkterrain.h | 4 +- {gui_qt => src/editing}/formatmosphere.cpp | 6 +-- {gui_qt => src/editing}/formatmosphere.h | 0 {gui_qt => src/editing}/formclouds.cpp | 6 +-- {gui_qt => src/editing}/formclouds.h | 2 +- {gui_qt => src/editing}/formmaterial.cpp | 0 {gui_qt => src/editing}/formmaterial.h | 2 +- {gui_qt => src/editing}/formrender.cpp | 4 +- {gui_qt => src/editing}/formrender.h | 6 +-- {gui_qt => src/editing}/formterrain.cpp | 2 +- {gui_qt => src/editing}/formterrain.h | 0 {gui_qt => src/editing}/formtextures.cpp | 2 +- {gui_qt => src/editing}/formtextures.h | 2 +- {gui_qt => src/editing}/formwater.cpp | 10 ++--- {gui_qt => src/editing}/formwater.h | 0 {gui_qt => src/editing}/inputboolean.cpp | 0 {gui_qt => src/editing}/inputboolean.h | 0 {gui_qt => src/editing}/inputcamera.cpp | 0 {gui_qt => src/editing}/inputcamera.h | 2 +- {gui_qt => src/editing}/inputcolor.cpp | 0 {gui_qt => src/editing}/inputcolor.h | 2 +- .../editing}/inputcolorgradation.cpp | 0 {gui_qt => src/editing}/inputcolorgradation.h | 2 +- {gui_qt => src/editing}/inputcurve.cpp | 0 {gui_qt => src/editing}/inputcurve.h | 2 +- {gui_qt => src/editing}/inputdouble.cpp | 0 {gui_qt => src/editing}/inputdouble.h | 0 {gui_qt => src/editing}/inputenum.cpp | 0 {gui_qt => src/editing}/inputenum.h | 0 {gui_qt => src/editing}/inputint.cpp | 0 {gui_qt => src/editing}/inputint.h | 0 {gui_qt => src/editing}/inputlayers.cpp | 0 {gui_qt => src/editing}/inputlayers.h | 2 +- {gui_qt => src/editing}/inputmaterial.cpp | 0 {gui_qt => src/editing}/inputmaterial.h | 4 +- {gui_qt => src/editing}/inputnoise.cpp | 0 {gui_qt => src/editing}/inputnoise.h | 2 +- {gui_qt => src/editing}/mainwindow.cpp | 36 +++++++++--------- {gui_qt => src/editing}/mainwindow.h | 2 +- {gui_qt => src/editing}/paysages-qt.pro | 13 ++++--- .../editing}/previewcolorgradation.cpp | 0 .../editing}/previewcolorgradation.h | 2 +- {gui_qt => src/editing}/previewmaterial.cpp | 4 +- {gui_qt => src/editing}/previewmaterial.h | 4 +- {gui_qt => src/editing}/previewosd.cpp | 0 {gui_qt => src/editing}/previewosd.h | 2 +- {gui_qt => src/editing}/tools.cpp | 0 {gui_qt => src/editing}/tools.h | 10 ++++- {gui_qt => src/editing}/widgetcurveeditor.cpp | 2 +- {gui_qt => src/editing}/widgetcurveeditor.h | 2 +- {gui_qt => src/editing}/widgetexplorer.cpp | 4 +- {gui_qt => src/editing}/widgetexplorer.h | 4 +- {gui_qt => src/editing}/widgetheightmap.cpp | 0 {gui_qt => src/editing}/widgetheightmap.h | 6 +-- {exploring => src/exploring}/Makefile | 0 {exploring => src/exploring}/chunk.c | 0 {exploring => src/exploring}/chunk.h | 0 {exploring => src/exploring}/main.c | 0 {exploring => src/exploring}/main.h | 4 +- {exploring => src/exploring}/sky.c | 0 {exploring => src/exploring}/sky.h | 0 {exploring => src/exploring}/terrain.c | 0 {exploring => src/exploring}/terrain.h | 0 {lib_paysages => src/rendering}/Makefile | 4 +- .../rendering}/atmosphere/bruneton.c | 0 .../rendering}/atmosphere/definition.c | 0 .../rendering}/atmosphere/presets.c | 0 .../rendering}/atmosphere/preview.c | 0 .../rendering}/atmosphere/private.h | 0 .../rendering}/atmosphere/public.h | 0 .../rendering}/atmosphere/raster.c | 0 .../rendering}/atmosphere/render.c | 0 {lib_paysages => src/rendering}/auto.c | 0 {lib_paysages => src/rendering}/auto.h | 0 {lib_paysages => src/rendering}/camera.c | 0 {lib_paysages => src/rendering}/camera.h | 0 .../rendering}/clouds/definition.c | 0 .../rendering}/clouds/presets.c | 0 .../rendering}/clouds/preview.c | 0 .../rendering}/clouds/private.h | 0 .../rendering}/clouds/public.h | 0 .../rendering}/clouds/rendering.c | 0 .../rendering}/clouds/tools.c | 0 {lib_paysages => src/rendering}/geoarea.c | 0 {lib_paysages => src/rendering}/geoarea.h | 0 {lib_paysages => src/rendering}/layers.c | 0 {lib_paysages => src/rendering}/layers.h | 0 {lib_paysages => src/rendering}/main.c | 0 {lib_paysages => src/rendering}/main.h | 0 {lib_paysages => src/rendering}/noise.c | 0 {lib_paysages => src/rendering}/noise.h | 0 {lib_paysages => src/rendering}/noisenaive.c | 0 {lib_paysages => src/rendering}/noisenaive.h | 0 {lib_paysages => src/rendering}/noiseperlin.c | 0 {lib_paysages => src/rendering}/noiseperlin.h | 0 .../rendering}/noisesimplex.c | 0 .../rendering}/noisesimplex.h | 0 {lib_paysages => src/rendering}/opencl.c | 0 {lib_paysages => src/rendering}/opencl.h | 0 {lib_paysages => src/rendering}/render.c | 0 {lib_paysages => src/rendering}/render.h | 0 {lib_paysages => src/rendering}/renderer.c | 0 {lib_paysages => src/rendering}/renderer.h | 0 {lib_paysages => src/rendering}/scenery.c | 0 {lib_paysages => src/rendering}/scenery.h | 0 .../rendering}/shared/preview.c | 0 .../rendering}/shared/preview.h | 0 .../rendering}/shared/types.h | 0 {lib_paysages => src/rendering}/system.c | 0 {lib_paysages => src/rendering}/system.h | 0 .../rendering}/terrain/main.c | 0 .../rendering}/terrain/painting.c | 0 .../rendering}/terrain/presets.c | 0 .../rendering}/terrain/preview.c | 0 .../rendering}/terrain/private.h | 0 .../rendering}/terrain/public.h | 0 .../rendering}/terrain/raster.c | 0 .../rendering}/textures/definition.c | 0 .../rendering}/textures/presets.c | 0 .../rendering}/textures/preview.c | 0 .../rendering}/textures/private.h | 0 .../rendering}/textures/public.h | 0 .../rendering}/textures/rendering.c | 0 .../rendering}/textures/tools.c | 0 {lib_paysages => src/rendering}/tools.c | 0 {lib_paysages => src/rendering}/tools.h | 0 {lib_paysages => src/rendering}/tools/array.c | 0 {lib_paysages => src/rendering}/tools/array.h | 0 {lib_paysages => src/rendering}/tools/cache.c | 0 {lib_paysages => src/rendering}/tools/cache.h | 0 {lib_paysages => src/rendering}/tools/color.c | 0 {lib_paysages => src/rendering}/tools/color.h | 0 {lib_paysages => src/rendering}/tools/curve.c | 0 {lib_paysages => src/rendering}/tools/curve.h | 0 .../rendering}/tools/euclid.c | 0 .../rendering}/tools/euclid.h | 0 .../rendering}/tools/lighting.c | 0 .../rendering}/tools/lighting.h | 0 .../rendering}/tools/memory.c | 0 .../rendering}/tools/memory.h | 0 {lib_paysages => src/rendering}/tools/pack.c | 0 {lib_paysages => src/rendering}/tools/pack.h | 0 .../rendering}/tools/parallel.c | 0 .../rendering}/tools/parallel.h | 0 .../rendering}/tools/texture.c | 0 .../rendering}/tools/texture.h | 0 .../rendering}/water/definition.c | 0 .../rendering}/water/presets.c | 0 .../rendering}/water/preview.c | 0 .../rendering}/water/private.h | 0 .../rendering}/water/public.h | 0 .../rendering}/water/raster.c | 0 .../rendering}/water/render.c | 0 {lib_paysages => src/rendering}/zone.c | 0 {lib_paysages => src/rendering}/zone.h | 0 220 files changed, 177 insertions(+), 163 deletions(-) create mode 100644 data/.paysages_data rename {i18n => data/i18n}/paysages_fr.ts (100%) rename {images => data/images}/about.png (100%) rename {images => data/images}/apply.png (100%) rename {images => data/images}/auto.png (100%) rename {images => data/images}/cancel.png (100%) rename {images => data/images}/choice_on.png (100%) rename {images => data/images}/explore.png (100%) rename {images => data/images}/layer_add.png (100%) rename {images => data/images}/layer_del.png (100%) rename {images => data/images}/layer_down.png (100%) rename {images => data/images}/layer_rename.png (100%) rename {images => data/images}/layer_up.png (100%) rename {images => data/images}/load.png (100%) rename {images => data/images}/logo.ico (100%) rename {images => data/images}/logo.svg (100%) rename {images => data/images}/logo_16.png (100%) rename {images => data/images}/logo_256.png (100%) rename {images => data/images}/logo_32.png (100%) rename {images => data/images}/logo_64.png (100%) rename {images => data/images}/new.png (100%) rename {images => data/images}/render.png (100%) rename {images => data/images}/revert.png (100%) rename {images => data/images}/save.png (100%) rename {images => data/images}/tab_atmosphere.png (100%) rename {images => data/images}/tab_clouds.png (100%) rename {images => data/images}/tab_render.png (100%) rename {images => data/images}/tab_terrain.png (100%) rename {images => data/images}/tab_textures.png (100%) rename {images => data/images}/tab_water.png (100%) rename {images => data/images}/toggle_on.png (100%) rename common_post.mk => src/common_post.mk (93%) rename common_pre.mk => src/common_pre.mk (57%) rename {cli => src/controlling}/Makefile (62%) rename {cli => src/controlling}/main.c (97%) rename {gui_qt => src/editing}/baseexplorerchunk.cpp (100%) rename {gui_qt => src/editing}/baseexplorerchunk.h (96%) rename {gui_qt => src/editing}/baseform.cpp (95%) rename {gui_qt => src/editing}/baseform.h (92%) rename {gui_qt => src/editing}/baseformlayer.cpp (100%) rename {gui_qt => src/editing}/baseformlayer.h (96%) rename {gui_qt => src/editing}/baseinput.cpp (100%) rename {gui_qt => src/editing}/baseinput.h (100%) rename {gui_qt => src/editing}/basepreview.cpp (99%) rename {gui_qt => src/editing}/basepreview.h (99%) rename {gui_qt => src/editing}/dialogcolorgradation.cpp (100%) rename {gui_qt => src/editing}/dialogcolorgradation.h (93%) rename {gui_qt => src/editing}/dialogcurve.cpp (93%) rename {gui_qt => src/editing}/dialogcurve.h (95%) rename {gui_qt => src/editing}/dialogexplorer.cpp (100%) rename {gui_qt => src/editing}/dialogexplorer.h (91%) rename {gui_qt => src/editing}/dialogheightmap.cpp (96%) rename {gui_qt => src/editing}/dialogheightmap.h (95%) rename {gui_qt => src/editing}/dialoglayers.cpp (90%) rename {gui_qt => src/editing}/dialoglayers.h (95%) rename {gui_qt => src/editing}/dialogmaterial.cpp (89%) rename {gui_qt => src/editing}/dialogmaterial.h (92%) rename {gui_qt => src/editing}/dialognoise.cpp (97%) rename {gui_qt => src/editing}/dialognoise.h (96%) rename {gui_qt => src/editing}/dialogrender.cpp (97%) rename {gui_qt => src/editing}/dialogrender.h (94%) rename {gui_qt => src/editing}/explorerchunksky.cpp (99%) rename {gui_qt => src/editing}/explorerchunksky.h (89%) rename {gui_qt => src/editing}/explorerchunkterrain.cpp (99%) rename {gui_qt => src/editing}/explorerchunkterrain.h (92%) rename {gui_qt => src/editing}/formatmosphere.cpp (96%) rename {gui_qt => src/editing}/formatmosphere.h (100%) rename {gui_qt => src/editing}/formclouds.cpp (97%) rename {gui_qt => src/editing}/formclouds.h (94%) rename {gui_qt => src/editing}/formmaterial.cpp (100%) rename {gui_qt => src/editing}/formmaterial.h (92%) rename {gui_qt => src/editing}/formrender.cpp (98%) rename {gui_qt => src/editing}/formrender.h (86%) rename {gui_qt => src/editing}/formterrain.cpp (98%) rename {gui_qt => src/editing}/formterrain.h (100%) rename {gui_qt => src/editing}/formtextures.cpp (99%) rename {gui_qt => src/editing}/formtextures.h (94%) rename {gui_qt => src/editing}/formwater.cpp (97%) rename {gui_qt => src/editing}/formwater.h (100%) rename {gui_qt => src/editing}/inputboolean.cpp (100%) rename {gui_qt => src/editing}/inputboolean.h (100%) rename {gui_qt => src/editing}/inputcamera.cpp (100%) rename {gui_qt => src/editing}/inputcamera.h (92%) rename {gui_qt => src/editing}/inputcolor.cpp (100%) rename {gui_qt => src/editing}/inputcolor.h (90%) rename {gui_qt => src/editing}/inputcolorgradation.cpp (100%) rename {gui_qt => src/editing}/inputcolorgradation.h (92%) rename {gui_qt => src/editing}/inputcurve.cpp (100%) rename {gui_qt => src/editing}/inputcurve.h (93%) rename {gui_qt => src/editing}/inputdouble.cpp (100%) rename {gui_qt => src/editing}/inputdouble.h (100%) rename {gui_qt => src/editing}/inputenum.cpp (100%) rename {gui_qt => src/editing}/inputenum.h (100%) rename {gui_qt => src/editing}/inputint.cpp (100%) rename {gui_qt => src/editing}/inputint.h (100%) rename {gui_qt => src/editing}/inputlayers.cpp (100%) rename {gui_qt => src/editing}/inputlayers.h (92%) rename {gui_qt => src/editing}/inputmaterial.cpp (100%) rename {gui_qt => src/editing}/inputmaterial.h (84%) rename {gui_qt => src/editing}/inputnoise.cpp (100%) rename {gui_qt => src/editing}/inputnoise.h (92%) rename {gui_qt => src/editing}/mainwindow.cpp (83%) rename {gui_qt => src/editing}/mainwindow.h (94%) rename {gui_qt => src/editing}/paysages-qt.pro (55%) rename {gui_qt => src/editing}/previewcolorgradation.cpp (100%) rename {gui_qt => src/editing}/previewcolorgradation.h (93%) rename {gui_qt => src/editing}/previewmaterial.cpp (96%) rename {gui_qt => src/editing}/previewmaterial.h (89%) rename {gui_qt => src/editing}/previewosd.cpp (100%) rename {gui_qt => src/editing}/previewosd.h (96%) rename {gui_qt => src/editing}/tools.cpp (100%) rename {gui_qt => src/editing}/tools.h (75%) rename {gui_qt => src/editing}/widgetcurveeditor.cpp (99%) rename {gui_qt => src/editing}/widgetcurveeditor.h (96%) rename {gui_qt => src/editing}/widgetexplorer.cpp (99%) rename {gui_qt => src/editing}/widgetexplorer.h (93%) rename {gui_qt => src/editing}/widgetheightmap.cpp (100%) rename {gui_qt => src/editing}/widgetheightmap.h (93%) rename {exploring => src/exploring}/Makefile (100%) rename {exploring => src/exploring}/chunk.c (100%) rename {exploring => src/exploring}/chunk.h (100%) rename {exploring => src/exploring}/main.c (100%) rename {exploring => src/exploring}/main.h (83%) rename {exploring => src/exploring}/sky.c (100%) rename {exploring => src/exploring}/sky.h (100%) rename {exploring => src/exploring}/terrain.c (100%) rename {exploring => src/exploring}/terrain.h (100%) rename {lib_paysages => src/rendering}/Makefile (83%) rename {lib_paysages => src/rendering}/atmosphere/bruneton.c (100%) rename {lib_paysages => src/rendering}/atmosphere/definition.c (100%) rename {lib_paysages => src/rendering}/atmosphere/presets.c (100%) rename {lib_paysages => src/rendering}/atmosphere/preview.c (100%) rename {lib_paysages => src/rendering}/atmosphere/private.h (100%) rename {lib_paysages => src/rendering}/atmosphere/public.h (100%) rename {lib_paysages => src/rendering}/atmosphere/raster.c (100%) rename {lib_paysages => src/rendering}/atmosphere/render.c (100%) rename {lib_paysages => src/rendering}/auto.c (100%) rename {lib_paysages => src/rendering}/auto.h (100%) rename {lib_paysages => src/rendering}/camera.c (100%) rename {lib_paysages => src/rendering}/camera.h (100%) rename {lib_paysages => src/rendering}/clouds/definition.c (100%) rename {lib_paysages => src/rendering}/clouds/presets.c (100%) rename {lib_paysages => src/rendering}/clouds/preview.c (100%) rename {lib_paysages => src/rendering}/clouds/private.h (100%) rename {lib_paysages => src/rendering}/clouds/public.h (100%) rename {lib_paysages => src/rendering}/clouds/rendering.c (100%) rename {lib_paysages => src/rendering}/clouds/tools.c (100%) rename {lib_paysages => src/rendering}/geoarea.c (100%) rename {lib_paysages => src/rendering}/geoarea.h (100%) rename {lib_paysages => src/rendering}/layers.c (100%) rename {lib_paysages => src/rendering}/layers.h (100%) rename {lib_paysages => src/rendering}/main.c (100%) rename {lib_paysages => src/rendering}/main.h (100%) rename {lib_paysages => src/rendering}/noise.c (100%) rename {lib_paysages => src/rendering}/noise.h (100%) rename {lib_paysages => src/rendering}/noisenaive.c (100%) rename {lib_paysages => src/rendering}/noisenaive.h (100%) rename {lib_paysages => src/rendering}/noiseperlin.c (100%) rename {lib_paysages => src/rendering}/noiseperlin.h (100%) rename {lib_paysages => src/rendering}/noisesimplex.c (100%) rename {lib_paysages => src/rendering}/noisesimplex.h (100%) rename {lib_paysages => src/rendering}/opencl.c (100%) rename {lib_paysages => src/rendering}/opencl.h (100%) rename {lib_paysages => src/rendering}/render.c (100%) rename {lib_paysages => src/rendering}/render.h (100%) rename {lib_paysages => src/rendering}/renderer.c (100%) rename {lib_paysages => src/rendering}/renderer.h (100%) rename {lib_paysages => src/rendering}/scenery.c (100%) rename {lib_paysages => src/rendering}/scenery.h (100%) rename {lib_paysages => src/rendering}/shared/preview.c (100%) rename {lib_paysages => src/rendering}/shared/preview.h (100%) rename {lib_paysages => src/rendering}/shared/types.h (100%) rename {lib_paysages => src/rendering}/system.c (100%) rename {lib_paysages => src/rendering}/system.h (100%) rename {lib_paysages => src/rendering}/terrain/main.c (100%) rename {lib_paysages => src/rendering}/terrain/painting.c (100%) rename {lib_paysages => src/rendering}/terrain/presets.c (100%) rename {lib_paysages => src/rendering}/terrain/preview.c (100%) rename {lib_paysages => src/rendering}/terrain/private.h (100%) rename {lib_paysages => src/rendering}/terrain/public.h (100%) rename {lib_paysages => src/rendering}/terrain/raster.c (100%) rename {lib_paysages => src/rendering}/textures/definition.c (100%) rename {lib_paysages => src/rendering}/textures/presets.c (100%) rename {lib_paysages => src/rendering}/textures/preview.c (100%) rename {lib_paysages => src/rendering}/textures/private.h (100%) rename {lib_paysages => src/rendering}/textures/public.h (100%) rename {lib_paysages => src/rendering}/textures/rendering.c (100%) rename {lib_paysages => src/rendering}/textures/tools.c (100%) rename {lib_paysages => src/rendering}/tools.c (100%) rename {lib_paysages => src/rendering}/tools.h (100%) rename {lib_paysages => src/rendering}/tools/array.c (100%) rename {lib_paysages => src/rendering}/tools/array.h (100%) rename {lib_paysages => src/rendering}/tools/cache.c (100%) rename {lib_paysages => src/rendering}/tools/cache.h (100%) rename {lib_paysages => src/rendering}/tools/color.c (100%) rename {lib_paysages => src/rendering}/tools/color.h (100%) rename {lib_paysages => src/rendering}/tools/curve.c (100%) rename {lib_paysages => src/rendering}/tools/curve.h (100%) rename {lib_paysages => src/rendering}/tools/euclid.c (100%) rename {lib_paysages => src/rendering}/tools/euclid.h (100%) rename {lib_paysages => src/rendering}/tools/lighting.c (100%) rename {lib_paysages => src/rendering}/tools/lighting.h (100%) rename {lib_paysages => src/rendering}/tools/memory.c (100%) rename {lib_paysages => src/rendering}/tools/memory.h (100%) rename {lib_paysages => src/rendering}/tools/pack.c (100%) rename {lib_paysages => src/rendering}/tools/pack.h (100%) rename {lib_paysages => src/rendering}/tools/parallel.c (100%) rename {lib_paysages => src/rendering}/tools/parallel.h (100%) rename {lib_paysages => src/rendering}/tools/texture.c (100%) rename {lib_paysages => src/rendering}/tools/texture.h (100%) rename {lib_paysages => src/rendering}/water/definition.c (100%) rename {lib_paysages => src/rendering}/water/presets.c (100%) rename {lib_paysages => src/rendering}/water/preview.c (100%) rename {lib_paysages => src/rendering}/water/private.h (100%) rename {lib_paysages => src/rendering}/water/public.h (100%) rename {lib_paysages => src/rendering}/water/raster.c (100%) rename {lib_paysages => src/rendering}/water/render.c (100%) rename {lib_paysages => src/rendering}/zone.c (100%) rename {lib_paysages => src/rendering}/zone.h (100%) diff --git a/Makefile b/Makefile index 2aa2966..687ce03 100644 --- a/Makefile +++ b/Makefile @@ -2,20 +2,20 @@ BUILDMODE=debug BUILDPATH=./build/${BUILDMODE} all: - @+cd lib_paysages && make BUILDMODE=${BUILDMODE} - @+cd exploring && make BUILDMODE=${BUILDMODE} - @+cd cli && make BUILDMODE=${BUILDMODE} - @+cd gui_qt && qmake "BUILDMODE=${BUILDMODE}" && make + @+cd src/rendering && make BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR} + @+cd src/exploring && make BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR} + @+cd src/controlling && make BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR} + @+cd src/editing && qmake "BUILDMODE=${BUILDMODE}" "PROJECT_PATH=${CURDIR}" && make clean: - cd lib_paysages && make clean BUILDMODE=${BUILDMODE} - cd exploring && make clean BUILDMODE=${BUILDMODE} - cd cli && make clean BUILDMODE=${BUILDMODE} - cd gui_qt && qmake "BUILDMODE=${BUILDMODE}" && make clean - rm -f ${BUILDPATH}/paysages-qt + cd src/rendering && make clean BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR} + cd src/exploring && make clean BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR} + cd src/controlling && make clean BUILDMODE=${BUILDMODE} PROJECT_PATH=${CURDIR} + cd src/editing && qmake "BUILDMODE=${BUILDMODE}" "PROJECT_PATH=${CURDIR}" && make clean rm -f ${BUILDPATH}/paysages-cli + rm -f ${BUILDPATH}/paysages-qt rm -f ${BUILDPATH}/libpaysages_exploring.so - rm -f ${BUILDPATH}/libpaysages.so + rm -f ${BUILDPATH}/libpaysages_rendering.so release: make BUILDMODE=release all diff --git a/data/.paysages_data b/data/.paysages_data new file mode 100644 index 0000000..e69de29 diff --git a/i18n/paysages_fr.ts b/data/i18n/paysages_fr.ts similarity index 100% rename from i18n/paysages_fr.ts rename to data/i18n/paysages_fr.ts diff --git a/images/about.png b/data/images/about.png similarity index 100% rename from images/about.png rename to data/images/about.png diff --git a/images/apply.png b/data/images/apply.png similarity index 100% rename from images/apply.png rename to data/images/apply.png diff --git a/images/auto.png b/data/images/auto.png similarity index 100% rename from images/auto.png rename to data/images/auto.png diff --git a/images/cancel.png b/data/images/cancel.png similarity index 100% rename from images/cancel.png rename to data/images/cancel.png diff --git a/images/choice_on.png b/data/images/choice_on.png similarity index 100% rename from images/choice_on.png rename to data/images/choice_on.png diff --git a/images/explore.png b/data/images/explore.png similarity index 100% rename from images/explore.png rename to data/images/explore.png diff --git a/images/layer_add.png b/data/images/layer_add.png similarity index 100% rename from images/layer_add.png rename to data/images/layer_add.png diff --git a/images/layer_del.png b/data/images/layer_del.png similarity index 100% rename from images/layer_del.png rename to data/images/layer_del.png diff --git a/images/layer_down.png b/data/images/layer_down.png similarity index 100% rename from images/layer_down.png rename to data/images/layer_down.png diff --git a/images/layer_rename.png b/data/images/layer_rename.png similarity index 100% rename from images/layer_rename.png rename to data/images/layer_rename.png diff --git a/images/layer_up.png b/data/images/layer_up.png similarity index 100% rename from images/layer_up.png rename to data/images/layer_up.png diff --git a/images/load.png b/data/images/load.png similarity index 100% rename from images/load.png rename to data/images/load.png diff --git a/images/logo.ico b/data/images/logo.ico similarity index 100% rename from images/logo.ico rename to data/images/logo.ico diff --git a/images/logo.svg b/data/images/logo.svg similarity index 100% rename from images/logo.svg rename to data/images/logo.svg diff --git a/images/logo_16.png b/data/images/logo_16.png similarity index 100% rename from images/logo_16.png rename to data/images/logo_16.png diff --git a/images/logo_256.png b/data/images/logo_256.png similarity index 100% rename from images/logo_256.png rename to data/images/logo_256.png diff --git a/images/logo_32.png b/data/images/logo_32.png similarity index 100% rename from images/logo_32.png rename to data/images/logo_32.png diff --git a/images/logo_64.png b/data/images/logo_64.png similarity index 100% rename from images/logo_64.png rename to data/images/logo_64.png diff --git a/images/new.png b/data/images/new.png similarity index 100% rename from images/new.png rename to data/images/new.png diff --git a/images/render.png b/data/images/render.png similarity index 100% rename from images/render.png rename to data/images/render.png diff --git a/images/revert.png b/data/images/revert.png similarity index 100% rename from images/revert.png rename to data/images/revert.png diff --git a/images/save.png b/data/images/save.png similarity index 100% rename from images/save.png rename to data/images/save.png diff --git a/images/tab_atmosphere.png b/data/images/tab_atmosphere.png similarity index 100% rename from images/tab_atmosphere.png rename to data/images/tab_atmosphere.png diff --git a/images/tab_clouds.png b/data/images/tab_clouds.png similarity index 100% rename from images/tab_clouds.png rename to data/images/tab_clouds.png diff --git a/images/tab_render.png b/data/images/tab_render.png similarity index 100% rename from images/tab_render.png rename to data/images/tab_render.png diff --git a/images/tab_terrain.png b/data/images/tab_terrain.png similarity index 100% rename from images/tab_terrain.png rename to data/images/tab_terrain.png diff --git a/images/tab_textures.png b/data/images/tab_textures.png similarity index 100% rename from images/tab_textures.png rename to data/images/tab_textures.png diff --git a/images/tab_water.png b/data/images/tab_water.png similarity index 100% rename from images/tab_water.png rename to data/images/tab_water.png diff --git a/images/toggle_on.png b/data/images/toggle_on.png similarity index 100% rename from images/toggle_on.png rename to data/images/toggle_on.png diff --git a/common_post.mk b/src/common_post.mk similarity index 93% rename from common_post.mk rename to src/common_post.mk index c37181b..f86c093 100644 --- a/common_post.mk +++ b/src/common_post.mk @@ -13,7 +13,7 @@ ifneq (,${LIBS}) CC_LDFLAGS += $(shell pkg-config --libs ${LIBS}) endif -CC_FLAGS += -fPIC -Wall +CC_FLAGS += -fPIC -Wall -I${PROJECT_PATH}/src CC_LDFLAGS += -fPIC all:prepare ${RESULT} diff --git a/common_pre.mk b/src/common_pre.mk similarity index 57% rename from common_pre.mk rename to src/common_pre.mk index e0c59a5..678892b 100644 --- a/common_pre.mk +++ b/src/common_pre.mk @@ -1,4 +1,11 @@ -PATH_LIB_PAYSAGES = ../lib_paysages +ifeq ($(strip $(BUILDMODE)),) + exit 1 +endif +ifeq ($(strip $(PROJECT_PATH)),) + exit 1 +endif + +PATH_LIB_PAYSAGES = ${PROJECT_PATH}/rendering BUILDMODE = debug -BUILDPATH = ../build/${BUILDMODE} +BUILDPATH = ${PROJECT_PATH}/build/${BUILDMODE} HEADERS = $(${PATH_LIB_PAYSAGES}/atmosphere/*.h ${PATH_LIB_PAYSAGES}/clouds/*.h ${PATH_LIB_PAYSAGES}/terrain/*.h ${PATH_LIB_PAYSAGES}/textures/*.h ${PATH_LIB_PAYSAGES}/water/*.h ${PATH_LIB_PAYSAGES}/tools/*.h ${PATH_LIB_PAYSAGES}/shared/*.h) diff --git a/cli/Makefile b/src/controlling/Makefile similarity index 62% rename from cli/Makefile rename to src/controlling/Makefile index 2eb6493..3a972d8 100644 --- a/cli/Makefile +++ b/src/controlling/Makefile @@ -1,10 +1,10 @@ include ../common_pre.mk -OBJPATH = ${BUILDPATH}/cli +OBJPATH = ${BUILDPATH}/controlling RESULT = ${BUILDPATH}/paysages-cli SOURCES += $(wildcard *.c) HEADERS += $(wildcard *.h) -CC_LDFLAGS += -L${BUILDPATH} -lpaysages +CC_LDFLAGS += -L${BUILDPATH} -lpaysages_rendering include ../common_post.mk diff --git a/cli/main.c b/src/controlling/main.c similarity index 97% rename from cli/main.c rename to src/controlling/main.c index 5c755f7..f5d3b31 100644 --- a/cli/main.c +++ b/src/controlling/main.c @@ -3,10 +3,10 @@ #include #include -#include "../lib_paysages/auto.h" -#include "../lib_paysages/main.h" -#include "../lib_paysages/render.h" -#include "../lib_paysages/scenery.h" +#include "rendering/auto.h" +#include "rendering/main.h" +#include "rendering/render.h" +#include "rendering/scenery.h" void startRender(Renderer* renderer, char* outputpath, RenderParams params) { diff --git a/gui_qt/baseexplorerchunk.cpp b/src/editing/baseexplorerchunk.cpp similarity index 100% rename from gui_qt/baseexplorerchunk.cpp rename to src/editing/baseexplorerchunk.cpp diff --git a/gui_qt/baseexplorerchunk.h b/src/editing/baseexplorerchunk.h similarity index 96% rename from gui_qt/baseexplorerchunk.h rename to src/editing/baseexplorerchunk.h index 2b7b036..9dbbeaa 100644 --- a/gui_qt/baseexplorerchunk.h +++ b/src/editing/baseexplorerchunk.h @@ -4,7 +4,7 @@ #include #include #include -#include "../lib_paysages/renderer.h" +#include "rendering/renderer.h" class BaseExplorerChunk { diff --git a/gui_qt/baseform.cpp b/src/editing/baseform.cpp similarity index 95% rename from gui_qt/baseform.cpp rename to src/editing/baseform.cpp index 9a88775..951d9a0 100644 --- a/gui_qt/baseform.cpp +++ b/src/editing/baseform.cpp @@ -49,31 +49,31 @@ BaseForm::BaseForm(QWidget* parent, bool auto_apply, bool with_layers) : QWidget layers->layout()->addWidget(_layer_list); QObject::connect(_layer_list, SIGNAL(currentIndexChanged(int)), this, SLOT(layerListChanged())); - _layer_new = new QPushButton(QIcon("images/layer_add.png"), "", layers); + _layer_new = new QPushButton(QIcon(getDataPath("images/layer_add.png")), "", layers); _layer_new->setToolTip(tr("Add layer")); _layer_new->setMaximumSize(30, 30); layers->layout()->addWidget(_layer_new); QObject::connect(_layer_new, SIGNAL(clicked()), this, SLOT(layerAddClicked())); - _layer_del = new QPushButton(QIcon("images/layer_del.png"), "", layers); + _layer_del = new QPushButton(QIcon(getDataPath("images/layer_del.png")), "", layers); _layer_del->setToolTip(tr("Delete layer")); _layer_del->setMaximumSize(30, 30); layers->layout()->addWidget(_layer_del); QObject::connect(_layer_del, SIGNAL(clicked()), this, SLOT(layerDelClicked())); - _layer_rename = new QPushButton(QIcon("images/layer_rename.png"), "", layers); + _layer_rename = new QPushButton(QIcon(getDataPath("images/layer_rename.png")), "", layers); _layer_rename->setToolTip(tr("Rename layer")); _layer_rename->setMaximumSize(30, 30); layers->layout()->addWidget(_layer_rename); QObject::connect(_layer_rename, SIGNAL(clicked()), this, SLOT(layerRenameClicked())); - _layer_up = new QPushButton(QIcon("images/layer_up.png"), "", layers); + _layer_up = new QPushButton(QIcon(getDataPath("images/layer_up.png")), "", layers); _layer_up->setToolTip(tr("Move layer upward")); _layer_up->setMaximumSize(30, 30); layers->layout()->addWidget(_layer_up); QObject::connect(_layer_up, SIGNAL(clicked()), this, SLOT(layerUpClicked())); - _layer_down = new QPushButton(QIcon("images/layer_down.png"), "", layers); + _layer_down = new QPushButton(QIcon(getDataPath("images/layer_down.png")), "", layers); _layer_down->setToolTip(tr("Move layer downward")); _layer_down->setMaximumSize(30, 30); layers->layout()->addWidget(_layer_down); @@ -112,15 +112,15 @@ BaseForm::BaseForm(QWidget* parent, bool auto_apply, bool with_layers) : QWidget control->layout()->setAlignment(_buttons, Qt::AlignBottom); _button_revert = addButton(tr("Revert")); - _button_revert->setIcon(QIcon("images/cancel.png")); + _button_revert->setIcon(QIcon(getDataPath("images/cancel.png"))); _button_revert->setEnabled(false); connect(_button_revert, SIGNAL(clicked()), this, SLOT(revertConfig())); _button_apply = addButton(tr("Apply")); - _button_apply->setIcon(QIcon("images/apply.png")); + _button_apply->setIcon(QIcon(getDataPath("images/apply.png"))); _button_apply->setEnabled(false); connect(_button_apply, SIGNAL(clicked()), this, SLOT(applyConfig())); _button_preset = addButton(tr("Load preset")); - _button_preset->setIcon(QIcon("images/auto.png")); + _button_preset->setIcon(QIcon(getDataPath("images/auto.png"))); _button_preset->hide(); connect(_button_preset, SIGNAL(clicked()), this, SLOT(presetChoiceClicked())); diff --git a/gui_qt/baseform.h b/src/editing/baseform.h similarity index 92% rename from gui_qt/baseform.h rename to src/editing/baseform.h index 09c38a3..9335a14 100644 --- a/gui_qt/baseform.h +++ b/src/editing/baseform.h @@ -8,12 +8,12 @@ #include "basepreview.h" #include "baseinput.h" #include "dialoglayers.h" -#include "../lib_paysages/shared/types.h" -#include "../lib_paysages/tools/curve.h" -#include "../lib_paysages/tools/color.h" -#include "../lib_paysages/tools/pack.h" -#include "../lib_paysages/noise.h" -#include "../lib_paysages/layers.h" +#include "rendering/shared/types.h" +#include "rendering/tools/curve.h" +#include "rendering/tools/color.h" +#include "rendering/tools/pack.h" +#include "rendering/noise.h" +#include "rendering/layers.h" class BaseForm:public QWidget { diff --git a/gui_qt/baseformlayer.cpp b/src/editing/baseformlayer.cpp similarity index 100% rename from gui_qt/baseformlayer.cpp rename to src/editing/baseformlayer.cpp diff --git a/gui_qt/baseformlayer.h b/src/editing/baseformlayer.h similarity index 96% rename from gui_qt/baseformlayer.h rename to src/editing/baseformlayer.h index f4b8390..2f7a1ae 100644 --- a/gui_qt/baseformlayer.h +++ b/src/editing/baseformlayer.h @@ -4,7 +4,7 @@ /* Base form, with automatic layer control */ #include "baseform.h" -#include "../lib_paysages/layers.h" +#include "rendering/layers.h" class BaseFormLayer:public BaseForm { diff --git a/gui_qt/baseinput.cpp b/src/editing/baseinput.cpp similarity index 100% rename from gui_qt/baseinput.cpp rename to src/editing/baseinput.cpp diff --git a/gui_qt/baseinput.h b/src/editing/baseinput.h similarity index 100% rename from gui_qt/baseinput.h rename to src/editing/baseinput.h diff --git a/gui_qt/basepreview.cpp b/src/editing/basepreview.cpp similarity index 99% rename from gui_qt/basepreview.cpp rename to src/editing/basepreview.cpp index d558585..875b1de 100644 --- a/gui_qt/basepreview.cpp +++ b/src/editing/basepreview.cpp @@ -9,7 +9,7 @@ #include #include #include "tools.h" -#include "../lib_paysages/system.h" +#include "rendering/system.h" /*************** PreviewChunk ***************/ class PreviewChunk @@ -744,7 +744,7 @@ void BasePreview::contextMenuEvent(QContextMenuEvent* event) action->setProperty("value", i); if (i == iter1.value().current) { - action->setIcon(QIcon("images/choice_on.png")); + action->setIcon(QIcon(getDataPath("images/choice_on.png"))); action->setIconVisibleInMenu(true); } } @@ -767,7 +767,7 @@ void BasePreview::contextMenuEvent(QContextMenuEvent* event) action->setProperty("value", not iter2.value().value); if (iter2.value().value) { - action->setIcon(QIcon("images/toggle_on.png")); + action->setIcon(QIcon(getDataPath("images/toggle_on.png"))); action->setIconVisibleInMenu(true); } } diff --git a/gui_qt/basepreview.h b/src/editing/basepreview.h similarity index 99% rename from gui_qt/basepreview.h rename to src/editing/basepreview.h index 398d22b..e2a3411 100644 --- a/gui_qt/basepreview.h +++ b/src/editing/basepreview.h @@ -10,7 +10,7 @@ #include #include #include "previewosd.h" -#include "../lib_paysages/tools/pack.h" +#include "rendering/tools/pack.h" class _ContextChoice { diff --git a/gui_qt/dialogcolorgradation.cpp b/src/editing/dialogcolorgradation.cpp similarity index 100% rename from gui_qt/dialogcolorgradation.cpp rename to src/editing/dialogcolorgradation.cpp diff --git a/gui_qt/dialogcolorgradation.h b/src/editing/dialogcolorgradation.h similarity index 93% rename from gui_qt/dialogcolorgradation.h rename to src/editing/dialogcolorgradation.h index 9f7b82d..559fc3e 100644 --- a/gui_qt/dialogcolorgradation.h +++ b/src/editing/dialogcolorgradation.h @@ -6,8 +6,8 @@ #include "widgetcurveeditor.h" #include "previewcolorgradation.h" -#include "../lib_paysages/tools/color.h" -#include "../lib_paysages/tools/curve.h" +#include "rendering/tools/color.h" +#include "rendering/tools/curve.h" class DialogColorGradation : public QDialog { diff --git a/gui_qt/dialogcurve.cpp b/src/editing/dialogcurve.cpp similarity index 93% rename from gui_qt/dialogcurve.cpp rename to src/editing/dialogcurve.cpp index ae44fcf..5cf8437 100644 --- a/gui_qt/dialogcurve.cpp +++ b/src/editing/dialogcurve.cpp @@ -21,18 +21,18 @@ DialogCurve::DialogCurve(QWidget *parent, Curve* curve, double xmin, double xmax QWidget* form; QGridLayout* form_layout; QLabel* label; - + _base = curve; _current = curveCreate(); curveCopy(_base, _current); setLayout(new QVBoxLayout()); - + form = new QWidget(this); form_layout = new QGridLayout(); form->setLayout(form_layout); layout()->addWidget(form); - + label = new QLabel(tr("This is the curve editor.\nClick on points and drag them to move them.\nDouble click to add a new point.\nRight click on a point to delete it."), form); label->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); label->setMinimumWidth(150); @@ -47,19 +47,19 @@ DialogCurve::DialogCurve(QWidget *parent, Curve* curve, double xmin, double xmax buttons = new QWidget(this); layout()->addWidget(buttons); buttons->setLayout(new QHBoxLayout()); - + _button_cancel = new QPushButton(tr("Cancel"), buttons); - _button_cancel->setIcon(QIcon("images/cancel.png")); + _button_cancel->setIcon(QIcon(getDataPath("images/cancel.png"))); buttons->layout()->addWidget(_button_cancel); QObject::connect(_button_cancel, SIGNAL(clicked()), this, SLOT(reject())); _button_revert = new QPushButton(tr("Revert"), buttons); - _button_revert->setIcon(QIcon("images/revert.png")); + _button_revert->setIcon(QIcon(getDataPath("images/revert.png"))); buttons->layout()->addWidget(_button_revert); QObject::connect(_button_revert, SIGNAL(clicked()), this, SLOT(revert())); _button_accept = new QPushButton(tr("Validate"), buttons); - _button_accept->setIcon(QIcon("images/apply.png")); + _button_accept->setIcon(QIcon(getDataPath("images/apply.png"))); buttons->layout()->addWidget(_button_accept); QObject::connect(_button_accept, SIGNAL(clicked()), this, SLOT(accept())); diff --git a/gui_qt/dialogcurve.h b/src/editing/dialogcurve.h similarity index 95% rename from gui_qt/dialogcurve.h rename to src/editing/dialogcurve.h index 3cd7bc0..67d77ae 100644 --- a/gui_qt/dialogcurve.h +++ b/src/editing/dialogcurve.h @@ -5,7 +5,7 @@ #include #include "widgetcurveeditor.h" -#include "../lib_paysages/tools/curve.h" +#include "rendering/tools/curve.h" class DialogCurve : public QDialog { diff --git a/gui_qt/dialogexplorer.cpp b/src/editing/dialogexplorer.cpp similarity index 100% rename from gui_qt/dialogexplorer.cpp rename to src/editing/dialogexplorer.cpp diff --git a/gui_qt/dialogexplorer.h b/src/editing/dialogexplorer.h similarity index 91% rename from gui_qt/dialogexplorer.h rename to src/editing/dialogexplorer.h index e190aed..c55f564 100644 --- a/gui_qt/dialogexplorer.h +++ b/src/editing/dialogexplorer.h @@ -3,7 +3,7 @@ #include #include "widgetexplorer.h" -#include "../lib_paysages/camera.h" +#include "rendering/camera.h" class DialogExplorer : public QDialog { diff --git a/gui_qt/dialogheightmap.cpp b/src/editing/dialogheightmap.cpp similarity index 96% rename from gui_qt/dialogheightmap.cpp rename to src/editing/dialogheightmap.cpp index 1e4c6c4..19ef0e5 100644 --- a/gui_qt/dialogheightmap.cpp +++ b/src/editing/dialogheightmap.cpp @@ -9,7 +9,7 @@ #include #include #include -#include "../lib_paysages/scenery.h" +#include "rendering/scenery.h" #include "widgetheightmap.h" /**************** Dialog form ****************/ @@ -110,17 +110,17 @@ DialogHeightMap::DialogHeightMap(QWidget* parent, TerrainDefinition* terrain) : // Buttons layout button = new QPushButton(tr("Cancel"), buttons); - button->setIcon(QIcon("images/cancel.png")); + button->setIcon(QIcon(getDataPath("images/cancel.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject())); button = new QPushButton(tr("Revert"), buttons); - button->setIcon(QIcon("images/revert.png")); + button->setIcon(QIcon(getDataPath("images/revert.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert())); button = new QPushButton(tr("Validate"), buttons); - button->setIcon(QIcon("images/apply.png")); + button->setIcon(QIcon(getDataPath("images/apply.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept())); diff --git a/gui_qt/dialogheightmap.h b/src/editing/dialogheightmap.h similarity index 95% rename from gui_qt/dialogheightmap.h rename to src/editing/dialogheightmap.h index 1d4f030..2847f23 100644 --- a/gui_qt/dialogheightmap.h +++ b/src/editing/dialogheightmap.h @@ -2,7 +2,7 @@ #define _PAYSAGES_QT_DIALOGHEIGHTMAP_H_ #include -#include "../lib_paysages/terrain/public.h" +#include "rendering/terrain/public.h" #include "tools.h" #include "widgetheightmap.h" diff --git a/gui_qt/dialoglayers.cpp b/src/editing/dialoglayers.cpp similarity index 90% rename from gui_qt/dialoglayers.cpp rename to src/editing/dialoglayers.cpp index 97d644c..707efb7 100644 --- a/gui_qt/dialoglayers.cpp +++ b/src/editing/dialoglayers.cpp @@ -11,32 +11,32 @@ DialogLayers::DialogLayers(QWidget *parent, Layers* layers, QString title, FormL { QPushButton* button; QWidget* buttons; - + _layers = layers; - + setLayout(new QVBoxLayout()); - + _form = form_builder(this, _layers); _form->hideButtons(); layout()->addWidget(_form); - + buttons = new QWidget(this); buttons->setLayout(new QHBoxLayout()); layout()->addWidget(buttons); layout()->setAlignment(buttons, Qt::AlignBottom); button = new QPushButton(tr("Cancel"), buttons); - button->setIcon(QIcon("images/cancel.png")); + button->setIcon(QIcon(getDataPath("images/cancel.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject())); button = new QPushButton(tr("Reset"), buttons); - button->setIcon(QIcon("images/revert.png")); + button->setIcon(QIcon(getDataPath("images/revert.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert())); button = new QPushButton(tr("Validate"), buttons); - button->setIcon(QIcon("images/apply.png")); + button->setIcon(QIcon(getDataPath("images/apply.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept())); @@ -53,7 +53,7 @@ bool DialogLayers::editLayers(QWidget* parent, Layers* layers, QString title, Fo DialogLayers* dialog = new DialogLayers(parent, layers, title, form_builder); result = dialog->exec(); - + delete dialog; return result != 0; diff --git a/gui_qt/dialoglayers.h b/src/editing/dialoglayers.h similarity index 95% rename from gui_qt/dialoglayers.h rename to src/editing/dialoglayers.h index 5953e46..8aca793 100644 --- a/gui_qt/dialoglayers.h +++ b/src/editing/dialoglayers.h @@ -6,7 +6,7 @@ #include #include "tools.h" -#include "../lib_paysages/layers.h" +#include "rendering/layers.h" class DialogLayers; class BaseFormLayer; diff --git a/gui_qt/dialogmaterial.cpp b/src/editing/dialogmaterial.cpp similarity index 89% rename from gui_qt/dialogmaterial.cpp rename to src/editing/dialogmaterial.cpp index a336ce8..a988281 100644 --- a/gui_qt/dialogmaterial.cpp +++ b/src/editing/dialogmaterial.cpp @@ -10,30 +10,30 @@ DialogMaterial::DialogMaterial(QWidget *parent, SurfaceMaterial* material) : Dia { QPushButton* button; QWidget* buttons; - + setLayout(new QVBoxLayout()); - + _form = new FormMaterial(this, material); _form->hideButtons(); layout()->addWidget(_form); - + buttons = new QWidget(this); buttons->setLayout(new QHBoxLayout()); layout()->addWidget(buttons); layout()->setAlignment(buttons, Qt::AlignBottom); button = new QPushButton(tr("Cancel"), buttons); - button->setIcon(QIcon("images/cancel.png")); + button->setIcon(QIcon(getDataPath("images/cancel.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject())); button = new QPushButton(tr("Revert"), buttons); - button->setIcon(QIcon("images/revert.png")); + button->setIcon(QIcon(getDataPath("images/revert.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert())); button = new QPushButton(tr("Validate"), buttons); - button->setIcon(QIcon("images/apply.png")); + button->setIcon(QIcon(getDataPath("images/apply.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept())); @@ -46,7 +46,7 @@ bool DialogMaterial::getMaterial(QWidget* parent, SurfaceMaterial* material) DialogMaterial* dialog = new DialogMaterial(parent, material); result = dialog->exec(); - + if (result) { dialog->_form->getMaterial(material); diff --git a/gui_qt/dialogmaterial.h b/src/editing/dialogmaterial.h similarity index 92% rename from gui_qt/dialogmaterial.h rename to src/editing/dialogmaterial.h index 5d47dd2..b41a5c0 100644 --- a/gui_qt/dialogmaterial.h +++ b/src/editing/dialogmaterial.h @@ -7,7 +7,7 @@ #include "formmaterial.h" #include "tools.h" -#include "../lib_paysages/shared/types.h" +#include "rendering/shared/types.h" class DialogMaterial : public DialogWithPreview { diff --git a/gui_qt/dialognoise.cpp b/src/editing/dialognoise.cpp similarity index 97% rename from gui_qt/dialognoise.cpp rename to src/editing/dialognoise.cpp index 333bf4e..80fe98f 100644 --- a/gui_qt/dialognoise.cpp +++ b/src/editing/dialognoise.cpp @@ -10,7 +10,7 @@ #include #include #include -#include "../lib_paysages/tools/color.h" +#include "rendering/tools/color.h" /**************** Previews ****************/ class PreviewLevel:public BasePreview @@ -184,17 +184,17 @@ DialogNoise::DialogNoise(QWidget *parent, NoiseGenerator* value): form->layout()->addWidget(buttons); button = new QPushButton(tr("Cancel"), buttons); - button->setIcon(QIcon("images/cancel.png")); + button->setIcon(QIcon(getDataPath("images/cancel.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(reject())); button = new QPushButton(tr("Revert"), buttons); - button->setIcon(QIcon("images/revert.png")); + button->setIcon(QIcon(getDataPath("images/revert.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(revert())); button = new QPushButton(tr("Validate"), buttons); - button->setIcon(QIcon("images/apply.png")); + button->setIcon(QIcon(getDataPath("images/apply.png"))); buttons->layout()->addWidget(button); QObject::connect(button, SIGNAL(clicked()), this, SLOT(accept())); diff --git a/gui_qt/dialognoise.h b/src/editing/dialognoise.h similarity index 96% rename from gui_qt/dialognoise.h rename to src/editing/dialognoise.h index 80e9d38..eb9522d 100644 --- a/gui_qt/dialognoise.h +++ b/src/editing/dialognoise.h @@ -6,7 +6,7 @@ #include "basepreview.h" #include "tools.h" -#include "../lib_paysages/noise.h" +#include "rendering/noise.h" class DialogNoise : public DialogWithPreview { diff --git a/gui_qt/dialogrender.cpp b/src/editing/dialogrender.cpp similarity index 97% rename from gui_qt/dialogrender.cpp rename to src/editing/dialogrender.cpp index 6d539a0..09844b9 100644 --- a/gui_qt/dialogrender.cpp +++ b/src/editing/dialogrender.cpp @@ -12,8 +12,8 @@ #include #include "tools.h" -#include "../lib_paysages/scenery.h" -#include "../lib_paysages/auto.h" +#include "rendering/scenery.h" +#include "rendering/auto.h" static DialogRender* _current_dialog; @@ -129,7 +129,7 @@ DialogRender::DialogRender(QWidget *parent, Renderer* renderer): _exposure_control->setValue(200); _actions->layout()->addWidget(_exposure_control); - _save_button = new QPushButton(QIcon("images/save.png"), tr("Save picture"), _actions); + _save_button = new QPushButton(QIcon(getDataPath("images/save.png")), tr("Save picture"), _actions); _actions->layout()->addWidget(_save_button); // Connections diff --git a/gui_qt/dialogrender.h b/src/editing/dialogrender.h similarity index 94% rename from gui_qt/dialogrender.h rename to src/editing/dialogrender.h index 728ae6f..903ba53 100644 --- a/gui_qt/dialogrender.h +++ b/src/editing/dialogrender.h @@ -10,8 +10,8 @@ #include #include #include -#include "../lib_paysages/renderer.h" -#include "../lib_paysages/tools/color.h" +#include "rendering/renderer.h" +#include "rendering/tools/color.h" class DialogRender : public QDialog { diff --git a/gui_qt/explorerchunksky.cpp b/src/editing/explorerchunksky.cpp similarity index 99% rename from gui_qt/explorerchunksky.cpp rename to src/editing/explorerchunksky.cpp index 46b2292..e22d5ec 100644 --- a/gui_qt/explorerchunksky.cpp +++ b/src/editing/explorerchunksky.cpp @@ -2,7 +2,7 @@ #include #include "baseexplorerchunk.h" -#include "../lib_paysages/camera.h" +#include "rendering/camera.h" ExplorerChunkSky::ExplorerChunkSky(Renderer* renderer, double size, SkyboxOrientation orientation) : BaseExplorerChunk(renderer) { diff --git a/gui_qt/explorerchunksky.h b/src/editing/explorerchunksky.h similarity index 89% rename from gui_qt/explorerchunksky.h rename to src/editing/explorerchunksky.h index 732a6d5..ca33bae 100644 --- a/gui_qt/explorerchunksky.h +++ b/src/editing/explorerchunksky.h @@ -2,8 +2,8 @@ #define _PAYSAGES_QT_EXPLORERCHUNKSKY_H_ #include "baseexplorerchunk.h" -#include "../lib_paysages/renderer.h" -#include "../lib_paysages/tools/euclid.h" +#include "rendering/renderer.h" +#include "rendering/tools/euclid.h" enum SkyboxOrientation { diff --git a/gui_qt/explorerchunkterrain.cpp b/src/editing/explorerchunkterrain.cpp similarity index 99% rename from gui_qt/explorerchunkterrain.cpp rename to src/editing/explorerchunkterrain.cpp index 84018e4..b96c6a1 100644 --- a/gui_qt/explorerchunkterrain.cpp +++ b/src/editing/explorerchunkterrain.cpp @@ -2,7 +2,7 @@ #include #include "baseexplorerchunk.h" -#include "../lib_paysages/camera.h" +#include "rendering/camera.h" ExplorerChunkTerrain::ExplorerChunkTerrain(Renderer* renderer, double x, double z, double size, int nbchunks, double water_height) : BaseExplorerChunk(renderer) { diff --git a/gui_qt/explorerchunkterrain.h b/src/editing/explorerchunkterrain.h similarity index 92% rename from gui_qt/explorerchunkterrain.h rename to src/editing/explorerchunkterrain.h index bf47db4..9dff03a 100644 --- a/gui_qt/explorerchunkterrain.h +++ b/src/editing/explorerchunkterrain.h @@ -2,8 +2,8 @@ #define _PAYSAGES_QT_EXPLORERCHUNKTERRAIN_H_ #include "baseexplorerchunk.h" -#include "../lib_paysages/renderer.h" -#include "../lib_paysages/tools/euclid.h" +#include "rendering/renderer.h" +#include "rendering/tools/euclid.h" class ExplorerChunkTerrain:public BaseExplorerChunk { diff --git a/gui_qt/formatmosphere.cpp b/src/editing/formatmosphere.cpp similarity index 96% rename from gui_qt/formatmosphere.cpp rename to src/editing/formatmosphere.cpp index 3d44004..52e705a 100644 --- a/gui_qt/formatmosphere.cpp +++ b/src/editing/formatmosphere.cpp @@ -6,9 +6,9 @@ #include #include -#include "../lib_paysages/atmosphere/public.h" -#include "../lib_paysages/scenery.h" -#include "../lib_paysages/renderer.h" +#include "rendering/atmosphere/public.h" +#include "rendering/scenery.h" +#include "rendering/renderer.h" static AtmosphereDefinition* _definition; diff --git a/gui_qt/formatmosphere.h b/src/editing/formatmosphere.h similarity index 100% rename from gui_qt/formatmosphere.h rename to src/editing/formatmosphere.h diff --git a/gui_qt/formclouds.cpp b/src/editing/formclouds.cpp similarity index 97% rename from gui_qt/formclouds.cpp rename to src/editing/formclouds.cpp index 2572fb3..885e73b 100644 --- a/gui_qt/formclouds.cpp +++ b/src/editing/formclouds.cpp @@ -1,8 +1,8 @@ #include "formclouds.h" -#include "../lib_paysages/tools/color.h" -#include "../lib_paysages/tools/euclid.h" -#include "../lib_paysages/scenery.h" +#include "rendering/tools/color.h" +#include "rendering/tools/euclid.h" +#include "rendering/scenery.h" #include "tools.h" diff --git a/gui_qt/formclouds.h b/src/editing/formclouds.h similarity index 94% rename from gui_qt/formclouds.h rename to src/editing/formclouds.h index e5cdd09..2f6a129 100644 --- a/gui_qt/formclouds.h +++ b/src/editing/formclouds.h @@ -4,7 +4,7 @@ #include #include "basepreview.h" #include "baseformlayer.h" -#include "../lib_paysages/clouds/public.h" +#include "rendering/clouds/public.h" class FormClouds : public BaseFormLayer { diff --git a/gui_qt/formmaterial.cpp b/src/editing/formmaterial.cpp similarity index 100% rename from gui_qt/formmaterial.cpp rename to src/editing/formmaterial.cpp diff --git a/gui_qt/formmaterial.h b/src/editing/formmaterial.h similarity index 92% rename from gui_qt/formmaterial.h rename to src/editing/formmaterial.h index 69614d1..f34de50 100644 --- a/gui_qt/formmaterial.h +++ b/src/editing/formmaterial.h @@ -4,7 +4,7 @@ #include "basepreview.h" #include "baseform.h" -#include "../lib_paysages/shared/types.h" +#include "rendering/shared/types.h" class FormMaterial : public BaseForm { diff --git a/gui_qt/formrender.cpp b/src/editing/formrender.cpp similarity index 98% rename from gui_qt/formrender.cpp rename to src/editing/formrender.cpp index 91e78f8..2b001e3 100644 --- a/gui_qt/formrender.cpp +++ b/src/editing/formrender.cpp @@ -3,8 +3,8 @@ #include "dialogrender.h" #include "inputcamera.h" #include "tools.h" -#include "../lib_paysages/render.h" -#include "../lib_paysages/scenery.h" +#include "rendering/render.h" +#include "rendering/scenery.h" /**************** Previews ****************/ class PreviewRenderLandscape:public BasePreview diff --git a/gui_qt/formrender.h b/src/editing/formrender.h similarity index 86% rename from gui_qt/formrender.h rename to src/editing/formrender.h index 0eab0e6..84f692b 100644 --- a/gui_qt/formrender.h +++ b/src/editing/formrender.h @@ -2,9 +2,9 @@ #define _PAYSAGES_QT_FORMRENDER_H_ #include "baseform.h" -#include "../lib_paysages/camera.h" -#include "../lib_paysages/renderer.h" -#include "../lib_paysages/render.h" +#include "rendering/camera.h" +#include "rendering/renderer.h" +#include "rendering/render.h" class FormRender : public BaseForm { diff --git a/gui_qt/formterrain.cpp b/src/editing/formterrain.cpp similarity index 98% rename from gui_qt/formterrain.cpp rename to src/editing/formterrain.cpp index 51b7d19..eb25985 100644 --- a/gui_qt/formterrain.cpp +++ b/src/editing/formterrain.cpp @@ -4,7 +4,7 @@ #include #include "tools.h" #include "dialogheightmap.h" -#include "../lib_paysages/scenery.h" +#include "rendering/scenery.h" static TerrainDefinition* _definition; diff --git a/gui_qt/formterrain.h b/src/editing/formterrain.h similarity index 100% rename from gui_qt/formterrain.h rename to src/editing/formterrain.h diff --git a/gui_qt/formtextures.cpp b/src/editing/formtextures.cpp similarity index 99% rename from gui_qt/formtextures.cpp rename to src/editing/formtextures.cpp index 6398cff..909e09a 100644 --- a/gui_qt/formtextures.cpp +++ b/src/editing/formtextures.cpp @@ -1,6 +1,6 @@ #include "formtextures.h" -#include "../lib_paysages/scenery.h" +#include "rendering/scenery.h" #include "tools.h" /**************** Previews ****************/ diff --git a/gui_qt/formtextures.h b/src/editing/formtextures.h similarity index 94% rename from gui_qt/formtextures.h rename to src/editing/formtextures.h index 914a9c2..e50f7f0 100644 --- a/gui_qt/formtextures.h +++ b/src/editing/formtextures.h @@ -4,7 +4,7 @@ #include #include "basepreview.h" #include "baseformlayer.h" -#include "../lib_paysages/textures/public.h" +#include "rendering/textures/public.h" class FormTextures : public BaseFormLayer { diff --git a/gui_qt/formwater.cpp b/src/editing/formwater.cpp similarity index 97% rename from gui_qt/formwater.cpp rename to src/editing/formwater.cpp index d01da4a..0eb45ed 100644 --- a/gui_qt/formwater.cpp +++ b/src/editing/formwater.cpp @@ -5,11 +5,11 @@ #include #include -#include "../lib_paysages/tools/euclid.h" -#include "../lib_paysages/tools/lighting.h" -#include "../lib_paysages/renderer.h" -#include "../lib_paysages/scenery.h" -#include "../lib_paysages/water/public.h" +#include "rendering/tools/euclid.h" +#include "rendering/tools/lighting.h" +#include "rendering/renderer.h" +#include "rendering/scenery.h" +#include "rendering/water/public.h" #include "tools.h" static WaterDefinition* _definition; diff --git a/gui_qt/formwater.h b/src/editing/formwater.h similarity index 100% rename from gui_qt/formwater.h rename to src/editing/formwater.h diff --git a/gui_qt/inputboolean.cpp b/src/editing/inputboolean.cpp similarity index 100% rename from gui_qt/inputboolean.cpp rename to src/editing/inputboolean.cpp diff --git a/gui_qt/inputboolean.h b/src/editing/inputboolean.h similarity index 100% rename from gui_qt/inputboolean.h rename to src/editing/inputboolean.h diff --git a/gui_qt/inputcamera.cpp b/src/editing/inputcamera.cpp similarity index 100% rename from gui_qt/inputcamera.cpp rename to src/editing/inputcamera.cpp diff --git a/gui_qt/inputcamera.h b/src/editing/inputcamera.h similarity index 92% rename from gui_qt/inputcamera.h rename to src/editing/inputcamera.h index b72276c..e5fedfa 100644 --- a/gui_qt/inputcamera.h +++ b/src/editing/inputcamera.h @@ -4,7 +4,7 @@ #include #include "baseinput.h" -#include "../lib_paysages/camera.h" +#include "rendering/camera.h" class InputCamera:public BaseInput { diff --git a/gui_qt/inputcolor.cpp b/src/editing/inputcolor.cpp similarity index 100% rename from gui_qt/inputcolor.cpp rename to src/editing/inputcolor.cpp diff --git a/gui_qt/inputcolor.h b/src/editing/inputcolor.h similarity index 90% rename from gui_qt/inputcolor.h rename to src/editing/inputcolor.h index c5211fd..7418e8d 100644 --- a/gui_qt/inputcolor.h +++ b/src/editing/inputcolor.h @@ -4,7 +4,7 @@ #include #include "baseinput.h" -#include "../lib_paysages/shared/types.h" +#include "rendering/shared/types.h" class InputColor:public BaseInput { diff --git a/gui_qt/inputcolorgradation.cpp b/src/editing/inputcolorgradation.cpp similarity index 100% rename from gui_qt/inputcolorgradation.cpp rename to src/editing/inputcolorgradation.cpp diff --git a/gui_qt/inputcolorgradation.h b/src/editing/inputcolorgradation.h similarity index 92% rename from gui_qt/inputcolorgradation.h rename to src/editing/inputcolorgradation.h index 08a150f..54bd555 100644 --- a/gui_qt/inputcolorgradation.h +++ b/src/editing/inputcolorgradation.h @@ -4,7 +4,7 @@ #include #include "baseinput.h" -#include "../lib_paysages/tools/color.h" +#include "rendering/tools/color.h" class InputColorGradation:public BaseInput { diff --git a/gui_qt/inputcurve.cpp b/src/editing/inputcurve.cpp similarity index 100% rename from gui_qt/inputcurve.cpp rename to src/editing/inputcurve.cpp diff --git a/gui_qt/inputcurve.h b/src/editing/inputcurve.h similarity index 93% rename from gui_qt/inputcurve.h rename to src/editing/inputcurve.h index 24e476f..bab3bd9 100644 --- a/gui_qt/inputcurve.h +++ b/src/editing/inputcurve.h @@ -4,7 +4,7 @@ #include #include "baseinput.h" -#include "../lib_paysages/tools/curve.h" +#include "rendering/tools/curve.h" class InputCurve:public BaseInput { diff --git a/gui_qt/inputdouble.cpp b/src/editing/inputdouble.cpp similarity index 100% rename from gui_qt/inputdouble.cpp rename to src/editing/inputdouble.cpp diff --git a/gui_qt/inputdouble.h b/src/editing/inputdouble.h similarity index 100% rename from gui_qt/inputdouble.h rename to src/editing/inputdouble.h diff --git a/gui_qt/inputenum.cpp b/src/editing/inputenum.cpp similarity index 100% rename from gui_qt/inputenum.cpp rename to src/editing/inputenum.cpp diff --git a/gui_qt/inputenum.h b/src/editing/inputenum.h similarity index 100% rename from gui_qt/inputenum.h rename to src/editing/inputenum.h diff --git a/gui_qt/inputint.cpp b/src/editing/inputint.cpp similarity index 100% rename from gui_qt/inputint.cpp rename to src/editing/inputint.cpp diff --git a/gui_qt/inputint.h b/src/editing/inputint.h similarity index 100% rename from gui_qt/inputint.h rename to src/editing/inputint.h diff --git a/gui_qt/inputlayers.cpp b/src/editing/inputlayers.cpp similarity index 100% rename from gui_qt/inputlayers.cpp rename to src/editing/inputlayers.cpp diff --git a/gui_qt/inputlayers.h b/src/editing/inputlayers.h similarity index 92% rename from gui_qt/inputlayers.h rename to src/editing/inputlayers.h index b6ba424..90565eb 100644 --- a/gui_qt/inputlayers.h +++ b/src/editing/inputlayers.h @@ -4,7 +4,7 @@ #include #include "baseinput.h" #include "dialoglayers.h" -#include "../lib_paysages/layers.h" +#include "rendering/layers.h" class InputLayers:public BaseInput { diff --git a/gui_qt/inputmaterial.cpp b/src/editing/inputmaterial.cpp similarity index 100% rename from gui_qt/inputmaterial.cpp rename to src/editing/inputmaterial.cpp diff --git a/gui_qt/inputmaterial.h b/src/editing/inputmaterial.h similarity index 84% rename from gui_qt/inputmaterial.h rename to src/editing/inputmaterial.h index cf3e95c..6955350 100644 --- a/gui_qt/inputmaterial.h +++ b/src/editing/inputmaterial.h @@ -4,8 +4,8 @@ #include #include "baseinput.h" -#include "../lib_paysages/shared/types.h" -#include "../lib_paysages/tools/lighting.h" +#include "rendering/shared/types.h" +#include "rendering/tools/lighting.h" class InputMaterial:public BaseInput { diff --git a/gui_qt/inputnoise.cpp b/src/editing/inputnoise.cpp similarity index 100% rename from gui_qt/inputnoise.cpp rename to src/editing/inputnoise.cpp diff --git a/gui_qt/inputnoise.h b/src/editing/inputnoise.h similarity index 92% rename from gui_qt/inputnoise.h rename to src/editing/inputnoise.h index 924b1ed..b16be5f 100644 --- a/gui_qt/inputnoise.h +++ b/src/editing/inputnoise.h @@ -4,7 +4,7 @@ #include #include "baseinput.h" -#include "../lib_paysages/noise.h" +#include "rendering/noise.h" class InputNoise:public BaseInput { diff --git a/gui_qt/mainwindow.cpp b/src/editing/mainwindow.cpp similarity index 83% rename from gui_qt/mainwindow.cpp rename to src/editing/mainwindow.cpp index 65de000..1a10be9 100644 --- a/gui_qt/mainwindow.cpp +++ b/src/editing/mainwindow.cpp @@ -23,9 +23,9 @@ #include "dialogrender.h" #include "dialogexplorer.h" -#include "../lib_paysages/main.h" -#include "../lib_paysages/auto.h" -#include "../lib_paysages/scenery.h" +#include "rendering/main.h" +#include "rendering/auto.h" +#include "rendering/scenery.h" #include "tools.h" int main(int argc, char** argv) @@ -36,13 +36,13 @@ int main(int argc, char** argv) QApplication app(argc, argv); - splash = new QSplashScreen(QPixmap("images/logo_256.png")); + splash = new QSplashScreen(QPixmap(getDataPath("images/logo_256.png"))); splash->show(); QTranslator qtTranslator; QTranslator myTranslator; - if (myTranslator.load("paysages_" + QLocale::system().name(), "./i18n")) + if (myTranslator.load("paysages_" + QLocale::system().name(), "./data/i18n")) { app.installTranslator(&myTranslator); @@ -88,32 +88,32 @@ QMainWindow(parent) tabs->setIconSize(QSize(32, 32)); form = new FormTerrain(tabs); - tabs->addTab(form, QIcon("images/tab_terrain.png"), tr("Terrain")); + tabs->addTab(form, QIcon(getDataPath("images/tab_terrain.png")), tr("Terrain")); QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll()), Qt::QueuedConnection); _forms.append(form); form = new FormTextures(tabs); - tabs->addTab(form, QIcon("images/tab_textures.png"), tr("Textures")); + tabs->addTab(form, QIcon(getDataPath("images/tab_textures.png")), tr("Textures")); QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll()), Qt::QueuedConnection); _forms.append(form); form = new FormWater(tabs); - tabs->addTab(form, QIcon("images/tab_water.png"), tr("Water")); + tabs->addTab(form, QIcon(getDataPath("images/tab_water.png")), tr("Water")); QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll()), Qt::QueuedConnection); _forms.append(form); form = new FormAtmosphere(tabs); - tabs->addTab(form, QIcon("images/tab_atmosphere.png"), tr("Atmosphere")); + tabs->addTab(form, QIcon(getDataPath("images/tab_atmosphere.png")), tr("Atmosphere")); QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll()), Qt::QueuedConnection); _forms.append(form); form = new FormClouds(tabs); - tabs->addTab(form, QIcon("images/tab_clouds.png"), tr("Clouds")); + tabs->addTab(form, QIcon(getDataPath("images/tab_clouds.png")), tr("Clouds")); QObject::connect(form, SIGNAL(configApplied()), this, SLOT(refreshAll()), Qt::QueuedConnection); _forms.append(form); _form_render = new FormRender(tabs); - tabs->addTab(_form_render, QIcon("images/tab_render.png"), tr("Render")); + tabs->addTab(_form_render, QIcon(getDataPath("images/tab_render.png")), tr("Render")); _forms.append(_form_render); toolbar = new QToolBar(this); @@ -126,17 +126,17 @@ QMainWindow(parent) toolbar->setIconSize(QSize(32, 32)); addToolBar(Qt::LeftToolBarArea, toolbar); - toolbar->addAction(QIcon("images/new.png"), tr("&New"), this, SLOT(fileNew()))->setShortcut(QKeySequence(tr("Crtl+N"))); - toolbar->addAction(QIcon("images/save.png"), tr("&Save"), this, SLOT(fileSave()))->setShortcut(QKeySequence(tr("Crtl+S"))); - toolbar->addAction(QIcon("images/load.png"), tr("&Load"), this, SLOT(fileLoad()))->setShortcut(QKeySequence(tr("Crtl+L"))); - toolbar->addAction(QIcon("images/explore.png"), tr("&Explore (F2)"), this, SLOT(explore3D()))->setShortcut(QKeySequence(tr("F2"))); - toolbar->addAction(QIcon("images/render.png"), tr("&Quick\nrender (F5)"), this, SLOT(quickPreview()))->setShortcut(QKeySequence(tr("F5"))); - toolbar->addAction(QIcon("images/about.png"), tr("&About"), this, SLOT(showAboutDialog())); + toolbar->addAction(QIcon(getDataPath("images/new.png")), tr("&New"), this, SLOT(fileNew()))->setShortcut(QKeySequence(tr("Crtl+N"))); + toolbar->addAction(QIcon(getDataPath("images/save.png")), tr("&Save"), this, SLOT(fileSave()))->setShortcut(QKeySequence(tr("Crtl+S"))); + toolbar->addAction(QIcon(getDataPath("images/load.png")), tr("&Load"), this, SLOT(fileLoad()))->setShortcut(QKeySequence(tr("Crtl+L"))); + toolbar->addAction(QIcon(getDataPath("images/explore.png")), tr("&Explore (F2)"), this, SLOT(explore3D()))->setShortcut(QKeySequence(tr("F2"))); + toolbar->addAction(QIcon(getDataPath("images/render.png")), tr("&Quick\nrender (F5)"), this, SLOT(quickPreview()))->setShortcut(QKeySequence(tr("F5"))); + toolbar->addAction(QIcon(getDataPath("images/about.png")), tr("&About"), this, SLOT(showAboutDialog())); setCentralWidget(tabs); setWindowTitle("Paysages 3D"); - setWindowIcon(QIcon("images/logo_32.png")); + setWindowIcon(QIcon(getDataPath("images/logo_32.png"))); scenerySetCustomDataCallback(MainWindow::guiSaveCallback, MainWindow::guiLoadCallback, this); diff --git a/gui_qt/mainwindow.h b/src/editing/mainwindow.h similarity index 94% rename from gui_qt/mainwindow.h rename to src/editing/mainwindow.h index 64bfe66..0a00ae8 100644 --- a/gui_qt/mainwindow.h +++ b/src/editing/mainwindow.h @@ -3,7 +3,7 @@ #include #include "formrender.h" -#include "../lib_paysages/tools/pack.h" +#include "rendering/tools/pack.h" class MainWindow : public QMainWindow { diff --git a/gui_qt/paysages-qt.pro b/src/editing/paysages-qt.pro similarity index 55% rename from gui_qt/paysages-qt.pro rename to src/editing/paysages-qt.pro index 04bb83e..e53dcaf 100644 --- a/gui_qt/paysages-qt.pro +++ b/src/editing/paysages-qt.pro @@ -3,22 +3,23 @@ CONFIG += qt QT += core gui opengl DEPENDPATH += . INCLUDEPATH += . -DESTDIR = ../build/$$BUILDMODE/ -OBJECTS_DIR = $$DESTDIR/gui_qt/ -MOC_DIR = $$DESTDIR/gui_qt/moc +DESTDIR = $$PROJECT_PATH/build/$$BUILDMODE/ +OBJECTS_DIR = $$DESTDIR/editing/ +MOC_DIR = $$OBJECTS_DIR/moc/ CONFIG -= release CONFIG += $$BUILDMODE +INCLUDEPATH += $$PROJECT_PATH/src/ release:DEFINES += NDEBUG release:QMAKE_CXXFLAGS += -Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable LIBS += -lGLU -unix:LIBS += -L$$DESTDIR -lpaysages -lpaysages_exploring +unix:LIBS += -L$$DESTDIR -lpaysages_rendering -lpaysages_exploring win32:LIBS += ../libpaysages.a ../libpaysages_exploring.a -lDevIL -lILU -lILUT -lglib-2.0 -lgthread-2.0 -HEADERS += $$files(*.h) $$files(../lib_paysages/*.h) $$files(../lib_paysages/shared/*.h) $$files(../exploring/*.h) +HEADERS += $$files(*.h) $$files(../rendering/*.h) $$files(../rendering/shared/*.h) $$files(../exploring/*.h) SOURCES += $$files(*.cpp) -TRANSLATIONS = ../i18n/paysages_fr.ts +TRANSLATIONS = $$PROJECT_PATH/data/i18n/paysages_fr.ts #system(lupdate paysages-qt.pro) #system(lrelease $$TRANSLATIONS) diff --git a/gui_qt/previewcolorgradation.cpp b/src/editing/previewcolorgradation.cpp similarity index 100% rename from gui_qt/previewcolorgradation.cpp rename to src/editing/previewcolorgradation.cpp diff --git a/gui_qt/previewcolorgradation.h b/src/editing/previewcolorgradation.h similarity index 93% rename from gui_qt/previewcolorgradation.h rename to src/editing/previewcolorgradation.h index 6d5b3ec..dc09095 100644 --- a/gui_qt/previewcolorgradation.h +++ b/src/editing/previewcolorgradation.h @@ -3,7 +3,7 @@ #include -#include "../lib_paysages/tools/color.h" +#include "rendering/tools/color.h" typedef enum { diff --git a/gui_qt/previewmaterial.cpp b/src/editing/previewmaterial.cpp similarity index 96% rename from gui_qt/previewmaterial.cpp rename to src/editing/previewmaterial.cpp index 6252c13..0a5dfe5 100644 --- a/gui_qt/previewmaterial.cpp +++ b/src/editing/previewmaterial.cpp @@ -4,8 +4,8 @@ #include #include "tools.h" -#include "../lib_paysages/tools/lighting.h" -#include "../lib_paysages/tools/color.h" +#include "rendering/tools/lighting.h" +#include "rendering/tools/color.h" /***** Small static preview *****/ diff --git a/gui_qt/previewmaterial.h b/src/editing/previewmaterial.h similarity index 89% rename from gui_qt/previewmaterial.h rename to src/editing/previewmaterial.h index 4b963f4..7da83dd 100644 --- a/gui_qt/previewmaterial.h +++ b/src/editing/previewmaterial.h @@ -3,8 +3,8 @@ #include "basepreview.h" -#include "../lib_paysages/tools/lighting.h" -#include "../lib_paysages/renderer.h" +#include "rendering/tools/lighting.h" +#include "rendering/renderer.h" class SmallMaterialPreview:public QWidget { diff --git a/gui_qt/previewosd.cpp b/src/editing/previewosd.cpp similarity index 100% rename from gui_qt/previewosd.cpp rename to src/editing/previewosd.cpp diff --git a/gui_qt/previewosd.h b/src/editing/previewosd.h similarity index 96% rename from gui_qt/previewosd.h rename to src/editing/previewosd.h index 43b1bce..dde5e7d 100644 --- a/gui_qt/previewosd.h +++ b/src/editing/previewosd.h @@ -2,7 +2,7 @@ #define _PAYSAGES_QT_PREVIEWOSD_H_ #include -#include "../lib_paysages/camera.h" +#include "rendering/camera.h" class PreviewOsdItem:public QImage { diff --git a/gui_qt/tools.cpp b/src/editing/tools.cpp similarity index 100% rename from gui_qt/tools.cpp rename to src/editing/tools.cpp diff --git a/gui_qt/tools.h b/src/editing/tools.h similarity index 75% rename from gui_qt/tools.h rename to src/editing/tools.h index 10eebea..e2c3dae 100644 --- a/gui_qt/tools.h +++ b/src/editing/tools.h @@ -3,9 +3,10 @@ #include #include +#include -#include "../lib_paysages/shared/types.h" -#include "../lib_paysages/tools/color.h" +#include "rendering/shared/types.h" +#include "rendering/tools/color.h" static inline QColor colorToQColor(Color color) { @@ -13,6 +14,11 @@ static inline QColor colorToQColor(Color color) return QColor(color.r * 255.0, color.g * 255.0, color.b * 255.0, color.a * 255.0); } +static inline QString getDataPath(QString path) +{ + return QDir("./data").absoluteFilePath(path); +} + class DialogWithPreview:public QDialog { Q_OBJECT diff --git a/gui_qt/widgetcurveeditor.cpp b/src/editing/widgetcurveeditor.cpp similarity index 99% rename from gui_qt/widgetcurveeditor.cpp rename to src/editing/widgetcurveeditor.cpp index c11ecff..ae79ec0 100644 --- a/gui_qt/widgetcurveeditor.cpp +++ b/src/editing/widgetcurveeditor.cpp @@ -3,7 +3,7 @@ #include #include #include -#include "../lib_paysages/tools.h" +#include "rendering/tools.h" WidgetCurveEditor::WidgetCurveEditor(QWidget *parent, double xmin, double xmax, double ymin, double ymax) : QWidget(parent) { diff --git a/gui_qt/widgetcurveeditor.h b/src/editing/widgetcurveeditor.h similarity index 96% rename from gui_qt/widgetcurveeditor.h rename to src/editing/widgetcurveeditor.h index 03e911b..d6d5ce6 100644 --- a/gui_qt/widgetcurveeditor.h +++ b/src/editing/widgetcurveeditor.h @@ -3,7 +3,7 @@ #include #include -#include "../lib_paysages/tools/curve.h" +#include "rendering/tools/curve.h" class WidgetCurveEditor : public QWidget { diff --git a/gui_qt/widgetexplorer.cpp b/src/editing/widgetexplorer.cpp similarity index 99% rename from gui_qt/widgetexplorer.cpp rename to src/editing/widgetexplorer.cpp index d84f67b..54f6c6a 100644 --- a/gui_qt/widgetexplorer.cpp +++ b/src/editing/widgetexplorer.cpp @@ -6,8 +6,8 @@ #include #include #include -#include "../lib_paysages/scenery.h" -#include "../lib_paysages/tools/euclid.h" +#include "rendering/scenery.h" +#include "rendering/tools/euclid.h" #include "../exploring/main.h" #include "explorerchunkterrain.h" #include "explorerchunksky.h" diff --git a/gui_qt/widgetexplorer.h b/src/editing/widgetexplorer.h similarity index 93% rename from gui_qt/widgetexplorer.h rename to src/editing/widgetexplorer.h index 3a7b815..f57ef56 100644 --- a/gui_qt/widgetexplorer.h +++ b/src/editing/widgetexplorer.h @@ -3,8 +3,8 @@ #include #include "baseexplorerchunk.h" -#include "../lib_paysages/camera.h" -#include "../lib_paysages/renderer.h" +#include "rendering/camera.h" +#include "rendering/renderer.h" class WidgetExplorer : public QGLWidget { diff --git a/gui_qt/widgetheightmap.cpp b/src/editing/widgetheightmap.cpp similarity index 100% rename from gui_qt/widgetheightmap.cpp rename to src/editing/widgetheightmap.cpp diff --git a/gui_qt/widgetheightmap.h b/src/editing/widgetheightmap.h similarity index 93% rename from gui_qt/widgetheightmap.h rename to src/editing/widgetheightmap.h index 34f6e36..14a5943 100644 --- a/gui_qt/widgetheightmap.h +++ b/src/editing/widgetheightmap.h @@ -3,9 +3,9 @@ #include #include -#include "../lib_paysages/tools/euclid.h" -#include "../lib_paysages/renderer.h" -#include "../lib_paysages/terrain/public.h" +#include "rendering/tools/euclid.h" +#include "rendering/renderer.h" +#include "rendering/terrain/public.h" typedef struct { diff --git a/exploring/Makefile b/src/exploring/Makefile similarity index 100% rename from exploring/Makefile rename to src/exploring/Makefile diff --git a/exploring/chunk.c b/src/exploring/chunk.c similarity index 100% rename from exploring/chunk.c rename to src/exploring/chunk.c diff --git a/exploring/chunk.h b/src/exploring/chunk.h similarity index 100% rename from exploring/chunk.h rename to src/exploring/chunk.h diff --git a/exploring/main.c b/src/exploring/main.c similarity index 100% rename from exploring/main.c rename to src/exploring/main.c diff --git a/exploring/main.h b/src/exploring/main.h similarity index 83% rename from exploring/main.h rename to src/exploring/main.h index 805c933..25a702d 100644 --- a/exploring/main.h +++ b/src/exploring/main.h @@ -1,8 +1,8 @@ #ifndef _PAYSAGES_EXPLORING_MAIN_H_ #define _PAYSAGES_EXPLORING_MAIN_H_ -#include "../lib_paysages/renderer.h" -#include "../lib_paysages/camera.h" +#include "rendering/renderer.h" +#include "rendering/camera.h" #ifdef __cplusplus extern "C" { diff --git a/exploring/sky.c b/src/exploring/sky.c similarity index 100% rename from exploring/sky.c rename to src/exploring/sky.c diff --git a/exploring/sky.h b/src/exploring/sky.h similarity index 100% rename from exploring/sky.h rename to src/exploring/sky.h diff --git a/exploring/terrain.c b/src/exploring/terrain.c similarity index 100% rename from exploring/terrain.c rename to src/exploring/terrain.c diff --git a/exploring/terrain.h b/src/exploring/terrain.h similarity index 100% rename from exploring/terrain.h rename to src/exploring/terrain.h diff --git a/lib_paysages/Makefile b/src/rendering/Makefile similarity index 83% rename from lib_paysages/Makefile rename to src/rendering/Makefile index fe6f4a9..e45b569 100644 --- a/lib_paysages/Makefile +++ b/src/rendering/Makefile @@ -1,7 +1,7 @@ include ../common_pre.mk -OBJPATH = ${BUILDPATH}/lib_paysages -RESULT = ${BUILDPATH}/libpaysages.so +OBJPATH = ${BUILDPATH}/rendering +RESULT = ${BUILDPATH}/libpaysages_rendering.so SOURCES += $(wildcard *.c atmosphere/*.c clouds/*.c terrain/*.c textures/*.c water/*.c tools/*.c shared/*.c) LIBS += glib-2.0 gthread-2.0 IL ILU diff --git a/lib_paysages/atmosphere/bruneton.c b/src/rendering/atmosphere/bruneton.c similarity index 100% rename from lib_paysages/atmosphere/bruneton.c rename to src/rendering/atmosphere/bruneton.c diff --git a/lib_paysages/atmosphere/definition.c b/src/rendering/atmosphere/definition.c similarity index 100% rename from lib_paysages/atmosphere/definition.c rename to src/rendering/atmosphere/definition.c diff --git a/lib_paysages/atmosphere/presets.c b/src/rendering/atmosphere/presets.c similarity index 100% rename from lib_paysages/atmosphere/presets.c rename to src/rendering/atmosphere/presets.c diff --git a/lib_paysages/atmosphere/preview.c b/src/rendering/atmosphere/preview.c similarity index 100% rename from lib_paysages/atmosphere/preview.c rename to src/rendering/atmosphere/preview.c diff --git a/lib_paysages/atmosphere/private.h b/src/rendering/atmosphere/private.h similarity index 100% rename from lib_paysages/atmosphere/private.h rename to src/rendering/atmosphere/private.h diff --git a/lib_paysages/atmosphere/public.h b/src/rendering/atmosphere/public.h similarity index 100% rename from lib_paysages/atmosphere/public.h rename to src/rendering/atmosphere/public.h diff --git a/lib_paysages/atmosphere/raster.c b/src/rendering/atmosphere/raster.c similarity index 100% rename from lib_paysages/atmosphere/raster.c rename to src/rendering/atmosphere/raster.c diff --git a/lib_paysages/atmosphere/render.c b/src/rendering/atmosphere/render.c similarity index 100% rename from lib_paysages/atmosphere/render.c rename to src/rendering/atmosphere/render.c diff --git a/lib_paysages/auto.c b/src/rendering/auto.c similarity index 100% rename from lib_paysages/auto.c rename to src/rendering/auto.c diff --git a/lib_paysages/auto.h b/src/rendering/auto.h similarity index 100% rename from lib_paysages/auto.h rename to src/rendering/auto.h diff --git a/lib_paysages/camera.c b/src/rendering/camera.c similarity index 100% rename from lib_paysages/camera.c rename to src/rendering/camera.c diff --git a/lib_paysages/camera.h b/src/rendering/camera.h similarity index 100% rename from lib_paysages/camera.h rename to src/rendering/camera.h diff --git a/lib_paysages/clouds/definition.c b/src/rendering/clouds/definition.c similarity index 100% rename from lib_paysages/clouds/definition.c rename to src/rendering/clouds/definition.c diff --git a/lib_paysages/clouds/presets.c b/src/rendering/clouds/presets.c similarity index 100% rename from lib_paysages/clouds/presets.c rename to src/rendering/clouds/presets.c diff --git a/lib_paysages/clouds/preview.c b/src/rendering/clouds/preview.c similarity index 100% rename from lib_paysages/clouds/preview.c rename to src/rendering/clouds/preview.c diff --git a/lib_paysages/clouds/private.h b/src/rendering/clouds/private.h similarity index 100% rename from lib_paysages/clouds/private.h rename to src/rendering/clouds/private.h diff --git a/lib_paysages/clouds/public.h b/src/rendering/clouds/public.h similarity index 100% rename from lib_paysages/clouds/public.h rename to src/rendering/clouds/public.h diff --git a/lib_paysages/clouds/rendering.c b/src/rendering/clouds/rendering.c similarity index 100% rename from lib_paysages/clouds/rendering.c rename to src/rendering/clouds/rendering.c diff --git a/lib_paysages/clouds/tools.c b/src/rendering/clouds/tools.c similarity index 100% rename from lib_paysages/clouds/tools.c rename to src/rendering/clouds/tools.c diff --git a/lib_paysages/geoarea.c b/src/rendering/geoarea.c similarity index 100% rename from lib_paysages/geoarea.c rename to src/rendering/geoarea.c diff --git a/lib_paysages/geoarea.h b/src/rendering/geoarea.h similarity index 100% rename from lib_paysages/geoarea.h rename to src/rendering/geoarea.h diff --git a/lib_paysages/layers.c b/src/rendering/layers.c similarity index 100% rename from lib_paysages/layers.c rename to src/rendering/layers.c diff --git a/lib_paysages/layers.h b/src/rendering/layers.h similarity index 100% rename from lib_paysages/layers.h rename to src/rendering/layers.h diff --git a/lib_paysages/main.c b/src/rendering/main.c similarity index 100% rename from lib_paysages/main.c rename to src/rendering/main.c diff --git a/lib_paysages/main.h b/src/rendering/main.h similarity index 100% rename from lib_paysages/main.h rename to src/rendering/main.h diff --git a/lib_paysages/noise.c b/src/rendering/noise.c similarity index 100% rename from lib_paysages/noise.c rename to src/rendering/noise.c diff --git a/lib_paysages/noise.h b/src/rendering/noise.h similarity index 100% rename from lib_paysages/noise.h rename to src/rendering/noise.h diff --git a/lib_paysages/noisenaive.c b/src/rendering/noisenaive.c similarity index 100% rename from lib_paysages/noisenaive.c rename to src/rendering/noisenaive.c diff --git a/lib_paysages/noisenaive.h b/src/rendering/noisenaive.h similarity index 100% rename from lib_paysages/noisenaive.h rename to src/rendering/noisenaive.h diff --git a/lib_paysages/noiseperlin.c b/src/rendering/noiseperlin.c similarity index 100% rename from lib_paysages/noiseperlin.c rename to src/rendering/noiseperlin.c diff --git a/lib_paysages/noiseperlin.h b/src/rendering/noiseperlin.h similarity index 100% rename from lib_paysages/noiseperlin.h rename to src/rendering/noiseperlin.h diff --git a/lib_paysages/noisesimplex.c b/src/rendering/noisesimplex.c similarity index 100% rename from lib_paysages/noisesimplex.c rename to src/rendering/noisesimplex.c diff --git a/lib_paysages/noisesimplex.h b/src/rendering/noisesimplex.h similarity index 100% rename from lib_paysages/noisesimplex.h rename to src/rendering/noisesimplex.h diff --git a/lib_paysages/opencl.c b/src/rendering/opencl.c similarity index 100% rename from lib_paysages/opencl.c rename to src/rendering/opencl.c diff --git a/lib_paysages/opencl.h b/src/rendering/opencl.h similarity index 100% rename from lib_paysages/opencl.h rename to src/rendering/opencl.h diff --git a/lib_paysages/render.c b/src/rendering/render.c similarity index 100% rename from lib_paysages/render.c rename to src/rendering/render.c diff --git a/lib_paysages/render.h b/src/rendering/render.h similarity index 100% rename from lib_paysages/render.h rename to src/rendering/render.h diff --git a/lib_paysages/renderer.c b/src/rendering/renderer.c similarity index 100% rename from lib_paysages/renderer.c rename to src/rendering/renderer.c diff --git a/lib_paysages/renderer.h b/src/rendering/renderer.h similarity index 100% rename from lib_paysages/renderer.h rename to src/rendering/renderer.h diff --git a/lib_paysages/scenery.c b/src/rendering/scenery.c similarity index 100% rename from lib_paysages/scenery.c rename to src/rendering/scenery.c diff --git a/lib_paysages/scenery.h b/src/rendering/scenery.h similarity index 100% rename from lib_paysages/scenery.h rename to src/rendering/scenery.h diff --git a/lib_paysages/shared/preview.c b/src/rendering/shared/preview.c similarity index 100% rename from lib_paysages/shared/preview.c rename to src/rendering/shared/preview.c diff --git a/lib_paysages/shared/preview.h b/src/rendering/shared/preview.h similarity index 100% rename from lib_paysages/shared/preview.h rename to src/rendering/shared/preview.h diff --git a/lib_paysages/shared/types.h b/src/rendering/shared/types.h similarity index 100% rename from lib_paysages/shared/types.h rename to src/rendering/shared/types.h diff --git a/lib_paysages/system.c b/src/rendering/system.c similarity index 100% rename from lib_paysages/system.c rename to src/rendering/system.c diff --git a/lib_paysages/system.h b/src/rendering/system.h similarity index 100% rename from lib_paysages/system.h rename to src/rendering/system.h diff --git a/lib_paysages/terrain/main.c b/src/rendering/terrain/main.c similarity index 100% rename from lib_paysages/terrain/main.c rename to src/rendering/terrain/main.c diff --git a/lib_paysages/terrain/painting.c b/src/rendering/terrain/painting.c similarity index 100% rename from lib_paysages/terrain/painting.c rename to src/rendering/terrain/painting.c diff --git a/lib_paysages/terrain/presets.c b/src/rendering/terrain/presets.c similarity index 100% rename from lib_paysages/terrain/presets.c rename to src/rendering/terrain/presets.c diff --git a/lib_paysages/terrain/preview.c b/src/rendering/terrain/preview.c similarity index 100% rename from lib_paysages/terrain/preview.c rename to src/rendering/terrain/preview.c diff --git a/lib_paysages/terrain/private.h b/src/rendering/terrain/private.h similarity index 100% rename from lib_paysages/terrain/private.h rename to src/rendering/terrain/private.h diff --git a/lib_paysages/terrain/public.h b/src/rendering/terrain/public.h similarity index 100% rename from lib_paysages/terrain/public.h rename to src/rendering/terrain/public.h diff --git a/lib_paysages/terrain/raster.c b/src/rendering/terrain/raster.c similarity index 100% rename from lib_paysages/terrain/raster.c rename to src/rendering/terrain/raster.c diff --git a/lib_paysages/textures/definition.c b/src/rendering/textures/definition.c similarity index 100% rename from lib_paysages/textures/definition.c rename to src/rendering/textures/definition.c diff --git a/lib_paysages/textures/presets.c b/src/rendering/textures/presets.c similarity index 100% rename from lib_paysages/textures/presets.c rename to src/rendering/textures/presets.c diff --git a/lib_paysages/textures/preview.c b/src/rendering/textures/preview.c similarity index 100% rename from lib_paysages/textures/preview.c rename to src/rendering/textures/preview.c diff --git a/lib_paysages/textures/private.h b/src/rendering/textures/private.h similarity index 100% rename from lib_paysages/textures/private.h rename to src/rendering/textures/private.h diff --git a/lib_paysages/textures/public.h b/src/rendering/textures/public.h similarity index 100% rename from lib_paysages/textures/public.h rename to src/rendering/textures/public.h diff --git a/lib_paysages/textures/rendering.c b/src/rendering/textures/rendering.c similarity index 100% rename from lib_paysages/textures/rendering.c rename to src/rendering/textures/rendering.c diff --git a/lib_paysages/textures/tools.c b/src/rendering/textures/tools.c similarity index 100% rename from lib_paysages/textures/tools.c rename to src/rendering/textures/tools.c diff --git a/lib_paysages/tools.c b/src/rendering/tools.c similarity index 100% rename from lib_paysages/tools.c rename to src/rendering/tools.c diff --git a/lib_paysages/tools.h b/src/rendering/tools.h similarity index 100% rename from lib_paysages/tools.h rename to src/rendering/tools.h diff --git a/lib_paysages/tools/array.c b/src/rendering/tools/array.c similarity index 100% rename from lib_paysages/tools/array.c rename to src/rendering/tools/array.c diff --git a/lib_paysages/tools/array.h b/src/rendering/tools/array.h similarity index 100% rename from lib_paysages/tools/array.h rename to src/rendering/tools/array.h diff --git a/lib_paysages/tools/cache.c b/src/rendering/tools/cache.c similarity index 100% rename from lib_paysages/tools/cache.c rename to src/rendering/tools/cache.c diff --git a/lib_paysages/tools/cache.h b/src/rendering/tools/cache.h similarity index 100% rename from lib_paysages/tools/cache.h rename to src/rendering/tools/cache.h diff --git a/lib_paysages/tools/color.c b/src/rendering/tools/color.c similarity index 100% rename from lib_paysages/tools/color.c rename to src/rendering/tools/color.c diff --git a/lib_paysages/tools/color.h b/src/rendering/tools/color.h similarity index 100% rename from lib_paysages/tools/color.h rename to src/rendering/tools/color.h diff --git a/lib_paysages/tools/curve.c b/src/rendering/tools/curve.c similarity index 100% rename from lib_paysages/tools/curve.c rename to src/rendering/tools/curve.c diff --git a/lib_paysages/tools/curve.h b/src/rendering/tools/curve.h similarity index 100% rename from lib_paysages/tools/curve.h rename to src/rendering/tools/curve.h diff --git a/lib_paysages/tools/euclid.c b/src/rendering/tools/euclid.c similarity index 100% rename from lib_paysages/tools/euclid.c rename to src/rendering/tools/euclid.c diff --git a/lib_paysages/tools/euclid.h b/src/rendering/tools/euclid.h similarity index 100% rename from lib_paysages/tools/euclid.h rename to src/rendering/tools/euclid.h diff --git a/lib_paysages/tools/lighting.c b/src/rendering/tools/lighting.c similarity index 100% rename from lib_paysages/tools/lighting.c rename to src/rendering/tools/lighting.c diff --git a/lib_paysages/tools/lighting.h b/src/rendering/tools/lighting.h similarity index 100% rename from lib_paysages/tools/lighting.h rename to src/rendering/tools/lighting.h diff --git a/lib_paysages/tools/memory.c b/src/rendering/tools/memory.c similarity index 100% rename from lib_paysages/tools/memory.c rename to src/rendering/tools/memory.c diff --git a/lib_paysages/tools/memory.h b/src/rendering/tools/memory.h similarity index 100% rename from lib_paysages/tools/memory.h rename to src/rendering/tools/memory.h diff --git a/lib_paysages/tools/pack.c b/src/rendering/tools/pack.c similarity index 100% rename from lib_paysages/tools/pack.c rename to src/rendering/tools/pack.c diff --git a/lib_paysages/tools/pack.h b/src/rendering/tools/pack.h similarity index 100% rename from lib_paysages/tools/pack.h rename to src/rendering/tools/pack.h diff --git a/lib_paysages/tools/parallel.c b/src/rendering/tools/parallel.c similarity index 100% rename from lib_paysages/tools/parallel.c rename to src/rendering/tools/parallel.c diff --git a/lib_paysages/tools/parallel.h b/src/rendering/tools/parallel.h similarity index 100% rename from lib_paysages/tools/parallel.h rename to src/rendering/tools/parallel.h diff --git a/lib_paysages/tools/texture.c b/src/rendering/tools/texture.c similarity index 100% rename from lib_paysages/tools/texture.c rename to src/rendering/tools/texture.c diff --git a/lib_paysages/tools/texture.h b/src/rendering/tools/texture.h similarity index 100% rename from lib_paysages/tools/texture.h rename to src/rendering/tools/texture.h diff --git a/lib_paysages/water/definition.c b/src/rendering/water/definition.c similarity index 100% rename from lib_paysages/water/definition.c rename to src/rendering/water/definition.c diff --git a/lib_paysages/water/presets.c b/src/rendering/water/presets.c similarity index 100% rename from lib_paysages/water/presets.c rename to src/rendering/water/presets.c diff --git a/lib_paysages/water/preview.c b/src/rendering/water/preview.c similarity index 100% rename from lib_paysages/water/preview.c rename to src/rendering/water/preview.c diff --git a/lib_paysages/water/private.h b/src/rendering/water/private.h similarity index 100% rename from lib_paysages/water/private.h rename to src/rendering/water/private.h diff --git a/lib_paysages/water/public.h b/src/rendering/water/public.h similarity index 100% rename from lib_paysages/water/public.h rename to src/rendering/water/public.h diff --git a/lib_paysages/water/raster.c b/src/rendering/water/raster.c similarity index 100% rename from lib_paysages/water/raster.c rename to src/rendering/water/raster.c diff --git a/lib_paysages/water/render.c b/src/rendering/water/render.c similarity index 100% rename from lib_paysages/water/render.c rename to src/rendering/water/render.c diff --git a/lib_paysages/zone.c b/src/rendering/zone.c similarity index 100% rename from lib_paysages/zone.c rename to src/rendering/zone.c diff --git a/lib_paysages/zone.h b/src/rendering/zone.h similarity index 100% rename from lib_paysages/zone.h rename to src/rendering/zone.h