diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-29 05:09:24 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-29 07:01:07 +0400 |
| commit | 746628e0d021fa616c69e9ff0ef9ad71cba23694 (patch) | |
| tree | 4ca4b0e2d1aae189bc06df1a0b652ec5280a37aa /intern/cycles/kernel/osl/emissive.cpp | |
| parent | aa3933b411fc61d673facc6ea6f8cce6d86a3c6c (diff) | |
Cycles OSL: refactoring to remove all dependencies on builtin OSL closures.
These were removed in new OSL versions. We only used these as base classes,
not using them at all simplifies the code a bit.
Diffstat (limited to 'intern/cycles/kernel/osl/emissive.cpp')
| -rw-r--r-- | intern/cycles/kernel/osl/emissive.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/intern/cycles/kernel/osl/emissive.cpp b/intern/cycles/kernel/osl/emissive.cpp index 7d9fa81dbdd..02935542c56 100644 --- a/intern/cycles/kernel/osl/emissive.cpp +++ b/intern/cycles/kernel/osl/emissive.cpp @@ -50,18 +50,9 @@ using namespace OSL; /// outer_angle limit. It can also behave as a lambertian emitter /// if the provided angles are PI/2, which is the default /// -class GenericEmissiveClosure : public EmissiveClosure { +class GenericEmissiveClosure : public CClosurePrimitive { public: - GenericEmissiveClosure() { } - - void setup() {} - size_t memsize() const { return sizeof(*this); } - const char *name() const { return "emission"; } - - void print_on(std::ostream &out) const - { - out << name() << "()"; - } + GenericEmissiveClosure() : CClosurePrimitive(Emissive) { } Color3 eval(const Vec3 &Ng, const Vec3 &omega_out) const { @@ -92,7 +83,7 @@ ClosureParam *closure_emission_params() return params; } -CLOSURE_PREPARE(closure_emission_prepare, GenericEmissiveClosure) +CCLOSURE_PREPARE(closure_emission_prepare, GenericEmissiveClosure) CCL_NAMESPACE_END |