Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code cleanup / Cycles: Remove encasing_ratio variable, it was already hard coded, so define it in the kernel only.

Browse Source
This commit is contained in:
Thomas Dinges
2014-02-02 19:52:46 +01:00
parent 44b71c8c6c
commit 5c06b2d33e
5 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/blender_curves.cpp
View File

@@ -743,8 +743,6 @@ void BlenderSync::sync_curve_settings()
curve_system_manager->subdivisions = get_int(csscene, "subdivisions"); curve_system_manager->subdivisions = get_int(csscene, "subdivisions");
curve_system_manager->use_backfacing = !get_boolean(csscene, "cull_backfacing"); curve_system_manager->use_backfacing = !get_boolean(csscene, "cull_backfacing");
curve_system_manager->encasing_ratio = 1.01f;
if(curve_system_manager->primitive == CURVE_TRIANGLES && curve_system_manager->curve_shape == CURVE_RIBBON) { if(curve_system_manager->primitive == CURVE_TRIANGLES && curve_system_manager->curve_shape == CURVE_RIBBON) {
/* camera facing planes */ /* camera facing planes */
curve_system_manager->triangle_method = CURVE_CAMERA_TRIANGLES; curve_system_manager->triangle_method = CURVE_CAMERA_TRIANGLES;

3
intern/cycles/kernel/kernel_bvh.h
View File

@@ -640,8 +640,7 @@ ccl_device_inline bool bvh_curve_intersect(KernelGlobals *kg, Intersection *isec
if(t > 0.0f && t < isect->t && z >= 0 && z <= l) { if(t > 0.0f && t < isect->t && z >= 0 && z <= l) {
if (flags & CURVE_KN_ENCLOSEFILTER) { if (flags & CURVE_KN_ENCLOSEFILTER) {
float enc_ratio = 1.01f;
float enc_ratio = kernel_data.curve.encasing_ratio;
if((dot(P - p1, tg) > -r1 * enc_ratio) && (dot(P - p2, tg) < r2 * enc_ratio)) { if((dot(P - p1, tg) > -r1 * enc_ratio) && (dot(P - p2, tg) < r2 * enc_ratio)) {
float a2 = 1.0f - (dirz*dirz*(1 + gd*gd*enc_ratio*enc_ratio)); float a2 = 1.0f - (dirz*dirz*(1 + gd*gd*enc_ratio*enc_ratio));
float c2 = dot(dif,dif) - difz * difz * (1 + gd*gd*enc_ratio*enc_ratio) - r1*r1*enc_ratio*enc_ratio - 2*r1*difz*gd*enc_ratio; float c2 = dot(dif,dif) - difz * difz * (1 + gd*gd*enc_ratio*enc_ratio) - r1*r1*enc_ratio*enc_ratio - 2*r1*difz*gd*enc_ratio;

3
intern/cycles/kernel/kernel_types.h
View File

@@ -869,14 +869,11 @@ typedef enum CurveFlag {
typedef struct KernelCurves { typedef struct KernelCurves {
/* strand intersect and normal parameters - many can be changed to flags */ /* strand intersect and normal parameters - many can be changed to flags */
float encasing_ratio;
int curveflags; int curveflags;
int subdivisions; int subdivisions;
int pad1;
float minimum_width; float minimum_width;
float maximum_width; float maximum_width;
int pad2, pad3;
} KernelCurves; } KernelCurves;
typedef struct KernelBlackbody { typedef struct KernelBlackbody {

3
intern/cycles/render/curves.cpp
View File

@@ -85,7 +85,6 @@ CurveSystemManager::CurveSystemManager()
resolution = 3; resolution = 3;
subdivisions = 3; subdivisions = 3;
encasing_ratio = 1.01f;
minimum_width = 0.0f; minimum_width = 0.0f;
maximum_width = 0.0f; maximum_width = 0.0f;
@@ -133,7 +132,6 @@ void CurveSystemManager::device_update(Device *device, DeviceScene *dscene, Scen
if(use_encasing) if(use_encasing)
kcurve->curveflags |= CURVE_KN_ENCLOSEFILTER; kcurve->curveflags |= CURVE_KN_ENCLOSEFILTER;
kcurve->encasing_ratio = encasing_ratio;
kcurve->minimum_width = minimum_width; kcurve->minimum_width = minimum_width;
kcurve->maximum_width = maximum_width; kcurve->maximum_width = maximum_width;
kcurve->subdivisions = subdivisions; kcurve->subdivisions = subdivisions;
@@ -156,7 +154,6 @@ bool CurveSystemManager::modified(const CurveSystemManager& CurveSystemManager)
primitive == CurveSystemManager.primitive && primitive == CurveSystemManager.primitive &&
use_encasing == CurveSystemManager.use_encasing && use_encasing == CurveSystemManager.use_encasing &&
use_tangent_normal_geometry == CurveSystemManager.use_tangent_normal_geometry && use_tangent_normal_geometry == CurveSystemManager.use_tangent_normal_geometry &&
encasing_ratio == CurveSystemManager.encasing_ratio &&
minimum_width == CurveSystemManager.minimum_width && minimum_width == CurveSystemManager.minimum_width &&
maximum_width == CurveSystemManager.maximum_width && maximum_width == CurveSystemManager.maximum_width &&
use_backfacing == CurveSystemManager.use_backfacing && use_backfacing == CurveSystemManager.use_backfacing &&

1
intern/cycles/render/curves.h
View File

@@ -90,7 +90,6 @@ public:
int resolution; int resolution;
int subdivisions; int subdivisions;
float encasing_ratio;
float minimum_width; float minimum_width;
float maximum_width; float maximum_width;