Skip to content

Commit e77aa69

Browse files
committed
Fix Travis
1 parent 4add979 commit e77aa69

File tree

2 files changed

+65
-59
lines changed

2 files changed

+65
-59
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,12 @@ namespace
228228
void HosekSunLightFactory::release()
229229
{
230230
delete this;
231+
}
231232

232233
const char* HosekSunLightFactory::get_model() const
233234
{
234235
return Model;
236+
}
235237

236238
Dictionary HosekSunLightFactory::get_model_metadata() const
237239
{
@@ -240,13 +242,17 @@ Dictionary HosekSunLightFactory::get_model_metadata() const
240242
.insert("name", Model)
241243
.insert("label", "Hosek Sun Light")
242244
.insert("help", "Hosek's Physically-based sun light");
245+
}
243246

244247
DictionaryArray HosekSunLightFactory::get_input_metadata() const
245248
{
246-
DictionaryArray metada
249+
DictionaryArray metadata;
250+
247251
add_common_sun_input_metadata(metadata);
248-
add_common_input_metadata(metadat
252+
add_common_input_metadata(metadata);
253+
249254
return metadata;
255+
}
250256

251257
auto_release_ptr<Light> HosekSunLightFactory::create(
252258
const char* name,

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

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -64,29 +64,29 @@ using namespace foundation;
6464
namespace renderer
6565
{
6666

67-
namespace
68-
{
69-
//
70-
// Physically-based Sun light.
71-
//
72-
// References:
73-
//
74-
// http://www.cs.utah.edu/~shirley/papers/sunsky/sunsky.pdf
75-
// http://ompf2.com/viewtopic.php?f=3&t=33
76-
//
67+
namespace
68+
{
69+
//
70+
// Physically-based Sun light.
71+
//
72+
// References:
73+
//
74+
// http://www.cs.utah.edu/~shirley/papers/sunsky/sunsky.pdf
75+
// http://ompf2.com/viewtopic.php?f=3&t=33
76+
//
7777

78-
const char* Model = "Preetham_sun_light";
78+
const char* Model = "Preetham_sun_light";
79+
80+
constexpr float SolidAngleSun = 6.807e-5f;
7981

80-
constexpr float SolidAngleSun = 6.807e-5f;
81-
}
8282

8383
class PreethamSunLight
8484
:public SunLight
8585
{
8686
public:
8787
PreethamSunLight(
88-
const char* name,
89-
const ParamArray& params)
88+
const char* name,
89+
const ParamArray& params)
9090
: SunLight(name, params)
9191
{
9292
}
@@ -102,10 +102,10 @@ namespace renderer
102102
}
103103

104104
bool on_frame_begin(
105-
const Project& project,
106-
const BaseGroup* parent,
107-
OnFrameBeginRecorder& recorder,
108-
IAbortSwitch* abort_switch) override
105+
const Project& project,
106+
const BaseGroup* parent,
107+
OnFrameBeginRecorder& recorder,
108+
IAbortSwitch* abort_switch) override
109109
{
110110
if (!SunLight::on_frame_begin(project, parent, recorder, abort_switch))
111111
return false;
@@ -115,16 +115,16 @@ namespace renderer
115115
return true;
116116
}
117117

118-
private:
118+
private:
119119

120120
RegularSpectrum31f m_k1;
121121
RegularSpectrum31f m_k2;
122122

123123
void PreethamSunLight::compute_sun_radiance(
124-
const Vector3d& outgoing,
124+
const Vector3d& outgoing,
125125
const float turbidity,
126126
const float radiance_multiplier,
127-
RegularSpectrum31f& radiance,
127+
RegularSpectrum31f& radiance,
128128
const float squared_distance_to_center = 0.0f) const override
129129
{
130130
// Compute the relative optical mass.
@@ -234,7 +234,7 @@ namespace renderer
234234
tau_a[i] *
235235
tau_o[i] *
236236
#ifdef COMPUTE_REDUNDANT
237-
tau_g[i] * // always 1.0
237+
tau_g[i] * // always 1.0
238238
#endif
239239
tau_wa[i] *
240240
limb_darkening *
@@ -253,45 +253,45 @@ namespace renderer
253253
m_k2[i] = std::pow(g_light_wavelengths_um[i], -Alpha);
254254
}
255255
};
256+
}
257+
//
258+
// PreethamSunLightFactory class implementation.
259+
//
256260

257-
//
258-
// PreethamSunLightFactory class implementation.
259-
//
260-
261-
void PreethamSunLightFactory::release()
262-
{
263-
delete this;
264-
}
261+
void PreethamSunLightFactory::release()
262+
{
263+
delete this;
264+
}
265265

266-
const char* PreethamSunLightFactory::get_model() const
267-
{
268-
return Model;
269-
}
266+
const char* PreethamSunLightFactory::get_model() const
267+
{
268+
return Model;
269+
}
270270

271-
Dictionary PreethamSunLightFactory::get_model_metadata() const
272-
{
273-
return
274-
Dictionary()
275-
.insert("name", Model)
276-
.insert("label", "Preetham sun Light")
277-
.insert("help", "Preetham's Physically-based sun light");
278-
}
279-
280-
DictionaryArray PreethamSunLightFactory::get_input_metadata() const
281-
{
282-
DictionaryArray metadata;
271+
Dictionary PreethamSunLightFactory::get_model_metadata() const
272+
{
273+
return
274+
Dictionary()
275+
.insert("name", Model)
276+
.insert("label", "Preetham sun Light")
277+
.insert("help", "Preetham's Physically-based sun light");
278+
}
279+
280+
DictionaryArray PreethamSunLightFactory::get_input_metadata() const
281+
{
282+
DictionaryArray metadata;
283283

284-
add_common_sun_input_metadata(metadata);
285-
add_common_input_metadata(metadata);
284+
add_common_sun_input_metadata(metadata);
285+
add_common_input_metadata(metadata);
286286

287-
return metadata;
288-
}
287+
return metadata;
288+
}
289289

290-
auto_release_ptr<Light> PreethamSunLightFactory::create(
291-
const char* name,
292-
const ParamArray& params) const
293-
{
294-
return auto_release_ptr<Light>(new PreethamSunLight(name, params));
295-
}
290+
auto_release_ptr<Light> PreethamSunLightFactory::create(
291+
const char* name,
292+
const ParamArray& params) const
293+
{
294+
return auto_release_ptr<Light>(new PreethamSunLight(name, params));
295+
}
296296

297297
} // namespace renderer

0 commit comments

Comments
 (0)