From 85e19d380af421ea6dda6d1bb7f84d8c85f92b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Thu, 12 Apr 2012 20:20:57 +0000
Subject: [PATCH] paysages: More UI polishing.

git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@293 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
---
 gui_qt/dialogwanderer.cpp |  2 +-
 gui_qt/formterrain.cpp    | 16 ++++++++++------
 gui_qt/inputcamera.cpp    | 10 +++++++---
 gui_qt/mainwindow.cpp     | 11 +++++++----
 i18n/paysages_fr.ts       | 10 +++++-----
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/gui_qt/dialogwanderer.cpp b/gui_qt/dialogwanderer.cpp
index fa5e89a..2e0b7e5 100644
--- a/gui_qt/dialogwanderer.cpp
+++ b/gui_qt/dialogwanderer.cpp
@@ -51,6 +51,6 @@ DialogWanderer::~DialogWanderer()
 void DialogWanderer::validateCamera()
 {
     _wanderer->validateCamera();
-    reject();
+    accept();
 }
 
diff --git a/gui_qt/formterrain.cpp b/gui_qt/formterrain.cpp
index 19d9ff2..a76633b 100644
--- a/gui_qt/formterrain.cpp
+++ b/gui_qt/formterrain.cpp
@@ -50,25 +50,28 @@ public:
         _renderer.getTerrainHeight = _getTerrainHeight;
         _renderer.applyLightingToSurface = _applyLightingToSurface;
         _renderer.maskLight = _maskLight;
+        _renderer.camera_location.x = 0.0;
+        _renderer.camera_location.y = 50.0;
+        _renderer.camera_location.z = 0.0;
 
         _lighting = lightingCreateDefinition();
-        light.color.r = 0.7;
-        light.color.g = 0.7;
-        light.color.b = 0.7;
+        light.color.r = 0.6;
+        light.color.g = 0.6;
+        light.color.b = 0.6;
         light.amplitude = 0.0;
         light.direction.x = -0.5;
         light.direction.y = -0.7071;
         light.direction.z = 0.5;
         light.filtered = 0;
         light.masked = 1;
-        light.reflection = 0.0;
+        light.reflection = 1.0;
         lightingAddLight(&_lighting, light);
         light.color.r = 0.3;
         light.color.g = 0.3;
         light.color.b = 0.3;
         light.amplitude = 0.0;
         light.direction.x = 0.5;
-        light.direction.y = -0.7071;
+        light.direction.y = 0.7071;
         light.direction.z = -0.5;
         light.filtered = 0;
         light.masked = 0;
@@ -81,7 +84,8 @@ public:
         texturesAddLayer(&_textures);
         texture = texturesGetLayer(&_textures, 0);
         texture->material.base = COLOR_WHITE;
-        texture->material.reflection = 0.0;
+        texture->material.reflection = 0.3;
+        texture->material.shininess = 2.0;
         texture->bump_height = 0.0;
         texturesLayerValidateDefinition(texture);
 
diff --git a/gui_qt/inputcamera.cpp b/gui_qt/inputcamera.cpp
index 837ab77..7a947f8 100644
--- a/gui_qt/inputcamera.cpp
+++ b/gui_qt/inputcamera.cpp
@@ -38,11 +38,15 @@ void InputCamera::revert()
 
 void InputCamera::editCamera()
 {
+    int result;
+    
     DialogWanderer* dialog = new DialogWanderer(_control, _value, true);
-    dialog->exec();
+    result = dialog->exec();
 
     delete dialog;
 
-    // TODO Only if camera was edited
-    applyValue();
+    if (result == QDialog::Accepted)
+    {
+        applyValue();
+    }
 }
diff --git a/gui_qt/mainwindow.cpp b/gui_qt/mainwindow.cpp
index 61973ec..32c2b38 100644
--- a/gui_qt/mainwindow.cpp
+++ b/gui_qt/mainwindow.cpp
@@ -174,15 +174,18 @@ void MainWindow::quickPreview()
 void MainWindow::explore3D()
 {
     CameraDefinition camera;
+    int result;
 
     sceneryGetCamera(&camera);
 
     DialogWanderer* dialog = new DialogWanderer(this, &camera, true);
-    dialog->exec();
+    result = dialog->exec();
     
-    scenerySetCamera(&camera);
-
     delete dialog;
     
-    refreshAll();
+    if (result == QDialog::Accepted)
+    {
+        scenerySetCamera(&camera);
+        refreshAll();
+    }
 }
diff --git a/i18n/paysages_fr.ts b/i18n/paysages_fr.ts
index 890f527..b45dab0 100644
--- a/i18n/paysages_fr.ts
+++ b/i18n/paysages_fr.ts
@@ -454,7 +454,7 @@ Maintenir Ctrl : Plus rapide</translation>
 <context>
     <name>FormTerrain</name>
     <message>
-        <location filename="../gui_qt/formterrain.cpp" line="139"/>
+        <location filename="../gui_qt/formterrain.cpp" line="143"/>
         <source>Height preview (normalized)</source>
         <translation>Aperçu de la hauteur (normalisée)</translation>
     </message>
@@ -463,22 +463,22 @@ Maintenir Ctrl : Plus rapide</translation>
         <translation type="obsolete">Aperçu du rendu (sans ombres)</translation>
     </message>
     <message>
-        <location filename="../gui_qt/formterrain.cpp" line="140"/>
+        <location filename="../gui_qt/formterrain.cpp" line="144"/>
         <source>Lighted preview (no texture)</source>
         <translation>Aperçu éclairé (sans texture)</translation>
     </message>
     <message>
-        <location filename="../gui_qt/formterrain.cpp" line="142"/>
+        <location filename="../gui_qt/formterrain.cpp" line="146"/>
         <source>Noise</source>
         <translation>Bruit</translation>
     </message>
     <message>
-        <location filename="../gui_qt/formterrain.cpp" line="143"/>
+        <location filename="../gui_qt/formterrain.cpp" line="147"/>
         <source>Height</source>
         <translation>Hauteur</translation>
     </message>
     <message>
-        <location filename="../gui_qt/formterrain.cpp" line="144"/>
+        <location filename="../gui_qt/formterrain.cpp" line="148"/>
         <source>Scaling</source>
         <translation>Echelle</translation>
     </message>