paysages: Textures form (WIP)

git-svn-id: https://subversion.assembla.com/svn/thunderk/paysages@286 b1fd45b6-86a6-48da-8261-f70d1f35bdcc

gui_qt/formtextures.cpp

@@ -2,6 +2,7 @@
 
 #include "../lib_paysages/textures.h"
 #include "../lib_paysages/scenery.h"
+#include "tools.h"
 
 static TexturesDefinition _definition;
 static TextureLayerDefinition _layer;
@@ -37,23 +38,49 @@ class PreviewTexturesColor:public BasePreview
 public:
     PreviewTexturesColor(QWidget* parent):BasePreview(parent)
     {
-        _renderer = rendererCreate();
+        LightDefinition light;
-        _renderer.render_quality = 3;
 
         _preview_layer = texturesLayerCreateDefinition();
+        
+        _lighting = lightingCreateDefinition();
+        light.color = COLOR_WHITE;
+        light.amplitude = 0.0;
+        light.direction.x = 0.0;
+        light.direction.y = -0.4794;
+        light.direction.z = 0.8776;
+        light.filtered = 0;
+        light.masked = 0;
+        light.reflection = 1.0;
+        lightingAddLight(&_lighting, light);
+        lightingValidateDefinition(&_lighting);
+        
+        _renderer = rendererCreate();
+        _renderer.render_quality = 3;
+        _renderer.applyLightingToSurface = _applyLightingToSurface;
+        _renderer.customData[0] = &_lighting;
     }
 protected:
     QColor getColor(double x, double y)
     {
-        return QColor(0, 0, 0);
+        Vector3 location;
+        location.x = x * 0.01;
+        location.y = 0.0;
+        location.z = y * 0.01;
+        return colorToQColor(texturesGetLayerColor(&_preview_layer, &_renderer, location, this->scaling * 0.01));
     }
     void updateData()
     {
         texturesLayerCopyDefinition(&_layer, &_preview_layer);
     }
 private:
+    static Color _applyLightingToSurface(Renderer* renderer, Vector3 location, Vector3 normal, SurfaceMaterial material)
+    {
+        return lightingApplyToSurface((LightingDefinition*)renderer->customData[0], renderer, location, normal, material);
+    }
+    
     Renderer _renderer;
     TextureLayerDefinition _preview_layer;
+    LightingDefinition _lighting;
 };
 
 /**************** Form ****************/

i18n/paysages_fr.ts

@@ -477,32 +477,32 @@ Maintenir Ctrl : Plus rapide</translation>
 <context>
     <name>FormTextures</name>
     <message>
-        <location filename="../gui_qt/formtextures.cpp" line="71"/>
+        <location filename="../gui_qt/formtextures.cpp" line="98"/>
         <source>Surface noise</source>
         <translation>Bruit de surface</translation>
     </message>
     <message>
-        <location filename="../gui_qt/formtextures.cpp" line="72"/>
+        <location filename="../gui_qt/formtextures.cpp" line="99"/>
         <source>Surface noise height</source>
         <translation>Hauteur du bruit</translation>
     </message>
     <message>
-        <location filename="../gui_qt/formtextures.cpp" line="73"/>
+        <location filename="../gui_qt/formtextures.cpp" line="100"/>
         <source>Surface noise scaling</source>
         <translation>Echelle du bruit</translation>
     </message>
     <message>
-        <location filename="../gui_qt/formtextures.cpp" line="74"/>
+        <location filename="../gui_qt/formtextures.cpp" line="101"/>
         <source>Base color</source>
         <translation>Couleur de base</translation>
     </message>
     <message>
-        <location filename="../gui_qt/formtextures.cpp" line="75"/>
+        <location filename="../gui_qt/formtextures.cpp" line="102"/>
         <source>Light reflection</source>
         <translation>Réflexion de lumière</translation>
     </message>
     <message>
-        <location filename="../gui_qt/formtextures.cpp" line="76"/>
+        <location filename="../gui_qt/formtextures.cpp" line="103"/>
         <source>Light reflection shininess</source>
         <translation>Concentration de la réflexion de lumière</translation>
     </message>

lib_paysages/auto.c

@@ -172,25 +172,25 @@ void autoGenRealisticLandscape(int seed)
     texture = texturesGetLayer(&textures, texturesAddLayer(&textures));
     noiseGenerateBaseNoise(texture->bump_noise, 102400);
     noiseAddLevelsSimple(texture->bump_noise, 6, 1.0, 1.0);
-    texture->bump_height = 0.01;
+    texture->bump_height = 0.1;
-    texture->bump_scaling = 1.0;
+    texture->bump_scaling = 0.15;
     texture->material.base.r = 0.6;
     texture->material.base.g = 0.55;
     texture->material.base.b = 0.57;
-    texture->material.reflection = 0.4;
+    texture->material.reflection = 0.2;
-    texture->material.shininess = 0.1;
+    texture->material.shininess = 3.0;
     texture = texturesGetLayer(&textures, texturesAddLayer(&textures));
     zoneAddHeightRange(texture->zone, 1.0, -1.0, 0.0, 3.0, 15.0);
     zoneAddSteepnessRange(texture->zone, 1.0, 0.0, 0.0, 0.2, 0.3);
     noiseGenerateBaseNoise(texture->bump_noise, 102400);
     noiseAddLevelsSimple(texture->bump_noise, 6, 1.0, 0.4);
     texture->bump_height = 0.02;
-    texture->bump_scaling = 1.0;
+    texture->bump_scaling = 0.1;
     texture->material.base.r = 0.2;
     texture->material.base.g = 0.24;
     texture->material.base.b = 0.05;
-    texture->material.reflection = 0.2;
+    texture->material.reflection = 0.1;
-    texture->material.shininess = 0.02;
+    texture->material.shininess = 2.0;
     /*texture = texturesGetLayer(&textures, texturesAddLayer(&textures));
     zoneAddHeightRange(texture->zone, 1.0, 3.0, 4.0, 100.0, 100.0);
     noiseGenerateBaseNoise(texture->bump_noise, 102400);