From 31ae2d3a49d1ebbf92f10e0d45a835a0a99dc0cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Sat, 25 May 2013 15:16:10 +0200 Subject: [PATCH 1/4] Added dist + fixed small compiling problem --- .gitignore | 1 + dist/Paysages3D.exe | Bin 0 -> 26112 bytes dist/README.txt | 19 +++++++++++++++++++ src/common_post.mk | 2 +- 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 dist/Paysages3D.exe create mode 100644 dist/README.txt diff --git a/.gitignore b/.gitignore index df123a5..dc30022 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build/ +cache/ data/i18n/paysages_*.qm gmon.out nbproject/ diff --git a/dist/Paysages3D.exe b/dist/Paysages3D.exe new file mode 100644 index 0000000000000000000000000000000000000000..45f0397eefd8c5ee384ec6861256a3c767ed69ee GIT binary patch literal 26112 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 literal 0 HcmV?d00001 diff --git a/dist/README.txt b/dist/README.txt new file mode 100644 index 0000000..5530323 --- /dev/null +++ b/dist/README.txt @@ -0,0 +1,19 @@ +Paysages 3D, a landscape generator, editor and renderer. + +This version is a development preview. Its only purpose is to demonstrate the software features and gather user feedback. +The software is provided "as-is". The authors give no warranty whatsoever regarding to this software, and disclaim any warranty of merchantability, fitness for a particular purpose, non-interference, or non-infringement. The authors cannot be kept responsible for any damage of any kind caused directly or indirectly by the software. +By installing, configuring, and/or using the software, you accept above terms. + +This version is provided free of charge, with no limits on usage. If you paid to obtain this version, please inform the authors. + +This version is distributed under the terms of the Creative Commons Licence (BY-NC-ND 3.0). Please read the full terms on the Creative Commons information website : http://creativecommons.org/licenses/by-nc-nd/3.0/ + +Authors : +Michael LEMAIRE - Developer + +Credits : +Qt - http://qt.nokia.com/ +DevIL - http://openil.sourceforge.net/ +GLib - http://www.gtk.org/ + +You can find complementary information, or contact the authors on the website : http://www.paysages3d.com/ diff --git a/src/common_post.mk b/src/common_post.mk index f86c093..28b4197 100644 --- a/src/common_post.mk +++ b/src/common_post.mk @@ -14,7 +14,7 @@ ifneq (,${LIBS}) endif CC_FLAGS += -fPIC -Wall -I${PROJECT_PATH}/src -CC_LDFLAGS += -fPIC +CC_LDFLAGS += -fPIC -lm all:prepare ${RESULT} From 4a7fe29a5cfaa25b92c6fd353971b0ed3827a34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Sat, 25 May 2013 15:33:37 +0200 Subject: [PATCH 2/4] Use ui header file to find widgets rather than search them by name --- .../common/widgetglobalformbuttons.cpp | 20 +-- src/editing/terrain/dialogterrainpainting.cpp | 119 ++++-------------- src/editing/terrain/mainterrainform.cpp | 22 ++-- 3 files changed, 36 insertions(+), 125 deletions(-) diff --git a/src/editing/common/widgetglobalformbuttons.cpp b/src/editing/common/widgetglobalformbuttons.cpp index 0e1083b..3f0c17e 100644 --- a/src/editing/common/widgetglobalformbuttons.cpp +++ b/src/editing/common/widgetglobalformbuttons.cpp @@ -5,25 +5,11 @@ WidgetGlobalFormButtons::WidgetGlobalFormButtons(QWidget *parent) : QWidget(parent), ui(new Ui::WidgetGlobalFormButtons) { - QPushButton* button; - ui->setupUi(this); - button = findChild("button_ok"); - if (button) - { - connect(button, SIGNAL(clicked()), this, SIGNAL(okClicked())); - } - button = findChild("button_cancel"); - if (button) - { - connect(button, SIGNAL(clicked()), this, SIGNAL(cancelClicked())); - } - button = findChild("button_revert"); - if (button) - { - connect(button, SIGNAL(clicked()), this, SIGNAL(revertClicked())); - } + connect(ui->button_ok, SIGNAL(clicked()), this, SIGNAL(okClicked())); + connect(ui->button_cancel, SIGNAL(clicked()), this, SIGNAL(cancelClicked())); + connect(ui->button_revert, SIGNAL(clicked()), this, SIGNAL(revertClicked())); } WidgetGlobalFormButtons::~WidgetGlobalFormButtons() diff --git a/src/editing/terrain/dialogterrainpainting.cpp b/src/editing/terrain/dialogterrainpainting.cpp index e362a28..5d9f129 100644 --- a/src/editing/terrain/dialogterrainpainting.cpp +++ b/src/editing/terrain/dialogterrainpainting.cpp @@ -15,11 +15,7 @@ DialogTerrainPainting::DialogTerrainPainting(QWidget*parent, TerrainDefinition* _terrain_original = terrain; _terrain_modified = (TerrainDefinition*)TerrainDefinitionClass.create(); - QWidget* widget = findChild("widget_commands"); - if (widget) - { - widget->hide(); - } + ui->widget_commands->hide(); revert(); @@ -33,43 +29,26 @@ DialogTerrainPainting::~DialogTerrainPainting() void DialogTerrainPainting::keyReleaseEvent(QKeyEvent* event) { - QComboBox* input_brush_mode = findChild("input_brush_mode"); - switch (event->key()) { case Qt::Key_F2: - if (input_brush_mode) - { - input_brush_mode->setCurrentIndex(0); - } + ui->input_brush_mode->setCurrentIndex(0); event->accept(); break; case Qt::Key_F3: - if (input_brush_mode) - { - input_brush_mode->setCurrentIndex(1); - } + ui->input_brush_mode->setCurrentIndex(1); event->accept(); break; case Qt::Key_F4: - if (input_brush_mode) - { - input_brush_mode->setCurrentIndex(2); - } + ui->input_brush_mode->setCurrentIndex(2); event->accept(); break; case Qt::Key_F11: - if (input_brush_mode) - { - input_brush_mode->setCurrentIndex(3); - } + ui->input_brush_mode->setCurrentIndex(3); event->accept(); break; case Qt::Key_F12: - if (input_brush_mode) - { - input_brush_mode->setCurrentIndex(4); - } + ui->input_brush_mode->setCurrentIndex(4); event->accept(); break; default: @@ -79,32 +58,19 @@ void DialogTerrainPainting::keyReleaseEvent(QKeyEvent* event) void DialogTerrainPainting::wheelEvent(QWheelEvent* event) { - QSlider* input_brush_size = findChild("input_brush_size"); - QSlider* input_brush_smoothing = findChild("input_brush_smoothing"); - QSlider* input_brush_strength = findChild("input_brush_strength"); - if (event->modifiers() & Qt::ControlModifier) { - if (input_brush_size) - { - input_brush_size->setValue(input_brush_size->value() + (event->delta() > 0 ? 1 : -1)); - } + ui->input_brush_size->setValue(ui->input_brush_size->value() + (event->delta() > 0 ? 1 : -1)); event->accept(); } else if (event->modifiers() & Qt::ShiftModifier) { - if (input_brush_strength) - { - input_brush_strength->setValue(input_brush_strength->value() + (event->delta() > 0 ? 1 : -1)); - } + ui->input_brush_strength->setValue(ui->input_brush_strength->value() + (event->delta() > 0 ? 1 : -1)); event->accept(); } else if (event->modifiers() & Qt::AltModifier) { - if (input_brush_smoothing) - { - input_brush_smoothing->setValue(input_brush_smoothing->value() + (event->delta() > 0 ? 1 : -1)); - } + ui->input_brush_smoothing->setValue(ui->input_brush_smoothing->value() + (event->delta() > 0 ? 1 : -1)); event->accept(); } else @@ -123,75 +89,34 @@ void DialogTerrainPainting::revert() { TerrainDefinitionClass.copy(_terrain_original, _terrain_modified); - WidgetHeightMap* heightmap = findChild("widget_heightmap"); - if (heightmap) - { - heightmap->setTerrain(_terrain_modified); - heightmap->setBrush(&_brush); - } + ui->widget_heightmap->setTerrain(_terrain_modified); + ui->widget_heightmap->setBrush(&_brush); } void DialogTerrainPainting::brushConfigChanged() { - QLabel* label; - QComboBox* combobox; - QSlider* slider; - // Fill brush object - combobox = findChild("input_brush_mode"); - if (combobox) - { - _brush.setMode((PaintingBrushMode)combobox->currentIndex()); - } - slider = findChild("input_brush_size"); - if (slider) - { - _brush.setSize(slider); - } - slider = findChild("input_brush_smoothing"); - if (slider) - { - _brush.setSmoothing(slider); - } - slider = findChild("input_brush_strength"); - if (slider) - { - _brush.setStrength(slider); - } + _brush.setMode((PaintingBrushMode) ui->input_brush_mode->currentIndex()); + _brush.setSize(ui->input_brush_size); + _brush.setSmoothing(ui->input_brush_smoothing); + _brush.setStrength(ui->input_brush_strength); // Update brush description - label = findChild("label_brush_description"); - if (label) - { - label->setText(getHelpText()); - } + ui->label_brush_description->setText(getHelpText()); // Update brush preview + // TODO // Tell to 3D widget - WidgetHeightMap* heightmap = findChild("widget_heightmap"); - if (heightmap) - { - heightmap->setBrush(&_brush); - } + ui->widget_heightmap->setBrush(&_brush); } void DialogTerrainPainting::heightmapChanged() { - QLabel* label = findChild("label_memory_consumption"); - if (label) - { - qint64 memused = terrainGetMemoryStats(_terrain_modified); - label->setText(tr("Memory used: %1").arg(getHumanMemory(memused))); - - // TODO Find available memory - QProgressBar* progress = findChild("progress_memory_consumption"); - if (progress) - { - progress->setMaximum(1024); - progress->setValue(memused / 1024); - } - } + qint64 memused = terrainGetMemoryStats(_terrain_modified); + ui->label_memory_consumption->setText(tr("Memory used: %1").arg(getHumanMemory(memused))); + ui->progress_memory_consumption->setMaximum(1024); + ui->progress_memory_consumption->setValue(memused / 1024); } QString DialogTerrainPainting::getHelpText() diff --git a/src/editing/terrain/mainterrainform.cpp b/src/editing/terrain/mainterrainform.cpp index fcb9c2f..04ad6c7 100644 --- a/src/editing/terrain/mainterrainform.cpp +++ b/src/editing/terrain/mainterrainform.cpp @@ -17,20 +17,20 @@ MainTerrainForm::MainTerrainForm(QWidget *parent) : _form_helper = new FreeFormHelper(this); _renderer_shape = new PreviewTerrainShape(_terrain); - _form_helper->addPreview("preview_shape", _renderer_shape); + _form_helper->addPreview(ui->preview_shape, _renderer_shape); - _form_helper->addDoubleInputSlider("input_scaling", &_terrain->scaling, 0.1, 3.0, 0.03, 0.3); - _form_helper->addDoubleInputSlider("input_height", &_terrain->height, 1.0, 45.0, 0.3, 3.0); - _form_helper->addDoubleInputSlider("input_shadow_smoothing", &_terrain->shadow_smoothing, 0.0, 0.3, 0.003, 0.03); - _form_helper->addDoubleInputSlider("input_water_height", &_terrain->water_height, -2.0, 2.0, 0.01, 0.1); + _form_helper->addDoubleInputSlider(ui->input_scaling, &_terrain->scaling, 0.1, 3.0, 0.03, 0.3); + _form_helper->addDoubleInputSlider(ui->input_height, &_terrain->height, 1.0, 45.0, 0.3, 3.0); + _form_helper->addDoubleInputSlider(ui->input_shadow_smoothing, &_terrain->shadow_smoothing, 0.0, 0.3, 0.003, 0.03); + _form_helper->addDoubleInputSlider(ui->input_water_height, &_terrain->water_height, -2.0, 2.0, 0.01, 0.1); - _form_helper->setApplyButton("button_apply"); - _form_helper->setRevertButton("button_revert"); - _form_helper->setExploreButton("button_explore"); - _form_helper->setRenderButton("button_render"); + _form_helper->setApplyButton(ui->button_apply); + _form_helper->setRevertButton(ui->button_revert); + _form_helper->setExploreButton(ui->button_explore); + _form_helper->setRenderButton(ui->button_render); - connect(findChild("button_dialog_painting"), SIGNAL(clicked()), this, SLOT(buttonPaintingPressed())); - connect(findChild("button_goto_textures"), SIGNAL(clicked()), this, SLOT(buttonTexturesPressed())); + connect(ui->button_dialog_painting, SIGNAL(clicked()), this, SLOT(buttonPaintingPressed())); + connect(ui->button_goto_textures, SIGNAL(clicked()), this, SLOT(buttonTexturesPressed())); _form_helper->startManaging(); } From fdf77b095ffbff7737028c8d647fbc038cd0d169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Sat, 25 May 2013 15:46:00 +0200 Subject: [PATCH 3/4] Fix for Qt5 --- .gitignore | 1 + src/editing/terrain/dialogterrainpainting.ui | 50 ++++++++++---------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index dc30022..053389a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ nbproject/ output/ src/editing/Makefile *.pro.user +*.pro.user.* qrc_*.cpp ui_*.h tags diff --git a/src/editing/terrain/dialogterrainpainting.ui b/src/editing/terrain/dialogterrainpainting.ui index e50addc..72d405f 100644 --- a/src/editing/terrain/dialogterrainpainting.ui +++ b/src/editing/terrain/dialogterrainpainting.ui @@ -6,8 +6,8 @@ 0 0 - 1116 - 726 + 1145 + 777 @@ -831,8 +831,8 @@ brushConfigChanged() - 752 - 42 + 1115 + 53 437 @@ -847,8 +847,8 @@ brushConfigChanged() - 919 - 115 + 1115 + 143 437 @@ -879,8 +879,8 @@ reject() - 875 - 580 + 1134 + 766 711 @@ -895,8 +895,8 @@ accept() - 943 - 587 + 1134 + 766 683 @@ -911,8 +911,8 @@ revert() - 943 - 587 + 1134 + 766 747 @@ -927,12 +927,12 @@ toggleWater(bool) - 40 - 21 + 60 + 43 - 39 - 160 + 58 + 480 @@ -943,12 +943,12 @@ toggleGrid(bool) - 102 - 17 + 161 + 40 - 102 - 143 + 121 + 463 @@ -972,15 +972,15 @@ pushButton toggled(bool) widget_commands - setShown(bool) + setVisible(bool) - 516 - 20 + 734 + 40 - 517 - 50 + 536 + 104 From b7f64c6d7989823bf53163a52815bc01d3ebd912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= Date: Sat, 25 May 2013 16:29:36 +0200 Subject: [PATCH 4/4] Made master branch work again regarding clouds --- src/rendering/clouds/clo_tools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rendering/clouds/clo_tools.c b/src/rendering/clouds/clo_tools.c index cadf4c0..5337e54 100644 --- a/src/rendering/clouds/clo_tools.c +++ b/src/rendering/clouds/clo_tools.c @@ -97,7 +97,6 @@ Color cloudsApplyLayer(CloudsLayerDefinition* definition, Color base, Renderer* /* TODO Crawl in segments for render */ col = definition->material.base; - col.a = 0.0; /*if (definition->transparencydepth == 0 || inside_length >= definition->transparencydepth) { col.a = 1.0; @@ -108,6 +107,7 @@ Color cloudsApplyLayer(CloudsLayerDefinition* definition, Color base, Renderer* }*/ col = renderer->atmosphere->applyAerialPerspective(renderer, start, col).final; + col.a = 0.0; colorMask(&base, &col);