Fix Travis

Author: mororo250

src/appleseed/renderer/modeling/light/ArHosekSkyModelData_Spectral.h

@@ -100,7 +100,7 @@ This file contains the coefficient data for the spectral version of the model.
 */
 
 // uses Apr 26 dataset
-
+/*
 double dataset320[] =
 {
     // albedo 0, turbidity 1
@@ -13858,7 +13858,7 @@ double* datasetsRad[] =
     datasetRad680,
     datasetRad720
 };
-
+*/
 // Uses Feb 9 dataset
 double solarDataset320[] =
 {
@@ -33718,7 +33718,7 @@ double* solarDatasets[] =
     solarDataset680,
     solarDataset720
 };
-
+/*
 double limbDarkeningDataset320[] =
 { 0.087657, 0.767174, 0.658123, -1.02953, 0.703297, -0.186735 };
 
@@ -33766,3 +33766,4 @@ double* limbDarkeningDatasets[] =
     limbDarkeningDataset680,
     limbDarkeningDataset720
 };
+*/

src/appleseed/renderer/modeling/light/HosekSun.cpp

@@ -57,9 +57,9 @@
 #include <cstddef>
 
 // Forward declarations.
-namespace foundation { class IAbortSwitch; }
-namespace renderer { class Assembly; }
-namespace renderer { class ShadingContext; }
+namespace foundation    { class IAbortSwitch; }
+namespace renderer      { class Assembly; }
+namespace renderer      { class ShadingContext; }
 
 using namespace foundation;
 
@@ -72,9 +72,8 @@ namespace
     // Hosek & Wilkie model data.
     //
 
-    #include "renderer\modeling\light\ArHosekSkyModelData_Spectral.h"
-    
-    
+    #include "renderer/modeling/light/ArHosekSkyModelData_Spectral.h"
+
     //
     // Hosek Sun light.
     //
@@ -228,10 +227,12 @@ namespace
 void HosekSunLightFactory::release()
 {
     delete this;
+}
 
 const char* HosekSunLightFactory::get_model() const
 {
     return Model;
+}
 
 Dictionary HosekSunLightFactory::get_model_metadata() const
 {
@@ -240,13 +241,17 @@ Dictionary HosekSunLightFactory::get_model_metadata() const
         .insert("name", Model)
         .insert("label", "Hosek Sun Light")
         .insert("help", "Hosek's Physically-based sun light");
+}
 
 DictionaryArray HosekSunLightFactory::get_input_metadata() const
 {
-    DictionaryArray metada
+    DictionaryArray metadata;
+
     add_common_sun_input_metadata(metadata);
-    add_common_input_metadata(metadat
+    add_common_input_metadata(metadata);
+
     return metadata;
+}
 
 auto_release_ptr<Light> HosekSunLightFactory::create(
     const char* name,

src/appleseed/renderer/modeling/light/PreethamSun.cpp

@@ -37,7 +37,7 @@
 #include "renderer/modeling/input/inputarray.h"
 #include "renderer/modeling/input/source.h"
 #include "renderer/modeling/light/lighttarget.h"
-#include "renderer/modeling/light/sunLight.h"
+#include "renderer/modeling/light/sunlight.h"
 #include "renderer/modeling/project/project.h"
 #include "renderer/modeling/scene/scene.h"
 
@@ -64,29 +64,29 @@ using namespace foundation;
 namespace renderer
 {
 
-    namespace
-    {
-        //
-        // Physically-based Sun light.
-        //
-        // References:
-        //
-        //   http://www.cs.utah.edu/~shirley/papers/sunsky/sunsky.pdf
-        //   http://ompf2.com/viewtopic.php?f=3&t=33
-        //
+namespace
+{
+    //
+    // Physically-based Sun light.
+    //
+    // References:
+    //
+    //   http://www.cs.utah.edu/~shirley/papers/sunsky/sunsky.pdf
+    //   http://ompf2.com/viewtopic.php?f=3&t=33
+    //
 
-        const char* Model = "Preetham_sun_light";
+    const char* Model = "Preetham_sun_light";
+
+    constexpr float SolidAngleSun = 6.807e-5f;
 
-        constexpr float SolidAngleSun = 6.807e-5f;
-    }
 
     class PreethamSunLight
         :public SunLight
     {
       public:
         PreethamSunLight(
-            const char*                 name,
-            const ParamArray&           params)
+            const char* name,
+            const ParamArray& params)
             : SunLight(name, params)
         {
         }
@@ -102,10 +102,10 @@ namespace renderer
         }
 
         bool on_frame_begin(
-            const Project&              project,
-            const BaseGroup*            parent,
-            OnFrameBeginRecorder&       recorder,
-            IAbortSwitch*               abort_switch) override
+            const Project& project,
+            const BaseGroup* parent,
+            OnFrameBeginRecorder& recorder,
+            IAbortSwitch* abort_switch) override
         {
             if (!SunLight::on_frame_begin(project, parent, recorder, abort_switch))
                 return false;
@@ -115,16 +115,16 @@ namespace renderer
             return true;
         }
 
-    private:
+      private:
 
         RegularSpectrum31f  m_k1;
         RegularSpectrum31f  m_k2;
 
         void PreethamSunLight::compute_sun_radiance(
-            const Vector3d&             outgoing,
+            const Vector3d& outgoing,
             const float                 turbidity,
             const float                 radiance_multiplier,
-            RegularSpectrum31f&         radiance,
+            RegularSpectrum31f& radiance,
             const float                 squared_distance_to_center = 0.0f) const override
         {
             // Compute the relative optical mass.
@@ -234,7 +234,7 @@ namespace renderer
                     tau_a[i] *
                     tau_o[i] *
 #ifdef COMPUTE_REDUNDANT
-                    tau_g[i] *      // always 1.0
+                        tau_g[i] *      // always 1.0
 #endif
                     tau_wa[i] *
                     limb_darkening *
@@ -253,45 +253,45 @@ namespace renderer
                 m_k2[i] = std::pow(g_light_wavelengths_um[i], -Alpha);
         }
     };
+}
+//
+// PreethamSunLightFactory class implementation.
+//
 
-    //
-    // PreethamSunLightFactory class implementation.
-    //
-
-    void PreethamSunLightFactory::release()
-    {
-        delete this;
-    }
+void PreethamSunLightFactory::release()
+{
+    delete this;
+}
 
-    const char* PreethamSunLightFactory::get_model() const
-    {
-        return Model;
-    }
+const char* PreethamSunLightFactory::get_model() const
+{
+    return Model;
+}
 
-    Dictionary PreethamSunLightFactory::get_model_metadata() const
-    {
-        return
-            Dictionary()
-            .insert("name", Model)
-            .insert("label", "Preetham sun Light")
-            .insert("help", "Preetham's Physically-based sun light");
-    }
-
-    DictionaryArray PreethamSunLightFactory::get_input_metadata() const
-    {
-        DictionaryArray metadata;
+Dictionary PreethamSunLightFactory::get_model_metadata() const
+{
+    return
+        Dictionary()
+        .insert("name", Model)
+        .insert("label", "Preetham sun Light")
+        .insert("help", "Preetham's Physically-based sun light");
+}
+
+DictionaryArray PreethamSunLightFactory::get_input_metadata() const
+{
+    DictionaryArray metadata;
 
-        add_common_sun_input_metadata(metadata);
-        add_common_input_metadata(metadata);
+    add_common_sun_input_metadata(metadata);
+    add_common_input_metadata(metadata);
 
-        return metadata;
-    }
+    return metadata;
+}
 
-    auto_release_ptr<Light> PreethamSunLightFactory::create(
-        const char* name,
-        const ParamArray& params) const
-    {
-        return auto_release_ptr<Light>(new PreethamSunLight(name, params));
-    }
+auto_release_ptr<Light> PreethamSunLightFactory::create(
+    const char* name,
+    const ParamArray& params) const
+{
+    return auto_release_ptr<Light>(new PreethamSunLight(name, params));
+}
 
 }   // namespace renderer