Hi,<br><br>Here on Windows, the while loop is quite dangerous (there are reasons why I almost always avoid them like the plague!), as if the mouse moves out of the window and moves back in, all events are swallowed and Blender freezes. Perhaps this will need a more elegant solution...<br>
<br>Regards,<br>Joshua<br><br><div class="gmail_quote">On Mon, Dec 22, 2008 at 8:58 AM, Ton Roosendaal <span dir="ltr"><<a href="mailto:ton@blender.org">ton@blender.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Revision: 17998<br>
<a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17998" target="_blank">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17998</a><br>
Author: ton<br>
Date: 2008-12-21 20:58:25 +0100 (Sun, 21 Dec 2008)<br>
<br>
Log Message:<br>
-----------<br>
2.5<br>
<br>
Animated screen! (unfinished, now only draws, no animation code yet).<br>
Fun though to see it all work. :)<br>
<br>
NOTE: Mac ghost has timer bug, the GHOST_ProcessEvents() doesnt wake<br>
up for timers.<br>
<br>
NOTE2: Added while loop in wm_window_process_events() to force Ghost<br>
giving all events to Blender. Timers otherwise don't accumulate...<br>
might be needed to fix in ghost too.<br>
<br>
I tend to think to code own timer, this ghost stuff is totally different<br>
per platform.<br>
<br>
Modified Paths:<br>
--------------<br>
branches/blender2.5/blender/source/blender/editors/include/ED_screen.h<br>
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c<br>
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c<br>
branches/blender2.5/blender/source/blender/editors/space_time/time_header.c<br>
branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h<br>
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c<br>
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c<br>
<br>
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_screen.h<br>
===================================================================<br>
--- branches/blender2.5/blender/source/blender/editors/include/ED_screen.h 2008-12-21 19:40:47 UTC (rev 17997)<br>
+++ branches/blender2.5/blender/source/blender/editors/include/ED_screen.h 2008-12-21 19:58:25 UTC (rev 17998)<br>
@@ -74,6 +74,7 @@<br>
bScreen *ED_screen_duplicate(struct wmWindow *win, struct bScreen *sc);<br>
void ED_screen_set_subwinactive(struct wmWindow *win, struct wmEvent *event);<br>
void ED_screen_exit(struct bContext *C, struct wmWindow *window, struct bScreen *screen);<br>
+void ED_animation_timer(struct wmWindow *win, int enable);<br>
<br>
void ED_operatortypes_screen(void);<br>
void ED_keymap_screen(struct wmWindowManager *wm);<br>
<br>
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c<br>
===================================================================<br>
--- branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c 2008-12-21 19:40:47 UTC (rev 17997)<br>
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c 2008-12-21 19:58:25 UTC (rev 17998)<br>
@@ -29,6 +29,7 @@<br>
#include "MEM_guardedalloc.h"<br>
<br>
#include "DNA_vec_types.h"<br>
+#include "DNA_scene_types.h"<br>
<br>
#include "BLI_blenlib.h"<br>
<br>
@@ -1263,3 +1264,14 @@<br>
<br>
}<br>
<br>
+void ED_animation_timer(wmWindow *win, int enable)<br>
+{<br>
+<br>
+ if(win->animtimer)<br>
+ WM_event_remove_window_timer(win, win->animtimer);<br>
+ win->animtimer= NULL;<br>
+<br>
+ if(enable)<br>
+ win->animtimer= WM_event_add_window_timer(win, (int)(1000/FPS), (int)(1000/FPS));<br>
+}<br>
+<br>
<br>
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c<br>
===================================================================<br>
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c 2008-12-21 19:40:47 UTC (rev 17997)<br>
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c 2008-12-21 19:58:25 UTC (rev 17998)<br>
@@ -1310,7 +1310,6 @@<br>
<br>
void ED_SCR_OT_region_flip(wmOperatorType *ot)<br>
{<br>
-<br>
/* identifiers */<br>
ot->name= "Flip Region";<br>
ot->idname= "ED_SCR_OT_region_flip";<br>
@@ -1322,7 +1321,39 @@<br>
ot->poll= ED_operator_areaactive;<br>
}<br>
<br>
+/* ****************** anim player, typically with timer ***************** */<br>
<br>
+static int screen_animation_play(bContext *C, wmOperator *op, wmEvent *event)<br>
+{<br>
+ wmWindow *win= CTX_wm_window(C);<br>
+<br>
+ if(win->animtimer==event->customdata) {<br>
+ Scene *scene= CTX_data_scene(C);<br>
+<br>
+ scene->r.cfra++;<br>
+ if(scene->r.cfra > scene->r.efra)<br>
+ scene->r.cfra= scene->r.sfra;<br>
+<br>
+ WM_event_add_notifier(C, WM_NOTE_WINDOW_REDRAW, 0, NULL);<br>
+<br>
+ return OPERATOR_FINISHED;<br>
+ }<br>
+ return OPERATOR_PASS_THROUGH;<br>
+}<br>
+<br>
+void ED_SCR_OT_animation_play(wmOperatorType *ot)<br>
+{<br>
+ /* identifiers */<br>
+ ot->name= "Animation player";<br>
+ ot->idname= "ED_SCR_OT_animation_play";<br>
+<br>
+ /* api callbacks */<br>
+ ot->invoke= screen_animation_play;<br>
+<br>
+ ot->poll= ED_operator_screenactive;<br>
+<br>
+}<br>
+<br>
/* ************** border select operator (template) ***************************** */<br>
<br>
/* operator state vars used: (added by default WM callbacks)<br>
@@ -1402,7 +1433,8 @@<br>
<br>
/*frame changes*/<br>
WM_operatortype_append(ED_SCR_OT_frame_offset);<br>
-<br>
+ WM_operatortype_append(ED_SCR_OT_animation_play);<br>
+<br>
/* tools shared by more space types */<br>
ED_marker_operatortypes();<br>
<br>
@@ -1430,6 +1462,7 @@<br>
RNA_enum_set(WM_keymap_add_item(keymap, "ED_SCR_OT_region_split", SKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "dir", 'v');<br>
<br>
/*frame offsets*/<br>
+ WM_keymap_add_item(keymap, "ED_SCR_OT_animation_play", TIMER, KM_ANY, 0, 0);<br>
RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", UPARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", 10);<br>
RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", DOWNARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -10);<br>
RNA_int_set(WM_keymap_add_item(keymap, "ED_SCR_OT_frame_offset", LEFTARROWKEY, KM_PRESS, 0, 0)->ptr, "delta", -1);<br>
<br>
Modified: branches/blender2.5/blender/source/blender/editors/space_time/time_header.c<br>
===================================================================<br>
--- branches/blender2.5/blender/source/blender/editors/space_time/time_header.c 2008-12-21 19:40:47 UTC (rev 17997)<br>
+++ branches/blender2.5/blender/source/blender/editors/space_time/time_header.c 2008-12-21 19:58:25 UTC (rev 17998)<br>
@@ -337,24 +337,7 @@<br>
return block;<br>
}<br>
<br>
-static void start_animated_screen(SpaceTime *stime)<br>
-{<br>
- // XXX add_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM, stime->redraws);<br>
-<br>
- // if(stime->redraws & TIME_WITH_SEQ_AUDIO)<br>
- // audiostream_start( CFRA );<br>
-<br>
- // BKE_ptcache_set_continue_physics((stime->redraws & TIME_CONTINUE_PHYSICS));<br>
-}<br>
<br>
-static void end_animated_screen(SpaceTime *stime)<br>
-{<br>
- // rem_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM);<br>
-<br>
- // audiostream_stop();<br>
- // BKE_ptcache_set_continue_physics(0);<br>
-}<br>
-<br>
#define B_REDRAWALL 750<br>
#define B_TL_REW 751<br>
#define B_TL_PLAY 752<br>
@@ -374,7 +357,7 @@<br>
<br>
void do_time_buttons(bContext *C, void *arg, int event)<br>
{<br>
- SpaceTime *stime= (SpaceTime*)CTX_wm_space_data(C);<br>
+// SpaceTime *stime= (SpaceTime*)CTX_wm_space_data(C);<br>
Scene *scene= CTX_data_scene(C);<br>
<br>
switch(event) {<br>
@@ -386,10 +369,10 @@<br>
//update_for_newframe();<br>
break;<br>
case B_TL_PLAY:<br>
- start_animated_screen(stime);<br>
+ ED_animation_timer(CTX_wm_window(C), 1);<br>
break;<br>
case B_TL_STOP:<br>
- end_animated_screen(stime);<br>
+ ED_animation_timer(CTX_wm_window(C), 0);<br>
WM_event_add_notifier(C, WM_NOTE_WINDOW_REDRAW, 0, NULL);<br>
break;<br>
case B_TL_FF:<br>
@@ -524,10 +507,10 @@<br>
xco, yco, XIC, YIC, 0, 0, 0, 0, 0, "Skip to previous keyframe (Ctrl PageDown)");<br>
xco+= XIC+4;<br>
<br>
-// if(has_screenhandler(G.curscreen, SCREEN_HANDLER_ANIM))<br>
-// uiDefIconBut(block, BUT, B_TL_STOP, ICON_PAUSE,<br>
-// xco, 0, XIC, YIC, 0, 0, 0, 0, 0, "Stop Playing Timeline");<br>
-// else<br>
+ if(CTX_wm_window(C)->animtimer)<br>
+ uiDefIconBut(block, BUT, B_TL_STOP, ICON_PAUSE,<br>
+ xco, yco, XIC, YIC, 0, 0, 0, 0, 0, "Stop Playing Timeline");<br>
+ else<br>
uiDefIconBut(block, BUT, B_TL_PLAY, ICON_PLAY,<br>
xco, yco, XIC, YIC, 0, 0, 0, 0, 0, "Play Timeline ");<br>
<br>
<br>
Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h<br>
===================================================================<br>
--- branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h 2008-12-21 19:40:47 UTC (rev 17997)<br>
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_windowmanager_types.h 2008-12-21 19:58:25 UTC (rev 17998)<br>
@@ -47,6 +47,7 @@<br>
struct bScreen;<br>
struct uiBlock;<br>
struct wmSubWindow;<br>
+struct wmTimerHandle;<br>
struct StructRNA;<br>
struct PointerRNA;<br>
<br>
@@ -93,6 +94,8 @@<br>
<br>
struct wmSubWindow *curswin; /* internal for wm_subwindow.c only */<br>
<br>
+ struct wmTimerHandle *animtimer;<br>
+<br>
ListBase queue; /* all events (ghost level events were handled) */<br>
ListBase handlers; /* window+screen handlers, overriding all queues */<br>
<br>
<br>
Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c<br>
===================================================================<br>
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c 2008-12-21 19:40:47 UTC (rev 17997)<br>
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c 2008-12-21 19:58:25 UTC (rev 17998)<br>
@@ -675,7 +675,7 @@<br>
CTX_wm_area_set(C, area_event_inside(C, event));<br>
CTX_wm_region_set(C, region_event_inside(C, event));<br>
<br>
- /* MVC demands to not draw in event handlers... for now we leave it */<br>
+ /* MVC demands to not draw in event handlers... but we need to leave it for ogl selecting etc */<br>
wm_window_make_drawable(C, win);<br>
<br>
action= wm_handlers_do(C, event, &win->handlers);<br>
<br>
Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c<br>
===================================================================<br>
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c 2008-12-21 19:40:47 UTC (rev 17997)<br>
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c 2008-12-21 19:58:25 UTC (rev 17998)<br>
@@ -498,8 +498,21 @@<br>
<br>
void wm_window_process_events(int wait_for_event)<br>
{<br>
- GHOST_ProcessEvents(g_system, wait_for_event);<br>
- GHOST_DispatchEvents(g_system);<br>
+ int handled= 0;<br>
+<br>
+ /* ghost only processes 1 (timer?) event a time... we want to accumulate all */<br>
+ while(1) {<br>
+ if(GHOST_ProcessEvents(g_system, 0)) {<br>
+ GHOST_DispatchEvents(g_system);<br>
+ handled= 1;<br>
+ }<br>
+ else<br>
+ break;<br>
+ }<br>
+ if(handled==0 && wait_for_event) {<br>
+ GHOST_ProcessEvents(g_system, wait_for_event);<br>
+ GHOST_DispatchEvents(g_system);<br>
+ }<br>
}<br>
<br>
/* **************** init ********************** */<br>
<br>
<br>
_______________________________________________<br>
Bf-blender-cvs mailing list<br>
<a href="mailto:Bf-blender-cvs@blender.org">Bf-blender-cvs@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/bf-blender-cvs" target="_blank">http://lists.blender.org/mailman/listinfo/bf-blender-cvs</a><br>
</blockquote></div><br>