Joshua Leung
096e2f0b5a
This commit restores transform support for NLA. Grab, scale, 'extend', and tweak (i.e. grab by just click+dragging) are implemented. Notes: - As soon as one end of a strip touches another adjacent strip (within the same track), that end stops moving. This has been done to avoid the situation where overlapping strips within the same track (which is not allowed) might be caused by transforms. - Made some changes to the RNA setters for the strip extents so that the validation above could take place (and other necessary changes on a per-strip basis could also occur). TODO's ? - Strips cannot be transferred from track to track using transforms. I've yet to decide whether this needs to be done, or whether a separate operator will suffice. - What happens to the range of Actions used when the strips change sizes unexpectedly (i.e. the no-overlap condition above)? Currently range stays the same, but this doesn't always seem desirable?
224 lines
7.2 KiB
C
224 lines
7.2 KiB
C
/**
|
|
* $Id:
|
|
*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2009 Blender Foundation, Joshua Leung
|
|
* All rights reserved.
|
|
*
|
|
*
|
|
* Contributor(s): Joshua Leung (major recode)
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
|
|
#include "DNA_anim_types.h"
|
|
#include "DNA_action_types.h"
|
|
#include "DNA_nla_types.h"
|
|
#include "DNA_object_types.h"
|
|
#include "DNA_space_types.h"
|
|
#include "DNA_scene_types.h"
|
|
#include "DNA_screen_types.h"
|
|
#include "DNA_windowmanager_types.h"
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "BLI_blenlib.h"
|
|
#include "BLI_arithb.h"
|
|
#include "BLI_rand.h"
|
|
|
|
#include "BKE_animsys.h"
|
|
#include "BKE_nla.h"
|
|
#include "BKE_context.h"
|
|
#include "BKE_report.h"
|
|
#include "BKE_screen.h"
|
|
|
|
#include "ED_anim_api.h"
|
|
#include "ED_space_api.h"
|
|
#include "ED_screen.h"
|
|
|
|
#include "BIF_transform.h"
|
|
|
|
#include "WM_api.h"
|
|
#include "WM_types.h"
|
|
|
|
#include "RNA_access.h"
|
|
|
|
#include "UI_interface.h"
|
|
#include "UI_resources.h"
|
|
#include "UI_view2d.h"
|
|
|
|
#include "nla_intern.h" // own include
|
|
|
|
/* ************************** poll callbacks for operators **********************************/
|
|
|
|
/* tweakmode is NOT enabled */
|
|
int nlaop_poll_tweakmode_off (bContext *C)
|
|
{
|
|
Scene *scene;
|
|
|
|
/* for now, we check 2 things:
|
|
* 1) active editor must be NLA
|
|
* 2) tweakmode is currently set as a 'per-scene' flag
|
|
* so that it will affect entire NLA data-sets,
|
|
* but not all AnimData blocks will be in tweakmode for
|
|
* various reasons
|
|
*/
|
|
if (ED_operator_nla_active(C) == 0)
|
|
return 0;
|
|
|
|
scene= CTX_data_scene(C);
|
|
if ((scene == NULL) || (scene->flag & SCE_NLA_EDIT_ON))
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* tweakmode IS enabled */
|
|
int nlaop_poll_tweakmode_on (bContext *C)
|
|
{
|
|
Scene *scene;
|
|
|
|
/* for now, we check 2 things:
|
|
* 1) active editor must be NLA
|
|
* 2) tweakmode is currently set as a 'per-scene' flag
|
|
* so that it will affect entire NLA data-sets,
|
|
* but not all AnimData blocks will be in tweakmode for
|
|
* various reasons
|
|
*/
|
|
if (ED_operator_nla_active(C) == 0)
|
|
return 0;
|
|
|
|
scene= CTX_data_scene(C);
|
|
if ((scene == NULL) || !(scene->flag & SCE_NLA_EDIT_ON))
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
/* ************************** registration - operator types **********************************/
|
|
|
|
void nla_operatortypes(void)
|
|
{
|
|
/* view */
|
|
WM_operatortype_append(NLAEDIT_OT_properties);
|
|
|
|
/* channels */
|
|
WM_operatortype_append(NLA_OT_channels_click);
|
|
WM_operatortype_append(NLA_OT_channels_select_border);
|
|
|
|
/* select */
|
|
WM_operatortype_append(NLAEDIT_OT_click_select);
|
|
WM_operatortype_append(NLAEDIT_OT_select_all_toggle);
|
|
|
|
/* edit */
|
|
WM_operatortype_append(NLAEDIT_OT_tweakmode_enter);
|
|
WM_operatortype_append(NLAEDIT_OT_tweakmode_exit);
|
|
}
|
|
|
|
/* ************************** registration - keymaps **********************************/
|
|
|
|
static void nla_keymap_channels (wmWindowManager *wm, ListBase *keymap)
|
|
{
|
|
/* NLA-specific (different to standard channels keymap) -------------------------- */
|
|
/* selection */
|
|
/* click-select */
|
|
// XXX for now, only leftmouse....
|
|
WM_keymap_add_item(keymap, "NLA_OT_channels_click", LEFTMOUSE, KM_PRESS, 0, 0);
|
|
RNA_boolean_set(WM_keymap_add_item(keymap, "NLA_OT_channels_click", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "extend", 1);
|
|
|
|
/* borderselect */
|
|
WM_keymap_add_item(keymap, "NLA_OT_channels_select_border", BKEY, KM_PRESS, 0, 0);
|
|
|
|
/* General Animation Channels keymap (see anim_channels.c) ----------------------- */
|
|
/* deselect all */
|
|
WM_keymap_add_item(keymap, "ANIM_OT_channels_select_all_toggle", AKEY, KM_PRESS, 0, 0);
|
|
RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1);
|
|
|
|
/* settings */
|
|
WM_keymap_add_item(keymap, "ANIM_OT_channels_setting_toggle", WKEY, KM_PRESS, KM_SHIFT, 0);
|
|
WM_keymap_add_item(keymap, "ANIM_OT_channels_setting_enable", WKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0);
|
|
WM_keymap_add_item(keymap, "ANIM_OT_channels_setting_disable", WKEY, KM_PRESS, KM_ALT, 0);
|
|
|
|
/* settings - specialised hotkeys */
|
|
WM_keymap_add_item(keymap, "ANIM_OT_channels_editable_toggle", TABKEY, KM_PRESS, 0, 0);
|
|
|
|
/* expand/collapse */
|
|
WM_keymap_add_item(keymap, "ANIM_OT_channels_expand", PADPLUSKEY, KM_PRESS, 0, 0);
|
|
WM_keymap_add_item(keymap, "ANIM_OT_channels_collapse", PADMINUS, KM_PRESS, 0, 0);
|
|
|
|
RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_expand", PADPLUSKEY, KM_PRESS, KM_CTRL, 0)->ptr, "all", 1);
|
|
RNA_boolean_set(WM_keymap_add_item(keymap, "ANIM_OT_channels_collapse", PADMINUS, KM_PRESS, KM_CTRL, 0)->ptr, "all", 1);
|
|
}
|
|
|
|
static void nla_keymap_main (wmWindowManager *wm, ListBase *keymap)
|
|
{
|
|
wmKeymapItem *kmi;
|
|
|
|
/* selection */
|
|
/* click select */
|
|
WM_keymap_add_item(keymap, "NLAEDIT_OT_click_select", SELECTMOUSE, KM_PRESS, 0, 0);
|
|
kmi= WM_keymap_add_item(keymap, "NLAEDIT_OT_click_select", SELECTMOUSE, KM_PRESS, KM_SHIFT, 0);
|
|
RNA_boolean_set(kmi->ptr, "extend", 1);
|
|
kmi= WM_keymap_add_item(keymap, "NLAEDIT_OT_click_select", SELECTMOUSE, KM_PRESS, KM_CTRL, 0);
|
|
RNA_enum_set(kmi->ptr, "left_right", NLAEDIT_LRSEL_TEST);
|
|
|
|
/* deselect all */
|
|
WM_keymap_add_item(keymap, "NLAEDIT_OT_select_all_toggle", AKEY, KM_PRESS, 0, 0);
|
|
RNA_boolean_set(WM_keymap_add_item(keymap, "NLAEDIT_OT_select_all_toggle", IKEY, KM_PRESS, KM_CTRL, 0)->ptr, "invert", 1);
|
|
|
|
/* editing */
|
|
/* tweakmode
|
|
* - enter and exit are separate operators with the same hotkey...
|
|
* This works as they use different poll()'s
|
|
*/
|
|
WM_keymap_add_item(keymap, "NLAEDIT_OT_tweakmode_enter", TABKEY, KM_PRESS, 0, 0);
|
|
WM_keymap_add_item(keymap, "NLAEDIT_OT_tweakmode_exit", TABKEY, KM_PRESS, 0, 0);
|
|
|
|
/* transform system */
|
|
transform_keymap_for_space(wm, keymap, SPACE_NLA);
|
|
}
|
|
|
|
/* --------------- */
|
|
|
|
void nla_keymap(wmWindowManager *wm)
|
|
{
|
|
ListBase *keymap;
|
|
|
|
/* keymap for all regions */
|
|
keymap= WM_keymap_listbase(wm, "NLA Generic", SPACE_NLA, 0);
|
|
WM_keymap_add_item(keymap, "NLAEDIT_OT_properties", NKEY, KM_PRESS, 0, 0);
|
|
|
|
/* channels */
|
|
/* Channels are not directly handled by the NLA Editor module, but are inherited from the Animation module.
|
|
* Most of the relevant operations, keymaps, drawing, etc. can therefore all be found in that module instead, as there
|
|
* are many similarities with the other Animation Editors.
|
|
*
|
|
* However, those operations which involve clicking on channels and/or the placement of them in the view are implemented here instead
|
|
*/
|
|
keymap= WM_keymap_listbase(wm, "NLA Channels", SPACE_NLA, 0);
|
|
nla_keymap_channels(wm, keymap);
|
|
|
|
/* data */
|
|
keymap= WM_keymap_listbase(wm, "NLA Data", SPACE_NLA, 0);
|
|
nla_keymap_main(wm, keymap);
|
|
}
|
|
|