[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19069] branches/blender2.5/blender/source /blender/editors/space_graph: Graph Editor: Started adding the missing NKEY panel stuff
Joshua Leung
aligorith at gmail.com
Sat Feb 21 11:39:46 CET 2009
Revision: 19069
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19069
Author: aligorith
Date: 2009-02-21 11:38:58 +0100 (Sat, 21 Feb 2009)
Log Message:
-----------
Graph Editor: Started adding the missing NKEY panel stuff
Only a dummy pannel for now. I'll add some basic examples of relevant buttons + ways to use them soon.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_intern.h
branches/blender2.5/blender/source/blender/editors/space_graph/graph_ops.c
branches/blender2.5/blender/source/blender/editors/space_graph/space_graph.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c
Added: branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c (rev 0)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c 2009-02-21 10:38:58 UTC (rev 19069)
@@ -0,0 +1,168 @@
+/**
+ * $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.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation, Joshua Leung
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+#include <float.h>
+
+#include "DNA_anim_types.h"
+#include "DNA_action_types.h"
+#include "DNA_object_types.h"
+#include "DNA_space_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_screen_types.h"
+#include "DNA_userdef_types.h"
+
+#include "MEM_guardedalloc.h"
+
+#include "BLI_arithb.h"
+#include "BLI_blenlib.h"
+#include "BLI_editVert.h"
+#include "BLI_rand.h"
+
+#include "BKE_animsys.h"
+#include "BKE_action.h"
+#include "BKE_context.h"
+#include "BKE_curve.h"
+#include "BKE_customdata.h"
+#include "BKE_depsgraph.h"
+#include "BKE_object.h"
+#include "BKE_global.h"
+#include "BKE_scene.h"
+#include "BKE_screen.h"
+#include "BKE_utildefines.h"
+
+#include "BIF_gl.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "ED_anim_api.h"
+#include "ED_keyframing.h"
+#include "ED_screen.h"
+#include "ED_types.h"
+#include "ED_util.h"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+#include "UI_view2d.h"
+
+#include "graph_intern.h" // own include
+
+
+/* ******************* view3d space & buttons ************** */
+#define B_NOP 1
+#define B_REDR 2
+
+static void do_graph_region_buttons(bContext *C, void *arg, int event)
+{
+ //Scene *scene= CTX_data_scene(C);
+
+ switch(event) {
+
+ }
+
+ /* default for now */
+ //WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, ob);
+}
+
+
+static void graph_panel_properties(const bContext *C, ARegion *ar, short cntrl) // GRAPH_HANDLER_SETTINGS
+{
+ //ScrArea *sa= CTX_wm_area(C);
+ //Scene *scene= CTX_data_scene(C);
+ uiBlock *block;
+
+ block= uiBeginBlock(C, ar, "graph_panel_properties", UI_EMBOSS, UI_HELV);
+ if(uiNewPanel(C, ar, block, "Properties", "Graph", 340, 30, 318, 254)==0) return;
+ uiBlockSetHandleFunc(block, do_graph_region_buttons, NULL);
+
+ /* to force height */
+ uiNewPanelHeight(block, 264);
+
+ uiDefBut(block, LABEL, 1, "Testing", 10, 220, 150, 19, NULL, 0.0, 0.0, 0, 0, "");
+#if 0
+ uiBlockBeginAlign(block);
+ uiDefButF(block, NUM, B_REDR, "Spacing:", 10, 200, 140, 19, &v3d->grid, 0.001, 100.0, 10, 0, "Set the distance between grid lines");
+ uiDefButS(block, NUM, B_REDR, "Lines:", 10, 180, 140, 19, &v3d->gridlines, 0.0, 100.0, 100, 0, "Set the number of grid lines in perspective view");
+ uiDefButS(block, NUM, B_REDR, "Divisions:", 10, 160, 140, 19, &v3d->gridsubdiv, 1.0, 100.0, 100, 0, "Set the number of grid lines");
+ uiBlockEndAlign(block);
+#endif
+}
+
+
+
+void graph_region_buttons(const bContext *C, ARegion *ar)
+{
+ SpaceIpo *sipo= (SpaceIpo *)CTX_wm_space_data(C);
+
+ // XXX temp panel for testing
+ graph_panel_properties(C, ar, 0);
+
+ /* driver settings for active F-Curve (only for 'Drivers' mode) */
+ if (sipo->mode == SIPO_MODE_DRIVERS) {
+ //graph_panel_drivers(C, ar, 0);
+ }
+
+
+ uiDrawPanels(C, 1); /* 1 = align */
+ uiMatchPanelsView2d(ar); /* sets v2d->totrct */
+
+}
+
+
+static int graph_properties(bContext *C, wmOperator *op)
+{
+ ScrArea *sa= CTX_wm_area(C);
+ ARegion *ar= graph_has_buttons_region(sa);
+
+ if(ar) {
+ ar->flag ^= RGN_FLAG_HIDDEN;
+ ar->v2d.flag &= ~V2D_IS_INITIALISED; /* XXX should become hide/unhide api? */
+
+ ED_area_initialize(CTX_wm_manager(C), CTX_wm_window(C), sa);
+ ED_area_tag_redraw(sa);
+ }
+ return OPERATOR_FINISHED;
+}
+
+void GRAPHEDIT_OT_properties(wmOperatorType *ot)
+{
+ ot->name= "Properties";
+ ot->idname= "GRAPHEDIT_OT_properties";
+
+ ot->exec= graph_properties;
+ ot->poll= ED_operator_ipo_active; // xxx
+
+ /* flags */
+ ot->flag= 0;
+}
Property changes on: branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c 2009-02-21 05:04:12 UTC (rev 19068)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c 2009-02-21 10:38:58 UTC (rev 19069)
@@ -703,7 +703,12 @@
if (nob)
ANIM_nla_mapping_apply_fcurve(nob, ale->key_data, 0, 0);
- /* draw curve - we currently calculate colour on the fly, but that should probably be done in advance instead */
+ /* draw curve - if there's an active modifier (or a stack of modifiers) drawing these takes presidence,
+ * unless modifiers in use will not alter any of the values within the keyframed area...
+ */
+
+
+ /* draw curve - as defined by keyframes */
if ( ((fcu->bezt) || (fcu->fpt)) && (fcu->totvert) ) {
/* set color/drawing style for curve itself */
if ( ((fcu->grp) && (fcu->grp->flag & AGRP_PROTECTED)) || (fcu->flag & FCURVE_PROTECTED) ) {
Modified: branches/blender2.5/blender/source/blender/editors/space_graph/graph_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_intern.h 2009-02-21 05:04:12 UTC (rev 19068)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_intern.h 2009-02-21 10:38:58 UTC (rev 19069)
@@ -42,7 +42,7 @@
struct ARegion *graph_has_buttons_region(struct ScrArea *sa);
/* ***************************************** */
-/* ipo_draw.c */
+/* graph_draw.c */
void graph_draw_channel_names(struct bAnimContext *ac, struct SpaceIpo *sipo, struct ARegion *ar);
void graph_draw_curves(struct bAnimContext *ac, struct SpaceIpo *sipo, struct ARegion *ar);
Modified: branches/blender2.5/blender/source/blender/editors/space_graph/graph_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_ops.c 2009-02-21 05:04:12 UTC (rev 19068)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_ops.c 2009-02-21 10:38:58 UTC (rev 19069)
@@ -99,7 +99,7 @@
WM_operatortype_append(GRAPHEDIT_OT_view_togglehandles);
WM_operatortype_append(GRAPHEDIT_OT_set_previewrange);
WM_operatortype_append(GRAPHEDIT_OT_view_all);
- // XXX file is not in svn: WM_operatortype_append(GRAPHEDIT_OT_properties);
+ WM_operatortype_append(GRAPHEDIT_OT_properties);
/* keyframes */
/* selection */
@@ -202,7 +202,7 @@
/* keymap for all regions */
keymap= WM_keymap_listbase(wm, "GraphEdit Generic", SPACE_IPO, 0);
- // XXX file is not in svn: WM_keymap_add_item(keymap, "GRAPHEDIT_OT_properties", NKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "GRAPHEDIT_OT_properties", NKEY, KM_PRESS, 0, 0);
/* channels */
/* Channels are not directly handled by the Graph Editor module, but are inherited from the Animation module.
Modified: branches/blender2.5/blender/source/blender/editors/space_graph/space_graph.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_graph/space_graph.c 2009-02-21 05:04:12 UTC (rev 19068)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/space_graph.c 2009-02-21 10:38:58 UTC (rev 19069)
@@ -354,7 +354,7 @@
/* set view2d view matrix for scrolling (without scrollers) */
UI_view2d_view_ortho(C, &ar->v2d);
- // XXX file is not in svn: graph_region_buttons(C, ar);
+ graph_region_buttons(C, ar);
/* restore view matrix? */
UI_view2d_view_restore(C);
More information about the Bf-blender-cvs
mailing list