From dd2dca2f7e77e7521d13b78e875ffa58a90846f2 Mon Sep 17 00:00:00 2001 From: Martijn Berger Date: Fri, 7 Mar 2014 23:16:09 +0100 Subject: Add support for multiple interpolation modes on cycles image textures All textures are sampled bi-linear currently with the exception of OSL there texture sampling is fixed and set to smart bi-cubic. This patch adds user control to this setting. Added: - bits to DNA / RNA in the form of an enum for supporting multiple interpolations types - changes to the image texture node drawing code ( add enum) - to ImageManager (this needs to know to allocate second texture when interpolation type is different) - to node compiler (pass on interpolation type) - to device tex_alloc this also needs to get the concept of multiple interpolation types - implementation for doing non interpolated lookup for cuda and cpu - implementation where we pass this along to osl ( this makes OSL also do linear untill I add smartcubic to the interface / DNA/ RNA) Reviewers: brecht, dingto Reviewed By: brecht CC: dingto, venomgfx Differential Revision: https://developer.blender.org/D317 --- source/blender/makesrna/intern/rna_nodetree.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'source/blender/makesrna/intern/rna_nodetree.c') diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index d893a8c21f9..ae7dcdac423 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -3428,6 +3428,17 @@ static void def_sh_tex_image(StructRNA *srna) {0, NULL, 0, NULL, NULL} }; + static const EnumPropertyItem prop_interpolation_items[] = { + {SHD_INTER_LINEAR, "Linear", 0, "Linear", + "Linear interpolation"}, + {SHD_INTER_CLOSEST, "Closest", 0, "Closest", + "No interpolation (sample closest texel"}, + {SHD_INTER_CUBIC, "Cubic", 0, "Cubic", + "Cubic interpolation (OSL only)"}, + {SHD_INTER_SMART, "Smart", 0, "Smart", + "Bicubic when maxifying, else bilinear (OSL only)"}, + {0, NULL, 0, NULL, NULL} + }; PropertyRNA *prop; @@ -3451,6 +3462,11 @@ static void def_sh_tex_image(StructRNA *srna) RNA_def_property_ui_text(prop, "Projection", "Method to project 2D image on object with a 3D texture vector"); RNA_def_property_update(prop, 0, "rna_Node_update"); + prop = RNA_def_property(srna, "interpolation", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_items(prop, prop_interpolation_items); + RNA_def_property_ui_text(prop, "Interpolation", "Texture interpolation"); + RNA_def_property_update(prop, 0, "rna_Node_update"); + prop = RNA_def_property(srna, "projection_blend", PROP_FLOAT, PROP_FACTOR); RNA_def_property_ui_text(prop, "Projection Blend", "For box projection, amount of blend to use between sides"); RNA_def_property_update(prop, 0, "rna_Node_update"); -- cgit v1.2.3