[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13016] trunk/blender/source/blender: == PoseLib - Added 2 features ==
Joshua Leung
aligorith at gmail.com
Thu Dec 27 09:36:28 CET 2007
Revision: 13016
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13016
Author: aligorith
Date: 2007-12-27 09:36:27 +0100 (Thu, 27 Dec 2007)
Log Message:
-----------
== PoseLib - Added 2 features ==
* When previewing poses, it is now possible to manipulate the view to look at the pose from another angle. It is a known issue, that the normal header displays when using the MMB to do so.
* Added a tool to "validate" or sync its PoseLib data to the keys stored in the Action.
Modified Paths:
--------------
trunk/blender/source/blender/include/BIF_poselib.h
trunk/blender/source/blender/include/BIF_space.h
trunk/blender/source/blender/include/butspace.h
trunk/blender/source/blender/makesdna/DNA_action_types.h
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/poselib.c
Modified: trunk/blender/source/blender/include/BIF_poselib.h
===================================================================
--- trunk/blender/source/blender/include/BIF_poselib.h 2007-12-27 07:27:03 UTC (rev 13015)
+++ trunk/blender/source/blender/include/BIF_poselib.h 2007-12-27 08:36:27 UTC (rev 13016)
@@ -34,6 +34,7 @@
#define BIF_POSELIB_H
struct Object;
+struct bAction;
struct bPoseLib;
struct bPoseLibRef;
@@ -42,6 +43,7 @@
int poselib_get_free_index(struct bPoseLib *pl);
struct bPoseLib *poselib_init_new(struct Object *ob);
+void poselib_validate_act(struct bAction *act);
void poselib_remove_pose(struct Object *ob, struct bPoseLibRef *plr);
void poselib_rename_pose(struct Object *ob);
Modified: trunk/blender/source/blender/include/BIF_space.h
===================================================================
--- trunk/blender/source/blender/include/BIF_space.h 2007-12-27 07:27:03 UTC (rev 13015)
+++ trunk/blender/source/blender/include/BIF_space.h 2007-12-27 08:36:27 UTC (rev 13016)
@@ -120,6 +120,7 @@
extern void freespacelist(struct ScrArea *sa);
extern void handle_view3d_around(void);
extern void handle_view3d_lock(void);
+extern void handle_view_middlemouse(void);
extern void init_v2d_oops(struct ScrArea *, struct SpaceOops *);
extern void initipo(struct ScrArea *sa);
extern void newspace(struct ScrArea *sa, int type);
Modified: trunk/blender/source/blender/include/butspace.h
===================================================================
--- trunk/blender/source/blender/include/butspace.h 2007-12-27 07:27:03 UTC (rev 13015)
+++ trunk/blender/source/blender/include/butspace.h 2007-12-27 08:36:27 UTC (rev 13016)
@@ -515,6 +515,7 @@
#define B_POSELIB_ADDPOSE 2311
#define B_POSELIB_REPLACEP 2312
#define B_POSELIB_REMOVEP 2313
+#define B_POSELIB_VALIDATE 2314
/* *********************** */
#define B_CAMBUTS 2500
Modified: trunk/blender/source/blender/makesdna/DNA_action_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_action_types.h 2007-12-27 07:27:03 UTC (rev 13015)
+++ trunk/blender/source/blender/makesdna/DNA_action_types.h 2007-12-27 08:36:27 UTC (rev 13016)
@@ -105,7 +105,7 @@
struct bPoseLibRef *next, *prev;
int frame; /* frame in the action to look for this pose */
char name[32]; /* name of the pose */
- int pad;
+ int flag; /* temporary settings for this pose */
} bPoseLibRef;
/* PoseLib data for Action
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2007-12-27 07:27:03 UTC (rev 13015)
+++ trunk/blender/source/blender/src/buttons_editing.c 2007-12-27 08:36:27 UTC (rev 13016)
@@ -3757,6 +3757,14 @@
}
allqueue(REDRAWBUTSEDIT, 0);
break;
+ case B_POSELIB_VALIDATE:
+ if (ob && ob->pose) {
+ bAction *act= ob->pose->poselib;
+
+ poselib_validate_act(act);
+ }
+ allqueue(REDRAWBUTSEDIT, 0);
+ break;
}
}
@@ -4987,9 +4995,9 @@
uiDefIDPoinBut(block, test_actionpoin_but, ID_AC, REDRAWBUTSEDIT, "AC:", xco, 130, 140, 20, &pose->poselib, "Action to use as PoseLib");
}
}
- uiDefBut(block, BUT, B_POSELIB_NEW, "New PoseLib", xco,110,140,20, 0, 0, 0, 0, 0, "Creates a new PoseLib");
+ uiDefBut(block, BUT, B_POSELIB_NEW, "New PoseLib", xco,110,70,20, 0, 0, 0, 0, 0, "Creates a new PoseLib");
+ uiDefBut(block, BUT, B_POSELIB_VALIDATE, "Validate PoseLib", xco+70,110,70,20, 0, 0, 0, 0, 0, "Validates active PoseLib");
-
/* poselib pose editing controls */
if ((act) && (act->poselib)) {
bPoseLib *pl= act->poselib;
Modified: trunk/blender/source/blender/src/poselib.c
===================================================================
--- trunk/blender/source/blender/src/poselib.c 2007-12-27 07:27:03 UTC (rev 13015)
+++ trunk/blender/source/blender/src/poselib.c 2007-12-27 08:36:27 UTC (rev 13016)
@@ -1,4 +1,30 @@
-
+/**
+ * $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) 2007, Blender Foundation
+ * This is a new part of Blender
+ *
+ * Contributor(s): Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -36,11 +62,14 @@
//#include "BIF_keyframing.h"
#include "BSE_editipo.h"
+#include "BDR_drawaction.h"
+
#include "BIF_poselib.h"
#include "BIF_interface.h"
#include "BIF_editaction.h"
#include "BIF_space.h"
#include "BIF_screen.h"
+#include "BIF_toets.h"
#include "BIF_toolbox.h"
#include "blendef.h"
@@ -205,6 +234,75 @@
}
+/* This tool automagically generates/validates poselib data so that it corresponds to the data
+ * in the action. This is for use in making existing actions usable as poselibs.
+ */
+void poselib_validate_act (bAction *act)
+{
+ ListBase keys = {NULL, NULL};
+ ActKeyColumn *ak;
+ bPoseLib *pl;
+ bPoseLibRef *plr, *plrn;
+
+ /* validate action and poselib */
+ if (act == NULL) {
+ error("No Action to validate");
+ return;
+ }
+
+ if (act->poselib == NULL)
+ act->poselib= MEM_callocN(sizeof(bPoseLib), "bPoseLib");
+ pl= act->poselib;
+
+ /* determine which frames have keys */
+ action_to_keylist(act, &keys, NULL);
+
+ /* for each key, make sure there is a correspnding pose */
+ for (ak= keys.first; ak; ak= ak->next) {
+ /* check if any pose matches this */
+ for (plr= pl->poses.first; plr; plr= plr->next) {
+ if (IS_EQ(plr->frame, ak->cfra)) {
+ plr->flag = 1;
+ break;
+ }
+ }
+
+ /* add new if none found */
+ if (plr == NULL) {
+ char name[32];
+
+ /* add pose to poselib */
+ plr= MEM_callocN(sizeof(bPoseLibRef), "bPoseLibRef");
+
+ strcpy(name, "Pose");
+ poselib_unique_pose_name(pl, name);
+ BLI_strncpy(plr->name, name, sizeof(plr->name));
+
+ plr->frame= (int)ak->cfra;
+ plr->flag= 1;
+
+ BLI_addtail(&pl->poses, plr);
+ }
+ }
+
+ /* remove all untagged poses (unused), and remove all tags */
+ for (plr= pl->poses.first; plr; plr= plrn) {
+ plrn= plr->next;
+
+ if (plr->flag == 0)
+ BLI_freelinkN(&pl->poses, plr);
+ else
+ plr->flag = 0;
+ }
+
+ /* free temp memory */
+ BLI_freelistN(&keys);
+
+ BIF_undo_push("PoseLib Validate Action");
+}
+
+/* ************************************************************* */
+
/* This function adds an ipo-curve of the right type where it's needed */
static IpoCurve *poselib_verify_icu (Ipo *ipo, int adrcode)
{
@@ -528,7 +626,7 @@
/* apply this achan? */
if (achan->ipo) {
- /* find a keyframe at this frame */
+ /* find a keyframe at this frame - users may not have defined the pose on every channel, so this is necessary */
for (icu= achan->ipo->curve.first; icu; icu= icu->next) {
BezTriple *bezt;
int i;
@@ -616,13 +714,20 @@
/* ---------------------------- */
-/* defines for psoelib_preview_poses --> ret_val values */
+/* defines for poselib_preview_poses --> ret_val values */
enum {
PL_PREVIEW_RUNNING = 0,
PL_PREVIEW_CONFIRM,
PL_PREVIEW_CANCEL
};
+/* defines for poselib_preview_poses --> redraw values */
+enum {
+ PL_PREVIEW_NOREDRAW = 0,
+ PL_PREVIEW_REDRAWALL,
+ PL_PREVIEW_REDRAWHEADER,
+};
+
/* This tool allows users to preview the pose from the pose-lib using the mouse-scrollwheel/pageupdown */
void poselib_preview_poses (Object *ob)
{
@@ -665,45 +770,48 @@
while (ret_val == PL_PREVIEW_RUNNING) {
/* preview a pose */
if (redraw) {
- /* don't clear pose if firsttime */
- if (firsttime == 0)
- poselib_backup_restore(&backups);
- else
- firsttime = 0;
+ /* only recalc pose (and its dependencies) if pose has changed */
+ if (redraw == PL_PREVIEW_REDRAWALL) {
+ /* don't clear pose if firsttime */
+ if (firsttime == 0)
+ poselib_backup_restore(&backups);
+ else
+ firsttime = 0;
+
+ /* pose should be the right one to draw */
+ poselib_apply_pose(ob, plr, headerstr);
- /* pose should be the right one to draw */
- poselib_apply_pose(ob, plr, headerstr);
-
- /* old optimize trick... this enforces to bypass the depgraph
- * - note: code copied from transform_generics.c -> recalcData()
- */
- if ((arm->flag & ARM_DELAYDEFORM)==0) {
- Base *base;
-
- DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); /* sets recalc flags */
-
- /* bah, softbody exception... recalcdata doesnt reset */
- for (base= FIRSTBASE; base; base= base->next) {
- if (base->object->recalc & OB_RECALC_DATA)
- if (modifiers_isSoftbodyEnabled(base->object)) {
- base->object->softflag |= OB_SB_REDO;
+ /* old optimize trick... this enforces to bypass the depgraph
+ * - note: code copied from transform_generics.c -> recalcData()
+ */
+ if ((arm->flag & ARM_DELAYDEFORM)==0) {
+ Base *base;
+
+ DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); /* sets recalc flags */
+
+ /* bah, softbody exception... recalcdata doesnt reset */
+ for (base= FIRSTBASE; base; base= base->next) {
+ if (base->object->recalc & OB_RECALC_DATA)
+ if (modifiers_isSoftbodyEnabled(base->object)) {
+ base->object->softflag |= OB_SB_REDO;
+ }
}
}
+ else
+ where_is_pose(ob);
}
- else
- where_is_pose(ob);
/* do header print */
sprintf(headerstr, "PoseLib Previewing Pose: \"%s\" | Use ScrollWheel or PageUp/Down to change", plr->name);
headerprint(headerstr);
- /* redraw... */
+ /* force drawing of view + clear redraw flag */
force_draw(0);
- redraw= 0;
+ redraw= PL_PREVIEW_NOREDRAW;
}
/* essential for idling subloop */
- if( qtest()==0) PIL_sleep_ms(2);
+ if (qtest() == 0) PIL_sleep_ms(2);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list