From 98c64cc5ebb2ec541c145f99e32ae2b7d284f0d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Lemaire?= <michael@thunderk.net>
Date: Sat, 24 Nov 2012 16:04:33 +0000
Subject: [PATCH] paysages : Small changes and bugfixes.

git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@467 b1fd45b6-86a6-48da-8261-f70d1f35bdcc
---
 TODO                   | 4 ++++
 gui_qt/formclouds.cpp  | 4 ++--
 gui_qt/inputdouble.cpp | 2 +-
 lib_paysages/clouds.c  | 2 +-
 lib_paysages/clouds.h  | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index f209f77..fd9d5dd 100644
--- a/TODO
+++ b/TODO
@@ -9,6 +9,10 @@ Technology Preview 2 :
 - Finalize Preetham's model usage
    => Apply model to atmosphere (aerial perspective)
    => Find a proper model for night sky (maybe Shirley)
+- Merge atmosphere and sky in a coherent model.
+   => All stopper rendering (terrain, water and skydome) should pass through an atmosphere walker.
+   => The atmosphere walker collects callbacks (clouds, water...) to alter the medium.
+   => God rays are possible with particle lighting through the walker.
 - Keep skydome lights in cache for a render.
 - Clouds should keep distance to ground.
 - Rethink the quality settings and detail smoothing in the distance.
diff --git a/gui_qt/formclouds.cpp b/gui_qt/formclouds.cpp
index 409cc28..b48bbad 100644
--- a/gui_qt/formclouds.cpp
+++ b/gui_qt/formclouds.cpp
@@ -157,9 +157,9 @@ private:
 FormClouds::FormClouds(QWidget *parent):
     BaseFormLayer(parent)
 {
-    addAutoPreset(tr("Stratocumulus"));
-    addAutoPreset(tr("Cumulus"));
     addAutoPreset(tr("Cirrus"));
+    addAutoPreset(tr("Cumulus"));
+    addAutoPreset(tr("Stratocumulus"));
     addAutoPreset(tr("Stratus"));
 
     _definition = cloudsCreateDefinition();
diff --git a/gui_qt/inputdouble.cpp b/gui_qt/inputdouble.cpp
index 8583dd2..01e6d0e 100644
--- a/gui_qt/inputdouble.cpp
+++ b/gui_qt/inputdouble.cpp
@@ -51,7 +51,7 @@ double InputDouble::getValue()
     {
         result = _min + ((double)ivalue) * _small_step;
     }
-    if (fabs(*_value) < 0.0000001)
+    if (fabs(result) < 0.0000001)
     {
         result = 0.0;
     }
diff --git a/lib_paysages/clouds.c b/lib_paysages/clouds.c
index 37a76ba..bd6e3cc 100644
--- a/lib_paysages/clouds.c
+++ b/lib_paysages/clouds.c
@@ -76,7 +76,7 @@ CloudsLayerDefinition* cloudsLayerCreateDefinition()
 
     result->_custom_coverage = _standardCoverageFunc;
     
-    cloudsLayerAutoPreset(result, CLOUDS_PRESET_STRATOCUMULUS);
+    cloudsLayerAutoPreset(result, CLOUDS_PRESET_CIRRUS);
 
     return result;
 }
diff --git a/lib_paysages/clouds.h b/lib_paysages/clouds.h
index 689fecc..a961986 100644
--- a/lib_paysages/clouds.h
+++ b/lib_paysages/clouds.h
@@ -12,9 +12,9 @@ extern "C" {
 
 typedef enum
 {
-    CLOUDS_PRESET_STRATOCUMULUS,
-    CLOUDS_PRESET_CUMULUS,
     CLOUDS_PRESET_CIRRUS,
+    CLOUDS_PRESET_CUMULUS,
+    CLOUDS_PRESET_STRATOCUMULUS,
     CLOUDS_PRESET_STRATUS
 } CloudsPreset;