archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
60090384f52cc9b3b87455657139a208dfd0ad19
blender-archive/source/blender/editors/animation/fmodifier_ui.c

786 lines
25 KiB
C
Raw Normal View History

doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +00:00
/*
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
Cleanup: trailing whitespace (comment blocks) Strip unindented comment blocks - mainly headers to avoid conflicts.
2018-06-01 18:19:39 +02:00
* of the License, or (at your option) any later version.
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
correct fsf address
2010-02-12 13:34:04 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
*
* The Original Code is Copyright (C) 2009 Blender Foundation.
* All rights reserved.
*/
doxygen: add newline after \file While \file doesn't need an argument, it can't have another doxy command after it.
2019-02-18 08:08:12 +11:00
/** \file
* \ingroup edanimation
doxygen: blender/editors tagged.
2011-02-27 20:29:51 +00:00
*/
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* User-Interface Stuff for F-Modifiers:
Cleanup: trailing whitespace (comment blocks) Strip unindented comment blocks - mainly headers to avoid conflicts.
2018-06-01 18:19:39 +02:00
* This file defines the (C-Coded) templates + editing callbacks needed
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
* by the interface stuff or F-Modifiers, as used by F-Curves in the Graph Editor,
* and NLA-Strips in the NLA Editor.
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
*
* Copy/Paste Buffer for F-Modifiers:
Cleanup: trailing whitespace (comment blocks) Strip unindented comment blocks - mainly headers to avoid conflicts.
2018-06-01 18:19:39 +02:00
* For now, this is also defined in this file so that it can be shared between the
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
*/
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
#include <string.h>
#include "DNA_anim_types.h"
#include "DNA_scene_types.h"
#include "MEM_guardedalloc.h"
Refactor translation code out of blenfont - Add blentranslation `BLT_*` module. - moved & split `BLF_translation.h` into (`BLT_translation.h`, `BLT_lang.h`). - moved `BLF_*_unifont` functions from `blf_translation.c` to new source file `blf_font_i18n.c`.
2015-08-16 17:32:01 +10:00
#include "BLT_translation.h"
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
More F-Modifier Tweaks: This commit started out aiming to make the "Stepped" F-Modifier (committed last night) even more useful, but ended up fixing a few other finer-points of how F-Modifiers work. Firstly, the new stuff: I've addded options to the Stepped F-Modifier to not affect frames before and/or after specified values, and renamed the 'start offset' to 'offset' for clarity. The main objective of this is to allow Stepped F-Modifiers to only affect certain time ranges, so that by layering/using multiple instances of the F-Modifier, it can be possible to have multiple stepping-sizes. This allows for effects like: http://www.pasteall.org/blend/2230 or in words, it provides a convenient mechanism for animators to specify whether sections of the animation is shown "on twos", "fours", or even "forty-second-ths plus a smidgen", as can be easily done with 2D. Assorted changes to support this: * Properly fixed up how F-Modifiers that work with time, evaluate the time to evaluate the curve at. Now layered time effects like this should be possible in a much nicer way. * Added proper value range validation/clamping to many properties. There are still a lot more that need checking, but at least more properties now do "the right thing".
2010-03-19 03:38:14 +00:00
#include "BLI_blenlib.h"
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h. no functional changes.
2011-01-07 18:36:47 +00:00
#include "BLI_utildefines.h"
More F-Modifier Tweaks: This commit started out aiming to make the "Stepped" F-Modifier (committed last night) even more useful, but ended up fixing a few other finer-points of how F-Modifiers work. Firstly, the new stuff: I've addded options to the Stepped F-Modifier to not affect frames before and/or after specified values, and renamed the 'start offset' to 'offset' for clarity. The main objective of this is to allow Stepped F-Modifiers to only affect certain time ranges, so that by layering/using multiple instances of the F-Modifier, it can be possible to have multiple stepping-sizes. This allows for effects like: http://www.pasteall.org/blend/2230 or in words, it provides a convenient mechanism for animators to specify whether sections of the animation is shown "on twos", "fours", or even "forty-second-ths plus a smidgen", as can be easily done with 2D. Assorted changes to support this: * Properly fixed up how F-Modifiers that work with time, evaluate the time to evaluate the curve at. Now layered time effects like this should be possible in a much nicer way. * Added proper value range validation/clamping to many properties. There are still a lot more that need checking, but at least more properties now do "the right thing".
2010-03-19 03:38:14 +00:00
Fix T60340: Removing f-curve modifier doesn't update animation
2019-01-10 15:56:02 +01:00
#include "BKE_animsys.h"
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
#include "BKE_context.h"
#include "BKE_fcurve.h"
#include "WM_api.h"
#include "WM_types.h"
#include "RNA_access.h"
#include "UI_interface.h"
#include "UI_resources.h"
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
#include "ED_anim_api.h"
Cleanup: move undo into it's own directory Split out undo API from ED_util.h into ED_undo.h
2018-04-02 15:02:08 +02:00
#include "ED_undo.h"
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
Fix T60340: Removing f-curve modifier doesn't update animation
2019-01-10 15:56:02 +01:00
#include "DEG_depsgraph.h"
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* ********************************************** */
/* UI STUFF */
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
// XXX! --------------------------------
/* temporary definition for limits of float number buttons (FLT_MAX tends to infinity with old system) */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
#define UI_FLT_MAX 10000.0f
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
#define B_REDR 1
#define B_FMODIFIER_REDRAW 20
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* callback to verify modifier data */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
static void validate_fmodifier_cb(bContext *UNUSED(C), void *fcm_v, void *UNUSED(arg))
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
FModifier *fcm = (FModifier *)fcm_v;
Cleanup: use const for typeinfo
2015-03-30 21:17:07 +11:00
const FModifierTypeInfo *fmi = fmodifier_get_typeinfo(fcm);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* call the verify callback on the modifier if applicable */
if (fmi && fmi->verify_data)
fmi->verify_data(fcm);
}
/* callback to remove the given modifier */
Fix T60340: Removing f-curve modifier doesn't update animation
2019-01-10 15:56:02 +01:00
typedef struct FModifierDeleteContext {
ID *fcurve_owner_id;
ListBase *modifiers;
} FModifierDeleteContext;
static void delete_fmodifier_cb(bContext *C, void *ctx_v, void *fcm_v)
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
Fix T60340: Removing f-curve modifier doesn't update animation
2019-01-10 15:56:02 +01:00
FModifierDeleteContext *ctx = (FModifierDeleteContext *)ctx_v;
ListBase *modifiers = ctx->modifiers;
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
FModifier *fcm = (FModifier *)fcm_v;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating out F-Modifier API * F-Modifier API is now in its own file in blenkernel * Renamed and refactored these so that they're no dependent on F-Curves, since all they really used was the fcu->modifiers list * Added missing license blocks to a few files
2009-07-02 05:25:14 +00:00
/* remove the given F-Modifier from the active modifier-stack */
remove_fmodifier(modifiers, fcm);
fix [#26801] Undoing Animation modifiers undoes 2 steps. also found grease pencil layer operators were not flagged to use undo.
2011-04-06 01:13:01 +00:00
ED_undo_push(C, "Delete F-Curve Modifier");
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Armature Bugfixes: * Bugfix #20136: unclear tool tip for inherit rotation toggle * Bugfix for Apply Pose as Restpose (Ctrl A in Pose Mode): missing call to free edit-data was causing drawing code to only draw editbones until editmode was entered + toggled * Added missing notifier for deleting F-Modifiers, so deleting F-Modifiers now updates the view correctly afterwards
2009-11-29 05:56:39 +00:00
/* send notifiers */
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
// XXX for now, this is the only way to get updates in all the right places... but would be nice to have a special one in this case
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);
Fix T58721: Keyframing one transform option reset other transforms Use dedicated flag to tag animation just for copy-on-write synchronization, which makes it so copies of the original data blocks gets in sync with the original ID. This will not flush the animation update to all objects which depend on that animation. If such flush is required, use ID_RECALC_ANIMATION. Reviewers: brecht Reviewed By: brecht Differential Revision: https://developer.blender.org/D4508
2019-03-13 15:38:45 +01:00
DEG_id_tag_update(ctx->fcurve_owner_id, ID_RECALC_ANIMATION);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
/* --------------- */
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* draw settings for generator modifier */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
static void draw_modifier__generator(uiLayout *layout, ID *fcurve_owner_id, FModifier *fcm, short width)
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
FMod_Generator *data = (FMod_Generator *)fcm->data;
Commented and tagged some unused vars (gcc warnings...).
2011-09-25 15:37:06 +00:00
uiLayout /* *col, */ /* UNUSED */ *row;
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
uiBlock *block;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
uiBut *but;
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
PointerRNA ptr;
Fix a few DPI/retina scaling issues in the graph editor and movie clip editor. Patch #35889 by David Jeske.
2013-06-27 11:29:53 +00:00
short bwidth = width - 1.5 * UI_UNIT_X; /* max button width */
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
/* init the RNA-pointer */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
RNA_pointer_create(fcurve_owner_id, &RNA_FModifierFunctionGenerator, fcm, &ptr);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* basic settings (backdrop + mode selector + some padding) */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
/* col = uiLayoutColumn(layout, true); */ /* UNUSED */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
block = uiLayoutGetBlock(layout);
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_align_begin(block);
but = uiDefButR(block, UI_BTYPE_MENU, B_FMODIFIER_REDRAW, NULL, 0, 0, bwidth, UI_UNIT_Y, &ptr, "mode", -1, 0, 0, -1, -1, NULL);
UI_but_func_set(but, validate_fmodifier_cb, fcm, NULL);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefButR(block, UI_BTYPE_TOGGLE, B_FMODIFIER_REDRAW, NULL, 0, 0, bwidth, UI_UNIT_Y, &ptr, "use_additive", -1, 0, 0, -1, -1, NULL);
UI_block_align_end(block);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* now add settings for individual modes */
switch (data->mode) {
case FCM_GENERATOR_POLYNOMIAL: /* polynomial expression */
{
UI: cleanup UI_fontstyle_string_width, UI_draw_string Both were maked as temp, but used often. Now pass uiFontStyle to both, rename UI_draw_string to UI_fontstyle_draw_simple, since its a variant of UI_fontstyle_draw that skips shadow, align... etc.
2015-01-20 14:25:39 +11:00
const uiFontStyle *fstyle = UI_FSTYLE_WIDGET;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
float *cp = NULL;
char xval[32];
unsigned int i;
Fix: Text fields for Generator FModifier were too small This was caused by the x^n labels being far too large. Also, replaced old string functions with "safer" versions
2012-10-19 08:49:49 +00:00
int maxXWidth;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* draw polynomial order selector */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, false);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
block = uiLayoutGetBlock(row);
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
but = uiDefButI(block, UI_BTYPE_NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0.5f * UI_UNIT_X, 0, bwidth, UI_UNIT_Y,
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
&data->poly_order, 1, 100, 0, 0,
TIP_("'Order' of the Polynomial (for a polynomial with n terms, 'order' is n-1)"));
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_but_func_set(but, validate_fmodifier_cb, fcm, NULL);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Fix: Text fields for Generator FModifier were too small This was caused by the x^n labels being far too large. Also, replaced old string functions with "safer" versions
2012-10-19 08:49:49 +00:00
/* calculate maximum width of label for "x^n" labels */
if (data->arraysize > 2) {
BLI_snprintf(xval, sizeof(xval), "x^%u", data->arraysize);
UI: cleanup UI_fontstyle_string_width, UI_draw_string Both were maked as temp, but used often. Now pass uiFontStyle to both, rename UI_draw_string to UI_fontstyle_draw_simple, since its a variant of UI_fontstyle_draw that skips shadow, align... etc.
2015-01-20 14:25:39 +11:00
/* XXX: UI_fontstyle_string_width is not accurate */
maxXWidth = UI_fontstyle_string_width(fstyle, xval) + 0.5 * UI_UNIT_X;
Fix: Text fields for Generator FModifier were too small This was caused by the x^n labels being far too large. Also, replaced old string functions with "safer" versions
2012-10-19 08:49:49 +00:00
}
else {
/* basic size (just "x") */
UI: cleanup UI_fontstyle_string_width, UI_draw_string Both were maked as temp, but used often. Now pass uiFontStyle to both, rename UI_draw_string to UI_fontstyle_draw_simple, since its a variant of UI_fontstyle_draw that skips shadow, align... etc.
2015-01-20 14:25:39 +11:00
maxXWidth = UI_fontstyle_string_width(fstyle, "x") + 0.5 * UI_UNIT_X;
Fix: Text fields for Generator FModifier were too small This was caused by the x^n labels being far too large. Also, replaced old string functions with "safer" versions
2012-10-19 08:49:49 +00:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* draw controls for each coefficient and a + sign at end of row */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
block = uiLayoutGetBlock(row);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
cp = data->coefficients;
for (i = 0; (i < data->arraysize) && (cp); i++, cp++) {
Fix: Text fields for Generator FModifier were too small This was caused by the x^n labels being far too large. Also, replaced old string functions with "safer" versions
2012-10-19 08:49:49 +00:00
/* To align with first line... */
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
if (i)
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, " ", 0, 0, 2 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
else
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, "y =", 0, 0, 2 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* coefficient */
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefButF(block, UI_BTYPE_NUM, B_FMODIFIER_REDRAW, "", 0, 0, bwidth / 2, UI_UNIT_Y, cp, -UI_FLT_MAX, UI_FLT_MAX,
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
10, 3, TIP_("Coefficient for polynomial"));
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* 'x' param (and '+' if necessary) */
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
if (i == 0)
Fix: Text fields for Generator FModifier were too small This was caused by the x^n labels being far too large. Also, replaced old string functions with "safer" versions
2012-10-19 08:49:49 +00:00
BLI_strncpy(xval, "", sizeof(xval));
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
else if (i == 1)
Fix: Text fields for Generator FModifier were too small This was caused by the x^n labels being far too large. Also, replaced old string functions with "safer" versions
2012-10-19 08:49:49 +00:00
BLI_strncpy(xval, "x", sizeof(xval));
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
else
Fix: Text fields for Generator FModifier were too small This was caused by the x^n labels being far too large. Also, replaced old string functions with "safer" versions
2012-10-19 08:49:49 +00:00
BLI_snprintf(xval, sizeof(xval), "x^%u", i);
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, xval, 0, 0, maxXWidth, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, TIP_("Power of x"));
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
if ( (i != (data->arraysize - 1)) || ((i == 0) && data->arraysize == 2) ) {
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, "+", 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
/* next coefficient on a new row */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
block = uiLayoutGetBlock(row);
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
}
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
else {
Fix: Text fields for Generator FModifier were too small This was caused by the x^n labels being far too large. Also, replaced old string functions with "safer" versions
2012-10-19 08:49:49 +00:00
/* For alignment in UI! */
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, " ", 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
}
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
break;
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Spelling Cleanup
2012-03-01 12:20:18 +00:00
case FCM_GENERATOR_POLYNOMIAL_FACTORISED: /* Factorized polynomial expression */
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
float *cp = NULL;
unsigned int i;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* draw polynomial order selector */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, false);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
block = uiLayoutGetBlock(row);
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
but = uiDefButI(block, UI_BTYPE_NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0, 0, width - 1.5 * UI_UNIT_X, UI_UNIT_Y,
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
&data->poly_order, 1, 100, 0, 0,
TIP_("'Order' of the Polynomial (for a polynomial with n terms, 'order' is n-1)"));
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_but_func_set(but, validate_fmodifier_cb, fcm, NULL);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* draw controls for each pair of coefficients */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
block = uiLayoutGetBlock(row);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
cp = data->coefficients;
for (i = 0; (i < data->poly_order) && (cp); i++, cp += 2) {
Whitespace tweaks
2012-03-04 02:43:15 +00:00
/* To align with first line */
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
if (i)
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, " ", 0, 0, 2.5 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
else
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, "y =", 0, 0, 2.5 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* opening bracket */
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, "(", 0, 0, UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* coefficients */
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefButF(block, UI_BTYPE_NUM, B_FMODIFIER_REDRAW, "", 0, 0, 5 * UI_UNIT_X, UI_UNIT_Y, cp, -UI_FLT_MAX, UI_FLT_MAX,
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
10, 3, TIP_("Coefficient of x"));
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, "x +", 0, 0, 2 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefButF(block, UI_BTYPE_NUM, B_FMODIFIER_REDRAW, "", 0, 0, 5 * UI_UNIT_X, UI_UNIT_Y, cp + 1, -UI_FLT_MAX, UI_FLT_MAX,
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
10, 3, TIP_("Second coefficient"));
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Bugfix [#33623] UI for Factored Polynomial Generator FModifiers drawing incorrectly * Plus signs were used between factors instead of multiplication. These now use the times symbol * Fixed alignment problem for last factor being more spread out
2012-12-21 05:03:47 +00:00
/* closing bracket and multiplication sign */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
if ( (i != (data->poly_order - 1)) || ((i == 0) && data->poly_order == 2) ) {
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, ") \xc3\x97", 0, 0, 2 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
2012-08-17 14:43:20 +00:00
/* set up new row for the next pair of coefficients */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
block = uiLayoutGetBlock(row);
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
else
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, ") ", 0, 0, 2 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00: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 15:23:42 +00:00
break;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
}
}
/* --------------- */
Added a first version of the Sound F-Curve Modifier, not really usable yet, but you can play around with it.
2009-11-22 12:10:45 +00:00
/* draw settings for generator modifier */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
static void draw_modifier__fn_generator(uiLayout *layout, ID *fcurve_owner_id, FModifier *fcm, short UNUSED(width))
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
NLA SoC: Assorted fixes * Made NLA Editing functions more aware of transitions. - A transition can only be added between a pair of action-clips. Previous, two transitions could be added next to each other, which has undefined behaviour - Deleting a strip with transition(s) on either side will remove the transitions too. Feedback welcome on this - The 'type' setting for NLA-Strips is no longer editable. This was dangerous as it could result in transitions with undefined behaviour (though nothing would happen). * Menus for adding F-Modifiers now only show relevant modifiers (i.e. 'Invalid' is not included in the list, and 'Cycles' doesn't need to be shown for NLA since we've got repeat) * Function Generator and Noise F-Modifiers now have complete GUI's. A few settings were missed during the porting process. * F-Modifier buttons now have their source-ID's included in the RNA Pointers used. This didn't get them animateable directly, but is a step closer.
2009-07-03 01:10:46 +00:00
uiLayout *col;
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
PointerRNA ptr;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* init the RNA-pointer */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
RNA_pointer_create(fcurve_owner_id, &RNA_FModifierFunctionGenerator, fcm, &ptr);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* add the settings */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(layout, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "function_type", 0, "", ICON_NONE);
uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, ICON_NONE);
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(layout, false); // no grouping for now
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "amplitude", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "phase_multiplier", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "phase_offset", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "value_offset", 0, NULL, ICON_NONE);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
/* --------------- */
/* draw settings for cycles modifier */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
static void draw_modifier__cycles(uiLayout *layout, ID *fcurve_owner_id, FModifier *fcm, short UNUSED(width))
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
uiLayout *split, *col;
PointerRNA ptr;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* init the RNA-pointer */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
RNA_pointer_create(fcurve_owner_id, &RNA_FModifierCycles, fcm, &ptr);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
/* split into 2 columns
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
* NOTE: the mode comboboxes shouldn't get labels, otherwise there isn't enough room
*/
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
split = uiLayoutSplit(layout, 0.5f, false);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* before range */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(split, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemL(col, IFACE_("Before:"), ICON_NONE);
uiItemR(col, &ptr, "mode_before", 0, "", ICON_NONE);
uiItemR(col, &ptr, "cycles_before", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* after range */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(split, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemL(col, IFACE_("After:"), ICON_NONE);
uiItemR(col, &ptr, "mode_after", 0, "", ICON_NONE);
uiItemR(col, &ptr, "cycles_after", 0, NULL, ICON_NONE);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
/* --------------- */
/* draw settings for noise modifier */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
static void draw_modifier__noise(uiLayout *layout, ID *fcurve_owner_id, FModifier *fcm, short UNUSED(width))
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
uiLayout *split, *col;
PointerRNA ptr;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* init the RNA-pointer */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
RNA_pointer_create(fcurve_owner_id, &RNA_FModifierNoise, fcm, &ptr);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Assorted fixes * Made NLA Editing functions more aware of transitions. - A transition can only be added between a pair of action-clips. Previous, two transitions could be added next to each other, which has undefined behaviour - Deleting a strip with transition(s) on either side will remove the transitions too. Feedback welcome on this - The 'type' setting for NLA-Strips is no longer editable. This was dangerous as it could result in transitions with undefined behaviour (though nothing would happen). * Menus for adding F-Modifiers now only show relevant modifiers (i.e. 'Invalid' is not included in the list, and 'Cycles' doesn't need to be shown for NLA since we've got repeat) * Function Generator and Noise F-Modifiers now have complete GUI's. A few settings were missed during the porting process. * F-Modifier buttons now have their source-ID's included in the RNA Pointers used. This didn't get them animateable directly, but is a step closer.
2009-07-03 01:10:46 +00:00
/* blending mode */
== UI icons == * Change ICON_NULL --> ICON_NONE to avoid two #defines with the same meaning.
2011-02-27 18:03:19 +00:00
uiItemR(layout, &ptr, "blend_type", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* split into 2 columns */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
split = uiLayoutSplit(layout, 0.5f, false);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* col 1 */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(split, false);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "scale", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "strength", 0, NULL, ICON_NONE);
Patch T38282/D295: Add a time offset to the FCurve Noise Modifier FCurve Noise Modifer now has an extra float property which offsets the noise in time. This is useful for creating follow through in procedurally animated noise. For example, if you've used a noise modifier on a parent bone to add additional movement, a quick and easy way to add overlapping motion is to create copies of that modifier on its children, and then offset the time those curves play at. See this in action at: http://youtu.be/Ph6fk_z_k3k Reviewed By: Joshua Leung
2014-02-10 15:23:01 +13:00
uiItemR(col, &ptr, "offset", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* col 2 */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(split, false);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "phase", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "depth", 0, NULL, ICON_NONE);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
/* callback to add new envelope data point */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
static void fmod_envelope_addpoint_cb(bContext *C, void *fcm_dv, void *UNUSED(arg))
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
Scene *scene = CTX_data_scene(C);
FMod_Envelope *env = (FMod_Envelope *)fcm_dv;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
FCM_EnvelopeData *fedn;
FCM_EnvelopeData fed;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* init template data */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
fed.min = -1.0f;
fed.max = 1.0f;
fed.time = (float)scene->r.cfra; // XXX make this int for ease of use?
fed.f1 = fed.f2 = 0;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* check that no data exists for the current frame... */
if (env->data) {
use const pointers for file loading and booleans for animation system return values passed as pointers.
2013-03-17 19:13:04 +00:00
bool exists;
patch [#33985] Added FModifierEnvelope control_point add remove to API from Peter Staples (batfinger)
2013-01-31 08:19:11 +00:00
int i = BKE_fcm_envelope_find_index(env->data, (float)(scene->r.cfra), env->totvert, &exists);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Cleanup: comment line length (editors) Prevents clang-format wrapping text before comments.
2019-01-15 23:24:20 +11:00
/* binarysearch_...() will set exists by default to 0,
* so if it is non-zero, that means that the point exists already */
if (exists) {
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
return;
Cleanup: comment line length (editors) Prevents clang-format wrapping text before comments.
2019-01-15 23:24:20 +11:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* add new */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
fedn = MEM_callocN((env->totvert + 1) * sizeof(FCM_EnvelopeData), "FCM_EnvelopeData");
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* add the points that should occur before the point to be pasted */
if (i > 0)
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
memcpy(fedn, env->data, i * sizeof(FCM_EnvelopeData));
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* add point to paste at index i */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
*(fedn + i) = fed;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* add the points that occur after the point to be pasted */
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
if (i < env->totvert)
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
memcpy(fedn + i + 1, env->data + i, (env->totvert - i) * sizeof(FCM_EnvelopeData));
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* replace (+ free) old with new */
MEM_freeN(env->data);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
env->data = fedn;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
env->totvert++;
}
else {
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
env->data = MEM_callocN(sizeof(FCM_EnvelopeData), "FCM_EnvelopeData");
*(env->data) = fed;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
env->totvert = 1;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
}
/* callback to remove envelope data point */
// TODO: should we have a separate file for things like this?
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
static void fmod_envelope_deletepoint_cb(bContext *UNUSED(C), void *fcm_dv, void *ind_v)
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
FMod_Envelope *env = (FMod_Envelope *)fcm_dv;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
FCM_EnvelopeData *fedn;
BLI_utildefines: rename pointer conversion macros Terms get/set don't make much sense when casting values. Name macros so the conversion is obvious, use common prefix for easier completion. - GET_INT_FROM_POINTER -> POINTER_AS_INT - SET_INT_IN_POINTER -> POINTER_FROM_INT - GET_UINT_FROM_POINTER -> POINTER_AS_UINT - SET_UINT_IN_POINTER -> POINTER_FROM_UINT
2018-09-19 12:05:58 +10:00
int index = POINTER_AS_INT(ind_v);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* check that no data exists for the current frame... */
if (env->totvert > 1) {
/* allocate a new smaller array */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
fedn = MEM_callocN(sizeof(FCM_EnvelopeData) * (env->totvert - 1), "FCM_EnvelopeData");
fix for incorrect array use when freeing fcurve modifier envelope points, array also wasnt NULL'd on freeing which gave memory errors later on.
2011-03-24 09:59:02 +00:00
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
memcpy(fedn, env->data, sizeof(FCM_EnvelopeData) * (index));
memcpy(fedn + index, env->data + (index + 1), sizeof(FCM_EnvelopeData) * ((env->totvert - index) - 1));
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* free old array, and set the new */
MEM_freeN(env->data);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
env->data = fedn;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
env->totvert--;
}
else {
/* just free array, since the only vert was deleted */
fix for incorrect array use when freeing fcurve modifier envelope points, array also wasnt NULL'd on freeing which gave memory errors later on.
2011-03-24 09:59:02 +00:00
if (env->data) {
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
MEM_freeN(env->data);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
env->data = NULL;
fix for incorrect array use when freeing fcurve modifier envelope points, array also wasnt NULL'd on freeing which gave memory errors later on.
2011-03-24 09:59:02 +00:00
}
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
env->totvert = 0;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
}
/* draw settings for envelope modifier */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
static void draw_modifier__envelope(uiLayout *layout, ID *fcurve_owner_id, FModifier *fcm, short UNUSED(width))
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
FMod_Envelope *env = (FMod_Envelope *)fcm->data;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
FCM_EnvelopeData *fed;
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
uiLayout *col, *row;
uiBlock *block;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
uiBut *but;
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
PointerRNA ptr;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
int i;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
/* init the RNA-pointer */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
RNA_pointer_create(fcurve_owner_id, &RNA_FModifierEnvelope, fcm, &ptr);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
/* general settings */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(layout, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemL(col, IFACE_("Envelope:"), ICON_NONE);
uiItemR(col, &ptr, "reference_value", 0, NULL, ICON_NONE);
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(col, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(row, &ptr, "default_min", 0, IFACE_("Min"), ICON_NONE);
uiItemR(row, &ptr, "default_max", 0, IFACE_("Max"), ICON_NONE);
style cleanup: use c style comments in C code
2012-07-06 23:56:59 +00:00
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
/* control points header */
style cleanup: use c style comments in C code
2012-07-06 23:56:59 +00:00
/* TODO: move this control-point control stuff to using the new special widgets for lists
* the current way is far too cramped */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, false);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
block = uiLayoutGetBlock(row);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefBut(block, UI_BTYPE_LABEL, 1, IFACE_("Control Points:"), 0, 0, 7.5 * UI_UNIT_X, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
but = uiDefBut(block, UI_BTYPE_BUT, B_FMODIFIER_REDRAW, IFACE_("Add Point"), 0, 0, 7.5 * UI_UNIT_X, UI_UNIT_Y,
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
NULL, 0, 0, 0, 0, TIP_("Add a new control-point to the envelope on the current frame"));
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_but_func_set(but, fmod_envelope_addpoint_cb, env, NULL);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
/* control points list */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
for (i = 0, fed = env->data; i < env->totvert; i++, fed++) {
NLA SoC: UI-Drawing for Generator and Envelope FModifiers Restored These now use a hybrid drawing approach - using the layout engine for just layouts, but still mostly using old-style buttons in many places where button callbacks and/or special data-access methods are needed (or where RNA wrapping isn't in place yet).
2009-07-02 23:27:11 +00:00
/* get a new row to operate on */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(layout, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
block = uiLayoutGetBlock(row);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_align_begin(block);
but = uiDefButF(block, UI_BTYPE_NUM, B_FMODIFIER_REDRAW, IFACE_("Fra:"), 0, 0, 4.5 * UI_UNIT_X, UI_UNIT_Y,
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
&fed->time, -MAXFRAMEF, MAXFRAMEF, 10, 1, TIP_("Frame that envelope point occurs"));
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_but_func_set(but, validate_fmodifier_cb, fcm, NULL);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefButF(block, UI_BTYPE_NUM, B_FMODIFIER_REDRAW, IFACE_("Min:"), 0, 0, 5 * UI_UNIT_X, UI_UNIT_Y,
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
&fed->min, -UI_FLT_MAX, UI_FLT_MAX, 10, 2, TIP_("Minimum bound of envelope at this point"));
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
uiDefButF(block, UI_BTYPE_NUM, B_FMODIFIER_REDRAW, IFACE_("Max:"), 0, 0, 5 * UI_UNIT_X, UI_UNIT_Y,
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
&fed->max, -UI_FLT_MAX, UI_FLT_MAX, 10, 2, TIP_("Maximum bound of envelope at this point"));
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
but = uiDefIconBut(block, UI_BTYPE_BUT, B_FMODIFIER_REDRAW, ICON_X, 0, 0, 0.9 * UI_UNIT_X, UI_UNIT_Y,
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Delete envelope control point"));
BLI_utildefines: rename pointer conversion macros Terms get/set don't make much sense when casting values. Name macros so the conversion is obvious, use common prefix for easier completion. - GET_INT_FROM_POINTER -> POINTER_AS_INT - SET_INT_IN_POINTER -> POINTER_FROM_INT - GET_UINT_FROM_POINTER -> POINTER_AS_UINT - SET_UINT_IN_POINTER -> POINTER_FROM_UINT
2018-09-19 12:05:58 +10:00
UI_but_func_set(but, fmod_envelope_deletepoint_cb, env, POINTER_FROM_INT(i));
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_align_begin(block);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
}
/* --------------- */
/* draw settings for limits modifier */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
static void draw_modifier__limits(uiLayout *layout, ID *fcurve_owner_id, FModifier *fcm, short UNUSED(width))
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
Commented and tagged some unused vars (gcc warnings...).
2011-09-25 15:37:06 +00:00
uiLayout *split, *col /* , *row */ /* UNUSED */;
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
PointerRNA ptr;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* init the RNA-pointer */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
RNA_pointer_create(fcurve_owner_id, &RNA_FModifierLimits, fcm, &ptr);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* row 1: minimum */
{
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
/* row = uiLayoutRow(layout, false); */ /* UNUSED */
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* split into 2 columns */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
split = uiLayoutSplit(layout, 0.5f, false);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* x-minimum */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(split, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "use_min_x", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "min_x", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* y-minimum*/
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(split, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "use_min_y", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "min_y", 0, NULL, ICON_NONE);
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
More F-Modifier Tweaks: This commit started out aiming to make the "Stepped" F-Modifier (committed last night) even more useful, but ended up fixing a few other finer-points of how F-Modifiers work. Firstly, the new stuff: I've addded options to the Stepped F-Modifier to not affect frames before and/or after specified values, and renamed the 'start offset' to 'offset' for clarity. The main objective of this is to allow Stepped F-Modifiers to only affect certain time ranges, so that by layering/using multiple instances of the F-Modifier, it can be possible to have multiple stepping-sizes. This allows for effects like: http://www.pasteall.org/blend/2230 or in words, it provides a convenient mechanism for animators to specify whether sections of the animation is shown "on twos", "fours", or even "forty-second-ths plus a smidgen", as can be easily done with 2D. Assorted changes to support this: * Properly fixed up how F-Modifiers that work with time, evaluate the time to evaluate the curve at. Now layered time effects like this should be possible in a much nicer way. * Added proper value range validation/clamping to many properties. There are still a lot more that need checking, but at least more properties now do "the right thing".
2010-03-19 03:38:14 +00:00
/* row 2: maximum */
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
{
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
/* row = uiLayoutRow(layout, false); */ /* UNUSED */
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* split into 2 columns */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
split = uiLayoutSplit(layout, 0.5f, false);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* x-minimum */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(split, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "use_max_x", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "max_x", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* y-minimum*/
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(split, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "use_max_y", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "max_y", 0, NULL, ICON_NONE);
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
}
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
/* --------------- */
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* draw settings for stepped interpolation modifier */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
static void draw_modifier__stepped(uiLayout *layout, ID *fcurve_owner_id, FModifier *fcm, short UNUSED(width))
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
{
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *col, *sub;
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
PointerRNA ptr;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* init the RNA-pointer */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
RNA_pointer_create(fcurve_owner_id, &RNA_FModifierStepped, fcm, &ptr);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
More F-Modifier Tweaks: This commit started out aiming to make the "Stepped" F-Modifier (committed last night) even more useful, but ended up fixing a few other finer-points of how F-Modifiers work. Firstly, the new stuff: I've addded options to the Stepped F-Modifier to not affect frames before and/or after specified values, and renamed the 'start offset' to 'offset' for clarity. The main objective of this is to allow Stepped F-Modifiers to only affect certain time ranges, so that by layering/using multiple instances of the F-Modifier, it can be possible to have multiple stepping-sizes. This allows for effects like: http://www.pasteall.org/blend/2230 or in words, it provides a convenient mechanism for animators to specify whether sections of the animation is shown "on twos", "fours", or even "forty-second-ths plus a smidgen", as can be easily done with 2D. Assorted changes to support this: * Properly fixed up how F-Modifiers that work with time, evaluate the time to evaluate the curve at. Now layered time effects like this should be possible in a much nicer way. * Added proper value range validation/clamping to many properties. There are still a lot more that need checking, but at least more properties now do "the right thing".
2010-03-19 03:38:14 +00:00
/* block 1: "stepping" settings */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(layout, false);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "frame_step", 0, NULL, ICON_NONE);
uiItemR(col, &ptr, "frame_offset", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
More F-Modifier Tweaks: This commit started out aiming to make the "Stepped" F-Modifier (committed last night) even more useful, but ended up fixing a few other finer-points of how F-Modifiers work. Firstly, the new stuff: I've addded options to the Stepped F-Modifier to not affect frames before and/or after specified values, and renamed the 'start offset' to 'offset' for clarity. The main objective of this is to allow Stepped F-Modifiers to only affect certain time ranges, so that by layering/using multiple instances of the F-Modifier, it can be possible to have multiple stepping-sizes. This allows for effects like: http://www.pasteall.org/blend/2230 or in words, it provides a convenient mechanism for animators to specify whether sections of the animation is shown "on twos", "fours", or even "forty-second-ths plus a smidgen", as can be easily done with 2D. Assorted changes to support this: * Properly fixed up how F-Modifiers that work with time, evaluate the time to evaluate the curve at. Now layered time effects like this should be possible in a much nicer way. * Added proper value range validation/clamping to many properties. There are still a lot more that need checking, but at least more properties now do "the right thing".
2010-03-19 03:38:14 +00:00
/* block 2: start range settings */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(layout, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "use_frame_start", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
sub = uiLayoutColumn(col, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_frame_start"));
uiItemR(sub, &ptr, "frame_start", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
More F-Modifier Tweaks: This commit started out aiming to make the "Stepped" F-Modifier (committed last night) even more useful, but ended up fixing a few other finer-points of how F-Modifiers work. Firstly, the new stuff: I've addded options to the Stepped F-Modifier to not affect frames before and/or after specified values, and renamed the 'start offset' to 'offset' for clarity. The main objective of this is to allow Stepped F-Modifiers to only affect certain time ranges, so that by layering/using multiple instances of the F-Modifier, it can be possible to have multiple stepping-sizes. This allows for effects like: http://www.pasteall.org/blend/2230 or in words, it provides a convenient mechanism for animators to specify whether sections of the animation is shown "on twos", "fours", or even "forty-second-ths plus a smidgen", as can be easily done with 2D. Assorted changes to support this: * Properly fixed up how F-Modifiers that work with time, evaluate the time to evaluate the curve at. Now layered time effects like this should be possible in a much nicer way. * Added proper value range validation/clamping to many properties. There are still a lot more that need checking, but at least more properties now do "the right thing".
2010-03-19 03:38:14 +00:00
/* block 3: end range settings */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(layout, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiItemR(col, &ptr, "use_frame_end", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
sub = uiLayoutColumn(col, true);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
uiLayoutSetActive(sub, RNA_boolean_get(&ptr, "use_frame_end"));
uiItemR(sub, &ptr, "frame_end", 0, NULL, ICON_NONE);
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
}
/* --------------- */
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
void ANIM_uiTemplate_fmodifier_draw(uiLayout *layout, ID *fcurve_owner_id,
Fix T60340: Removing f-curve modifier doesn't update animation
2019-01-10 15:56:02 +01:00
ListBase *modifiers, FModifier *fcm)
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
{
Cleanup: use const for typeinfo
2015-03-30 21:17:07 +11:00
const FModifierTypeInfo *fmi = fmodifier_get_typeinfo(fcm);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayout *box, *row, *sub, *col;
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
uiBlock *block;
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
uiBut *but;
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
short width = 314;
Fix for [#20008] In the Graph Editor, clicking on the eye doesn't update the GUI As part of this, fixed a typo in rna flags which was causing some strange behaviour with icons earlier. Reverted the workaround for this, too.
2009-11-25 08:28:57 +00:00
PointerRNA ptr;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Fix for [#20008] In the Graph Editor, clicking on the eye doesn't update the GUI As part of this, fixed a typo in rna flags which was causing some strange behaviour with icons earlier. Reverted the workaround for this, too.
2009-11-25 08:28:57 +00:00
/* init the RNA-pointer */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
RNA_pointer_create(fcurve_owner_id, &RNA_FModifier, fcm, &ptr);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* draw header */
{
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* get layout-row + UI-block for this */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
box = uiLayoutBox(layout);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(box, false);
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
block = uiLayoutGetBlock(row); // err...
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* left-align -------------------------------------------- */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
sub = uiLayoutRow(row, true);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_LEFT);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_emboss_set(block, UI_EMBOSS_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* expand */
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, &ptr, "show_expanded", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* checkbox for 'active' status (for now) */
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, &ptr, "active", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* name */
if (fmi)
Another bunch of UI translation fixes, thanks to Leon Cheung, Gabriel Gazzán and S. Lockal for spotting them!
2013-02-24 15:40:28 +00:00
uiItemL(sub, IFACE_(fmi->name), ICON_NONE);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
else
Another bunch of UI translation fixes, thanks to Leon Cheung, Gabriel Gazzán and S. Lockal for spotting them!
2013-02-24 15:40:28 +00:00
uiItemL(sub, IFACE_("<Unknown Modifier>"), ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* right-align ------------------------------------------- */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
sub = uiLayoutRow(row, true);
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiLayoutSetAlignment(sub, UI_LAYOUT_ALIGN_RIGHT);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* 'mute' button */
2.6 UI code: * Get rid of subrow/subcol variable names in the C UI code as well, use sub instead. This is shorter and sufficient. * Minor layout alignment fixes. * Greying out in NLA editor was doing nothing for "strip_time" property.
2011-11-23 19:05:52 +00:00
uiItemR(sub, &ptr, "mute", UI_ITEM_R_ICON_ONLY, "", ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_emboss_set(block, UI_EMBOSS_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* delete button */
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
but = uiDefIconBut(block, UI_BTYPE_BUT, B_REDR, ICON_X, 0, 0, UI_UNIT_X, UI_UNIT_Y,
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
NULL, 0.0, 0.0, 0.0, 0.0, TIP_("Delete F-Curve Modifier"));
Fix T60340: Removing f-curve modifier doesn't update animation
2019-01-10 15:56:02 +01:00
FModifierDeleteContext *ctx = MEM_mallocN(sizeof(FModifierDeleteContext), "fmodifier ctx");
ctx->fcurve_owner_id = fcurve_owner_id;
ctx->modifiers = modifiers;
UI_but_funcN_set(but, delete_fmodifier_cb, ctx, fcm);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
UI Refactor T41640 Make the UI API more consistent and reduce confusion with some naming. mainly: - API function calls - enum values some internal static functions have been left for now
2014-11-09 21:20:40 +01:00
UI_block_emboss_set(block, UI_EMBOSS);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* when modifier is expanded, draw settings */
if (fcm->flag & FMODIFIER_FLAG_EXPANDED) {
NLA SoC: FModifier drawing converted to use Layout Engine * Most of the F-Modifiers have been ported to use the layout engine + RNA for drawing their buttons now. This plays much nicer with various button-layouts. --> As a nice demo, try adding a Noise Modifier to a NLA-strip, and change the 'size' setting to about 2 to see some effects. * Generator and Envelope modifiers haven't been ported yet since they're quite complex (requiring more time + energy), and as such, have been made to have some temporary error prints instead. Will check on this tomorrow. * Finished/cleaned up the RNA-wrapping of most FModifiers. TODO's (help requested... Brecht?): Generator modifier's UI cannot be wrapped yet using the layout engine (though I might try using the old system only), as I'm having some trouble wrapping the coefficients array for this (see rna_fcurve.c - rna_def_fmodifier_generator())
2009-07-02 12:41:03 +00:00
/* set up the flexible-box layout which acts as the backdrop for the modifier settings */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
box = uiLayoutBox(layout);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
/* draw settings for individual modifiers */
switch (fcm->type) {
case FMODIFIER_TYPE_GENERATOR: /* Generator */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
draw_modifier__generator(box, fcurve_owner_id, fcm, width);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
break;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
case FMODIFIER_TYPE_FN_GENERATOR: /* Built-In Function Generator */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
draw_modifier__fn_generator(box, fcurve_owner_id, fcm, width);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
break;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
case FMODIFIER_TYPE_CYCLES: /* Cycles */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
draw_modifier__cycles(box, fcurve_owner_id, fcm, width);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
break;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
case FMODIFIER_TYPE_ENVELOPE: /* Envelope */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
draw_modifier__envelope(box, fcurve_owner_id, fcm, width);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
break;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
case FMODIFIER_TYPE_LIMITS: /* Limits */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
draw_modifier__limits(box, fcurve_owner_id, fcm, width);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
break;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
case FMODIFIER_TYPE_NOISE: /* Noise */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
draw_modifier__noise(box, fcurve_owner_id, fcm, width);
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
break;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
case FMODIFIER_TYPE_STEPPED: /* Stepped */
Use proper ID to create FModifier RNA pointer Allows to do simple DEG tag, without extra checks for ID type. Will solve possible missing updates when modifying f-curve modifier of a shared action.
2019-01-10 16:21:40 +01:00
draw_modifier__stepped(box, fcurve_owner_id, fcm, width);
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
break;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
default: /* unknown type */
break;
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Experimental Feature: Frame Range Masks for FModifiers Using this feature, it is now possible to for example have different noise-profiles for different parts of a curve, which makes it possible to do animate camera shake for example. Or perhaps, for having greater control of mixing and matching different parts of F-Modifier effects, such as combining several generator modifiers to get multi-case functions for instance. See http://aligorith.blogspot.com/2011/06/gsoc11-fmodifier-range- masks.html for details.
2011-06-03 13:34:02 +00:00
/* one last panel below this: FModifier range */
// TODO: experiment with placement of this
{
box = uiLayoutBox(layout);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
FModifier Influence/BlendIn-Out Following on from my commit to introduce frame ranges for FModifiers, those frame ranges can now have blend in/out values. By setting a blendin or blendout value, you're specifying the number of frames for the modifier's "full influence" to take effect or fade out relative to the start/end frames. The "full influence" above needs a little clarification. When the "use influence" setting is enabled, "full influence" is taken from the "influence" slider (a new setting). Otherwise, it uses 1.0 (i.e. unmodified influence, same as old behaviour before the introduction of influence controls). The influence slider basically says how much the modifier's effects are allowed to contribute to the final result. --- Notes: - This opt-in "Use Influence" approach is really forced upon us because there are heaps of old files for which we cannot easily version patch without spending some effort going through all the data in the file, hunting out the F-Modifiers. - interpf() seems to use a backwards order compared to everything else
2011-06-04 06:22:01 +00:00
/* restricted range ----------------------------------------------------- */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(box, true);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Experimental Feature: Frame Range Masks for FModifiers Using this feature, it is now possible to for example have different noise-profiles for different parts of a curve, which makes it possible to do animate camera shake for example. Or perhaps, for having greater control of mixing and matching different parts of F-Modifier effects, such as combining several generator modifiers to get multi-case functions for instance. See http://aligorith.blogspot.com/2011/06/gsoc11-fmodifier-range- masks.html for details.
2011-06-03 13:34:02 +00:00
/* top row: use restricted range */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(col, true);
Experimental Feature: Frame Range Masks for FModifiers Using this feature, it is now possible to for example have different noise-profiles for different parts of a curve, which makes it possible to do animate camera shake for example. Or perhaps, for having greater control of mixing and matching different parts of F-Modifier effects, such as combining several generator modifiers to get multi-case functions for instance. See http://aligorith.blogspot.com/2011/06/gsoc11-fmodifier-range- masks.html for details.
2011-06-03 13:34:02 +00:00
uiItemR(row, &ptr, "use_restricted_range", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Experimental Feature: Frame Range Masks for FModifiers Using this feature, it is now possible to for example have different noise-profiles for different parts of a curve, which makes it possible to do animate camera shake for example. Or perhaps, for having greater control of mixing and matching different parts of F-Modifier effects, such as combining several generator modifiers to get multi-case functions for instance. See http://aligorith.blogspot.com/2011/06/gsoc11-fmodifier-range- masks.html for details.
2011-06-03 13:34:02 +00:00
if (fcm->flag & FMODIFIER_FLAG_RANGERESTRICT) {
/* second row: settings */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(col, true);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
uiItemR(row, &ptr, "frame_start", 0, IFACE_("Start"), ICON_NONE);
uiItemR(row, &ptr, "frame_end", 0, IFACE_("End"), ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
FModifier Influence/BlendIn-Out Following on from my commit to introduce frame ranges for FModifiers, those frame ranges can now have blend in/out values. By setting a blendin or blendout value, you're specifying the number of frames for the modifier's "full influence" to take effect or fade out relative to the start/end frames. The "full influence" above needs a little clarification. When the "use influence" setting is enabled, "full influence" is taken from the "influence" slider (a new setting). Otherwise, it uses 1.0 (i.e. unmodified influence, same as old behaviour before the introduction of influence controls). The influence slider basically says how much the modifier's effects are allowed to contribute to the final result. --- Notes: - This opt-in "Use Influence" approach is really forced upon us because there are heaps of old files for which we cannot easily version patch without spending some effort going through all the data in the file, hunting out the F-Modifiers. - interpf() seems to use a backwards order compared to everything else
2011-06-04 06:22:01 +00:00
/* third row: blending influence */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
row = uiLayoutRow(col, true);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Many i18n fixings, based on [#30428] [2.62] Translation Issues. In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more). Also done some style edits…
2012-03-03 21:42:21 +00:00
uiItemR(row, &ptr, "blend_in", 0, IFACE_("In"), ICON_NONE);
uiItemR(row, &ptr, "blend_out", 0, IFACE_("Out"), ICON_NONE);
FModifier Influence/BlendIn-Out Following on from my commit to introduce frame ranges for FModifiers, those frame ranges can now have blend in/out values. By setting a blendin or blendout value, you're specifying the number of frames for the modifier's "full influence" to take effect or fade out relative to the start/end frames. The "full influence" above needs a little clarification. When the "use influence" setting is enabled, "full influence" is taken from the "influence" slider (a new setting). Otherwise, it uses 1.0 (i.e. unmodified influence, same as old behaviour before the introduction of influence controls). The influence slider basically says how much the modifier's effects are allowed to contribute to the final result. --- Notes: - This opt-in "Use Influence" approach is really forced upon us because there are heaps of old files for which we cannot easily version patch without spending some effort going through all the data in the file, hunting out the F-Modifiers. - interpf() seems to use a backwards order compared to everything else
2011-06-04 06:22:01 +00:00
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
FModifier Influence/BlendIn-Out Following on from my commit to introduce frame ranges for FModifiers, those frame ranges can now have blend in/out values. By setting a blendin or blendout value, you're specifying the number of frames for the modifier's "full influence" to take effect or fade out relative to the start/end frames. The "full influence" above needs a little clarification. When the "use influence" setting is enabled, "full influence" is taken from the "influence" slider (a new setting). Otherwise, it uses 1.0 (i.e. unmodified influence, same as old behaviour before the introduction of influence controls). The influence slider basically says how much the modifier's effects are allowed to contribute to the final result. --- Notes: - This opt-in "Use Influence" approach is really forced upon us because there are heaps of old files for which we cannot easily version patch without spending some effort going through all the data in the file, hunting out the F-Modifiers. - interpf() seems to use a backwards order compared to everything else
2011-06-04 06:22:01 +00:00
/* influence -------------------------------------------------------------- */
Code cleanup: remove TRUE/FALSE & WITH_BOOL_COMPAT define
2014-04-01 11:34:00 +11:00
col = uiLayoutColumn(box, true);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
FModifier Influence/BlendIn-Out Following on from my commit to introduce frame ranges for FModifiers, those frame ranges can now have blend in/out values. By setting a blendin or blendout value, you're specifying the number of frames for the modifier's "full influence" to take effect or fade out relative to the start/end frames. The "full influence" above needs a little clarification. When the "use influence" setting is enabled, "full influence" is taken from the "influence" slider (a new setting). Otherwise, it uses 1.0 (i.e. unmodified influence, same as old behaviour before the introduction of influence controls). The influence slider basically says how much the modifier's effects are allowed to contribute to the final result. --- Notes: - This opt-in "Use Influence" approach is really forced upon us because there are heaps of old files for which we cannot easily version patch without spending some effort going through all the data in the file, hunting out the F-Modifiers. - interpf() seems to use a backwards order compared to everything else
2011-06-04 06:22:01 +00:00
/* top row: use influence */
uiItemR(col, &ptr, "use_influence", 0, NULL, ICON_NONE);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
FModifier Influence/BlendIn-Out Following on from my commit to introduce frame ranges for FModifiers, those frame ranges can now have blend in/out values. By setting a blendin or blendout value, you're specifying the number of frames for the modifier's "full influence" to take effect or fade out relative to the start/end frames. The "full influence" above needs a little clarification. When the "use influence" setting is enabled, "full influence" is taken from the "influence" slider (a new setting). Otherwise, it uses 1.0 (i.e. unmodified influence, same as old behaviour before the introduction of influence controls). The influence slider basically says how much the modifier's effects are allowed to contribute to the final result. --- Notes: - This opt-in "Use Influence" approach is really forced upon us because there are heaps of old files for which we cannot easily version patch without spending some effort going through all the data in the file, hunting out the F-Modifiers. - interpf() seems to use a backwards order compared to everything else
2011-06-04 06:22:01 +00:00
if (fcm->flag & FMODIFIER_FLAG_USEINFLUENCE) {
/* second row: influence value */
uiItemR(col, &ptr, "influence", 0, NULL, ICON_NONE);
Experimental Feature: Frame Range Masks for FModifiers Using this feature, it is now possible to for example have different noise-profiles for different parts of a curve, which makes it possible to do animate camera shake for example. Or perhaps, for having greater control of mixing and matching different parts of F-Modifier effects, such as combining several generator modifiers to get multi-case functions for instance. See http://aligorith.blogspot.com/2011/06/gsoc11-fmodifier-range- masks.html for details.
2011-06-03 13:34:02 +00:00
}
}
NLA SoC: Separating F-Modifier UI drawing into its own file * F-Modifier UI drawing/handling is now defined in a separate file so that it will be more suitable for inclusion into the NLA Editor's buttons. * Started removing F-Curve dependence from the modifier drawing code, which wasn't strictly necessary * Fixed F-Curve RNA wrapping to correctly use FPoints instead of the bulkier BPoints. Although nobody was likely to have encountered bugs here yet, this would almost certainly have contributed to some segfaults/data corruption along the track.
2009-07-02 04:47:36 +00:00
}
}
/* ********************************************** */
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* COPY/PASTE BUFFER STUFF */
/* Copy/Paste Buffer itself (list of FModifier 's) */
static ListBase fmodifier_copypaste_buf = {NULL, NULL};
/* ---------- */
/* free the copy/paste buffer */
Code Cleanup: Add proper defines (with ANIM_* prefix) for animation-related copy-paste buffer free callbacks
2016-04-03 01:18:23 +13:00
void ANIM_fmodifiers_copybuf_free(void)
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
{
/* just free the whole buffer */
free_fmodifiers(&fmodifier_copypaste_buf);
}
/* copy the given F-Modifiers to the buffer, returning whether anything was copied or not
Code Cleanup: Add proper defines (with ANIM_* prefix) for animation-related copy-paste buffer free callbacks
2016-04-03 01:18:23 +13:00
* assuming that the buffer has been cleared already with ANIM_fmodifiers_copybuf_free()
Cleanup: comment block tabs
2018-11-14 12:53:15 +11:00
* - active: only copy the active modifier
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
*/
Code cleanup: use bool
2014-04-11 11:25:41 +10:00
bool ANIM_fmodifiers_copy_to_buf(ListBase *modifiers, bool active)
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
{
Code cleanup: use bool
2014-04-11 11:25:41 +10:00
bool ok = true;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* sanity checks */
style cleanup: add braces around checks - 'if ELEM() {...}', confuses some parsers that done expand macros.
2012-03-25 22:35:18 +00:00
if (ELEM(NULL, modifiers, modifiers->first))
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
return 0;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* copy the whole list, or just the active one? */
if (active) {
FModifier *fcm = find_active_fmodifier(modifiers);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
if (fcm) {
FModifier *fcmN = copy_fmodifier(fcm);
BLI_addtail(&fmodifier_copypaste_buf, fcmN);
}
else
ok = 0;
}
else
copy_fmodifiers(&fmodifier_copypaste_buf, modifiers);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* did we succeed? */
return ok;
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
/* 'Paste' the F-Modifier(s) from the buffer to the specified list
Cleanup: comment block tabs
2018-11-14 12:53:15 +11:00
* - replace: free all the existing modifiers to leave only the pasted ones
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
*/
Make auto handle placement aware of cyclic extrapolation. Cyclic extrapolation is implemented as an f-curve modifier, so this technically violates abstraction separation and is something of a hack. However without such behavior achieving smooth looping with cyclic extrapolation is extremely cumbersome. The new behavior is applied when the first modifier is Cyclic extrapolation in Repeat or Repeat with Offset mode without using influence, repeat count or range restrictions. This change in behavior means that curve handles have to be updated when the modifier is added, removed or its options change. Due to the way code is structured, it seems it requires a helper link to the containing curve from the modifier object. Reviewers: aligorith Differential Revision: https://developer.blender.org/D2783
2017-10-17 19:39:10 +03:00
bool ANIM_fmodifiers_paste_from_buf(ListBase *modifiers, bool replace, FCurve *curve)
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
{
FModifier *fcm;
Code cleanup: use bool
2014-04-11 11:25:41 +10:00
bool ok = false;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* sanity checks */
if (modifiers == NULL)
return 0;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Make auto handle placement aware of cyclic extrapolation. Cyclic extrapolation is implemented as an f-curve modifier, so this technically violates abstraction separation and is something of a hack. However without such behavior achieving smooth looping with cyclic extrapolation is extremely cumbersome. The new behavior is applied when the first modifier is Cyclic extrapolation in Repeat or Repeat with Offset mode without using influence, repeat count or range restrictions. This change in behavior means that curve handles have to be updated when the modifier is added, removed or its options change. Due to the way code is structured, it seems it requires a helper link to the containing curve from the modifier object. Reviewers: aligorith Differential Revision: https://developer.blender.org/D2783
2017-10-17 19:39:10 +03:00
bool was_cyclic = curve && BKE_fcurve_is_cyclic(curve);
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* if replacing the list, free the existing modifiers */
if (replace)
free_fmodifiers(modifiers);
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* now copy over all the modifiers in the buffer to the end of the list */
style cleanup: misc editor changes.
2012-05-08 11:48:19 +00:00
for (fcm = fmodifier_copypaste_buf.first; fcm; fcm = fcm->next) {
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* make a copy of it */
FModifier *fcmN = copy_fmodifier(fcm);
Make auto handle placement aware of cyclic extrapolation. Cyclic extrapolation is implemented as an f-curve modifier, so this technically violates abstraction separation and is something of a hack. However without such behavior achieving smooth looping with cyclic extrapolation is extremely cumbersome. The new behavior is applied when the first modifier is Cyclic extrapolation in Repeat or Repeat with Offset mode without using influence, repeat count or range restrictions. This change in behavior means that curve handles have to be updated when the modifier is added, removed or its options change. Due to the way code is structured, it seems it requires a helper link to the containing curve from the modifier object. Reviewers: aligorith Differential Revision: https://developer.blender.org/D2783
2017-10-17 19:39:10 +03:00
fcmN->curve = curve;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* make sure the new one isn't active, otherwise the list may get several actives */
fcmN->flag &= ~FMODIFIER_FLAG_ACTIVE;
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* now add it to the end of the list */
BLI_addtail(modifiers, fcmN);
ok = 1;
}
Cleanup: strip trailing space in editors
2018-06-04 09:31:30 +02:00
Make auto handle placement aware of cyclic extrapolation. Cyclic extrapolation is implemented as an f-curve modifier, so this technically violates abstraction separation and is something of a hack. However without such behavior achieving smooth looping with cyclic extrapolation is extremely cumbersome. The new behavior is applied when the first modifier is Cyclic extrapolation in Repeat or Repeat with Offset mode without using influence, repeat count or range restrictions. This change in behavior means that curve handles have to be updated when the modifier is added, removed or its options change. Due to the way code is structured, it seems it requires a helper link to the containing curve from the modifier object. Reviewers: aligorith Differential Revision: https://developer.blender.org/D2783
2017-10-17 19:39:10 +03:00
/* adding or removing the Cycles modifier requires an update to handles */
if (curve && BKE_fcurve_is_cyclic(curve) != was_cyclic)
calchandles_fcurve(curve);
F-Modifier Goodies (as requested by @ndy): * Copy/Paste operators for F-Modifiers Available in Graph and NLA Editors. Use the Copy/Paste buttons beside the 'Add Modifier' buttons. Copy copies all the modifiers of the ACTIVE F-Curve or Strip depending on the editor. Paste pastes modifiers from the buffer to all the selected F-Curves or Strips, adding the new modifiers to the ends of each list. * 'Stepped Interpolation' F-Modifier This modifier holds each interpolated value from the F-Curve for several frames without changing the timing. This allows to preview motions 'on-twos' for example without altering the timing, or having to go through setting heaps of keyframes. In this case, Andy wanted to use this for CG <-> StopMo.
2010-03-18 13:04:46 +00:00
/* did we succeed? */
return ok;
}
/* ********************************************** */
Copy Permalink