Renaming editing -> interface/desktop
This commit is contained in:
parent
c1fd52b0db
commit
dc679500fa
115 changed files with 105 additions and 110 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -5,7 +5,6 @@
|
|||
/gmon.out
|
||||
/nbproject/
|
||||
/output/
|
||||
/src/*/Makefile
|
||||
*.pro.user
|
||||
*.pro.user.*
|
||||
qrc_*.cpp
|
||||
|
|
11
Makefile
11
Makefile
|
@ -40,17 +40,17 @@ else
|
|||
endif
|
||||
|
||||
run_cli:build
|
||||
LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/controlling/paysages-cli
|
||||
LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/interface/commandline/paysages-cli
|
||||
|
||||
run:build
|
||||
LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/editing/paysages-gui
|
||||
LD_LIBRARY_PATH=$(LIBRARY_PATH) ${RUNNER} ${BUILDPATH}/interface/desktop/paysages-gui
|
||||
|
||||
profile:debug
|
||||
LD_LIBRARY_PATH=build/debug/rendering:build/debug/exploring perf record -g fp ./build/debug/paysages-gui
|
||||
LD_LIBRARY_PATH=${LIBRARY_PATH} perf record -g fp ${BUILDPATH}/interface/desktop/paysages-gui
|
||||
perf report -g
|
||||
|
||||
profile_cli:debug
|
||||
LD_LIBRARY_PATH=build/debug/rendering perf record -g fp ./build/debug/paysages-cli
|
||||
LD_LIBRARY_PATH=${LIBRARY_PATH} perf record -g fp ${BUILDPATH}/interface/commandline/paysages-cli
|
||||
perf report -g
|
||||
|
||||
package:release
|
||||
|
@ -65,8 +65,7 @@ package:release
|
|||
cp $(BUILDPATH)/render/software/libpaysages_render_software.so* paysages3d-linux/lib/
|
||||
cp $(BUILDPATH)/render/opengl/libpaysages_render_opengl.so* paysages3d-linux/lib/
|
||||
cp $(BUILDPATH)/rendering/libpaysages_rendering.so* paysages3d-linux/lib/
|
||||
cp $(BUILDPATH)/exploring/libpaysages_exploring.so* paysages3d-linux/lib/
|
||||
cp $(BUILDPATH)/editing/paysages-gui paysages3d-linux/lib/
|
||||
cp $(BUILDPATH)/interface/desktop/paysages-gui paysages3d-linux/lib/
|
||||
chmod +x paysages3d-linux/lib/paysages-gui
|
||||
cp -r data paysages3d-linux/
|
||||
cp -r cache/*.cache paysages3d-linux/cache/
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
CONFIG(release, debug|release): DEFINES += NDEBUG
|
||||
CONFIG(release, debug|release): DEFINES += NDEBUG QT_NO_DEBUG_OUTPUT
|
||||
|
||||
QMAKE_CXXFLAGS += -std=c++11
|
||||
|
|
|
@ -16,6 +16,7 @@ namespace definition {
|
|||
class CameraDefinition;
|
||||
class SurfaceMaterial;
|
||||
class WaterDefinition;
|
||||
class Layers;
|
||||
}
|
||||
}
|
||||
using namespace paysages::definition;
|
||||
|
|
|
@ -464,11 +464,6 @@ BaseInput* BaseForm::addInputEnum(QString label, int* value, const QStringList&
|
|||
return addInput(new InputEnum(_form, label, value, values));
|
||||
}
|
||||
|
||||
BaseInput* BaseForm::addInputLayers(QString label, Layers* value, FormLayerBuilder form_builder)
|
||||
{
|
||||
return addInput(new InputLayers(_form, label, value, form_builder));
|
||||
}
|
||||
|
||||
void BaseForm::updatePreviews()
|
||||
{
|
||||
for (int i = 0; i < _previews_list.size(); i++)
|
|
@ -1,19 +1,18 @@
|
|||
#ifndef _PAYSAGES_QT_BASEFORM_H_
|
||||
#define _PAYSAGES_QT_BASEFORM_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QStringList>
|
||||
#include "baseinput.h"
|
||||
#include "dialoglayers.h"
|
||||
#include "shared/types.h"
|
||||
#include "tools/curve.h"
|
||||
#include "tools/color.h"
|
||||
#include "tools/lighting.h"
|
||||
|
||||
class QPushButton;
|
||||
class QComboBox;
|
||||
class ColorGradation;
|
||||
class Curve;
|
||||
|
||||
namespace paysages {
|
||||
namespace desktop {
|
||||
|
||||
class BaseForm : public QWidget
|
||||
{
|
||||
|
@ -60,7 +59,6 @@ protected:
|
|||
BaseInput* addInputCurve(QString label, Curve* value, double xmin, double xmax, double ymin, double ymax, QString xlabel, QString ylabel);
|
||||
BaseInput* addInputMaterial(QString label, SurfaceMaterial* material);
|
||||
BaseInput* addInputEnum(QString label, int* value, const QStringList& values);
|
||||
BaseInput* addInputLayers(QString label, Layers* value, FormLayerBuilder form_builder);
|
||||
|
||||
void updatePreviews();
|
||||
void disablePreviewsUpdate();
|
||||
|
@ -104,4 +102,7 @@ private:
|
|||
QPushButton* _layer_rename;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
|
@ -1,10 +1,15 @@
|
|||
#ifndef _PAYSAGES_QT_BASEINPUT_H_
|
||||
#define _PAYSAGES_QT_BASEINPUT_H_
|
||||
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include <QObject>
|
||||
class QWidget;
|
||||
class QLabel;
|
||||
|
||||
namespace paysages {
|
||||
namespace desktop {
|
||||
|
||||
class BaseInput:public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
@ -38,4 +43,7 @@ protected:
|
|||
bool _enabled;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef FREEFORMHELPER_H
|
||||
#define FREEFORMHELPER_H
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include <QVector>
|
||||
#include <QStringList>
|
|
@ -1,19 +1,13 @@
|
|||
#ifndef MAINWINDOW_H
|
||||
#define MAINWINDOW_H
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include <QMainWindow>
|
||||
|
||||
#include <QVector>
|
||||
|
||||
class BaseForm;
|
||||
class FormRender;
|
||||
|
||||
namespace paysages {
|
||||
namespace system {
|
||||
class PackStream;
|
||||
}
|
||||
}
|
||||
|
||||
namespace Ui {
|
||||
class MainWindow;
|
||||
}
|
|
@ -7,7 +7,7 @@ TARGET = paysages-gui
|
|||
|
||||
unix:LIBS += -lGLU
|
||||
|
||||
include(../common.pri)
|
||||
include(../../common.pri)
|
||||
|
||||
HEADERS += \
|
||||
terrain/widgetheightmap.h \
|
||||
|
@ -59,7 +59,7 @@ HEADERS += \
|
|||
textures/PreviewLayerLook.h \
|
||||
textures/PreviewCumul.h \
|
||||
textures/DialogTexturesLayer.h \
|
||||
editing_global.h
|
||||
desktop_global.h
|
||||
|
||||
SOURCES += \
|
||||
terrain/widgetheightmap.cpp \
|
||||
|
@ -123,48 +123,48 @@ FORMS += \
|
|||
textures/DialogTexturesLayer.ui
|
||||
|
||||
RESOURCES += \
|
||||
../../data/ui_pictures.qrc
|
||||
../../../data/ui_pictures.qrc
|
||||
|
||||
TRANSLATIONS = ../../data/i18n/paysages_fr.ts
|
||||
TRANSLATIONS = ../../../data/i18n/paysages_fr.ts
|
||||
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../system/release/ -lpaysages_system
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../system/debug/ -lpaysages_system
|
||||
else:unix: LIBS += -L$$OUT_PWD/../system/ -lpaysages_system
|
||||
INCLUDEPATH += $$PWD/../system
|
||||
DEPENDPATH += $$PWD/../system
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../system/release/ -lpaysages_system
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../system/debug/ -lpaysages_system
|
||||
else:unix: LIBS += -L$$OUT_PWD/../../system/ -lpaysages_system
|
||||
INCLUDEPATH += $$PWD/../../system
|
||||
DEPENDPATH += $$PWD/../../system
|
||||
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../basics/release/ -lpaysages_basics
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../basics/debug/ -lpaysages_basics
|
||||
else:unix: LIBS += -L$$OUT_PWD/../basics/ -lpaysages_basics
|
||||
INCLUDEPATH += $$PWD/../basics
|
||||
DEPENDPATH += $$PWD/../basics
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../basics/release/ -lpaysages_basics
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../basics/debug/ -lpaysages_basics
|
||||
else:unix: LIBS += -L$$OUT_PWD/../../basics/ -lpaysages_basics
|
||||
INCLUDEPATH += $$PWD/../../basics
|
||||
DEPENDPATH += $$PWD/../../basics
|
||||
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../rendering/release/ -lpaysages_rendering
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../rendering/debug/ -lpaysages_rendering
|
||||
else:unix: LIBS += -L$$OUT_PWD/../rendering/ -lpaysages_rendering
|
||||
INCLUDEPATH += $$PWD/../rendering
|
||||
DEPENDPATH += $$PWD/../rendering
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../rendering/release/ -lpaysages_rendering
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../rendering/debug/ -lpaysages_rendering
|
||||
else:unix: LIBS += -L$$OUT_PWD/../../rendering/ -lpaysages_rendering
|
||||
INCLUDEPATH += $$PWD/../../rendering
|
||||
DEPENDPATH += $$PWD/../../rendering
|
||||
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../definition/release/ -lpaysages_definition
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../definition/debug/ -lpaysages_definition
|
||||
else:unix: LIBS += -L$$OUT_PWD/../definition/ -lpaysages_definition
|
||||
INCLUDEPATH += $$PWD/../definition
|
||||
DEPENDPATH += $$PWD/../definition
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../definition/release/ -lpaysages_definition
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../definition/debug/ -lpaysages_definition
|
||||
else:unix: LIBS += -L$$OUT_PWD/../../definition/ -lpaysages_definition
|
||||
INCLUDEPATH += $$PWD/../../definition
|
||||
DEPENDPATH += $$PWD/../../definition
|
||||
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../render/software/release/ -lpaysages_render_software
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../render/software/debug/ -lpaysages_render_software
|
||||
else:unix: LIBS += -L$$OUT_PWD/../render/software/ -lpaysages_render_software
|
||||
INCLUDEPATH += $$PWD/../render/software
|
||||
DEPENDPATH += $$PWD/../render/software
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../render/software/release/ -lpaysages_render_software
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../render/software/debug/ -lpaysages_render_software
|
||||
else:unix: LIBS += -L$$OUT_PWD/../../render/software/ -lpaysages_render_software
|
||||
INCLUDEPATH += $$PWD/../../render/software
|
||||
DEPENDPATH += $$PWD/../../render/software
|
||||
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../render/preview/release/ -lpaysages_render_preview
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../render/preview/debug/ -lpaysages_render_preview
|
||||
else:unix: LIBS += -L$$OUT_PWD/../render/preview/ -lpaysages_render_preview
|
||||
INCLUDEPATH += $$PWD/../render/preview
|
||||
DEPENDPATH += $$PWD/../render/preview
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../render/preview/release/ -lpaysages_render_preview
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../render/preview/debug/ -lpaysages_render_preview
|
||||
else:unix: LIBS += -L$$OUT_PWD/../../render/preview/ -lpaysages_render_preview
|
||||
INCLUDEPATH += $$PWD/../../render/preview
|
||||
DEPENDPATH += $$PWD/../../render/preview
|
||||
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../render/opengl/release/ -lpaysages_render_opengl
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../render/opengl/debug/ -lpaysages_render_opengl
|
||||
else:unix: LIBS += -L$$OUT_PWD/../render/opengl/ -lpaysages_render_opengl
|
||||
INCLUDEPATH += $$PWD/../render/opengl
|
||||
DEPENDPATH += $$PWD/../render/opengl
|
||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../../render/opengl/release/ -lpaysages_render_opengl
|
||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../../render/opengl/debug/ -lpaysages_render_opengl
|
||||
else:unix: LIBS += -L$$OUT_PWD/../../render/opengl/ -lpaysages_render_opengl
|
||||
INCLUDEPATH += $$PWD/../../render/opengl
|
||||
DEPENDPATH += $$PWD/../../render/opengl
|
|
@ -6,4 +6,13 @@
|
|||
#include "opengl_global.h"
|
||||
#include "preview_global.h"
|
||||
|
||||
namespace paysages {
|
||||
namespace desktop {
|
||||
class BaseInput;
|
||||
class BaseForm;
|
||||
}
|
||||
}
|
||||
|
||||
using namespace paysages::desktop;
|
||||
|
||||
#endif // EDITING_GLOBAL_H
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _PAYSAGES_QT_DIALOGEXPLORER_H_
|
||||
#define _PAYSAGES_QT_DIALOGEXPLORER_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include <QDialog>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _PAYSAGES_QT_DIALOGNOISE_H_
|
||||
#define _PAYSAGES_QT_DIALOGNOISE_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include <QListWidget>
|
||||
#include <QComboBox>
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _PAYSAGES_QT_FORMATMOSPHERE_H_
|
||||
#define _PAYSAGES_QT_FORMATMOSPHERE_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include "baseform.h"
|
||||
class QWidget;
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _PAYSAGES_QT_FORMCLOUDS_H_
|
||||
#define _PAYSAGES_QT_FORMCLOUDS_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include "baseformlayer.h"
|
||||
#include "clouds/public.h"
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _PAYSAGES_QT_FORMTEXTURES_H_
|
||||
#define _PAYSAGES_QT_FORMTEXTURES_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include "baseformlayer.h"
|
||||
#include "textures/public.h"
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _PAYSAGES_QT_FORMWATER_H_
|
||||
#define _PAYSAGES_QT_FORMWATER_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include "baseform.h"
|
||||
class QWidget;
|
|
@ -1,10 +1,12 @@
|
|||
#ifndef _PAYSAGES_QT_INPUTCAMERA_H_
|
||||
#define _PAYSAGES_QT_INPUTCAMERA_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include "baseinput.h"
|
||||
#include <QObject>
|
||||
|
||||
class QWidget;
|
||||
|
||||
class InputCamera:public BaseInput
|
||||
{
|
|
@ -1,16 +1,12 @@
|
|||
#ifndef _PAYSAGES_QT_INPUTNOISE_H_
|
||||
#define _PAYSAGES_QT_INPUTNOISE_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include "baseinput.h"
|
||||
|
||||
namespace paysages {
|
||||
namespace basics {
|
||||
class NoiseGenerator;
|
||||
}
|
||||
}
|
||||
#include <QObject>
|
||||
class QWidget;
|
||||
|
||||
class InputNoise:public BaseInput
|
||||
{
|
|
@ -1,13 +1,12 @@
|
|||
#ifndef _PAYSAGES_QT_PREVIEWMATERIAL_H_
|
||||
#define _PAYSAGES_QT_PREVIEWMATERIAL_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include "Base2dPreviewRenderer.h"
|
||||
#include <QWidget>
|
||||
|
||||
#include "tools/lighting.h"
|
||||
#include "renderer.h"
|
||||
|
||||
class MaterialPreviewRenderer:public Base2dPreviewRenderer {
|
||||
public:
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef DIALOGBASETERRAINNOISE_H
|
||||
#define DIALOGBASETERRAINNOISE_H
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
#include <QDialog>
|
||||
|
||||
namespace paysages {
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef MAINTERRAINFORM_H
|
||||
#define MAINTERRAINFORM_H
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include <QWidget>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef PREVIEWTERRAINSHAPE_H
|
||||
#define PREVIEWTERRAINSHAPE_H
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include "Base2dPreviewRenderer.h"
|
||||
#include "terrain/public.h"
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _PAYSAGES_EDITING_TERRAIN_WIDGETTERRAINBASENOISEPREVIEW_H_
|
||||
#define _PAYSAGES_EDITING_TERRAIN_WIDGETTERRAINBASENOISEPREVIEW_H_
|
||||
|
||||
#include "editing_global.h"
|
||||
#include "desktop_global.h"
|
||||
|
||||
#include "DrawingWidget.h"
|
||||
class QPainter;
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue