diff options
author | Antonioya <blendergit@gmail.com> | 2018-10-10 23:52:55 +0300 |
---|---|---|
committer | Antonioya <blendergit@gmail.com> | 2018-10-11 00:00:56 +0300 |
commit | c2519d8521687a802ce6cb6e9ca2e973693cf9a4 (patch) | |
tree | 27e20c8ed90d868de47ce1de8ab340b485e53751 /source/blender/shader_fx | |
parent | d29f98e3f2a526d5dd13694c01aa27c4b81283fd (diff) |
GP: New Glow Shader FX (wip)
New shader to simulate a glow of the color.
The glow can be generated by luminance threshold or using a selection color.
Diffstat (limited to 'source/blender/shader_fx')
-rw-r--r-- | source/blender/shader_fx/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blender/shader_fx/FX_shader_types.h | 1 | ||||
-rw-r--r-- | source/blender/shader_fx/intern/FX_shader_util.c | 1 | ||||
-rw-r--r-- | source/blender/shader_fx/intern/fx_shader_glow.c | 78 |
4 files changed, 81 insertions, 0 deletions
diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt index 89defbd4ac7..1807635aa8d 100644 --- a/source/blender/shader_fx/CMakeLists.txt +++ b/source/blender/shader_fx/CMakeLists.txt @@ -46,6 +46,7 @@ set(SRC intern/FX_shader_blur.c intern/FX_shader_colorize.c intern/FX_shader_flip.c + intern/FX_shader_glow.c intern/FX_shader_light.c intern/FX_shader_pixel.c intern/FX_shader_rim.c diff --git a/source/blender/shader_fx/FX_shader_types.h b/source/blender/shader_fx/FX_shader_types.h index 57b9ae71146..311f5ec52e8 100644 --- a/source/blender/shader_fx/FX_shader_types.h +++ b/source/blender/shader_fx/FX_shader_types.h @@ -35,6 +35,7 @@ extern ShaderFxTypeInfo shaderfx_Type_None; extern ShaderFxTypeInfo shaderfx_Type_Blur; extern ShaderFxTypeInfo shaderfx_Type_Colorize; extern ShaderFxTypeInfo shaderfx_Type_Flip; +extern ShaderFxTypeInfo shaderfx_Type_Glow; extern ShaderFxTypeInfo shaderfx_Type_Light; extern ShaderFxTypeInfo shaderfx_Type_Pixel; extern ShaderFxTypeInfo shaderfx_Type_Rim; diff --git a/source/blender/shader_fx/intern/FX_shader_util.c b/source/blender/shader_fx/intern/FX_shader_util.c index d5cbdc69ba3..b74ff45b991 100644 --- a/source/blender/shader_fx/intern/FX_shader_util.c +++ b/source/blender/shader_fx/intern/FX_shader_util.c @@ -46,6 +46,7 @@ void shaderfx_type_init(ShaderFxTypeInfo *types[]) INIT_FX_TYPE(Blur); INIT_FX_TYPE(Colorize); INIT_FX_TYPE(Flip); + INIT_FX_TYPE(Glow); INIT_FX_TYPE(Light); INIT_FX_TYPE(Pixel); INIT_FX_TYPE(Rim); diff --git a/source/blender/shader_fx/intern/fx_shader_glow.c b/source/blender/shader_fx/intern/fx_shader_glow.c new file mode 100644 index 00000000000..cd513ed1f0a --- /dev/null +++ b/source/blender/shader_fx/intern/fx_shader_glow.c @@ -0,0 +1,78 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2018, Blender Foundation + * This is a new part of Blender + * + * Contributor(s): Antonio Vazquez + * + * ***** END GPL LICENSE BLOCK ***** + * + */ + +/** \file blender/shader_fx/intern/FX_shader_glow.c + * \ingroup shader_fx + */ + +#include <stdio.h> + +#include "DNA_scene_types.h" +#include "DNA_object_types.h" +#include "DNA_gpencil_types.h" + +#include "BLI_math_base.h" +#include "BLI_utildefines.h" + +#include "BKE_library_query.h" +#include "BKE_modifier.h" +#include "BKE_shader_fx.h" + +#include "FX_shader_types.h" + +static void initData(ShaderFxData *md) +{ + GlowShaderFxData *gpfx = (GlowShaderFxData *)md; + ARRAY_SET_ITEMS(gpfx->glow_color, 0.75f, 1.0f, 1.0f); + ARRAY_SET_ITEMS(gpfx->select_color, 0.0f, 0.0f, 0.0f); + gpfx->threshold = 0.1f; + + ARRAY_SET_ITEMS(gpfx->blur, 50, 0); + gpfx->samples = 16; +} + +static void copyData(const ShaderFxData *md, ShaderFxData *target) +{ + BKE_shaderfx_copyData_generic(md, target); +} + +ShaderFxTypeInfo shaderfx_Type_Glow = { + /* name */ "Glow", + /* structName */ "GlowShaderFxData", + /* structSize */ sizeof(GlowShaderFxData), + /* type */ eShaderFxType_GpencilType, + /* flags */ 0, + + /* copyData */ copyData, + + /* initData */ initData, + /* freeData */ NULL, + /* isDisabled */ NULL, + /* updateDepsgraph */ NULL, + /* dependsOnTime */ NULL, + /* foreachObjectLink */ NULL, + /* foreachIDLink */ NULL, +}; |