From 5c06b2d33eb72a107236cf43bf2e0db3291fc646 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Sun, 2 Feb 2014 19:52:46 +0100 Subject: Code cleanup / Cycles: Remove encasing_ratio variable, it was already hard coded, so define it in the kernel only. --- intern/cycles/blender/blender_curves.cpp | 2 -- intern/cycles/kernel/kernel_bvh.h | 3 +-- intern/cycles/kernel/kernel_types.h | 3 --- intern/cycles/render/curves.cpp | 3 --- intern/cycles/render/curves.h | 1 - 5 files changed, 1 insertion(+), 11 deletions(-) (limited to 'intern') diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 5cde9d52d0d..b0e89ca1827 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -743,8 +743,6 @@ void BlenderSync::sync_curve_settings() curve_system_manager->subdivisions = get_int(csscene, "subdivisions"); 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) { /* camera facing planes */ curve_system_manager->triangle_method = CURVE_CAMERA_TRIANGLES; diff --git a/intern/cycles/kernel/kernel_bvh.h b/intern/cycles/kernel/kernel_bvh.h index c1595f64e0d..9d3d9c08a3b 100644 --- a/intern/cycles/kernel/kernel_bvh.h +++ b/intern/cycles/kernel/kernel_bvh.h @@ -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 (flags & CURVE_KN_ENCLOSEFILTER) { - - float enc_ratio = kernel_data.curve.encasing_ratio; + float enc_ratio = 1.01f; 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 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; diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 77ecc2b8dd8..cdde0fe0291 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -869,14 +869,11 @@ typedef enum CurveFlag { typedef struct KernelCurves { /* strand intersect and normal parameters - many can be changed to flags */ - float encasing_ratio; int curveflags; int subdivisions; - int pad1; float minimum_width; float maximum_width; - int pad2, pad3; } KernelCurves; typedef struct KernelBlackbody { diff --git a/intern/cycles/render/curves.cpp b/intern/cycles/render/curves.cpp index 574ad4f6ca0..6e6b11ca92f 100644 --- a/intern/cycles/render/curves.cpp +++ b/intern/cycles/render/curves.cpp @@ -85,7 +85,6 @@ CurveSystemManager::CurveSystemManager() resolution = 3; subdivisions = 3; - encasing_ratio = 1.01f; minimum_width = 0.0f; maximum_width = 0.0f; @@ -133,7 +132,6 @@ void CurveSystemManager::device_update(Device *device, DeviceScene *dscene, Scen if(use_encasing) kcurve->curveflags |= CURVE_KN_ENCLOSEFILTER; - kcurve->encasing_ratio = encasing_ratio; kcurve->minimum_width = minimum_width; kcurve->maximum_width = maximum_width; kcurve->subdivisions = subdivisions; @@ -156,7 +154,6 @@ bool CurveSystemManager::modified(const CurveSystemManager& CurveSystemManager) primitive == CurveSystemManager.primitive && use_encasing == CurveSystemManager.use_encasing && use_tangent_normal_geometry == CurveSystemManager.use_tangent_normal_geometry && - encasing_ratio == CurveSystemManager.encasing_ratio && minimum_width == CurveSystemManager.minimum_width && maximum_width == CurveSystemManager.maximum_width && use_backfacing == CurveSystemManager.use_backfacing && diff --git a/intern/cycles/render/curves.h b/intern/cycles/render/curves.h index 8020a93e77e..6fd0fff57fb 100644 --- a/intern/cycles/render/curves.h +++ b/intern/cycles/render/curves.h @@ -90,7 +90,6 @@ public: int resolution; int subdivisions; - float encasing_ratio; float minimum_width; float maximum_width; -- cgit v1.2.3