tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity
tornavis/source/blender/blenkernel/intern/linestyle.c

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

2075 lines
74 KiB
C
Raw Normal View History

File headers: SPDX License migration Use a shorter/simpler license convention, stops the header taking so much space. Follow the SPDX license specification: https://spdx.org/licenses - C/C++/objc/objc++ - Python - Shell Scripts - CMake, GNUmakefile While most of the source tree has been included - `./extern/` was left out. - `./intern/cycles` & `./intern/atomic` are also excluded because they use different header conventions. doc/license/SPDX-license-identifiers.txt has been added to list SPDX all used identifiers. See P2788 for the script that automated these edits. Reviewed By: brecht, mont29, sergey Ref D14069
2022-02-10 23:07:11 +01:00
/* SPDX-License-Identifier: GPL-2.0-or-later
* Copyright 2010 Blender Foundation. All rights reserved. */
A step toward a new user-friendly GUI for manipulating line style parameters. This commit is just meant to give the new GUI framework a concrete shape. There is no usefulness in newly introduced elements at the moment. Freestyle options in render layers now include a pull-down menu named Control Mode that allows you to choose either the Python Scripting or Parameter Editor mode. The Python Scripting mode is the conventional way of controlling Freestyle by directly using style modules written in Python. The Parameter Editor is a new control mode that is intended to be used by everyone without relying on Python programming. In the Parameter Editor mode, you can specify multiple line sets for each render layer. A line set defines feature edge selection criteria, as well as a line style for drawing the selected feature edges using specific line stylization parameters. Line style is a new datablock type, meaning that a line style can be shared by multiple line sets (possibly those in different render layers in different scenes). Much more additions are anticipated in subsequent commits to implement UI controls for specifying feature edge selection criteria and line stylization parameters.
2010-06-26 00:45:42 +02:00
doxygen: add newline after \file While \file doesn't need an argument, it can't have another doxy command after it.
2019-02-17 22:08:12 +01:00
/** \file
* \ingroup bke
A big cleaning patch by Bastien Montagne (thanks a lot!) * Split and moved Cycles’ render layers panels into the render_layer context as well (would be nice to hide this context when not needed, e.g. with the BGE, but this is not so easy to do nicely...). * Fixed some inconsistencies with trunk (probably due to svn merge glitches) using r52858 as reference. Also recovered the missing release/bin/blender-softwaregl file. * A bunch of style code fixes in Blender's own code (not Freestyle itself yet): line lengths, spaces around operators, block formatting, headers, etc. In rna_linestyle.c, color_blend_items was replaced by ramp_blend_items (exported from rna_material.c).
2012-12-11 23:00:22 +01:00
*/
A step toward a new user-friendly GUI for manipulating line style parameters. This commit is just meant to give the new GUI framework a concrete shape. There is no usefulness in newly introduced elements at the moment. Freestyle options in render layers now include a pull-down menu named Control Mode that allows you to choose either the Python Scripting or Parameter Editor mode. The Python Scripting mode is the conventional way of controlling Freestyle by directly using style modules written in Python. The Parameter Editor is a new control mode that is intended to be used by everyone without relying on Python programming. In the Parameter Editor mode, you can specify multiple line sets for each render layer. A line set defines feature edge selection criteria, as well as a line style for drawing the selected feature edges using specific line stylization parameters. Line style is a new datablock type, meaning that a line style can be shared by multiple line sets (possibly those in different render layers in different scenes). Much more additions are anticipated in subsequent commits to implement UI controls for specifying feature edge selection criteria and line stylization parameters.
2010-06-26 00:45:42 +02:00
#include <stdio.h>
#include <stdlib.h>
* Another attempt to fix the bug partly addressed in revision 31419. * Fix for the missing function declaration of strcpy. This caused a linker error in the Debug build with x64 VC 2008 and CMake.
2010-10-24 18:10:45 +02:00
#include <string.h>
A step toward a new user-friendly GUI for manipulating line style parameters. This commit is just meant to give the new GUI framework a concrete shape. There is no usefulness in newly introduced elements at the moment. Freestyle options in render layers now include a pull-down menu named Control Mode that allows you to choose either the Python Scripting or Parameter Editor mode. The Python Scripting mode is the conventional way of controlling Freestyle by directly using style modules written in Python. The Parameter Editor is a new control mode that is intended to be used by everyone without relying on Python programming. In the Parameter Editor mode, you can specify multiple line sets for each render layer. A line set defines feature edge selection criteria, as well as a line style for drawing the selected feature edges using specific line stylization parameters. Line style is a new datablock type, meaning that a line style can be shared by multiple line sets (possibly those in different render layers in different scenes). Much more additions are anticipated in subsequent commits to implement UI controls for specifying feature edge selection criteria and line stylization parameters.
2010-06-26 00:45:42 +02:00
#include "MEM_guardedalloc.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "DNA_defaults.h"
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
#include "DNA_material_types.h" /* for ramp blend */
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "DNA_object_types.h"
Added support for animation of line style parameters. Most stylization parameters in line style datablocks are now animatable by means of keyframes. Right click on a line style parameter, and you will see a list of keyframe-related commands in the context menu. Concerning the implementation, RNA path resolution has been extended to properly address color ramps in line style color modifiers. File I/O has been also improved to load/save the animation data associated with line style datablocks. Known issue: Freestyle-related options in render layers are not animatable at the moment, because of general inability (or maybe a bug) that keyframes cannot be inserted with respect to render layer options.
2010-09-18 02:31:22 +02:00
#include "DNA_texture_types.h"
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
Merged changes in the trunk up to revision 55357. Resolved conflicts: release/datafiles/startup.blend source/blender/editors/space_nla/nla_buttons.c Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of recent changes for the use of bool.
2013-03-18 01:48:59 +01:00
#include "BLI_blenlib.h"
#include "BLI_math.h"
Cleanup/refactor: Add new BLI_string_util. Things like `BLI_uniquename` had nothing, but really nothing to do in BLI_path_util files! Also, got rid of length limitation in `BLI_uniquename_cb`, we can use alloca here to avoid overhead of malloc while keeping free size (within reasonable limits of course).
2017-01-16 17:33:34 +01:00
#include "BLI_string_utils.h"
Merged changes in the trunk up to revision 55357. Resolved conflicts: release/datafiles/startup.blend source/blender/editors/space_nla/nla_buttons.c Also updated source/blender/blenkernel/intern/linestyle.c as a follow-up of recent changes for the use of bool.
2013-03-18 01:48:59 +01:00
#include "BLI_utildefines.h"
Cleanup: FreestyleLineStyle: Move to IDTypeInfo and remove unused BKE API.
2020-03-09 16:56:12 +01:00
#include "BLT_translation.h"
Refactor: move LineStyle .blend I/O to IDTypeInfo callbacks
2020-09-10 13:50:03 +02:00
#include "BKE_anim_data.h"
Cleanup: extract BKE_colorband from BKE_texture
2017-12-07 05:36:26 +01:00
#include "BKE_colorband.h"
Cleanup: `make format` after SortedIncludes change
2020-03-19 09:33:03 +01:00
#include "BKE_colortools.h"
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree. Changes to ED_node_shader_default() were reverted since the code there was actually not suitable for setting up the default line style node tree properly.
2014-07-16 08:25:10 +02:00
#include "BKE_context.h"
Renamed CTX_data_linestyle_from_scene() to BKE_get_linestyle_from_scene(). The function is to retrieve the active line style ID datablock from a scene and there is nothing related to bContext.
2014-07-16 06:36:39 +02:00
#include "BKE_freestyle.h"
Cleanup: FreestyleLineStyle: Move to IDTypeInfo and remove unused BKE API.
2020-03-09 16:56:12 +01:00
#include "BKE_idtype.h"
Cleanup/refactor: Rename `BKE_library` files to `BKE_lib`. Note that `BKE_library.h`/`library.c` were renamed to `BKE_lib_id.h`/`lib_id.c` to avoid having a too generic name here. Part of T72604.
2020-02-10 12:58:59 +01:00
#include "BKE_lib_id.h"
Refactor: Move linestyle foreach_id to new IDTypeInfo structure.
2020-05-15 18:45:54 +02:00
#include "BKE_lib_query.h"
A step toward a new user-friendly GUI for manipulating line style parameters. This commit is just meant to give the new GUI framework a concrete shape. There is no usefulness in newly introduced elements at the moment. Freestyle options in render layers now include a pull-down menu named Control Mode that allows you to choose either the Python Scripting or Parameter Editor mode. The Python Scripting mode is the conventional way of controlling Freestyle by directly using style modules written in Python. The Parameter Editor is a new control mode that is intended to be used by everyone without relying on Python programming. In the Parameter Editor mode, you can specify multiple line sets for each render layer. A line set defines feature edge selection criteria, as well as a line style for drawing the selected feature edges using specific line stylization parameters. Line style is a new datablock type, meaning that a line style can be shared by multiple line sets (possibly those in different render layers in different scenes). Much more additions are anticipated in subsequent commits to implement UI controls for specifying feature edge selection criteria and line stylization parameters.
2010-06-26 00:45:42 +02:00
#include "BKE_linestyle.h"
Cleanup: FreestyleLineStyle: Move to IDTypeInfo and remove unused BKE API.
2020-03-09 16:56:12 +01:00
#include "BKE_main.h"
Patch D246: Texture Marks for freestyle strokes, written and contributed by Paolo Acampora. Reviewers: brecht, kjym3, #freestyle Reviewed By: brecht, kjym3 Differential Revision: https://developer.blender.org/D246
2014-05-03 11:51:53 +02:00
#include "BKE_node.h"
Nodes: refactor node tree update handling Goals of this refactor: * More unified approach to updating everything that needs to be updated after a change in a node tree. * The updates should happen in the correct order and quadratic or worse algorithms should be avoided. * Improve detection of changes to the output to avoid tagging the depsgraph when it's not necessary. * Move towards a more declarative style of defining nodes by having a more centralized update procedure. The refactor consists of two main parts: * Node tree tagging and update refactor. * Generally, when changes are done to a node tree, it is tagged dirty until a global update function is called that updates everything in the correct order. * The tagging is more fine-grained compared to before, to allow for more precise depsgraph update tagging. * Depsgraph changes. * The shading specific depsgraph node for node trees as been removed. * Instead, there is a new `NTREE_OUTPUT` depsgrap node, which is only tagged when the output of the node tree changed (e.g. the Group Output or Material Output node). * The copy-on-write relation from node trees to the data block they are embedded in is now non-flushing. This avoids e.g. triggering a material update after the shader node tree changed in unrelated ways. Instead the material has a flushing relation to the new `NTREE_OUTPUT` node now. * The depsgraph no longer reports data block changes through to cycles through `Depsgraph.updates` when only the node tree changed in ways that do not affect the output. Avoiding unnecessary updates seems to work well for geometry nodes and cycles. The situation is a bit worse when there are drivers on the node tree, but that could potentially be improved separately in the future. Avoiding updates in eevee and the compositor is more tricky, but also less urgent. * Eevee updates are triggered by calling `DRW_notify_view_update` in `ED_render_view3d_update` indirectly from `DEG_editors_update`. * Compositor updates are triggered by `ED_node_composite_job` in `node_area_refresh`. This is triggered by calling `ED_area_tag_refresh` in `node_area_listener`. Removing updates always has the risk of breaking some dependency that no one was aware of. It's not unlikely that this will happen here as well. Adding back missing updates should be quite a bit easier than getting rid of unnecessary updates though. Differential Revision: https://developer.blender.org/D13246
2021-12-21 15:18:56 +01:00
#include "BKE_node_tree_update.h"
Refactor: Move linestyle foreach_id to new IDTypeInfo structure.
2020-05-15 18:45:54 +02:00
#include "BKE_texture.h"
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
Refactor: move LineStyle .blend I/O to IDTypeInfo callbacks
2020-09-10 13:50:03 +02:00
#include "BLO_read_write.h"
Cleanup: FreestyleLineStyle: Move to IDTypeInfo and remove unused BKE API.
2020-03-09 16:56:12 +01:00
static void linestyle_init_data(ID *id)
{
FreestyleLineStyle *linestyle = (FreestyleLineStyle *)id;
BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(linestyle, id));
MEMCPY_STRUCT_AFTER(linestyle, DNA_struct_default_get(FreestyleLineStyle), id);
BKE_linestyle_geometry_modifier_add(linestyle, NULL, LS_MODIFIER_SAMPLING);
}
static void linestyle_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const int flag)
{
FreestyleLineStyle *linestyle_dst = (FreestyleLineStyle *)id_dst;
const FreestyleLineStyle *linestyle_src = (const FreestyleLineStyle *)id_src;
/* We never handle usercount here for own data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
/* We always need allocation of our private ID data. */
const int flag_private_id_data = flag & ~LIB_ID_CREATE_NO_ALLOCATE;
for (int a = 0; a < MAX_MTEX; a++) {
if (linestyle_src->mtex[a]) {
linestyle_dst->mtex[a] = MEM_mallocN(sizeof(*linestyle_dst->mtex[a]), __func__);
*linestyle_dst->mtex[a] = *linestyle_src->mtex[a];
}
}
if (linestyle_src->nodetree) {
BKE_id_copy_ex(bmain,
(ID *)linestyle_src->nodetree,
(ID **)&linestyle_dst->nodetree,
flag_private_id_data);
}
LineStyleModifier *linestyle_modifier;
BLI_listbase_clear(&linestyle_dst->color_modifiers);
for (linestyle_modifier = (LineStyleModifier *)linestyle_src->color_modifiers.first;
linestyle_modifier;
linestyle_modifier = linestyle_modifier->next) {
BKE_linestyle_color_modifier_copy(linestyle_dst, linestyle_modifier, flag_subdata);
}
BLI_listbase_clear(&linestyle_dst->alpha_modifiers);
for (linestyle_modifier = (LineStyleModifier *)linestyle_src->alpha_modifiers.first;
linestyle_modifier;
linestyle_modifier = linestyle_modifier->next) {
BKE_linestyle_alpha_modifier_copy(linestyle_dst, linestyle_modifier, flag_subdata);
}
BLI_listbase_clear(&linestyle_dst->thickness_modifiers);
for (linestyle_modifier = (LineStyleModifier *)linestyle_src->thickness_modifiers.first;
linestyle_modifier;
linestyle_modifier = linestyle_modifier->next) {
BKE_linestyle_thickness_modifier_copy(linestyle_dst, linestyle_modifier, flag_subdata);
}
BLI_listbase_clear(&linestyle_dst->geometry_modifiers);
for (linestyle_modifier = (LineStyleModifier *)linestyle_src->geometry_modifiers.first;
linestyle_modifier;
linestyle_modifier = linestyle_modifier->next) {
BKE_linestyle_geometry_modifier_copy(linestyle_dst, linestyle_modifier, flag_subdata);
}
}
static void linestyle_free_data(ID *id)
{
FreestyleLineStyle *linestyle = (FreestyleLineStyle *)id;
LineStyleModifier *linestyle_modifier;
for (int material_slot_index = 0; material_slot_index < MAX_MTEX; material_slot_index++) {
MEM_SAFE_FREE(linestyle->mtex[material_slot_index]);
}
/* is no lib link block, but linestyle extension */
if (linestyle->nodetree) {
Cleanup: rename "nested" to "embedded" Reviewers: mont29 Differential Revision: https://developer.blender.org/D7476
2020-04-20 16:14:45 +02:00
ntreeFreeEmbeddedTree(linestyle->nodetree);
Cleanup: FreestyleLineStyle: Move to IDTypeInfo and remove unused BKE API.
2020-03-09 16:56:12 +01:00
MEM_freeN(linestyle->nodetree);
linestyle->nodetree = NULL;
}
while ((linestyle_modifier = (LineStyleModifier *)linestyle->color_modifiers.first)) {
BKE_linestyle_color_modifier_remove(linestyle, linestyle_modifier);
}
while ((linestyle_modifier = (LineStyleModifier *)linestyle->alpha_modifiers.first)) {
BKE_linestyle_alpha_modifier_remove(linestyle, linestyle_modifier);
}
while ((linestyle_modifier = (LineStyleModifier *)linestyle->thickness_modifiers.first)) {
BKE_linestyle_thickness_modifier_remove(linestyle, linestyle_modifier);
}
while ((linestyle_modifier = (LineStyleModifier *)linestyle->geometry_modifiers.first)) {
BKE_linestyle_geometry_modifier_remove(linestyle, linestyle_modifier);
}
}
Refactor: Move linestyle foreach_id to new IDTypeInfo structure.
2020-05-15 18:45:54 +02:00
static void linestyle_foreach_id(ID *id, LibraryForeachIDData *data)
{
FreestyleLineStyle *linestyle = (FreestyleLineStyle *)id;
for (int i = 0; i < MAX_MTEX; i++) {
if (linestyle->mtex[i]) {
LibQuery: Add macro to help break looping when requested. The new `BKE_LIB_FOREACHID_PROCESS_FUNCTION_CALL` execute the given statement and then check status of `LibraryForeachIDData` data, and return in case stop of iteration is requested. This is very similar to the other `BKE_LIB_FOREACHID_PROCESS_` existing macros, and allows us to properly break iteration when a sub-function has requested it. Part of T90922: Fix return policy inconsistency in `scene_foreach_id`.
2021-10-27 11:30:43 +02:00
BKE_LIB_FOREACHID_PROCESS_FUNCTION_CALL(
data, BKE_texture_mtex_foreach_id(data, linestyle->mtex[i]));
Refactor: Move linestyle foreach_id to new IDTypeInfo structure.
2020-05-15 18:45:54 +02:00
}
}
if (linestyle->nodetree) {
/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
LibQuery: Add macro to help break looping when requested. The new `BKE_LIB_FOREACHID_PROCESS_FUNCTION_CALL` execute the given statement and then check status of `LibraryForeachIDData` data, and return in case stop of iteration is requested. This is very similar to the other `BKE_LIB_FOREACHID_PROCESS_` existing macros, and allows us to properly break iteration when a sub-function has requested it. Part of T90922: Fix return policy inconsistency in `scene_foreach_id`.
2021-10-27 11:30:43 +02:00
BKE_LIB_FOREACHID_PROCESS_FUNCTION_CALL(
data, BKE_library_foreach_ID_embedded(data, (ID **)&linestyle->nodetree));
Refactor: Move linestyle foreach_id to new IDTypeInfo structure.
2020-05-15 18:45:54 +02:00
}
LISTBASE_FOREACH (LineStyleModifier *, lsm, &linestyle->color_modifiers) {
if (lsm->type == LS_MODIFIER_DISTANCE_FROM_OBJECT) {
LineStyleColorModifier_DistanceFromObject *p = (LineStyleColorModifier_DistanceFromObject *)
lsm;
if (p->target) {
Cleanup: LibQuery: Rename `BKE_LIB_FOREACHID_PROCESS` to `BKE_LIB_FOREACHID_PROCESS_IDSUPER`. More in-line name with the rest of that macro-based API, especially since this will be extended in the future.
2021-10-26 10:40:36 +02:00
BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, p->target, IDWALK_CB_NOP);
Refactor: Move linestyle foreach_id to new IDTypeInfo structure.
2020-05-15 18:45:54 +02:00
}
}
}
LISTBASE_FOREACH (LineStyleModifier *, lsm, &linestyle->alpha_modifiers) {
if (lsm->type == LS_MODIFIER_DISTANCE_FROM_OBJECT) {
LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)
lsm;
if (p->target) {
Cleanup: LibQuery: Rename `BKE_LIB_FOREACHID_PROCESS` to `BKE_LIB_FOREACHID_PROCESS_IDSUPER`. More in-line name with the rest of that macro-based API, especially since this will be extended in the future.
2021-10-26 10:40:36 +02:00
BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, p->target, IDWALK_CB_NOP);
Refactor: Move linestyle foreach_id to new IDTypeInfo structure.
2020-05-15 18:45:54 +02:00
}
}
}
LISTBASE_FOREACH (LineStyleModifier *, lsm, &linestyle->thickness_modifiers) {
if (lsm->type == LS_MODIFIER_DISTANCE_FROM_OBJECT) {
LineStyleThicknessModifier_DistanceFromObject *p =
(LineStyleThicknessModifier_DistanceFromObject *)lsm;
if (p->target) {
Cleanup: LibQuery: Rename `BKE_LIB_FOREACHID_PROCESS` to `BKE_LIB_FOREACHID_PROCESS_IDSUPER`. More in-line name with the rest of that macro-based API, especially since this will be extended in the future.
2021-10-26 10:40:36 +02:00
BKE_LIB_FOREACHID_PROCESS_IDSUPER(data, p->target, IDWALK_CB_NOP);
Refactor: Move linestyle foreach_id to new IDTypeInfo structure.
2020-05-15 18:45:54 +02:00
}
}
}
}
Refactor: move LineStyle .blend I/O to IDTypeInfo callbacks
2020-09-10 13:50:03 +02:00
static void write_linestyle_color_modifiers(BlendWriter *writer, ListBase *modifiers)
{
LineStyleModifier *m;
for (m = modifiers->first; m; m = m->next) {
int struct_nr;
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_AlongStroke);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_DistanceFromCamera);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_DistanceFromObject);
break;
case LS_MODIFIER_MATERIAL:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Material);
break;
case LS_MODIFIER_TANGENT:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Tangent);
break;
case LS_MODIFIER_NOISE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Noise);
break;
case LS_MODIFIER_CREASE_ANGLE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_CreaseAngle);
break;
case LS_MODIFIER_CURVATURE_3D:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleColorModifier_Curvature_3D);
break;
default:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier); /* this should not happen */
}
BLO_write_struct_by_id(writer, struct_nr, m);
}
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
BLO_write_struct(writer, ColorBand, ((LineStyleColorModifier_AlongStroke *)m)->color_ramp);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
BLO_write_struct(
writer, ColorBand, ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
BLO_write_struct(
writer, ColorBand, ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp);
break;
case LS_MODIFIER_MATERIAL:
BLO_write_struct(writer, ColorBand, ((LineStyleColorModifier_Material *)m)->color_ramp);
break;
case LS_MODIFIER_TANGENT:
BLO_write_struct(writer, ColorBand, ((LineStyleColorModifier_Tangent *)m)->color_ramp);
break;
case LS_MODIFIER_NOISE:
BLO_write_struct(writer, ColorBand, ((LineStyleColorModifier_Noise *)m)->color_ramp);
break;
case LS_MODIFIER_CREASE_ANGLE:
BLO_write_struct(writer, ColorBand, ((LineStyleColorModifier_CreaseAngle *)m)->color_ramp);
break;
case LS_MODIFIER_CURVATURE_3D:
BLO_write_struct(
writer, ColorBand, ((LineStyleColorModifier_Curvature_3D *)m)->color_ramp);
break;
}
}
}
static void write_linestyle_alpha_modifiers(BlendWriter *writer, ListBase *modifiers)
{
LineStyleModifier *m;
for (m = modifiers->first; m; m = m->next) {
int struct_nr;
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_AlongStroke);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_DistanceFromCamera);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_DistanceFromObject);
break;
case LS_MODIFIER_MATERIAL:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Material);
break;
case LS_MODIFIER_TANGENT:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Tangent);
break;
case LS_MODIFIER_NOISE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Noise);
break;
case LS_MODIFIER_CREASE_ANGLE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_CreaseAngle);
break;
case LS_MODIFIER_CURVATURE_3D:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleAlphaModifier_Curvature_3D);
break;
default:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier); /* this should not happen */
}
BLO_write_struct_by_id(writer, struct_nr, m);
}
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
BKE_curvemapping_blend_write(writer, ((LineStyleAlphaModifier_AlongStroke *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
BKE_curvemapping_blend_write(writer,
((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
BKE_curvemapping_blend_write(writer,
((LineStyleAlphaModifier_DistanceFromObject *)m)->curve);
break;
case LS_MODIFIER_MATERIAL:
BKE_curvemapping_blend_write(writer, ((LineStyleAlphaModifier_Material *)m)->curve);
break;
case LS_MODIFIER_TANGENT:
BKE_curvemapping_blend_write(writer, ((LineStyleAlphaModifier_Tangent *)m)->curve);
break;
case LS_MODIFIER_NOISE:
BKE_curvemapping_blend_write(writer, ((LineStyleAlphaModifier_Noise *)m)->curve);
break;
case LS_MODIFIER_CREASE_ANGLE:
BKE_curvemapping_blend_write(writer, ((LineStyleAlphaModifier_CreaseAngle *)m)->curve);
break;
case LS_MODIFIER_CURVATURE_3D:
BKE_curvemapping_blend_write(writer, ((LineStyleAlphaModifier_Curvature_3D *)m)->curve);
break;
}
}
}
static void write_linestyle_thickness_modifiers(BlendWriter *writer, ListBase *modifiers)
{
LineStyleModifier *m;
for (m = modifiers->first; m; m = m->next) {
int struct_nr;
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_AlongStroke);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_DistanceFromCamera);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_DistanceFromObject);
break;
case LS_MODIFIER_MATERIAL:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Material);
break;
case LS_MODIFIER_CALLIGRAPHY:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Calligraphy);
break;
case LS_MODIFIER_TANGENT:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Tangent);
break;
case LS_MODIFIER_NOISE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Noise);
break;
case LS_MODIFIER_CREASE_ANGLE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_CreaseAngle);
break;
case LS_MODIFIER_CURVATURE_3D:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleThicknessModifier_Curvature_3D);
break;
default:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier); /* this should not happen */
}
BLO_write_struct_by_id(writer, struct_nr, m);
}
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
BKE_curvemapping_blend_write(writer, ((LineStyleThicknessModifier_AlongStroke *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
BKE_curvemapping_blend_write(writer,
((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
BKE_curvemapping_blend_write(writer,
((LineStyleThicknessModifier_DistanceFromObject *)m)->curve);
break;
case LS_MODIFIER_MATERIAL:
BKE_curvemapping_blend_write(writer, ((LineStyleThicknessModifier_Material *)m)->curve);
break;
case LS_MODIFIER_TANGENT:
BKE_curvemapping_blend_write(writer, ((LineStyleThicknessModifier_Tangent *)m)->curve);
break;
case LS_MODIFIER_CREASE_ANGLE:
BKE_curvemapping_blend_write(writer, ((LineStyleThicknessModifier_CreaseAngle *)m)->curve);
break;
case LS_MODIFIER_CURVATURE_3D:
BKE_curvemapping_blend_write(writer,
((LineStyleThicknessModifier_Curvature_3D *)m)->curve);
break;
}
}
}
static void write_linestyle_geometry_modifiers(BlendWriter *writer, ListBase *modifiers)
{
LineStyleModifier *m;
for (m = modifiers->first; m; m = m->next) {
int struct_nr;
switch (m->type) {
case LS_MODIFIER_SAMPLING:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Sampling);
break;
case LS_MODIFIER_BEZIER_CURVE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_BezierCurve);
break;
case LS_MODIFIER_SINUS_DISPLACEMENT:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_SinusDisplacement);
break;
case LS_MODIFIER_SPATIAL_NOISE:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_SpatialNoise);
break;
case LS_MODIFIER_PERLIN_NOISE_1D:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_PerlinNoise1D);
break;
case LS_MODIFIER_PERLIN_NOISE_2D:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_PerlinNoise2D);
break;
case LS_MODIFIER_BACKBONE_STRETCHER:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_BackboneStretcher);
break;
case LS_MODIFIER_TIP_REMOVER:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_TipRemover);
break;
case LS_MODIFIER_POLYGONIZATION:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Polygonalization);
break;
case LS_MODIFIER_GUIDING_LINES:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_GuidingLines);
break;
case LS_MODIFIER_BLUEPRINT:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Blueprint);
break;
case LS_MODIFIER_2D_OFFSET:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_2DOffset);
break;
case LS_MODIFIER_2D_TRANSFORM:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_2DTransform);
break;
case LS_MODIFIER_SIMPLIFICATION:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleGeometryModifier_Simplification);
break;
default:
struct_nr = SDNA_TYPE_FROM_STRUCT(LineStyleModifier); /* this should not happen */
}
BLO_write_struct_by_id(writer, struct_nr, m);
}
}
static void linestyle_blend_write(BlendWriter *writer, ID *id, const void *id_address)
{
FreestyleLineStyle *linestyle = (FreestyleLineStyle *)id;
Cleanup: Blendwrite: Move code deciding if an ID should be written out of ID callbacks. This was not really useful, and added estra useless steps in case and ID should not actually be written. Further more, it prevented clearing the usercount on write, which can be cause a false positive 'chanhged' detection in undo/redo case.
2021-08-19 11:13:55 +02:00
BLO_write_id_struct(writer, FreestyleLineStyle, id_address, &linestyle->id);
BKE_id_blend_write(writer, &linestyle->id);
Refactor: move LineStyle .blend I/O to IDTypeInfo callbacks
2020-09-10 13:50:03 +02:00
Cleanup: Blendwrite: Move code deciding if an ID should be written out of ID callbacks. This was not really useful, and added estra useless steps in case and ID should not actually be written. Further more, it prevented clearing the usercount on write, which can be cause a false positive 'chanhged' detection in undo/redo case.
2021-08-19 11:13:55 +02:00
if (linestyle->adt) {
BKE_animdata_blend_write(writer, linestyle->adt);
}
write_linestyle_color_modifiers(writer, &linestyle->color_modifiers);
write_linestyle_alpha_modifiers(writer, &linestyle->alpha_modifiers);
write_linestyle_thickness_modifiers(writer, &linestyle->thickness_modifiers);
write_linestyle_geometry_modifiers(writer, &linestyle->geometry_modifiers);
for (int a = 0; a < MAX_MTEX; a++) {
if (linestyle->mtex[a]) {
BLO_write_struct(writer, MTex, linestyle->mtex[a]);
Refactor: move LineStyle .blend I/O to IDTypeInfo callbacks
2020-09-10 13:50:03 +02:00
}
}
Cleanup: Blendwrite: Move code deciding if an ID should be written out of ID callbacks. This was not really useful, and added estra useless steps in case and ID should not actually be written. Further more, it prevented clearing the usercount on write, which can be cause a false positive 'chanhged' detection in undo/redo case.
2021-08-19 11:13:55 +02:00
if (linestyle->nodetree) {
BLO_write_struct(writer, bNodeTree, linestyle->nodetree);
ntreeBlendWrite(writer, linestyle->nodetree);
}
Refactor: move LineStyle .blend I/O to IDTypeInfo callbacks
2020-09-10 13:50:03 +02:00
}
static void direct_link_linestyle_color_modifier(BlendDataReader *reader,
LineStyleModifier *modifier)
{
switch (modifier->type) {
case LS_MODIFIER_ALONG_STROKE: {
LineStyleColorModifier_AlongStroke *m = (LineStyleColorModifier_AlongStroke *)modifier;
BLO_read_data_address(reader, &m->color_ramp);
break;
}
case LS_MODIFIER_DISTANCE_FROM_CAMERA: {
LineStyleColorModifier_DistanceFromCamera *m = (LineStyleColorModifier_DistanceFromCamera *)
modifier;
BLO_read_data_address(reader, &m->color_ramp);
break;
}
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
LineStyleColorModifier_DistanceFromObject *m = (LineStyleColorModifier_DistanceFromObject *)
modifier;
BLO_read_data_address(reader, &m->color_ramp);
break;
}
case LS_MODIFIER_MATERIAL: {
LineStyleColorModifier_Material *m = (LineStyleColorModifier_Material *)modifier;
BLO_read_data_address(reader, &m->color_ramp);
break;
}
case LS_MODIFIER_TANGENT: {
LineStyleColorModifier_Tangent *m = (LineStyleColorModifier_Tangent *)modifier;
BLO_read_data_address(reader, &m->color_ramp);
break;
}
case LS_MODIFIER_NOISE: {
LineStyleColorModifier_Noise *m = (LineStyleColorModifier_Noise *)modifier;
BLO_read_data_address(reader, &m->color_ramp);
break;
}
case LS_MODIFIER_CREASE_ANGLE: {
LineStyleColorModifier_CreaseAngle *m = (LineStyleColorModifier_CreaseAngle *)modifier;
BLO_read_data_address(reader, &m->color_ramp);
break;
}
case LS_MODIFIER_CURVATURE_3D: {
LineStyleColorModifier_Curvature_3D *m = (LineStyleColorModifier_Curvature_3D *)modifier;
BLO_read_data_address(reader, &m->color_ramp);
break;
}
}
}
static void direct_link_linestyle_alpha_modifier(BlendDataReader *reader,
LineStyleModifier *modifier)
{
switch (modifier->type) {
case LS_MODIFIER_ALONG_STROKE: {
LineStyleAlphaModifier_AlongStroke *m = (LineStyleAlphaModifier_AlongStroke *)modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_DISTANCE_FROM_CAMERA: {
LineStyleAlphaModifier_DistanceFromCamera *m = (LineStyleAlphaModifier_DistanceFromCamera *)
modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
LineStyleAlphaModifier_DistanceFromObject *m = (LineStyleAlphaModifier_DistanceFromObject *)
modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_MATERIAL: {
LineStyleAlphaModifier_Material *m = (LineStyleAlphaModifier_Material *)modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_TANGENT: {
LineStyleAlphaModifier_Tangent *m = (LineStyleAlphaModifier_Tangent *)modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_NOISE: {
LineStyleAlphaModifier_Noise *m = (LineStyleAlphaModifier_Noise *)modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_CREASE_ANGLE: {
LineStyleAlphaModifier_CreaseAngle *m = (LineStyleAlphaModifier_CreaseAngle *)modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_CURVATURE_3D: {
LineStyleAlphaModifier_Curvature_3D *m = (LineStyleAlphaModifier_Curvature_3D *)modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
}
}
static void direct_link_linestyle_thickness_modifier(BlendDataReader *reader,
LineStyleModifier *modifier)
{
switch (modifier->type) {
case LS_MODIFIER_ALONG_STROKE: {
LineStyleThicknessModifier_AlongStroke *m = (LineStyleThicknessModifier_AlongStroke *)
modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_DISTANCE_FROM_CAMERA: {
LineStyleThicknessModifier_DistanceFromCamera *m =
(LineStyleThicknessModifier_DistanceFromCamera *)modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
LineStyleThicknessModifier_DistanceFromObject *m =
(LineStyleThicknessModifier_DistanceFromObject *)modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_MATERIAL: {
LineStyleThicknessModifier_Material *m = (LineStyleThicknessModifier_Material *)modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_TANGENT: {
LineStyleThicknessModifier_Tangent *m = (LineStyleThicknessModifier_Tangent *)modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_CREASE_ANGLE: {
LineStyleThicknessModifier_CreaseAngle *m = (LineStyleThicknessModifier_CreaseAngle *)
modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
case LS_MODIFIER_CURVATURE_3D: {
LineStyleThicknessModifier_Curvature_3D *m = (LineStyleThicknessModifier_Curvature_3D *)
modifier;
BLO_read_data_address(reader, &m->curve);
BKE_curvemapping_blend_read(reader, m->curve);
break;
}
}
}
static void direct_link_linestyle_geometry_modifier(BlendDataReader *UNUSED(reader),
LineStyleModifier *UNUSED(modifier))
{
}
static void linestyle_blend_read_data(BlendDataReader *reader, ID *id)
{
FreestyleLineStyle *linestyle = (FreestyleLineStyle *)id;
BLO_read_data_address(reader, &linestyle->adt);
BKE_animdata_blend_read_data(reader, linestyle->adt);
BLO_read_list(reader, &linestyle->color_modifiers);
LISTBASE_FOREACH (LineStyleModifier *, modifier, &linestyle->color_modifiers) {
direct_link_linestyle_color_modifier(reader, modifier);
}
BLO_read_list(reader, &linestyle->alpha_modifiers);
LISTBASE_FOREACH (LineStyleModifier *, modifier, &linestyle->alpha_modifiers) {
direct_link_linestyle_alpha_modifier(reader, modifier);
}
BLO_read_list(reader, &linestyle->thickness_modifiers);
LISTBASE_FOREACH (LineStyleModifier *, modifier, &linestyle->thickness_modifiers) {
direct_link_linestyle_thickness_modifier(reader, modifier);
}
BLO_read_list(reader, &linestyle->geometry_modifiers);
LISTBASE_FOREACH (LineStyleModifier *, modifier, &linestyle->geometry_modifiers) {
direct_link_linestyle_geometry_modifier(reader, modifier);
}
for (int a = 0; a < MAX_MTEX; a++) {
BLO_read_data_address(reader, &linestyle->mtex[a]);
}
}
static void linestyle_blend_read_lib(BlendLibReader *reader, ID *id)
{
FreestyleLineStyle *linestyle = (FreestyleLineStyle *)id;
LISTBASE_FOREACH (LineStyleModifier *, m, &linestyle->color_modifiers) {
switch (m->type) {
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
LineStyleColorModifier_DistanceFromObject *cm =
(LineStyleColorModifier_DistanceFromObject *)m;
BLO_read_id_address(reader, linestyle->id.lib, &cm->target);
break;
}
}
}
LISTBASE_FOREACH (LineStyleModifier *, m, &linestyle->alpha_modifiers) {
switch (m->type) {
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
LineStyleAlphaModifier_DistanceFromObject *am =
(LineStyleAlphaModifier_DistanceFromObject *)m;
BLO_read_id_address(reader, linestyle->id.lib, &am->target);
break;
}
}
}
LISTBASE_FOREACH (LineStyleModifier *, m, &linestyle->thickness_modifiers) {
switch (m->type) {
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
LineStyleThicknessModifier_DistanceFromObject *tm =
(LineStyleThicknessModifier_DistanceFromObject *)m;
BLO_read_id_address(reader, linestyle->id.lib, &tm->target);
break;
}
}
}
for (int a = 0; a < MAX_MTEX; a++) {
MTex *mtex = linestyle->mtex[a];
if (mtex) {
BLO_read_id_address(reader, linestyle->id.lib, &mtex->tex);
BLO_read_id_address(reader, linestyle->id.lib, &mtex->object);
}
}
}
static void linestyle_blend_read_expand(BlendExpander *expander, ID *id)
{
FreestyleLineStyle *linestyle = (FreestyleLineStyle *)id;
for (int a = 0; a < MAX_MTEX; a++) {
if (linestyle->mtex[a]) {
BLO_expand(expander, linestyle->mtex[a]->tex);
BLO_expand(expander, linestyle->mtex[a]->object);
}
}
LISTBASE_FOREACH (LineStyleModifier *, m, &linestyle->color_modifiers) {
if (m->type == LS_MODIFIER_DISTANCE_FROM_OBJECT) {
BLO_expand(expander, ((LineStyleColorModifier_DistanceFromObject *)m)->target);
}
}
LISTBASE_FOREACH (LineStyleModifier *, m, &linestyle->alpha_modifiers) {
if (m->type == LS_MODIFIER_DISTANCE_FROM_OBJECT) {
BLO_expand(expander, ((LineStyleAlphaModifier_DistanceFromObject *)m)->target);
}
}
LISTBASE_FOREACH (LineStyleModifier *, m, &linestyle->thickness_modifiers) {
if (m->type == LS_MODIFIER_DISTANCE_FROM_OBJECT) {
BLO_expand(expander, ((LineStyleThicknessModifier_DistanceFromObject *)m)->target);
}
}
}
Cleanup: FreestyleLineStyle: Move to IDTypeInfo and remove unused BKE API.
2020-03-09 16:56:12 +01:00
IDTypeInfo IDType_ID_LS = {
.id_code = ID_LS,
.id_filter = FILTER_ID_LS,
.main_listbase_index = INDEX_ID_LS,
.struct_size = sizeof(FreestyleLineStyle),
.name = "FreestyleLineStyle",
.name_plural = "linestyles",
.translation_context = BLT_I18NCONTEXT_ID_FREESTYLELINESTYLE,
Initial implementation of local ID re-use when appending. This commit adds to ID struct a new optional 'weak reference' to a linked ID (in the form of a blend file library path and full ID name). This can then be used on next append to try to find a matching local ID instead of re-making the linked data local again. Ref. T90545 NOTE: ID re-use will be disabled for regular append for the time being (3.0 release), and only used for assets. Therefore, this commit should not change anything user-wise. Differential Revision: https://developer.blender.org/D12545
2021-09-17 16:22:29 +02:00
.flags = IDTYPE_FLAGS_APPEND_IS_REUSABLE,
Cleanup: `IDTypeInfo` new `asset_type_info` member. Two issues addressed here: I) `asset_type_info` is sub-data, not a callback. Therefore, move it before the callbacks in the `IDTypeInfo` struct. II) More important, initialize this new attribute in *ALL* `IDTypeInfo` instances. No member of this struct should ever be left implicitely uninitilazed, ever. Aftermath of rBa84f1c02d251.
2021-11-24 10:32:28 +01:00
.asset_type_info = NULL,
Cleanup: FreestyleLineStyle: Move to IDTypeInfo and remove unused BKE API.
2020-03-09 16:56:12 +01:00
.init_data = linestyle_init_data,
.copy_data = linestyle_copy_data,
.free_data = linestyle_free_data,
.make_local = NULL,
Refactor: Move linestyle foreach_id to new IDTypeInfo structure.
2020-05-15 18:45:54 +02:00
.foreach_id = linestyle_foreach_id,
IDTypeInfo: add .blend file io callbacks This is part of T76372. It adds the `blend_write`, `blend_read_data`, `blend_read_lib` and `blend_read_expand` which correspond to the various steps when reading and writing .blend files. Having these callbacks allows us to decentralize the blenloader code a lot more. This has the affect that code related to any specific ID type is less scattered. Reviewers: mont29 Differential Revision: https://developer.blender.org/D8670
2020-08-28 13:05:48 +02:00
.foreach_cache = NULL,
Refactor BKE_bpath module. The main goal of this refactor is to make BPath module use `IDTypeInfo`, and move each ID-specific part of the `foreach_path` looper into their own IDTypeInfo struct, using a new `foreach_path` callback. Additionally, following improvements/cleanups are included: * Attempt to get better, more consistent namings. ** In particular, move from `path_visitor` to more standard `foreach_path`. * Update and extend documentation. ** API doc was moved to header, according to recent discussions on this topic. * Remove `BKE_bpath_relocate_visitor` from API, this is specific callback that belongs in `lib_id.c` user code. NOTE: This commit is expected to be 100% non-behavioral-change. This implies that several potential further changes were only noted as comments (like using a more generic solution for `lib_id_library_local_paths`, addressing inconsistencies like path of packed libraries always being skipped, regardless of the `BKE_BPATH_FOREACH_PATH_SKIP_PACKED` `eBPathForeachFlag` flag value, etc.). NOTE: basic unittests were added to master already in rBdcc500e5a265093bc9cc. Reviewed By: brecht Differential Revision: https://developer.blender.org/D13381
2021-11-29 14:20:58 +01:00
.foreach_path = NULL,
Refactor: IDTypeInfo: Add `owner_get` to get owner of embedded IDs. This concerns currently only collections (`master_collection` of scenes) and root node trees. It removes the matching type-specific helpers (`BKE_collection_master_scene_search` and `BKE_node_tree_find_owner_ID`). No functional change expected here. NOTE: Current implementation of `owner_get` is far from optimal, we could probably do it better, see {T69169}. NOTE: While it could also have it, shapekeys IDTypeInfo was left out of this change for now. Mainly because it sould not be used currently, and we ultimately want to demote shape keys from ID status anyway.
2021-02-25 10:17:31 +01:00
.owner_get = NULL,
IDTypeInfo: add .blend file io callbacks This is part of T76372. It adds the `blend_write`, `blend_read_data`, `blend_read_lib` and `blend_read_expand` which correspond to the various steps when reading and writing .blend files. Having these callbacks allows us to decentralize the blenloader code a lot more. This has the affect that code related to any specific ID type is less scattered. Reviewers: mont29 Differential Revision: https://developer.blender.org/D8670
2020-08-28 13:05:48 +02:00
Refactor: move LineStyle .blend I/O to IDTypeInfo callbacks
2020-09-10 13:50:03 +02:00
.blend_write = linestyle_blend_write,
.blend_read_data = linestyle_blend_read_data,
.blend_read_lib = linestyle_blend_read_lib,
.blend_read_expand = linestyle_blend_read_expand,
Add a callback to `IDTypeInfo` to allow preservation of some data accross memfile undos This is essentially adding that new callback, and using it only for already existing Scene's 3DCursor. Note that the place where this is called has been moved again, after all have been lib-linked, such that those callbacks may also work on ID pointers. Maniphest Tasks: T71759 Differential Revision: https://developer.blender.org/D9237
2020-11-03 11:39:36 +01:00
.blend_read_undo_preserve = NULL,
LibOverride: Add an 'post apply' callback to IDTypeInfo. Currently this is needed to properly tag PointCache's for info update (fixes an issue reported in T82503). Suspect we may need this in more cases in the future though, RNA assign/update processes are not always 100% enough to deal with complicated corner cases.
2021-01-22 14:52:50 +01:00
.lib_override_apply_post = NULL,
Cleanup: FreestyleLineStyle: Move to IDTypeInfo and remove unused BKE API.
2020-03-09 16:56:12 +01:00
};
Fix for a number of compiler warnings as well as a bug hidden by the warnings. Patch contribution by Bastien Montagne, thanks!
2012-12-08 23:24:41 +01:00
static const char *modifier_name[LS_MODIFIER_NUM] = {
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
NULL,
"Along Stroke",
"Distance from Camera",
New line style modifiers for changing line color, alpha transparency, and line thickness based on object materials. Accessible material attributes are diffuse color, specular color, specular hardness, and alpha.
2011-07-25 01:29:19 +02:00
"Distance from Object",
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
"Material",
"Sampling",
"Bezier Curve",
"Sinus Displacement",
"Spatial Noise",
"Perlin Noise 1D",
"Perlin Noise 2D",
"Backbone Stretcher",
Implemented a calligraphic thickness modifier in the Parameter Editor mode. Also fixed a typo in the docstring of the CalligraphicShader.
2011-09-11 21:57:38 +02:00
"Tip Remover",
Added two stroke geometry modifiers: Parameterization and Guiding Lines.
2011-11-01 10:47:41 +01:00
"Calligraphy",
"Polygonalization",
Added to the Parameter Editor mode new stroke geometry modifier `Blueprint' that produces a blueprint using circular, elliptic, and square contour strokes. Related changes and bug fixes were made as follows: * The randomness in radius and center has been transformed into optional parameters of the pyBluePrintCirclesShader and pyBluePrintEllipsesShader. Also a new optional parameter to control the randomness of backbone stretching has been added to the pyBluePrintSquaresShader. * A bug in the pyBluePrintSquaresShader that invisible stroke vertices at corners of rectangular contour strokes were not properly drawn. The problem was due to the changes of the / operator between Python 2.x to 3.x. Even when the two operands of the division operator are integers, Python 3.x gives a floating-point number when the quotient is not an integer. The fix was just to replace the / operator by the // operator for integer division. * An unpleasant discontinuity in circular and elliptical contour strokes was fixed. * The length parameter of the Backbone Stretcher geometry modifier has been renamed to `backbone_length' in line with the parameter of the same name in the pyBluePrintSquaresShader.
2011-11-11 21:35:03 +01:00
"Guiding Lines",
Added two stroke geometry modifiers: - 2D Offset: Adds two-dimensional offsets to stroke backbone geometry. - 2D Transform: Applies two-dimensional scaling and rotation to stroke backbone geometry.
2012-01-04 01:23:34 +01:00
"Blueprint",
"2D Offset",
A big cleaning patch by Bastien Montagne (thanks a lot!) * Split and moved Cycles’ render layers panels into the render_layer context as well (would be nice to hide this context when not needed, e.g. with the BGE, but this is not so easy to do nicely...). * Fixed some inconsistencies with trunk (probably due to svn merge glitches) using r52858 as reference. Also recovered the missing release/bin/blender-softwaregl file. * A bunch of style code fixes in Blender's own code (not Freestyle itself yet): line lengths, spaces around operators, block formatting, headers, etc. In rna_linestyle.c, color_blend_items was replaced by ramp_blend_items (exported from rna_material.c).
2012-12-11 23:00:22 +01:00
"2D Transform",
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
"Tangent",
"Noise",
"Crease Angle",
"Simplification",
"3D Curvature",
A big cleaning patch by Bastien Montagne (thanks a lot!) * Split and moved Cycles’ render layers panels into the render_layer context as well (would be nice to hide this context when not needed, e.g. with the BGE, but this is not so easy to do nicely...). * Fixed some inconsistencies with trunk (probably due to svn merge glitches) using r52858 as reference. Also recovered the missing release/bin/blender-softwaregl file. * A bunch of style code fixes in Blender's own code (not Freestyle itself yet): line lengths, spaces around operators, block formatting, headers, etc. In rna_linestyle.c, color_blend_items was replaced by ramp_blend_items (exported from rna_material.c).
2012-12-11 23:00:22 +01:00
};
A step toward a new user-friendly GUI for manipulating line style parameters. This commit is just meant to give the new GUI framework a concrete shape. There is no usefulness in newly introduced elements at the moment. Freestyle options in render layers now include a pull-down menu named Control Mode that allows you to choose either the Python Scripting or Parameter Editor mode. The Python Scripting mode is the conventional way of controlling Freestyle by directly using style modules written in Python. The Parameter Editor is a new control mode that is intended to be used by everyone without relying on Python programming. In the Parameter Editor mode, you can specify multiple line sets for each render layer. A line set defines feature edge selection criteria, as well as a line style for drawing the selected feature edges using specific line stylization parameters. Line style is a new datablock type, meaning that a line style can be shared by multiple line sets (possibly those in different render layers in different scenes). Much more additions are anticipated in subsequent commits to implement UI controls for specifying feature edge selection criteria and line stylization parameters.
2010-06-26 00:45:42 +02:00
First step to handle missing libs/datablocks when reading a file. Idea is, instead of ignoring completely missing linked datablocks, to create void placeholders for them. That way, you can work on your file, save it, and find again your missing data once lib becomes available again. Or you can edit missing lib's path (in Outliner), save and reload the file, and you are done. Also, Outliner now shows broken libraries (and placeholders) with a 'broken lib' icon. Future plans are also to be able to relocate missing libs and reload them at runtime. Code notes: - Placeholder ID is just a regular datablock of same type as expected linked one, with 'default' data, and a LIB_MISSING bitflag set. - To allow creation of such datablocks, creation of datablocks in BKE was split in two step: + Allocation of memory itself. + Setting of all internal data to default values. See also the design task (T43351). Reviewed by @campbellbarton, thanks a bunch! Differential Revision: https://developer.blender.org/D1394
2015-10-20 14:44:57 +02:00
void BKE_linestyle_init(FreestyleLineStyle *linestyle)
More on the new GUI for the Parameter Editor mode. This is a WIP commit. * Moved render layer-specific Freestyle options to a separate "Freestyle" tab (in addition to the "Freestyle: Line Style" tab that has been introduced in the previous commit). * Added UI controls for specifying feature edge selection criteria in the Parameter Editor mode. Feature edge selection starts with a set of all feature edges in the view map. Each line set specifies edge selection criteria (e.g., to select only visible crease edges) by enabling appropriate UI controls (e.g., by turning on the "Crease" and "Visibility" toggle buttons). Selected criteria are combined by logical conjunction. Logical disjunction (e.g., "crease edges or contours") is represented by two or more line sets. * Slightly rearranged several UI controls in the Python Scripting mode.
2010-06-27 02:03:34 +02:00
{
Cleanup: FreestyleLineStyle: Move to IDTypeInfo and remove unused BKE API.
2020-03-09 16:56:12 +01:00
linestyle_init_data(&linestyle->id);
More on the new GUI for the Parameter Editor mode. This is a WIP commit. * Moved render layer-specific Freestyle options to a separate "Freestyle" tab (in addition to the "Freestyle: Line Style" tab that has been introduced in the previous commit). * Added UI controls for specifying feature edge selection criteria in the Parameter Editor mode. Feature edge selection starts with a set of all feature edges in the view map. Each line set specifies edge selection criteria (e.g., to select only visible crease edges) by enabling appropriate UI controls (e.g., by turning on the "Crease" and "Visibility" toggle buttons). Selected criteria are combined by logical conjunction. Logical disjunction (e.g., "crease edges or contours") is represented by two or more line sets. * Slightly rearranged several UI controls in the Python Scripting mode.
2010-06-27 02:03:34 +02:00
}
Freestyle: pass Main struct to new/copy
2015-03-19 04:33:05 +01:00
FreestyleLineStyle *BKE_linestyle_new(struct Main *bmain, const char *name)
A step toward a new user-friendly GUI for manipulating line style parameters. This commit is just meant to give the new GUI framework a concrete shape. There is no usefulness in newly introduced elements at the moment. Freestyle options in render layers now include a pull-down menu named Control Mode that allows you to choose either the Python Scripting or Parameter Editor mode. The Python Scripting mode is the conventional way of controlling Freestyle by directly using style modules written in Python. The Parameter Editor is a new control mode that is intended to be used by everyone without relying on Python programming. In the Parameter Editor mode, you can specify multiple line sets for each render layer. A line set defines feature edge selection criteria, as well as a line style for drawing the selected feature edges using specific line stylization parameters. Line style is a new datablock type, meaning that a line style can be shared by multiple line sets (possibly those in different render layers in different scenes). Much more additions are anticipated in subsequent commits to implement UI controls for specifying feature edge selection criteria and line stylization parameters.
2010-06-26 00:45:42 +02:00
{
FreestyleLineStyle *linestyle;
Refactor ID copying (and to some extent, ID freeing). This will allow much finer controll over how we copy data-blocks, from full copy in Main database, to "lighter" ones (out of Main, inside an already allocated datablock, etc.). This commit also transfers a llot of what was previously handled by per-ID-type custom code to generic ID handling code in BKE_library. Hopefully will avoid in future inconsistencies and missing bits we had all over the codebase in the past. It also adds missing copying handling for a few types, most notably Scene (which where using a fully customized handling previously). Note that the type of allocation used during copying (regular in Main, allocated but outside of Main, or not allocated by ID handling code at all) is stored in ID's, which allows to handle them correctly when freeing. This needs to be taken care of with caution when doing 'weird' unusual things with ID copying and/or allocation! As a final note, while rather noisy, this commit will hopefully not break too much existing branches, old 'API' has been kept for the main part, as a wrapper around new code. Cleaning it up will happen later. Design task : T51804 Phab Diff: D2714
2017-08-07 16:39:55 +02:00
linestyle = (FreestyleLineStyle *)BKE_libblock_alloc(bmain, ID_LS, name, 0);
A big cleaning patch by Bastien Montagne (thanks a lot!) * Split and moved Cycles’ render layers panels into the render_layer context as well (would be nice to hide this context when not needed, e.g. with the BGE, but this is not so easy to do nicely...). * Fixed some inconsistencies with trunk (probably due to svn merge glitches) using r52858 as reference. Also recovered the missing release/bin/blender-softwaregl file. * A bunch of style code fixes in Blender's own code (not Freestyle itself yet): line lengths, spaces around operators, block formatting, headers, etc. In rna_linestyle.c, color_blend_items was replaced by ramp_blend_items (exported from rna_material.c).
2012-12-11 23:00:22 +01:00
First step to handle missing libs/datablocks when reading a file. Idea is, instead of ignoring completely missing linked datablocks, to create void placeholders for them. That way, you can work on your file, save it, and find again your missing data once lib becomes available again. Or you can edit missing lib's path (in Outliner), save and reload the file, and you are done. Also, Outliner now shows broken libraries (and placeholders) with a 'broken lib' icon. Future plans are also to be able to relocate missing libs and reload them at runtime. Code notes: - Placeholder ID is just a regular datablock of same type as expected linked one, with 'default' data, and a LIB_MISSING bitflag set. - To allow creation of such datablocks, creation of datablocks in BKE was split in two step: + Allocation of memory itself. + Setting of all internal data to default values. See also the design task (T43351). Reviewed by @campbellbarton, thanks a bunch! Differential Revision: https://developer.blender.org/D1394
2015-10-20 14:44:57 +02:00
BKE_linestyle_init(linestyle);
A step toward a new user-friendly GUI for manipulating line style parameters. This commit is just meant to give the new GUI framework a concrete shape. There is no usefulness in newly introduced elements at the moment. Freestyle options in render layers now include a pull-down menu named Control Mode that allows you to choose either the Python Scripting or Parameter Editor mode. The Python Scripting mode is the conventional way of controlling Freestyle by directly using style modules written in Python. The Parameter Editor is a new control mode that is intended to be used by everyone without relying on Python programming. In the Parameter Editor mode, you can specify multiple line sets for each render layer. A line set defines feature edge selection criteria, as well as a line style for drawing the selected feature edges using specific line stylization parameters. Line style is a new datablock type, meaning that a line style can be shared by multiple line sets (possibly those in different render layers in different scenes). Much more additions are anticipated in subsequent commits to implement UI controls for specifying feature edge selection criteria and line stylization parameters.
2010-06-26 00:45:42 +02:00
return linestyle;
}
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 15:20:17 +02:00
FreestyleLineStyle *BKE_linestyle_active_from_view_layer(ViewLayer *view_layer)
Renamed CTX_data_linestyle_from_scene() to BKE_get_linestyle_from_scene(). The function is to retrieve the active line style ID datablock from a scene and there is nothing related to bContext.
2014-07-16 06:36:39 +02:00
{
Workspaces: active view layer now always comes from workspace, not scene. Both the scene and workspace had an active view layer, and it was confusing which settings were being used or displayed where. Now we always have one, so there is no mismatch. The "View Layers" tab in the properties editor is now "View Layer", no longer showing a list of layers. Instead view layers can be added and removed with the workspace view layer selector. They are also listed and selectable in the outliner. Single layer rendering uses the active view layer from the workspace. This fixes bugs where the wrong active view layer was used, but more places remain that are wrong and are now using the first view layer in the scene. These are all marked with BKE_view_layer_context_active_PLACEHOLDER.
2018-04-24 15:20:17 +02:00
FreestyleConfig *config = &view_layer->freestyle_config;
FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(config);
return (lineset) ? lineset->linestyle : NULL;
Renamed CTX_data_linestyle_from_scene() to BKE_get_linestyle_from_scene(). The function is to retrieve the active line style ID datablock from a scene and there is nothing related to bContext.
2014-07-16 06:36:39 +02:00
}
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
static LineStyleModifier *new_modifier(const char *name, int type, size_t size)
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
{
LineStyleModifier *m;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
if (!name) {
name = modifier_name[type];
}
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
m = (LineStyleModifier *)MEM_callocN(size, "line style modifier");
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
m->type = type;
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
BLI_strncpy(m->name, name, sizeof(m->name));
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
m->influence = 1.0f;
m->flags = LS_MODIFIER_ENABLED | LS_MODIFIER_EXPANDED;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
return m;
}
static void add_to_modifier_list(ListBase *lb, LineStyleModifier *m)
{
BLI_addtail(lb, (void *)m);
Merged changes in the trunk up to revision 41225. Conflicts resolved: source/blender/render/intern/source/pipeline.c
2011-10-29 17:46:14 +02:00
BLI_uniquename(
lb, m, modifier_name[m->type], '.', offsetof(LineStyleModifier, name), sizeof(m->name));
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
static LineStyleModifier *alloc_color_modifier(const char *name, int type)
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
{
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
size_t size;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
switch (type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE:
size = sizeof(LineStyleColorModifier_AlongStroke);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
size = sizeof(LineStyleColorModifier_DistanceFromCamera);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
size = sizeof(LineStyleColorModifier_DistanceFromObject);
break;
case LS_MODIFIER_MATERIAL:
size = sizeof(LineStyleColorModifier_Material);
break;
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT:
size = sizeof(LineStyleColorModifier_Tangent);
break;
case LS_MODIFIER_NOISE:
size = sizeof(LineStyleColorModifier_Noise);
break;
case LS_MODIFIER_CREASE_ANGLE:
size = sizeof(LineStyleColorModifier_CreaseAngle);
break;
case LS_MODIFIER_CURVATURE_3D:
size = sizeof(LineStyleColorModifier_Curvature_3D);
break;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return new_modifier(name, type, size);
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
Follow-up to code cleanup in rB415af0b: Keep compound terms as they are.
2014-07-17 02:23:30 +02:00
LineStyleModifier *BKE_linestyle_color_modifier_add(FreestyleLineStyle *linestyle,
const char *name,
int type)
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
{
LineStyleModifier *m;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
m = alloc_color_modifier(name, type);
Fix for unlikely NULL pointer dereference Potential crash reading freestyle modifiers from future blend-files
2015-02-20 07:17:36 +01:00
if (UNLIKELY(m == NULL)) {
return NULL;
}
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
m->blend = MA_RAMP_BLEND;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
switch (type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE:
Cleanup: Use BKE_colorband prefix
2017-12-07 05:52:59 +01:00
((LineStyleColorModifier_AlongStroke *)m)->color_ramp = BKE_colorband_add(true);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
Cleanup: Use BKE_colorband prefix
2017-12-07 05:52:59 +01:00
((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp = BKE_colorband_add(true);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
((LineStyleColorModifier_DistanceFromCamera *)m)->range_min = 0.0f;
((LineStyleColorModifier_DistanceFromCamera *)m)->range_max = 10000.0f;
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
((LineStyleColorModifier_DistanceFromObject *)m)->target = NULL;
Cleanup: Use BKE_colorband prefix
2017-12-07 05:52:59 +01:00
((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp = BKE_colorband_add(true);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
((LineStyleColorModifier_DistanceFromObject *)m)->range_min = 0.0f;
((LineStyleColorModifier_DistanceFromObject *)m)->range_max = 10000.0f;
break;
case LS_MODIFIER_MATERIAL:
Cleanup: Use BKE_colorband prefix
2017-12-07 05:52:59 +01:00
((LineStyleColorModifier_Material *)m)->color_ramp = BKE_colorband_add(true);
Per-material line color settings for Freestyle. New properties 'line_color' and 'line_priority' are added to Material ID data blocks. The 'line_color' property allows users to specify a per-material line color that can be used as a Freestyle line color through Material color modifiers of line style settings. The new line color property is intended to provide a solution for line color stylization when a proper Freestyle support for Cycles is implemented (likely as part of the upcoming Blender 2.72 release; see Patch D632). Materials in Cycles are usually set up using shader nodes, and Freestyle won't be capable of retrieving colors and other properties from node-based materials any soon. The new line color property of materials addresses this foreseen limitation by providing artists with an intuitive alternative mean to specify line colors on a per-material basis independently from node trees. The 'line_priority' property gives users a way to control line colors at material boundaries. When a line is drawn along a feature edge at material boundaries, one of the two materials on both sides of the edge has to be picked up to determine the line color. So far there was no way to control this selection (which was in effect at random). Now the material with a higher line color priority will be selected. The new per-material line settings are shown in the new Freestyle Line tab in the Material context of the Properties window (only when Freestyle is enabled).
2014-07-07 08:54:46 +02:00
((LineStyleColorModifier_Material *)m)->mat_attr = LS_MODIFIER_MATERIAL_LINE;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT:
Cleanup: Use BKE_colorband prefix
2017-12-07 05:52:59 +01:00
((LineStyleColorModifier_Tangent *)m)->color_ramp = BKE_colorband_add(true);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
case LS_MODIFIER_NOISE:
Cleanup: Use BKE_colorband prefix
2017-12-07 05:52:59 +01:00
((LineStyleColorModifier_Noise *)m)->color_ramp = BKE_colorband_add(true);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
((LineStyleColorModifier_Noise *)m)->amplitude = 10.0f;
((LineStyleColorModifier_Noise *)m)->period = 10.0f;
((LineStyleColorModifier_Noise *)m)->seed = 512;
break;
case LS_MODIFIER_CREASE_ANGLE:
Cleanup: Use BKE_colorband prefix
2017-12-07 05:52:59 +01:00
((LineStyleColorModifier_CreaseAngle *)m)->color_ramp = BKE_colorband_add(true);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
((LineStyleColorModifier_CreaseAngle *)m)->min_angle = 0.0f;
((LineStyleColorModifier_CreaseAngle *)m)->max_angle = DEG2RADF(180.0f);
break;
case LS_MODIFIER_CURVATURE_3D:
Cleanup: Use BKE_colorband prefix
2017-12-07 05:52:59 +01:00
((LineStyleColorModifier_Curvature_3D *)m)->color_ramp = BKE_colorband_add(true);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
((LineStyleColorModifier_Curvature_3D *)m)->min_curvature = 0.0f;
((LineStyleColorModifier_Curvature_3D *)m)->max_curvature = 0.5f;
break;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
add_to_modifier_list(&linestyle->color_modifiers, m);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
return m;
}
Refactor ID copying (and to some extent, ID freeing). This will allow much finer controll over how we copy data-blocks, from full copy in Main database, to "lighter" ones (out of Main, inside an already allocated datablock, etc.). This commit also transfers a llot of what was previously handled by per-ID-type custom code to generic ID handling code in BKE_library. Hopefully will avoid in future inconsistencies and missing bits we had all over the codebase in the past. It also adds missing copying handling for a few types, most notably Scene (which where using a fully customized handling previously). Note that the type of allocation used during copying (regular in Main, allocated but outside of Main, or not allocated by ID handling code at all) is stored in ID's, which allows to handle them correctly when freeing. This needs to be taken care of with caution when doing 'weird' unusual things with ID copying and/or allocation! As a final note, while rather noisy, this commit will hopefully not break too much existing branches, old 'API' has been kept for the main part, as a wrapper around new code. Cleaning it up will happen later. Design task : T51804 Phab Diff: D2714
2017-08-07 16:39:55 +02:00
LineStyleModifier *BKE_linestyle_color_modifier_copy(FreestyleLineStyle *linestyle,
const LineStyleModifier *m,
const int flag)
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
{
LineStyleModifier *new_m;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
new_m = alloc_color_modifier(m->name, m->type);
Fix for unlikely NULL pointer dereference Potential crash reading freestyle modifiers from future blend-files
2015-02-20 07:17:36 +01:00
if (UNLIKELY(new_m == NULL)) {
return NULL;
}
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
new_m->influence = m->influence;
new_m->flags = m->flags;
new_m->blend = m->blend;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
switch (m->type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleColorModifier_AlongStroke *p = (LineStyleColorModifier_AlongStroke *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleColorModifier_AlongStroke *q = (LineStyleColorModifier_AlongStroke *)new_m;
q->color_ramp = MEM_dupallocN(p->color_ramp);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_DISTANCE_FROM_CAMERA: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleColorModifier_DistanceFromCamera *p = (LineStyleColorModifier_DistanceFromCamera *)
m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleColorModifier_DistanceFromCamera *q = (LineStyleColorModifier_DistanceFromCamera *)
new_m;
q->color_ramp = MEM_dupallocN(p->color_ramp);
q->range_min = p->range_min;
q->range_max = p->range_max;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleColorModifier_DistanceFromObject *p = (LineStyleColorModifier_DistanceFromObject *)
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
m;
LineStyleColorModifier_DistanceFromObject *q = (LineStyleColorModifier_DistanceFromObject *)
new_m;
q->target = p->target;
Refactor ID copying (and to some extent, ID freeing). This will allow much finer controll over how we copy data-blocks, from full copy in Main database, to "lighter" ones (out of Main, inside an already allocated datablock, etc.). This commit also transfers a llot of what was previously handled by per-ID-type custom code to generic ID handling code in BKE_library. Hopefully will avoid in future inconsistencies and missing bits we had all over the codebase in the past. It also adds missing copying handling for a few types, most notably Scene (which where using a fully customized handling previously). Note that the type of allocation used during copying (regular in Main, allocated but outside of Main, or not allocated by ID handling code at all) is stored in ID's, which allows to handle them correctly when freeing. This needs to be taken care of with caution when doing 'weird' unusual things with ID copying and/or allocation! As a final note, while rather noisy, this commit will hopefully not break too much existing branches, old 'API' has been kept for the main part, as a wrapper around new code. Cleaning it up will happen later. Design task : T51804 Phab Diff: D2714
2017-08-07 16:39:55 +02:00
if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) {
id_us_plus((ID *)q->target);
}
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
q->color_ramp = MEM_dupallocN(p->color_ramp);
q->range_min = p->range_min;
q->range_max = p->range_max;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_MATERIAL: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleColorModifier_Material *p = (LineStyleColorModifier_Material *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleColorModifier_Material *q = (LineStyleColorModifier_Material *)new_m;
q->color_ramp = MEM_dupallocN(p->color_ramp);
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->flags = p->flags;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
q->mat_attr = p->mat_attr;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT: {
LineStyleColorModifier_Tangent *p = (LineStyleColorModifier_Tangent *)m;
LineStyleColorModifier_Tangent *q = (LineStyleColorModifier_Tangent *)new_m;
q->color_ramp = MEM_dupallocN(p->color_ramp);
break;
}
case LS_MODIFIER_NOISE: {
LineStyleColorModifier_Noise *p = (LineStyleColorModifier_Noise *)m;
LineStyleColorModifier_Noise *q = (LineStyleColorModifier_Noise *)new_m;
q->color_ramp = MEM_dupallocN(p->color_ramp);
q->amplitude = p->amplitude;
q->period = p->period;
q->seed = p->seed;
break;
}
case LS_MODIFIER_CREASE_ANGLE: {
LineStyleColorModifier_CreaseAngle *p = (LineStyleColorModifier_CreaseAngle *)m;
LineStyleColorModifier_CreaseAngle *q = (LineStyleColorModifier_CreaseAngle *)new_m;
q->color_ramp = MEM_dupallocN(p->color_ramp);
q->min_angle = p->min_angle;
q->max_angle = p->max_angle;
break;
}
case LS_MODIFIER_CURVATURE_3D: {
LineStyleColorModifier_Curvature_3D *p = (LineStyleColorModifier_Curvature_3D *)m;
LineStyleColorModifier_Curvature_3D *q = (LineStyleColorModifier_Curvature_3D *)new_m;
q->color_ramp = MEM_dupallocN(p->color_ramp);
q->min_curvature = p->min_curvature;
q->max_curvature = p->max_curvature;
break;
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
add_to_modifier_list(&linestyle->color_modifiers, new_m);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
return new_m;
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
Follow-up to code cleanup in rB415af0b: Keep compound terms as they are.
2014-07-17 02:23:30 +02:00
int BKE_linestyle_color_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *m)
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
{
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (BLI_findindex(&linestyle->color_modifiers, m) == -1) {
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return -1;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
switch (m->type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE:
MEM_freeN(((LineStyleColorModifier_AlongStroke *)m)->color_ramp);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
MEM_freeN(((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
MEM_freeN(((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp);
break;
case LS_MODIFIER_MATERIAL:
MEM_freeN(((LineStyleColorModifier_Material *)m)->color_ramp);
break;
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT:
MEM_freeN(((LineStyleColorModifier_Tangent *)m)->color_ramp);
break;
case LS_MODIFIER_NOISE:
MEM_freeN(((LineStyleColorModifier_Noise *)m)->color_ramp);
break;
case LS_MODIFIER_CREASE_ANGLE:
MEM_freeN(((LineStyleColorModifier_CreaseAngle *)m)->color_ramp);
break;
case LS_MODIFIER_CURVATURE_3D:
MEM_freeN(((LineStyleColorModifier_Curvature_3D *)m)->color_ramp);
break;
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
BLI_freelinkN(&linestyle->color_modifiers, m);
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return 0;
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
static LineStyleModifier *alloc_alpha_modifier(const char *name, int type)
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
{
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
size_t size;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
switch (type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE:
size = sizeof(LineStyleAlphaModifier_AlongStroke);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
size = sizeof(LineStyleAlphaModifier_DistanceFromCamera);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
size = sizeof(LineStyleAlphaModifier_DistanceFromObject);
break;
case LS_MODIFIER_MATERIAL:
size = sizeof(LineStyleAlphaModifier_Material);
break;
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT:
size = sizeof(LineStyleAlphaModifier_Tangent);
break;
case LS_MODIFIER_NOISE:
size = sizeof(LineStyleAlphaModifier_Noise);
break;
case LS_MODIFIER_CREASE_ANGLE:
size = sizeof(LineStyleAlphaModifier_CreaseAngle);
break;
case LS_MODIFIER_CURVATURE_3D:
size = sizeof(LineStyleAlphaModifier_Curvature_3D);
break;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
}
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return new_modifier(name, type, size);
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
Follow-up to code cleanup in rB415af0b: Keep compound terms as they are.
2014-07-17 02:23:30 +02:00
LineStyleModifier *BKE_linestyle_alpha_modifier_add(FreestyleLineStyle *linestyle,
const char *name,
int type)
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
{
LineStyleModifier *m;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
m = alloc_alpha_modifier(name, type);
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
m->blend = LS_VALUE_BLEND;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
switch (type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_DISTANCE_FROM_CAMERA: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)
m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
p->range_min = 0.0f;
p->range_max = 10000.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)
m;
p->target = NULL;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
p->range_min = 0.0f;
p->range_max = 10000.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_MATERIAL: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Fix T42198: Linked lines only work with linked objects. The reported issue was caused by a backward incompatibility due to careless code changes made when per-material Freestyle line colors were introduced in rB7915d7277ac8c605f016f30f943080556244fb59. In 2.71 line style Material color/alpha/thickness modifiers was retrieving alpha transparency from Material.alpha, whereas in 2.72 Material.line_color[3] was referenced. The present fix reverts the aforementioned code changes. This issue is a regression from 2.71, so the fix is appropriate for inclusion in the 2.72a release.
2014-10-13 17:53:08 +02:00
p->mat_attr = LS_MODIFIER_MATERIAL_LINE_A;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT: {
LineStyleAlphaModifier_Tangent *p = (LineStyleAlphaModifier_Tangent *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
}
case LS_MODIFIER_NOISE: {
LineStyleAlphaModifier_Noise *p = (LineStyleAlphaModifier_Noise *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
((LineStyleAlphaModifier_Noise *)m)->amplitude = 10.0f;
((LineStyleAlphaModifier_Noise *)m)->period = 10.0f;
((LineStyleAlphaModifier_Noise *)m)->seed = 512;
break;
}
case LS_MODIFIER_CREASE_ANGLE: {
LineStyleAlphaModifier_CreaseAngle *p = (LineStyleAlphaModifier_CreaseAngle *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
((LineStyleAlphaModifier_CreaseAngle *)m)->min_angle = 0.0f;
((LineStyleAlphaModifier_CreaseAngle *)m)->max_angle = DEG2RADF(180.0f);
break;
}
case LS_MODIFIER_CURVATURE_3D: {
LineStyleAlphaModifier_Curvature_3D *p = (LineStyleAlphaModifier_Curvature_3D *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
((LineStyleAlphaModifier_Curvature_3D *)m)->min_curvature = 0.0f;
((LineStyleAlphaModifier_Curvature_3D *)m)->max_curvature = 0.5f;
break;
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
add_to_modifier_list(&linestyle->alpha_modifiers, m);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
return m;
}
Refactor ID copying (and to some extent, ID freeing). This will allow much finer controll over how we copy data-blocks, from full copy in Main database, to "lighter" ones (out of Main, inside an already allocated datablock, etc.). This commit also transfers a llot of what was previously handled by per-ID-type custom code to generic ID handling code in BKE_library. Hopefully will avoid in future inconsistencies and missing bits we had all over the codebase in the past. It also adds missing copying handling for a few types, most notably Scene (which where using a fully customized handling previously). Note that the type of allocation used during copying (regular in Main, allocated but outside of Main, or not allocated by ID handling code at all) is stored in ID's, which allows to handle them correctly when freeing. This needs to be taken care of with caution when doing 'weird' unusual things with ID copying and/or allocation! As a final note, while rather noisy, this commit will hopefully not break too much existing branches, old 'API' has been kept for the main part, as a wrapper around new code. Cleaning it up will happen later. Design task : T51804 Phab Diff: D2714
2017-08-07 16:39:55 +02:00
LineStyleModifier *BKE_linestyle_alpha_modifier_copy(FreestyleLineStyle *linestyle,
const LineStyleModifier *m,
const int UNUSED(flag))
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
{
LineStyleModifier *new_m;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
new_m = alloc_alpha_modifier(m->name, m->type);
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
new_m->influence = m->influence;
new_m->flags = m->flags;
new_m->blend = m->blend;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
switch (m->type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleAlphaModifier_AlongStroke *p = (LineStyleAlphaModifier_AlongStroke *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleAlphaModifier_AlongStroke *q = (LineStyleAlphaModifier_AlongStroke *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->flags = p->flags;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_DISTANCE_FROM_CAMERA: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleAlphaModifier_DistanceFromCamera *p = (LineStyleAlphaModifier_DistanceFromCamera *)
m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleAlphaModifier_DistanceFromCamera *q = (LineStyleAlphaModifier_DistanceFromCamera *)
new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->flags = p->flags;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
q->range_min = p->range_min;
q->range_max = p->range_max;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleAlphaModifier_DistanceFromObject *p = (LineStyleAlphaModifier_DistanceFromObject *)
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
m;
LineStyleAlphaModifier_DistanceFromObject *q = (LineStyleAlphaModifier_DistanceFromObject *)
new_m;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (p->target) {
Cleanup: avoid incrementing/decrementing id->us outside of BKE_library. We have callbacks for that, they also do some checks and help ensure things are done correctly. Only place where this is assumed not true is blenloader (since here we may affect refcount of library IDs as well...).
2015-11-09 19:47:10 +01:00
id_us_plus(&p->target->id);
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
q->target = p->target;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->flags = p->flags;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
q->range_min = p->range_min;
q->range_max = p->range_max;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_MATERIAL: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleAlphaModifier_Material *p = (LineStyleAlphaModifier_Material *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleAlphaModifier_Material *q = (LineStyleAlphaModifier_Material *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->flags = p->flags;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
q->mat_attr = p->mat_attr;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT: {
LineStyleAlphaModifier_Tangent *p = (LineStyleAlphaModifier_Tangent *)m;
LineStyleAlphaModifier_Tangent *q = (LineStyleAlphaModifier_Tangent *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
q->flags = p->flags;
break;
}
case LS_MODIFIER_NOISE: {
LineStyleAlphaModifier_Noise *p = (LineStyleAlphaModifier_Noise *)m;
LineStyleAlphaModifier_Noise *q = (LineStyleAlphaModifier_Noise *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
q->flags = p->flags;
q->amplitude = p->amplitude;
q->period = p->period;
q->seed = p->seed;
break;
}
case LS_MODIFIER_CREASE_ANGLE: {
LineStyleAlphaModifier_CreaseAngle *p = (LineStyleAlphaModifier_CreaseAngle *)m;
LineStyleAlphaModifier_CreaseAngle *q = (LineStyleAlphaModifier_CreaseAngle *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
q->flags = p->flags;
q->min_angle = p->min_angle;
q->max_angle = p->max_angle;
break;
}
case LS_MODIFIER_CURVATURE_3D: {
LineStyleAlphaModifier_Curvature_3D *p = (LineStyleAlphaModifier_Curvature_3D *)m;
LineStyleAlphaModifier_Curvature_3D *q = (LineStyleAlphaModifier_Curvature_3D *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
q->flags = p->flags;
q->min_curvature = p->min_curvature;
q->max_curvature = p->max_curvature;
break;
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
add_to_modifier_list(&linestyle->alpha_modifiers, new_m);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
return new_m;
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
Follow-up to code cleanup in rB415af0b: Keep compound terms as they are.
2014-07-17 02:23:30 +02:00
int BKE_linestyle_alpha_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *m)
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
{
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (BLI_findindex(&linestyle->alpha_modifiers, m) == -1) {
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return -1;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
switch (m->type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleAlphaModifier_AlongStroke *)m)->curve);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleAlphaModifier_DistanceFromObject *)m)->curve);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
case LS_MODIFIER_MATERIAL:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleAlphaModifier_Material *)m)->curve);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleAlphaModifier_Tangent *)m)->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
case LS_MODIFIER_NOISE:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleAlphaModifier_Noise *)m)->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
case LS_MODIFIER_CREASE_ANGLE:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleAlphaModifier_CreaseAngle *)m)->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
case LS_MODIFIER_CURVATURE_3D:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleAlphaModifier_Curvature_3D *)m)->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
BLI_freelinkN(&linestyle->alpha_modifiers, m);
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return 0;
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
static LineStyleModifier *alloc_thickness_modifier(const char *name, int type)
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
{
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
size_t size;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
switch (type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE:
size = sizeof(LineStyleThicknessModifier_AlongStroke);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
size = sizeof(LineStyleThicknessModifier_DistanceFromCamera);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
size = sizeof(LineStyleThicknessModifier_DistanceFromObject);
break;
case LS_MODIFIER_MATERIAL:
size = sizeof(LineStyleThicknessModifier_Material);
break;
case LS_MODIFIER_CALLIGRAPHY:
size = sizeof(LineStyleThicknessModifier_Calligraphy);
break;
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT:
size = sizeof(LineStyleThicknessModifier_Tangent);
break;
case LS_MODIFIER_NOISE:
size = sizeof(LineStyleThicknessModifier_Noise);
break;
case LS_MODIFIER_CREASE_ANGLE:
size = sizeof(LineStyleThicknessModifier_CreaseAngle);
break;
case LS_MODIFIER_CURVATURE_3D:
size = sizeof(LineStyleThicknessModifier_Curvature_3D);
break;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return new_modifier(name, type, size);
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
Follow-up to code cleanup in rB415af0b: Keep compound terms as they are.
2014-07-17 02:23:30 +02:00
LineStyleModifier *BKE_linestyle_thickness_modifier_add(FreestyleLineStyle *linestyle,
const char *name,
int type)
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
{
LineStyleModifier *m;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
m = alloc_thickness_modifier(name, type);
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
m->blend = LS_VALUE_BLEND;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
switch (type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
p->value_min = 0.0f;
p->value_max = 1.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_DISTANCE_FROM_CAMERA: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleThicknessModifier_DistanceFromCamera *p =
(LineStyleThicknessModifier_DistanceFromCamera *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
p->range_min = 0.0f;
p->range_max = 1000.0f;
p->value_min = 0.0f;
p->value_max = 1.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleThicknessModifier_DistanceFromObject *p =
(LineStyleThicknessModifier_DistanceFromObject *)m;
p->target = NULL;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
p->range_min = 0.0f;
p->range_max = 1000.0f;
p->value_min = 0.0f;
p->value_max = 1.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_MATERIAL: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Per-material line color settings for Freestyle. New properties 'line_color' and 'line_priority' are added to Material ID data blocks. The 'line_color' property allows users to specify a per-material line color that can be used as a Freestyle line color through Material color modifiers of line style settings. The new line color property is intended to provide a solution for line color stylization when a proper Freestyle support for Cycles is implemented (likely as part of the upcoming Blender 2.72 release; see Patch D632). Materials in Cycles are usually set up using shader nodes, and Freestyle won't be capable of retrieving colors and other properties from node-based materials any soon. The new line color property of materials addresses this foreseen limitation by providing artists with an intuitive alternative mean to specify line colors on a per-material basis independently from node trees. The 'line_priority' property gives users a way to control line colors at material boundaries. When a line is drawn along a feature edge at material boundaries, one of the two materials on both sides of the edge has to be picked up to determine the line color. So far there was no way to control this selection (which was in effect at random). Now the material with a higher line color priority will be selected. The new per-material line settings are shown in the new Freestyle Line tab in the Material context of the Properties window (only when Freestyle is enabled).
2014-07-07 08:54:46 +02:00
p->mat_attr = LS_MODIFIER_MATERIAL_LINE;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
p->value_min = 0.0f;
p->value_max = 1.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_CALLIGRAPHY: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m;
p->min_thickness = 1.0f;
p->max_thickness = 10.0f;
p->orientation = DEG2RADF(60.0f);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT: {
LineStyleThicknessModifier_Tangent *p = (LineStyleThicknessModifier_Tangent *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
p->min_thickness = 1.0f;
p->max_thickness = 10.0f;
break;
}
case LS_MODIFIER_NOISE: {
LineStyleThicknessModifier_Noise *p = (LineStyleThicknessModifier_Noise *)m;
p->period = 10.0f;
p->amplitude = 10.0f;
p->seed = 512;
p->flags = LS_THICKNESS_ASYMMETRIC;
break;
}
case LS_MODIFIER_CREASE_ANGLE: {
LineStyleThicknessModifier_CreaseAngle *p = (LineStyleThicknessModifier_CreaseAngle *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
p->min_angle = 0.0f;
p->max_angle = DEG2RADF(180.0f);
p->min_thickness = 1.0f;
p->max_thickness = 10.0f;
break;
}
case LS_MODIFIER_CURVATURE_3D: {
LineStyleThicknessModifier_Curvature_3D *p = (LineStyleThicknessModifier_Curvature_3D *)m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
p->curve = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
p->min_curvature = 0.0f;
p->max_curvature = 0.5f;
p->min_thickness = 1.0f;
p->max_thickness = 10.0f;
break;
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
add_to_modifier_list(&linestyle->thickness_modifiers, m);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
return m;
}
Refactor ID copying (and to some extent, ID freeing). This will allow much finer controll over how we copy data-blocks, from full copy in Main database, to "lighter" ones (out of Main, inside an already allocated datablock, etc.). This commit also transfers a llot of what was previously handled by per-ID-type custom code to generic ID handling code in BKE_library. Hopefully will avoid in future inconsistencies and missing bits we had all over the codebase in the past. It also adds missing copying handling for a few types, most notably Scene (which where using a fully customized handling previously). Note that the type of allocation used during copying (regular in Main, allocated but outside of Main, or not allocated by ID handling code at all) is stored in ID's, which allows to handle them correctly when freeing. This needs to be taken care of with caution when doing 'weird' unusual things with ID copying and/or allocation! As a final note, while rather noisy, this commit will hopefully not break too much existing branches, old 'API' has been kept for the main part, as a wrapper around new code. Cleaning it up will happen later. Design task : T51804 Phab Diff: D2714
2017-08-07 16:39:55 +02:00
LineStyleModifier *BKE_linestyle_thickness_modifier_copy(FreestyleLineStyle *linestyle,
const LineStyleModifier *m,
const int flag)
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
{
LineStyleModifier *new_m;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
new_m = alloc_thickness_modifier(m->name, m->type);
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (!new_m) {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
return NULL;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
new_m->influence = m->influence;
new_m->flags = m->flags;
new_m->blend = m->blend;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
switch (m->type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleThicknessModifier_AlongStroke *p = (LineStyleThicknessModifier_AlongStroke *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleThicknessModifier_AlongStroke *q = (LineStyleThicknessModifier_AlongStroke *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->flags = p->flags;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
q->value_min = p->value_min;
q->value_max = p->value_max;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_DISTANCE_FROM_CAMERA: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleThicknessModifier_DistanceFromCamera *p =
(LineStyleThicknessModifier_DistanceFromCamera *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleThicknessModifier_DistanceFromCamera *q =
(LineStyleThicknessModifier_DistanceFromCamera *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->flags = p->flags;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
q->range_min = p->range_min;
q->range_max = p->range_max;
q->value_min = p->value_min;
q->value_max = p->value_max;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleThicknessModifier_DistanceFromObject *p =
(LineStyleThicknessModifier_DistanceFromObject *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleThicknessModifier_DistanceFromObject *q =
(LineStyleThicknessModifier_DistanceFromObject *)new_m;
q->target = p->target;
Refactor ID copying (and to some extent, ID freeing). This will allow much finer controll over how we copy data-blocks, from full copy in Main database, to "lighter" ones (out of Main, inside an already allocated datablock, etc.). This commit also transfers a llot of what was previously handled by per-ID-type custom code to generic ID handling code in BKE_library. Hopefully will avoid in future inconsistencies and missing bits we had all over the codebase in the past. It also adds missing copying handling for a few types, most notably Scene (which where using a fully customized handling previously). Note that the type of allocation used during copying (regular in Main, allocated but outside of Main, or not allocated by ID handling code at all) is stored in ID's, which allows to handle them correctly when freeing. This needs to be taken care of with caution when doing 'weird' unusual things with ID copying and/or allocation! As a final note, while rather noisy, this commit will hopefully not break too much existing branches, old 'API' has been kept for the main part, as a wrapper around new code. Cleaning it up will happen later. Design task : T51804 Phab Diff: D2714
2017-08-07 16:39:55 +02:00
if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) {
id_us_plus((ID *)q->target);
}
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->flags = p->flags;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
q->range_min = p->range_min;
q->range_max = p->range_max;
q->value_min = p->value_min;
q->value_max = p->value_max;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_MATERIAL: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleThicknessModifier_Material *p = (LineStyleThicknessModifier_Material *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleThicknessModifier_Material *q = (LineStyleThicknessModifier_Material *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->flags = p->flags;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
q->mat_attr = p->mat_attr;
q->value_min = p->value_min;
q->value_max = p->value_max;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_CALLIGRAPHY: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleThicknessModifier_Calligraphy *p = (LineStyleThicknessModifier_Calligraphy *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleThicknessModifier_Calligraphy *q = (LineStyleThicknessModifier_Calligraphy *)new_m;
q->min_thickness = p->min_thickness;
q->max_thickness = p->max_thickness;
q->orientation = p->orientation;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT: {
LineStyleThicknessModifier_Tangent *p = (LineStyleThicknessModifier_Tangent *)m;
LineStyleThicknessModifier_Tangent *q = (LineStyleThicknessModifier_Tangent *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
q->flags = p->flags;
q->min_thickness = p->min_thickness;
q->max_thickness = p->max_thickness;
break;
}
case LS_MODIFIER_NOISE: {
LineStyleThicknessModifier_Noise *p = (LineStyleThicknessModifier_Noise *)m;
LineStyleThicknessModifier_Noise *q = (LineStyleThicknessModifier_Noise *)new_m;
q->amplitude = p->amplitude;
q->period = p->period;
q->seed = p->seed;
q->flags = p->flags;
break;
}
case LS_MODIFIER_CURVATURE_3D: {
LineStyleThicknessModifier_Curvature_3D *p = (LineStyleThicknessModifier_Curvature_3D *)m;
LineStyleThicknessModifier_Curvature_3D *q = (LineStyleThicknessModifier_Curvature_3D *)
new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
q->flags = p->flags;
q->min_curvature = p->min_curvature;
q->max_curvature = p->max_curvature;
q->min_thickness = p->min_thickness;
q->max_thickness = p->max_thickness;
break;
}
case LS_MODIFIER_CREASE_ANGLE: {
LineStyleThicknessModifier_CreaseAngle *p = (LineStyleThicknessModifier_CreaseAngle *)m;
LineStyleThicknessModifier_CreaseAngle *q = (LineStyleThicknessModifier_CreaseAngle *)new_m;
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
q->curve = BKE_curvemapping_copy(p->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
q->flags = p->flags;
q->min_angle = p->min_angle;
q->max_angle = p->max_angle;
q->min_thickness = p->min_thickness;
q->max_thickness = p->max_thickness;
break;
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
add_to_modifier_list(&linestyle->thickness_modifiers, new_m);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
return new_m;
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
A step toward a new user-friendly GUI for manipulating line style parameters. This commit is just meant to give the new GUI framework a concrete shape. There is no usefulness in newly introduced elements at the moment. Freestyle options in render layers now include a pull-down menu named Control Mode that allows you to choose either the Python Scripting or Parameter Editor mode. The Python Scripting mode is the conventional way of controlling Freestyle by directly using style modules written in Python. The Parameter Editor is a new control mode that is intended to be used by everyone without relying on Python programming. In the Parameter Editor mode, you can specify multiple line sets for each render layer. A line set defines feature edge selection criteria, as well as a line style for drawing the selected feature edges using specific line stylization parameters. Line style is a new datablock type, meaning that a line style can be shared by multiple line sets (possibly those in different render layers in different scenes). Much more additions are anticipated in subsequent commits to implement UI controls for specifying feature edge selection criteria and line stylization parameters.
2010-06-26 00:45:42 +02:00
Follow-up to code cleanup in rB415af0b: Keep compound terms as they are.
2014-07-17 02:23:30 +02:00
int BKE_linestyle_thickness_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *m)
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
{
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (BLI_findindex(&linestyle->thickness_modifiers, m) == -1) {
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return -1;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
switch (m->type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleThicknessModifier_AlongStroke *)m)->curve);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleThicknessModifier_DistanceFromCamera *)m)->curve);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleThicknessModifier_DistanceFromObject *)m)->curve);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
case LS_MODIFIER_MATERIAL:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleThicknessModifier_Material *)m)->curve);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
case LS_MODIFIER_CALLIGRAPHY:
break;
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT:
Cleanup: use BKE_ prefix for BKE_colortools.h
2019-08-06 19:21:55 +02:00
BKE_curvemapping_free(((LineStyleThicknessModifier_Tangent *)m)->curve);
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
case LS_MODIFIER_NOISE:
break;
case LS_MODIFIER_CREASE_ANGLE:
break;
case LS_MODIFIER_CURVATURE_3D:
break;
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
BLI_freelinkN(&linestyle->thickness_modifiers, m);
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return 0;
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
static LineStyleModifier *alloc_geometry_modifier(const char *name, int type)
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
{
size_t size;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
switch (type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_SAMPLING:
size = sizeof(LineStyleGeometryModifier_Sampling);
break;
case LS_MODIFIER_BEZIER_CURVE:
size = sizeof(LineStyleGeometryModifier_BezierCurve);
break;
case LS_MODIFIER_SINUS_DISPLACEMENT:
size = sizeof(LineStyleGeometryModifier_SinusDisplacement);
break;
case LS_MODIFIER_SPATIAL_NOISE:
size = sizeof(LineStyleGeometryModifier_SpatialNoise);
break;
case LS_MODIFIER_PERLIN_NOISE_1D:
size = sizeof(LineStyleGeometryModifier_PerlinNoise1D);
break;
case LS_MODIFIER_PERLIN_NOISE_2D:
size = sizeof(LineStyleGeometryModifier_PerlinNoise2D);
break;
case LS_MODIFIER_BACKBONE_STRETCHER:
size = sizeof(LineStyleGeometryModifier_BackboneStretcher);
break;
case LS_MODIFIER_TIP_REMOVER:
size = sizeof(LineStyleGeometryModifier_TipRemover);
break;
case LS_MODIFIER_POLYGONIZATION:
size = sizeof(LineStyleGeometryModifier_Polygonalization);
break;
case LS_MODIFIER_GUIDING_LINES:
size = sizeof(LineStyleGeometryModifier_GuidingLines);
break;
case LS_MODIFIER_BLUEPRINT:
size = sizeof(LineStyleGeometryModifier_Blueprint);
break;
case LS_MODIFIER_2D_OFFSET:
size = sizeof(LineStyleGeometryModifier_2DOffset);
break;
case LS_MODIFIER_2D_TRANSFORM:
size = sizeof(LineStyleGeometryModifier_2DTransform);
break;
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_SIMPLIFICATION:
size = sizeof(LineStyleGeometryModifier_Simplification);
break;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return new_modifier(name, type, size);
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
Follow-up to code cleanup in rB415af0b: Keep compound terms as they are.
2014-07-17 02:23:30 +02:00
LineStyleModifier *BKE_linestyle_geometry_modifier_add(FreestyleLineStyle *linestyle,
const char *name,
int type)
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
{
LineStyleModifier *m;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
m = alloc_geometry_modifier(name, type);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
switch (type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_SAMPLING: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m;
p->sampling = 10.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_BEZIER_CURVE: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m;
p->error = 10.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_SINUS_DISPLACEMENT: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_SinusDisplacement *p =
(LineStyleGeometryModifier_SinusDisplacement *)m;
p->wavelength = 20.0f;
p->amplitude = 5.0f;
p->phase = 0.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_SPATIAL_NOISE: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m;
p->amplitude = 5.0f;
p->scale = 20.0f;
p->octaves = 4;
p->flags = LS_MODIFIER_SPATIAL_NOISE_SMOOTH | LS_MODIFIER_SPATIAL_NOISE_PURERANDOM;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_PERLIN_NOISE_1D: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m;
p->frequency = 10.0f;
p->amplitude = 10.0f;
p->octaves = 4;
p->angle = DEG2RADF(45.0f);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_PERLIN_NOISE_2D: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m;
p->frequency = 10.0f;
p->amplitude = 10.0f;
p->octaves = 4;
p->angle = DEG2RADF(45.0f);
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_BACKBONE_STRETCHER: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_BackboneStretcher *p =
(LineStyleGeometryModifier_BackboneStretcher *)m;
p->backbone_length = 10.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_TIP_REMOVER: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m;
p->tip_length = 10.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_POLYGONIZATION: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_Polygonalization *p =
(LineStyleGeometryModifier_Polygonalization *)m;
p->error = 10.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_GUIDING_LINES: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m;
p->offset = 0.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_BLUEPRINT: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m;
p->flags = LS_MODIFIER_BLUEPRINT_CIRCLES;
p->rounds = 1;
p->backbone_length = 10.0f;
p->random_radius = 3;
p->random_center = 5;
p->random_backbone = 5;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_2D_OFFSET: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_2DOffset *p = (LineStyleGeometryModifier_2DOffset *)m;
p->start = 0.0f;
p->end = 0.0f;
p->x = 0.0f;
p->y = 0.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_2D_TRANSFORM: {
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_2DTransform *p = (LineStyleGeometryModifier_2DTransform *)m;
p->pivot = LS_MODIFIER_2D_TRANSFORM_PIVOT_CENTER;
p->scale_x = 1.0f;
p->scale_y = 1.0f;
p->angle = DEG2RADF(0.0f);
p->pivot_u = 0.5f;
p->pivot_x = 0.0f;
p->pivot_y = 0.0f;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
}
Cleanup: style
2015-07-12 19:48:08 +02:00
case LS_MODIFIER_SIMPLIFICATION: {
LineStyleGeometryModifier_Simplification *p = (LineStyleGeometryModifier_Simplification *)m;
p->tolerance = 0.1f;
break;
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
}
add_to_modifier_list(&linestyle->geometry_modifiers, m);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
return m;
}
Refactor ID copying (and to some extent, ID freeing). This will allow much finer controll over how we copy data-blocks, from full copy in Main database, to "lighter" ones (out of Main, inside an already allocated datablock, etc.). This commit also transfers a llot of what was previously handled by per-ID-type custom code to generic ID handling code in BKE_library. Hopefully will avoid in future inconsistencies and missing bits we had all over the codebase in the past. It also adds missing copying handling for a few types, most notably Scene (which where using a fully customized handling previously). Note that the type of allocation used during copying (regular in Main, allocated but outside of Main, or not allocated by ID handling code at all) is stored in ID's, which allows to handle them correctly when freeing. This needs to be taken care of with caution when doing 'weird' unusual things with ID copying and/or allocation! As a final note, while rather noisy, this commit will hopefully not break too much existing branches, old 'API' has been kept for the main part, as a wrapper around new code. Cleaning it up will happen later. Design task : T51804 Phab Diff: D2714
2017-08-07 16:39:55 +02:00
LineStyleModifier *BKE_linestyle_geometry_modifier_copy(FreestyleLineStyle *linestyle,
const LineStyleModifier *m,
const int UNUSED(flag))
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
{
LineStyleModifier *new_m;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
new_m = alloc_geometry_modifier(m->name, m->type);
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
new_m->flags = m->flags;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
switch (m->type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_SAMPLING: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_Sampling *p = (LineStyleGeometryModifier_Sampling *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_Sampling *q = (LineStyleGeometryModifier_Sampling *)new_m;
q->sampling = p->sampling;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_BEZIER_CURVE: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_BezierCurve *p = (LineStyleGeometryModifier_BezierCurve *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_BezierCurve *q = (LineStyleGeometryModifier_BezierCurve *)new_m;
q->error = p->error;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_SINUS_DISPLACEMENT: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_SinusDisplacement *p =
(LineStyleGeometryModifier_SinusDisplacement *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_SinusDisplacement *q =
(LineStyleGeometryModifier_SinusDisplacement *)new_m;
q->wavelength = p->wavelength;
q->amplitude = p->amplitude;
q->phase = p->phase;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_SPATIAL_NOISE: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_SpatialNoise *p = (LineStyleGeometryModifier_SpatialNoise *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_SpatialNoise *q = (LineStyleGeometryModifier_SpatialNoise *)new_m;
q->amplitude = p->amplitude;
q->scale = p->scale;
q->octaves = p->octaves;
q->flags = p->flags;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_PERLIN_NOISE_1D: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_PerlinNoise1D *p = (LineStyleGeometryModifier_PerlinNoise1D *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_PerlinNoise1D *q = (LineStyleGeometryModifier_PerlinNoise1D *)
new_m;
q->frequency = p->frequency;
q->amplitude = p->amplitude;
q->angle = p->angle;
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->octaves = p->octaves;
q->seed = p->seed;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_PERLIN_NOISE_2D: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_PerlinNoise2D *p = (LineStyleGeometryModifier_PerlinNoise2D *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_PerlinNoise2D *q = (LineStyleGeometryModifier_PerlinNoise2D *)
new_m;
q->frequency = p->frequency;
q->amplitude = p->amplitude;
q->angle = p->angle;
minor fixes for freestyle - update copying code for linestyles to copy gaps - update copying code for freestyle line modifiers to copy mapping flags and seeds - fix drawing code for Material modifiers after a recent refactoring
2013-04-25 18:23:23 +02:00
q->octaves = p->octaves;
q->seed = p->seed;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_BACKBONE_STRETCHER: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_BackboneStretcher *p =
(LineStyleGeometryModifier_BackboneStretcher *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_BackboneStretcher *q =
(LineStyleGeometryModifier_BackboneStretcher *)new_m;
q->backbone_length = p->backbone_length;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_TIP_REMOVER: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_TipRemover *p = (LineStyleGeometryModifier_TipRemover *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_TipRemover *q = (LineStyleGeometryModifier_TipRemover *)new_m;
q->tip_length = p->tip_length;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_POLYGONIZATION: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_Polygonalization *p =
(LineStyleGeometryModifier_Polygonalization *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_Polygonalization *q =
(LineStyleGeometryModifier_Polygonalization *)new_m;
q->error = p->error;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_GUIDING_LINES: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_GuidingLines *p = (LineStyleGeometryModifier_GuidingLines *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_GuidingLines *q = (LineStyleGeometryModifier_GuidingLines *)new_m;
q->offset = p->offset;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_BLUEPRINT: {
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
LineStyleGeometryModifier_Blueprint *p = (LineStyleGeometryModifier_Blueprint *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_Blueprint *q = (LineStyleGeometryModifier_Blueprint *)new_m;
q->flags = p->flags;
q->rounds = p->rounds;
q->backbone_length = p->backbone_length;
q->random_radius = p->random_radius;
q->random_center = p->random_center;
q->random_backbone = p->random_backbone;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_2D_OFFSET: {
Added two stroke geometry modifiers: - 2D Offset: Adds two-dimensional offsets to stroke backbone geometry. - 2D Transform: Applies two-dimensional scaling and rotation to stroke backbone geometry.
2012-01-04 01:23:34 +01:00
LineStyleGeometryModifier_2DOffset *p = (LineStyleGeometryModifier_2DOffset *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_2DOffset *q = (LineStyleGeometryModifier_2DOffset *)new_m;
q->start = p->start;
q->end = p->end;
q->x = p->x;
q->y = p->y;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Added two stroke geometry modifiers: - 2D Offset: Adds two-dimensional offsets to stroke backbone geometry. - 2D Transform: Applies two-dimensional scaling and rotation to stroke backbone geometry.
2012-01-04 01:23:34 +01:00
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_2D_TRANSFORM: {
Added two stroke geometry modifiers: - 2D Offset: Adds two-dimensional offsets to stroke backbone geometry. - 2D Transform: Applies two-dimensional scaling and rotation to stroke backbone geometry.
2012-01-04 01:23:34 +01:00
LineStyleGeometryModifier_2DTransform *p = (LineStyleGeometryModifier_2DTransform *)m;
Code clean-up suggested by Sergey Sharybin through a code review of the branch. * Removed the checks of NULL pointers after malloc/calloc. * Replaced repeated cast operations with a temporary variable initialized with one cast operation. * Removed an unused switch block (meant to be a place to put per-modifier resource management code).
2013-03-20 00:54:14 +01:00
LineStyleGeometryModifier_2DTransform *q = (LineStyleGeometryModifier_2DTransform *)new_m;
q->pivot = p->pivot;
q->scale_x = p->scale_x;
q->scale_y = p->scale_y;
q->angle = p->angle;
q->pivot_u = p->pivot_u;
q->pivot_x = p->pivot_x;
q->pivot_y = p->pivot_y;
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
break;
Added two stroke geometry modifiers: - 2D Offset: Adds two-dimensional offsets to stroke backbone geometry. - 2D Transform: Applies two-dimensional scaling and rotation to stroke backbone geometry.
2012-01-04 01:23:34 +01:00
}
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_SIMPLIFICATION: {
LineStyleGeometryModifier_Simplification *p = (LineStyleGeometryModifier_Simplification *)m;
LineStyleGeometryModifier_Simplification *q = (LineStyleGeometryModifier_Simplification *)
new_m;
q->tolerance = p->tolerance;
break;
}
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
default:
return NULL; /* unknown modifier type */
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
}
add_to_modifier_list(&linestyle->geometry_modifiers, new_m);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Implemented a button to make a single-user copy of a line style.
2011-11-14 01:43:37 +01:00
return new_m;
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
}
Follow-up to code cleanup in rB415af0b: Keep compound terms as they are.
2014-07-17 02:23:30 +02:00
int BKE_linestyle_geometry_modifier_remove(FreestyleLineStyle *linestyle, LineStyleModifier *m)
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
{
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (BLI_findindex(&linestyle->geometry_modifiers, m) == -1) {
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return -1;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
BLI_freelinkN(&linestyle->geometry_modifiers, m);
Freestyle: Added .new() and .remove() methods to collection types of line style modifiers.
2014-05-13 02:15:12 +02:00
return 0;
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
}
BLI_listbase: Add/use utility to move link (BLI_listbase_link_move) We were calling BLI_remlink and then BLI_insertlinkbefore/after quite often. BLI_listbase_link_move simplifies code a bit and makes it easier to follow. It also returns if link position has changed which can be used to avoid unnecessary updates. Added it to a number of list reorder operators for now and made use of return value. Behavior shouldn't be changed. Also some minor cleanup.
2016-09-18 21:36:34 +02:00
bool BKE_linestyle_color_modifier_move(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier,
int direction)
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
{
BLI_listbase: Add/use utility to move link (BLI_listbase_link_move) We were calling BLI_remlink and then BLI_insertlinkbefore/after quite often. BLI_listbase_link_move simplifies code a bit and makes it easier to follow. It also returns if link position has changed which can be used to avoid unnecessary updates. Added it to a number of list reorder operators for now and made use of return value. Behavior shouldn't be changed. Also some minor cleanup.
2016-09-18 21:36:34 +02:00
return BLI_listbase_link_move(&linestyle->color_modifiers, modifier, direction);
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
BLI_listbase: Add/use utility to move link (BLI_listbase_link_move) We were calling BLI_remlink and then BLI_insertlinkbefore/after quite often. BLI_listbase_link_move simplifies code a bit and makes it easier to follow. It also returns if link position has changed which can be used to avoid unnecessary updates. Added it to a number of list reorder operators for now and made use of return value. Behavior shouldn't be changed. Also some minor cleanup.
2016-09-18 21:36:34 +02:00
bool BKE_linestyle_alpha_modifier_move(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier,
int direction)
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
{
BLI_listbase: Add/use utility to move link (BLI_listbase_link_move) We were calling BLI_remlink and then BLI_insertlinkbefore/after quite often. BLI_listbase_link_move simplifies code a bit and makes it easier to follow. It also returns if link position has changed which can be used to avoid unnecessary updates. Added it to a number of list reorder operators for now and made use of return value. Behavior shouldn't be changed. Also some minor cleanup.
2016-09-18 21:36:34 +02:00
return BLI_listbase_link_move(&linestyle->alpha_modifiers, modifier, direction);
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
BLI_listbase: Add/use utility to move link (BLI_listbase_link_move) We were calling BLI_remlink and then BLI_insertlinkbefore/after quite often. BLI_listbase_link_move simplifies code a bit and makes it easier to follow. It also returns if link position has changed which can be used to avoid unnecessary updates. Added it to a number of list reorder operators for now and made use of return value. Behavior shouldn't be changed. Also some minor cleanup.
2016-09-18 21:36:34 +02:00
bool BKE_linestyle_thickness_modifier_move(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier,
int direction)
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
{
BLI_listbase: Add/use utility to move link (BLI_listbase_link_move) We were calling BLI_remlink and then BLI_insertlinkbefore/after quite often. BLI_listbase_link_move simplifies code a bit and makes it easier to follow. It also returns if link position has changed which can be used to avoid unnecessary updates. Added it to a number of list reorder operators for now and made use of return value. Behavior shouldn't be changed. Also some minor cleanup.
2016-09-18 21:36:34 +02:00
return BLI_listbase_link_move(&linestyle->thickness_modifiers, modifier, direction);
A WIP commit for proof-of-concept implementations of line style modifiers. A number of UI elements were newly introduced to control line color, alpha transparency and line thickness by means of base color/alpha/thickness plus modifiers that alter the base values. To begin with, three basic modifiers were prototyped with the aim of putting the new UI framework in practice and evaluating if it works properly. The Parameter Editor mode is still in a work-in-progress state and totally useless from users' viewpoint.
2010-07-20 19:57:33 +02:00
}
BLI_listbase: Add/use utility to move link (BLI_listbase_link_move) We were calling BLI_remlink and then BLI_insertlinkbefore/after quite often. BLI_listbase_link_move simplifies code a bit and makes it easier to follow. It also returns if link position has changed which can be used to avoid unnecessary updates. Added it to a number of list reorder operators for now and made use of return value. Behavior shouldn't be changed. Also some minor cleanup.
2016-09-18 21:36:34 +02:00
bool BKE_linestyle_geometry_modifier_move(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier,
int direction)
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
{
BLI_listbase: Add/use utility to move link (BLI_listbase_link_move) We were calling BLI_remlink and then BLI_insertlinkbefore/after quite often. BLI_listbase_link_move simplifies code a bit and makes it easier to follow. It also returns if link position has changed which can be used to avoid unnecessary updates. Added it to a number of list reorder operators for now and made use of return value. Behavior shouldn't be changed. Also some minor cleanup.
2016-09-18 21:36:34 +02:00
return BLI_listbase_link_move(&linestyle->geometry_modifiers, modifier, direction);
Stroke geometry modifiers Added a set of stroke geometry modifiers to the Geometry tab of line styles in the Parameter Editor mode. Now the following stroke geometry modifiers are available, each with a set of animateable parameters: - Sampling: changes the resolution of stroke backbone polylines. - Bezier Curve: replace stroke backbone with a Bezier approximation of the stroke backbone. - Sinus Displacement: add sinus displacement to stroke backbone. - Spatial Noise: add spatial noise to stroke backbone. - Perlin Noise 1D: add one-dimensional Perlin noise to stroke backbone. - Perlin Noise 2D: add two-dimensional Perlin noise to stroke backbone. - Backbone Stretcher: stretch the beginning and the end of strokes. - Tip Remover: remove a piece of stroke at the beginning and the end of strokes. To branch users: When you have a .blend file with Freestyle options specified, you may want to add a Sampling modifier with the 'sampling' value set to 5. This value specifies a resolution of polylines for line drawing in Freestyle. If no sampling modifier is specified, your line drawing will result in coarse polylines. Before geometry modifiers were introduced, this initial sampling was automatically done. Now the initial sampling is a tunable parameter that can be omitted, allowing better control on polyline resolution.
2011-08-19 16:05:11 +02:00
}
Cleanup: Adhere to our naming convention for BKE_linestyle.h API
2014-07-16 07:13:40 +02:00
void BKE_linestyle_modifier_list_color_ramps(FreestyleLineStyle *linestyle, ListBase *listbase)
Added support for animation of line style parameters. Most stylization parameters in line style datablocks are now animatable by means of keyframes. Right click on a line style parameter, and you will see a list of keyframe-related commands in the context menu. Concerning the implementation, RNA path resolution has been extended to properly address color ramps in line style color modifiers. File I/O has been also improved to load/save the animation data associated with line style datablocks. Known issue: Freestyle-related options in render layers are not animatable at the moment, because of general inability (or maybe a bug) that keyframes cannot be inserted with respect to render layer options.
2010-09-18 02:31:22 +02:00
{
LineStyleModifier *m;
ColorBand *color_ramp;
LinkData *link;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
ListBase API: add utility api funcs for clearing and checking empty
2014-02-07 20:07:10 +01:00
BLI_listbase_clear(listbase);
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Added support for animation of line style parameters. Most stylization parameters in line style datablocks are now animatable by means of keyframes. Right click on a line style parameter, and you will see a list of keyframe-related commands in the context menu. Concerning the implementation, RNA path resolution has been extended to properly address color ramps in line style color modifiers. File I/O has been also improved to load/save the animation data associated with line style datablocks. Known issue: Freestyle-related options in render layers are not animatable at the moment, because of general inability (or maybe a bug) that keyframes cannot be inserted with respect to render layer options.
2010-09-18 02:31:22 +02:00
for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next) {
switch (m->type) {
style cleanup: switch statements, include break statements within braces & indent. also indent case's within the switch (we already did both of these almost everywhere)
2013-07-19 17:23:42 +02:00
case LS_MODIFIER_ALONG_STROKE:
color_ramp = ((LineStyleColorModifier_AlongStroke *)m)->color_ramp;
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
color_ramp = ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp;
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
color_ramp = ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp;
break;
case LS_MODIFIER_MATERIAL:
color_ramp = ((LineStyleColorModifier_Material *)m)->color_ramp;
break;
default:
continue;
Added support for animation of line style parameters. Most stylization parameters in line style datablocks are now animatable by means of keyframes. Right click on a line style parameter, and you will see a list of keyframe-related commands in the context menu. Concerning the implementation, RNA path resolution has been extended to properly address color ramps in line style color modifiers. File I/O has been also improved to load/save the animation data associated with line style datablocks. Known issue: Freestyle-related options in render layers are not animatable at the moment, because of general inability (or maybe a bug) that keyframes cannot be inserted with respect to render layer options.
2010-09-18 02:31:22 +02:00
}
Code cleanup: use struct type for mempool & style edits
2014-04-09 22:24:33 +02:00
link = (LinkData *)MEM_callocN(sizeof(LinkData), "link to color ramp");
Added support for animation of line style parameters. Most stylization parameters in line style datablocks are now animatable by means of keyframes. Right click on a line style parameter, and you will see a list of keyframe-related commands in the context menu. Concerning the implementation, RNA path resolution has been extended to properly address color ramps in line style color modifiers. File I/O has been also improved to load/save the animation data associated with line style datablocks. Known issue: Freestyle-related options in render layers are not animatable at the moment, because of general inability (or maybe a bug) that keyframes cannot be inserted with respect to render layer options.
2010-09-18 02:31:22 +02:00
link->data = color_ramp;
BLI_addtail(listbase, link);
}
}
Cleanup: Adhere to our naming convention for BKE_linestyle.h API
2014-07-16 07:13:40 +02:00
char *BKE_linestyle_path_to_color_ramp(FreestyleLineStyle *linestyle, ColorBand *color_ramp)
Added support for animation of line style parameters. Most stylization parameters in line style datablocks are now animatable by means of keyframes. Right click on a line style parameter, and you will see a list of keyframe-related commands in the context menu. Concerning the implementation, RNA path resolution has been extended to properly address color ramps in line style color modifiers. File I/O has been also improved to load/save the animation data associated with line style datablocks. Known issue: Freestyle-related options in render layers are not animatable at the moment, because of general inability (or maybe a bug) that keyframes cannot be inserted with respect to render layer options.
2010-09-18 02:31:22 +02:00
{
LineStyleModifier *m;
Removed goto's as suggested first by Bastien Montagne and also by Sergey Sharybin through a code review of the branch.
2013-03-20 01:08:42 +01:00
bool found = false;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Added support for animation of line style parameters. Most stylization parameters in line style datablocks are now animatable by means of keyframes. Right click on a line style parameter, and you will see a list of keyframe-related commands in the context menu. Concerning the implementation, RNA path resolution has been extended to properly address color ramps in line style color modifiers. File I/O has been also improved to load/save the animation data associated with line style datablocks. Known issue: Freestyle-related options in render layers are not animatable at the moment, because of general inability (or maybe a bug) that keyframes cannot be inserted with respect to render layer options.
2010-09-18 02:31:22 +02:00
for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next) {
switch (m->type) {
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
case LS_MODIFIER_ALONG_STROKE:
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (color_ramp == ((LineStyleColorModifier_AlongStroke *)m)->color_ramp) {
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
found = true;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (color_ramp == ((LineStyleColorModifier_DistanceFromCamera *)m)->color_ramp) {
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
found = true;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (color_ramp == ((LineStyleColorModifier_DistanceFromObject *)m)->color_ramp) {
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
found = true;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
break;
case LS_MODIFIER_MATERIAL:
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (color_ramp == ((LineStyleColorModifier_Material *)m)->color_ramp) {
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
found = true;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
break;
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
case LS_MODIFIER_TANGENT:
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (color_ramp == ((LineStyleColorModifier_Tangent *)m)->color_ramp) {
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
found = true;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
case LS_MODIFIER_NOISE:
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (color_ramp == ((LineStyleColorModifier_Noise *)m)->color_ramp) {
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
found = true;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
case LS_MODIFIER_CREASE_ANGLE:
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (color_ramp == ((LineStyleColorModifier_CreaseAngle *)m)->color_ramp) {
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
found = true;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
case LS_MODIFIER_CURVATURE_3D:
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
if (color_ramp == ((LineStyleColorModifier_Curvature_3D *)m)->color_ramp) {
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
found = true;
Cleanup: style, use braces for blenkernel
2019-04-22 01:39:35 +02:00
}
Freestyle: new stroke modifiers This patch introduces a couple new stroke modifiers. The ones currently implemented are based on prototypes by @kjym3 and myself. The new modifiers: - Tangent - Thickness noise - Crease Angle - Simplification - Curvature 3D The documentation for these new modifier types can be found [[ http://www.blender.org/manual/render/freestyle/parameter_editor/index.html | in the manual ]]: {F134441} (left: AnisotropicThicknessShader, right: NoiseThicknessShader) {F140499} (left: Curvature 3D, right: Simplification) Author: Folkert de Vries (flokkievids) Reviewers: kjym3 Subscribers: #user_interface, plasmasolutions, kjym3 Projects: #bf_blender Differential Revision: https://developer.blender.org/D963
2015-07-10 14:57:23 +02:00
break;
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
}
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
if (found) {
char name_esc[sizeof(m->name) * 2];
Cleanup: rename BLI_strescape to BLI_str_escape Prepare for `BLI_str_unescape` which doesn't read well without the separator.
2020-12-10 03:25:49 +01:00
BLI_str_escape(name_esc, m->name, sizeof(name_esc));
fix [#34958] keyframe many items would fail if there was a (") in the text.
2013-04-23 22:10:22 +02:00
return BLI_sprintfN("color_modifiers[\"%s\"].color_ramp", name_esc);
Added support for animation of line style parameters. Most stylization parameters in line style datablocks are now animatable by means of keyframes. Right click on a line style parameter, and you will see a list of keyframe-related commands in the context menu. Concerning the implementation, RNA path resolution has been extended to properly address color ramps in line style color modifiers. File I/O has been also improved to load/save the animation data associated with line style datablocks. Known issue: Freestyle-related options in render layers are not animatable at the moment, because of general inability (or maybe a bug) that keyframes cannot be inserted with respect to render layer options.
2010-09-18 02:31:22 +02:00
}
}
Cleanup: Adhere to our naming convention for BKE_linestyle.h API
2014-07-16 07:13:40 +02:00
printf("BKE_linestyle_path_to_color_ramp: No color ramps correspond to the given pointer.\n");
Added support for animation of line style parameters. Most stylization parameters in line style datablocks are now animatable by means of keyframes. Right click on a line style parameter, and you will see a list of keyframe-related commands in the context menu. Concerning the implementation, RNA path resolution has been extended to properly address color ramps in line style color modifiers. File I/O has been also improved to load/save the animation data associated with line style datablocks. Known issue: Freestyle-related options in render layers are not animatable at the moment, because of general inability (or maybe a bug) that keyframes cannot be inserted with respect to render layer options.
2010-09-18 02:31:22 +02:00
return NULL;
}
Fix for properly unlinking target object pointers when objects are deleted from scenes.
2010-11-29 22:24:55 +01:00
Added BKE_linestyle_use_textures() to check if stroke textures are enabled.
2014-07-19 08:33:15 +02:00
bool BKE_linestyle_use_textures(FreestyleLineStyle *linestyle, const bool use_shading_nodes)
{
if (use_shading_nodes) {
if (linestyle && linestyle->use_nodes && linestyle->nodetree) {
bNode *node;
ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
2019-04-17 06:17:24 +02:00
Added BKE_linestyle_use_textures() to check if stroke textures are enabled.
2014-07-19 08:33:15 +02:00
for (node = linestyle->nodetree->nodes.first; node; node = node->next) {
if (node->typeinfo->nclass == NODE_CLASS_TEXTURE) {
return true;
}
}
}
}
else {
if (linestyle && (linestyle->flag & LS_TEXTURE)) {
return (linestyle->mtex[0] != NULL);
}
}
return false;
}
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree. Changes to ED_node_shader_default() were reverted since the code there was actually not suitable for setting up the default line style node tree properly.
2014-07-16 08:25:10 +02:00
void BKE_linestyle_default_shader(const bContext *C, FreestyleLineStyle *linestyle)
{
Freestyle: Updated BKE_linestyle_default_shader() to include the UV Along Stroke shader node.
2014-07-20 05:17:22 +02:00
bNode *uv_along_stroke, *input_texure, *output_linestyle;
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree. Changes to ED_node_shader_default() were reverted since the code there was actually not suitable for setting up the default line style node tree properly.
2014-07-16 08:25:10 +02:00
bNodeSocket *fromsock, *tosock;
bNodeTree *ntree;
BLI_assert(linestyle->nodetree == NULL);
Revert "Fix T68971: Copy As New Driver from Material node creates a bad reference." This reverts commits 54fd8176d7e91, 4c5becb6b1 and 8f578150e. Those kind of commits must be reviewed and approved by project owners. That one: * Broke Collada building by not properly updating all calls to modified function. * Broke *whole* ID management by not properly updating library_query.c. And in general, I am strongly against backward ID pointers, those are *always* a serious PITA for ID management. Sometimes they cannot be avoided, but in general other ways to get that kind of info should be investigated first.
2019-08-22 16:00:59 +02:00
ntree = ntreeAddTree(NULL, "stroke_shader", "ShaderNodeTree");
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree. Changes to ED_node_shader_default() were reverted since the code there was actually not suitable for setting up the default line style node tree properly.
2014-07-16 08:25:10 +02:00
linestyle->nodetree = ntree;
Freestyle: Updated BKE_linestyle_default_shader() to include the UV Along Stroke shader node.
2014-07-20 05:17:22 +02:00
uv_along_stroke = nodeAddStaticNode(C, ntree, SH_NODE_UVALONGSTROKE);
uv_along_stroke->locx = 0.0f;
uv_along_stroke->locy = 300.0f;
uv_along_stroke->custom1 = 0; /* use_tips */
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree. Changes to ED_node_shader_default() were reverted since the code there was actually not suitable for setting up the default line style node tree properly.
2014-07-16 08:25:10 +02:00
input_texure = nodeAddStaticNode(C, ntree, SH_NODE_TEX_IMAGE);
Freestyle: Updated BKE_linestyle_default_shader() to include the UV Along Stroke shader node.
2014-07-20 05:17:22 +02:00
input_texure->locx = 200.0f;
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree. Changes to ED_node_shader_default() were reverted since the code there was actually not suitable for setting up the default line style node tree properly.
2014-07-16 08:25:10 +02:00
input_texure->locy = 300.0f;
output_linestyle = nodeAddStaticNode(C, ntree, SH_NODE_OUTPUT_LINESTYLE);
Freestyle: Updated BKE_linestyle_default_shader() to include the UV Along Stroke shader node.
2014-07-20 05:17:22 +02:00
output_linestyle->locx = 400.0f;
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree. Changes to ED_node_shader_default() were reverted since the code there was actually not suitable for setting up the default line style node tree properly.
2014-07-16 08:25:10 +02:00
output_linestyle->locy = 300.0f;
Freestyle: Added "blend_type" and "use_clamp" options to the Output Line Style shader node.
2014-07-16 15:25:37 +02:00
output_linestyle->custom1 = MA_RAMP_BLEND;
output_linestyle->custom2 = 0; /* use_clamp */
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree. Changes to ED_node_shader_default() were reverted since the code there was actually not suitable for setting up the default line style node tree properly.
2014-07-16 08:25:10 +02:00
nodeSetActive(ntree, input_texure);
Cleanup: unused var
2014-08-12 05:33:39 +02:00
fromsock = BLI_findlink(&uv_along_stroke->outputs, 0); /* UV */
tosock = BLI_findlink(&input_texure->inputs, 0); /* UV */
Freestyle: Updated BKE_linestyle_default_shader() to include the UV Along Stroke shader node.
2014-07-20 05:17:22 +02:00
nodeAddLink(ntree, uv_along_stroke, fromsock, input_texure, tosock);
Cleanup: unused var
2014-08-12 05:33:39 +02:00
fromsock = BLI_findlink(&input_texure->outputs, 0); /* Color */
tosock = BLI_findlink(&output_linestyle->inputs, 0); /* Color */
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree. Changes to ED_node_shader_default() were reverted since the code there was actually not suitable for setting up the default line style node tree properly.
2014-07-16 08:25:10 +02:00
nodeAddLink(ntree, input_texure, fromsock, output_linestyle, tosock);
Nodes: refactor node tree update handling Goals of this refactor: * More unified approach to updating everything that needs to be updated after a change in a node tree. * The updates should happen in the correct order and quadratic or worse algorithms should be avoided. * Improve detection of changes to the output to avoid tagging the depsgraph when it's not necessary. * Move towards a more declarative style of defining nodes by having a more centralized update procedure. The refactor consists of two main parts: * Node tree tagging and update refactor. * Generally, when changes are done to a node tree, it is tagged dirty until a global update function is called that updates everything in the correct order. * The tagging is more fine-grained compared to before, to allow for more precise depsgraph update tagging. * Depsgraph changes. * The shading specific depsgraph node for node trees as been removed. * Instead, there is a new `NTREE_OUTPUT` depsgrap node, which is only tagged when the output of the node tree changed (e.g. the Group Output or Material Output node). * The copy-on-write relation from node trees to the data block they are embedded in is now non-flushing. This avoids e.g. triggering a material update after the shader node tree changed in unrelated ways. Instead the material has a flushing relation to the new `NTREE_OUTPUT` node now. * The depsgraph no longer reports data block changes through to cycles through `Depsgraph.updates` when only the node tree changed in ways that do not affect the output. Avoiding unnecessary updates seems to work well for geometry nodes and cycles. The situation is a bit worse when there are drivers on the node tree, but that could potentially be improved separately in the future. Avoiding updates in eevee and the compositor is more tricky, but also less urgent. * Eevee updates are triggered by calling `DRW_notify_view_update` in `ED_render_view3d_update` indirectly from `DEG_editors_update`. * Compositor updates are triggered by `ED_node_composite_job` in `node_area_refresh`. This is triggered by calling `ED_area_tag_refresh` in `node_area_listener`. Removing updates always has the risk of breaking some dependency that no one was aware of. It's not unlikely that this will happen here as well. Adding back missing updates should be quite a bit easier than getting rid of unnecessary updates though. Differential Revision: https://developer.blender.org/D13246
2021-12-21 15:18:56 +01:00
BKE_ntree_update_main_tree(CTX_data_main(C), ntree, NULL);
Freestyle: Add BKE_linestyle_default_shader() for creating the default line style shader node tree. Changes to ED_node_shader_default() were reverted since the code there was actually not suitable for setting up the default line style node tree properly.
2014-07-16 08:25:10 +02:00
}