[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47440] trunk/blender/intern/cycles/kernel /osl: style cleanup
Campbell Barton
ideasman42 at gmail.com
Tue Jun 5 00:45:10 CEST 2012
Revision: 47440
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47440
Author: campbellbarton
Date: 2012-06-04 22:44:58 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/osl/background.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_diffuse.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_microfacet.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_reflection.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_refraction.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_transparent.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_ward.cpp
trunk/blender/intern/cycles/kernel/osl/bsdf_westin.cpp
trunk/blender/intern/cycles/kernel/osl/bssrdf.cpp
trunk/blender/intern/cycles/kernel/osl/debug.cpp
trunk/blender/intern/cycles/kernel/osl/emissive.cpp
trunk/blender/intern/cycles/kernel/osl/nodes/node_color.h
trunk/blender/intern/cycles/kernel/osl/nodes/node_fresnel.h
trunk/blender/intern/cycles/kernel/osl/nodes/node_texture.h
trunk/blender/intern/cycles/kernel/osl/nodes/stdosl.h
trunk/blender/intern/cycles/kernel/osl/osl_services.cpp
trunk/blender/intern/cycles/kernel/osl/osl_services.h
trunk/blender/intern/cycles/kernel/osl/osl_shader.cpp
trunk/blender/intern/cycles/kernel/osl/osl_shader.h
trunk/blender/intern/cycles/kernel/osl/vol_subsurface.cpp
Modified: trunk/blender/intern/cycles/kernel/osl/background.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/background.cpp 2012-06-04 22:34:28 UTC (rev 47439)
+++ trunk/blender/intern/cycles/kernel/osl/background.cpp 2012-06-04 22:44:58 UTC (rev 47440)
@@ -48,17 +48,17 @@
///
class GenericBackgroundClosure : public BackgroundClosure {
public:
- GenericBackgroundClosure() { }
+ GenericBackgroundClosure() {}
- void setup() {};
+ void setup() {};
- size_t memsize () const { return sizeof(*this); }
+ size_t memsize() const { return sizeof(*this); }
- const char *name () const { return "background"; }
+ const char *name() const { return "background"; }
- void print_on (std::ostream &out) const {
- out << name() << " ()";
- }
+ void print_on(std::ostream &out) const {
+ out << name() << " ()";
+ }
};
@@ -72,27 +72,29 @@
///
class HoldoutClosure : ClosurePrimitive {
public:
- HoldoutClosure () : ClosurePrimitive (Holdout) { }
+ HoldoutClosure () : ClosurePrimitive(Holdout) {}
- void setup() {};
+ void setup() {};
- size_t memsize () const { return sizeof(*this); }
+ size_t memsize() const { return sizeof(*this); }
- const char *name () const { return "holdout"; }
+ const char *name() const { return "holdout"; }
- void print_on (std::ostream &out) const {
- out << name() << " ()";
- }
+ void print_on(std::ostream &out) const {
+ out << name() << " ()";
+ }
};
ClosureParam closure_background_params[] = {
- CLOSURE_STRING_KEYPARAM("label"),
- CLOSURE_FINISH_PARAM(GenericBackgroundClosure) };
+ CLOSURE_STRING_KEYPARAM("label"),
+ CLOSURE_FINISH_PARAM(GenericBackgroundClosure)
+};
CLOSURE_PREPARE(closure_background_prepare, GenericBackgroundClosure)
ClosureParam closure_holdout_params[] = {
- CLOSURE_FINISH_PARAM(HoldoutClosure) };
+ CLOSURE_FINISH_PARAM(HoldoutClosure)
+};
CLOSURE_PREPARE(closure_holdout_prepare, HoldoutClosure)
Modified: trunk/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp 2012-06-04 22:34:28 UTC (rev 47439)
+++ trunk/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp 2012-06-04 22:44:58 UTC (rev 47440)
@@ -44,132 +44,134 @@
class AshikhminVelvetClosure : public BSDFClosure {
public:
- Vec3 m_N;
- float m_sigma;
- float m_invsigma2;
+ Vec3 m_N;
+ float m_sigma;
+ float m_invsigma2;
- AshikhminVelvetClosure() : BSDFClosure(Labels::DIFFUSE) { }
+ AshikhminVelvetClosure() : BSDFClosure(Labels::DIFFUSE) {}
- void setup()
- {
- m_sigma = max(m_sigma, 0.01f);
- m_invsigma2 = 1.0f/(m_sigma * m_sigma);
- }
+ void setup()
+ {
+ m_sigma = max(m_sigma, 0.01f);
+ m_invsigma2 = 1.0f / (m_sigma * m_sigma);
+ }
- bool mergeable (const ClosurePrimitive *other) const {
- const AshikhminVelvetClosure *comp = (const AshikhminVelvetClosure *)other;
- return m_N == comp->m_N && m_sigma == comp->m_sigma &&
- BSDFClosure::mergeable(other);
- }
+ bool mergeable(const ClosurePrimitive *other) const {
+ const AshikhminVelvetClosure *comp = (const AshikhminVelvetClosure *)other;
+ return m_N == comp->m_N && m_sigma == comp->m_sigma &&
+ BSDFClosure::mergeable(other);
+ }
- size_t memsize () const { return sizeof(*this); }
+ size_t memsize() const { return sizeof(*this); }
- const char *name () const { return "ashikhmin_velvet"; }
+ const char *name() const { return "ashikhmin_velvet"; }
- void print_on (std::ostream &out) const
- {
- out << name() << " (";
- out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
- out << m_sigma;
- out << ")";
- }
+ void print_on(std::ostream &out) const
+ {
+ out << name() << " (";
+ out << "(" << m_N[0] << ", " << m_N[1] << ", " << m_N[2] << "), ";
+ out << m_sigma;
+ out << ")";
+ }
- float albedo (const Vec3 &omega_out) const
- {
+ float albedo(const Vec3 &omega_out) const
+ {
return 1.0f;
- }
+ }
- Color3 eval_reflect (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
- {
- float cosNO = m_N.dot(omega_out);
- float cosNI = m_N.dot(omega_in);
- if (cosNO > 0 && cosNI > 0) {
- Vec3 H = omega_in + omega_out;
- H.normalize();
+ Color3 eval_reflect(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+ {
+ float cosNO = m_N.dot(omega_out);
+ float cosNI = m_N.dot(omega_in);
+ if (cosNO > 0 && cosNI > 0) {
+ Vec3 H = omega_in + omega_out;
+ H.normalize();
- float cosNH = m_N.dot(H);
- float cosHO = fabsf(omega_out.dot(H));
+ float cosNH = m_N.dot(H);
+ float cosHO = fabsf(omega_out.dot(H));
- float cosNHdivHO = cosNH / cosHO;
- cosNHdivHO = max(cosNHdivHO, 0.00001f);
+ float cosNHdivHO = cosNH / cosHO;
+ cosNHdivHO = max(cosNHdivHO, 0.00001f);
- float fac1 = 2 * fabsf(cosNHdivHO * cosNO);
- float fac2 = 2 * fabsf(cosNHdivHO * cosNI);
+ float fac1 = 2 * fabsf(cosNHdivHO * cosNO);
+ float fac2 = 2 * fabsf(cosNHdivHO * cosNI);
- float sinNH2 = 1 - cosNH * cosNH;
- float sinNH4 = sinNH2 * sinNH2;
- float cotangent2 = (cosNH * cosNH) / sinNH2;
+ float sinNH2 = 1 - cosNH * cosNH;
+ float sinNH4 = sinNH2 * sinNH2;
+ float cotangent2 = (cosNH * cosNH) / sinNH2;
- float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2 * float(M_1_PI) / sinNH4;
- float G = min(1.0f, min(fac1, fac2)); // TODO: derive G from D analytically
+ float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2 * float(M_1_PI) / sinNH4;
+ float G = min(1.0f, min(fac1, fac2)); // TODO: derive G from D analytically
- float out = 0.25f * (D * G) / cosNO;
+ float out = 0.25f * (D * G) / cosNO;
- pdf = 0.5f * (float) M_1_PI;
- return Color3 (out, out, out);
- }
- return Color3 (0, 0, 0);
- }
+ pdf = 0.5f * (float) M_1_PI;
+ return Color3(out, out, out);
+ }
+ return Color3(0, 0, 0);
+ }
- Color3 eval_transmit (const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
- {
- return Color3 (0, 0, 0);
- }
+ Color3 eval_transmit(const Vec3 &omega_out, const Vec3 &omega_in, float& pdf) const
+ {
+ return Color3(0, 0, 0);
+ }
- ustring sample (const Vec3 &Ng,
- const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
- float randu, float randv,
- Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
- float &pdf, Color3 &eval) const
- {
- // we are viewing the surface from above - send a ray out with uniform
- // distribution over the hemisphere
- sample_uniform_hemisphere (m_N, omega_out, randu, randv, omega_in, pdf);
- if (Ng.dot(omega_in) > 0) {
- Vec3 H = omega_in + omega_out;
- H.normalize();
+ ustring sample(const Vec3 &Ng,
+ const Vec3 &omega_out, const Vec3 &domega_out_dx, const Vec3 &domega_out_dy,
+ float randu, float randv,
+ Vec3 &omega_in, Vec3 &domega_in_dx, Vec3 &domega_in_dy,
+ float &pdf, Color3 &eval) const
+ {
+ // we are viewing the surface from above - send a ray out with uniform
+ // distribution over the hemisphere
+ sample_uniform_hemisphere(m_N, omega_out, randu, randv, omega_in, pdf);
+ if (Ng.dot(omega_in) > 0) {
+ Vec3 H = omega_in + omega_out;
+ H.normalize();
- float cosNI = m_N.dot(omega_in);
- float cosNO = m_N.dot(omega_out);
- float cosNH = m_N.dot(H);
- float cosHO = fabsf(omega_out.dot(H));
+ float cosNI = m_N.dot(omega_in);
+ float cosNO = m_N.dot(omega_out);
+ float cosNH = m_N.dot(H);
+ float cosHO = fabsf(omega_out.dot(H));
- float cosNHdivHO = cosNH / cosHO;
- cosNHdivHO = max(cosNHdivHO, 0.00001f);
+ float cosNHdivHO = cosNH / cosHO;
+ cosNHdivHO = max(cosNHdivHO, 0.00001f);
- float fac1 = 2 * fabsf(cosNHdivHO * cosNO);
- float fac2 = 2 * fabsf(cosNHdivHO * cosNI);
+ float fac1 = 2 * fabsf(cosNHdivHO * cosNO);
+ float fac2 = 2 * fabsf(cosNHdivHO * cosNI);
- float sinNH2 = 1 - cosNH * cosNH;
- float sinNH4 = sinNH2 * sinNH2;
- float cotangent2 = (cosNH * cosNH) / sinNH2;
+ float sinNH2 = 1 - cosNH * cosNH;
+ float sinNH4 = sinNH2 * sinNH2;
+ float cotangent2 = (cosNH * cosNH) / sinNH2;
- float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2 * float(M_1_PI) / sinNH4;
- float G = min(1.0f, min(fac1, fac2)); // TODO: derive G from D analytically
+ float D = expf(-cotangent2 * m_invsigma2) * m_invsigma2 * float(M_1_PI) / sinNH4;
+ float G = min(1.0f, min(fac1, fac2)); // TODO: derive G from D analytically
- float power = 0.25f * (D * G) / cosNO;
+ float power = 0.25f * (D * G) / cosNO;
- eval.setValue(power, power, power);
+ eval.setValue(power, power, power);
- // TODO: find a better approximation for the retroreflective bounce
- domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
- domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
- domega_in_dx *= 125;
- domega_in_dy *= 125;
- } else
- pdf = 0;
- return Labels::REFLECT;
- }
+ // TODO: find a better approximation for the retroreflective bounce
+ domega_in_dx = (2 * m_N.dot(domega_out_dx)) * m_N - domega_out_dx;
+ domega_in_dy = (2 * m_N.dot(domega_out_dy)) * m_N - domega_out_dy;
+ domega_in_dx *= 125;
+ domega_in_dy *= 125;
+ }
+ else
+ pdf = 0;
+ return Labels::REFLECT;
+ }
};
ClosureParam bsdf_ashikhmin_velvet_params[] = {
- CLOSURE_VECTOR_PARAM(AshikhminVelvetClosure, m_N),
- CLOSURE_FLOAT_PARAM (AshikhminVelvetClosure, m_sigma),
- CLOSURE_STRING_KEYPARAM("label"),
- CLOSURE_FINISH_PARAM(AshikhminVelvetClosure) };
+ CLOSURE_VECTOR_PARAM(AshikhminVelvetClosure, m_N),
+ CLOSURE_FLOAT_PARAM(AshikhminVelvetClosure, m_sigma),
+ CLOSURE_STRING_KEYPARAM("label"),
+ CLOSURE_FINISH_PARAM(AshikhminVelvetClosure)
+};
CLOSURE_PREPARE(bsdf_ashikhmin_velvet_prepare, AshikhminVelvetClosure)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list