Blender Git Loki
Git Commits -> Revision 9a1c1f1
Revision 9a1c1f1 by Brecht Van Lommel (master) October 20, 2012, 12:18 (GMT) |
Cycles OSL: most closure code is now shared between OSL and SVM. Also fix transmission pass and filter glossy option. The BSDF closure class is now more similar to the SVM closures, and includes some flags and labels that are needed to properly categorize the BSDF's for render passes. Phong closure is gone for the moment, needs to be adapated to the new structure still. |
Commit Details:
Full Hash: 9a1c1f132de971a840816614a0f4657ef1c12c89
SVN Revision: 51444
Parent Commit: 3abef3a
Lines Changed: +2179, -4635
12 Added Paths:
/intern/cycles/kernel/closure/bsdf.h (+137, -0) (View)
/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h (+153, -0) (View)
/intern/cycles/kernel/closure/bsdf_diffuse.h (+144, -0) (View)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+514, -0) (View)
/intern/cycles/kernel/closure/bsdf_oren_nayar.h (+99, -0) (View)
/intern/cycles/kernel/closure/bsdf_reflection.h (+84, -0) (View)
/intern/cycles/kernel/closure/bsdf_refraction.h (+91, -0) (View)
/intern/cycles/kernel/closure/bsdf_transparent.h (+74, -0) (View)
/intern/cycles/kernel/closure/bsdf_ward.h (+195, -0) (View)
/intern/cycles/kernel/closure/bsdf_westin.h (+192, -0) (View)
/intern/cycles/kernel/closure/emissive.h (+65, -0) (View)
/intern/cycles/kernel/closure/volume.h (+76, -0) (View)
/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h (+153, -0) (View)
/intern/cycles/kernel/closure/bsdf_diffuse.h (+144, -0) (View)
/intern/cycles/kernel/closure/bsdf_microfacet.h (+514, -0) (View)
/intern/cycles/kernel/closure/bsdf_oren_nayar.h (+99, -0) (View)
/intern/cycles/kernel/closure/bsdf_reflection.h (+84, -0) (View)
/intern/cycles/kernel/closure/bsdf_refraction.h (+91, -0) (View)
/intern/cycles/kernel/closure/bsdf_transparent.h (+74, -0) (View)
/intern/cycles/kernel/closure/bsdf_ward.h (+195, -0) (View)
/intern/cycles/kernel/closure/bsdf_westin.h (+192, -0) (View)
/intern/cycles/kernel/closure/emissive.h (+65, -0) (View)
/intern/cycles/kernel/closure/volume.h (+76, -0) (View)
25 Deleted Paths:
/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp (+0, -190)
/intern/cycles/kernel/osl/bsdf_diffuse.cpp (+0, -195)
/intern/cycles/kernel/osl/bsdf_microfacet.cpp (+0, -558)
/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp (+0, -142)
/intern/cycles/kernel/osl/bsdf_phong.cpp (+0, -287)
/intern/cycles/kernel/osl/bsdf_reflection.cpp (+0, -113)
/intern/cycles/kernel/osl/bsdf_refraction.cpp (+0, -125)
/intern/cycles/kernel/osl/bsdf_transparent.cpp (+0, -102)
/intern/cycles/kernel/osl/bsdf_ward.cpp (+0, -230)
/intern/cycles/kernel/osl/bsdf_westin.cpp (+0, -251)
/intern/cycles/kernel/osl/bssrdf.cpp (+0, -110)
/intern/cycles/kernel/osl/debug.cpp (+0, -85)
/intern/cycles/kernel/osl/vol_subsurface.cpp (+0, -141)
/intern/cycles/kernel/svm/bsdf.h (+0, -137)
/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h (+0, -156)
/intern/cycles/kernel/svm/bsdf_diffuse.h (+0, -149)
/intern/cycles/kernel/svm/bsdf_microfacet.h (+0, -498)
/intern/cycles/kernel/svm/bsdf_oren_nayar.h (+0, -101)
/intern/cycles/kernel/svm/bsdf_reflection.h (+0, -89)
/intern/cycles/kernel/svm/bsdf_refraction.h (+0, -98)
/intern/cycles/kernel/svm/bsdf_transparent.h (+0, -79)
/intern/cycles/kernel/svm/bsdf_ward.h (+0, -197)
/intern/cycles/kernel/svm/bsdf_westin.h (+0, -199)
/intern/cycles/kernel/svm/emissive.h (+0, -59)
/intern/cycles/kernel/svm/volume.h (+0, -74)
/intern/cycles/kernel/osl/bsdf_diffuse.cpp (+0, -195)
/intern/cycles/kernel/osl/bsdf_microfacet.cpp (+0, -558)
/intern/cycles/kernel/osl/bsdf_oren_nayar.cpp (+0, -142)
/intern/cycles/kernel/osl/bsdf_phong.cpp (+0, -287)
/intern/cycles/kernel/osl/bsdf_reflection.cpp (+0, -113)
/intern/cycles/kernel/osl/bsdf_refraction.cpp (+0, -125)
/intern/cycles/kernel/osl/bsdf_transparent.cpp (+0, -102)
/intern/cycles/kernel/osl/bsdf_ward.cpp (+0, -230)
/intern/cycles/kernel/osl/bsdf_westin.cpp (+0, -251)
/intern/cycles/kernel/osl/bssrdf.cpp (+0, -110)
/intern/cycles/kernel/osl/debug.cpp (+0, -85)
/intern/cycles/kernel/osl/vol_subsurface.cpp (+0, -141)
/intern/cycles/kernel/svm/bsdf.h (+0, -137)
/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h (+0, -156)
/intern/cycles/kernel/svm/bsdf_diffuse.h (+0, -149)
/intern/cycles/kernel/svm/bsdf_microfacet.h (+0, -498)
/intern/cycles/kernel/svm/bsdf_oren_nayar.h (+0, -101)
/intern/cycles/kernel/svm/bsdf_reflection.h (+0, -89)
/intern/cycles/kernel/svm/bsdf_refraction.h (+0, -98)
/intern/cycles/kernel/svm/bsdf_transparent.h (+0, -79)
/intern/cycles/kernel/svm/bsdf_ward.h (+0, -197)
/intern/cycles/kernel/svm/bsdf_westin.h (+0, -199)
/intern/cycles/kernel/svm/emissive.h (+0, -59)
/intern/cycles/kernel/svm/volume.h (+0, -74)
13 Modified Paths:
/intern/cycles/kernel/CMakeLists.txt (+11, -12) (Diff)
/intern/cycles/kernel/kernel_shader.h (+15, -13) (Diff)
/intern/cycles/kernel/osl/background.cpp (+3, -16) (Diff)
/intern/cycles/kernel/osl/CMakeLists.txt (+0, -13) (Diff)
/intern/cycles/kernel/osl/emissive.cpp (+12, -26) (Diff)
/intern/cycles/kernel/osl/osl_closures.cpp (+126, -22) (Diff)
/intern/cycles/kernel/osl/osl_closures.h (+105, -64) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+2, -2) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+26, -68) (Diff)
/intern/cycles/kernel/osl/osl_shader.h (+2, -1) (Diff)
/intern/cycles/kernel/svm/svm_bsdf.h (+9, -9) (Diff)
/intern/cycles/kernel/svm/svm_closure.h (+42, -24) (Diff)
/intern/cycles/render/osl.cpp (+2, -0) (Diff)
/intern/cycles/kernel/kernel_shader.h (+15, -13) (Diff)
/intern/cycles/kernel/osl/background.cpp (+3, -16) (Diff)
/intern/cycles/kernel/osl/CMakeLists.txt (+0, -13) (Diff)
/intern/cycles/kernel/osl/emissive.cpp (+12, -26) (Diff)
/intern/cycles/kernel/osl/osl_closures.cpp (+126, -22) (Diff)
/intern/cycles/kernel/osl/osl_closures.h (+105, -64) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+2, -2) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+26, -68) (Diff)
/intern/cycles/kernel/osl/osl_shader.h (+2, -1) (Diff)
/intern/cycles/kernel/svm/svm_bsdf.h (+9, -9) (Diff)
/intern/cycles/kernel/svm/svm_closure.h (+42, -24) (Diff)
/intern/cycles/render/osl.cpp (+2, -0) (Diff)