MadButterfly: nodejs/mbapp.js comparison

comparison nodejs/mbapp.js @ 1405:05e8d3ffa703

Change the changeScene to sleep less when the render speed is too slow.

author	wycc
date	Mon, 04 Apr 2011 11:59:19 +0800
parents	0efa20061d70
children	c918b79892ab

comparison

equal deleted inserted replaced

-:c297ceec37f2
+:05e8d3ffa703
 this.mb_rt.kbevents.add_event_observer(exports.EVT_KB_PRESS, function(evt) { self.KeyPress(evt);});
 this.keymap={};
 this.onKeyPress = null;
 this.svg = new svg.loadSVG(this.mb_rt,this.mb_rt.root,null);
-this.frame_interval = 1000/24; // 12 frame per second
+this.frame_interval = 1000/30; // 12 frame per second
 this.timer = null;
+this._time = Date.now();
+}
+app.prototype.ts=function(m) {
+var now = Date.now();
+var t = now-this._time;
+sys.puts("["+t+"] "+m);
 }
 app.prototype.loadSVG=function(fname) {
 this.svg.load(this.mb_rt,this.mb_rt.root,fname);
 this.changeScene(0);
 sys.puts("xxxx");
 app.prototype.addKeyboardListener=function(type,f) {
 return this.mb_rt.kbevents.add_event_observer(type,f);
 }
 app.prototype.refresh=function() {
 this.mb_rt.redraw_changed();
+//this.mb_rt.redraw_all();
 this.mb_rt.flush();
 }
 app.prototype.dump=function() {
 sys.puts(this.onKeyPress);
 }
 app.prototype.generateScaleTween=function(src,dest,p) {
 sys.puts("p="+ p);
 src.hide();
 // Duplicate the group
 var nodes = src.children;
+if (src.dup) {
+//src.dup.remove();
+//src.dup = null;
+}
 if (src.dup == null) {
 var dup = this.mb_rt.coord_new(src.parent);
 	for (i in nodes) {
 	    var c = nodes[i];
 	    var ng = this.mb_rt.coord_new(dup);
 	nth = s;
 } else {
 nth = this.svg.getFrameNumber(s);
 	if (nth == -1) return;
 }
-sys.puts("goto to scene "+nth);
+this.ts("goto to scene "+nth);
 this.currentScene = nth;
 var scenes = this.svg.scenes;
 if (scenes == null) return;
 for(i=0;i<scenes.length-1;i++) {
 try {
 	    sys.puts(e);
 	    sys.puts(scenes[i].ref);
 	}
 }
 this.get(scenes[i].ref).hide();
+this.ts("refresh");
 this.refresh();
+this.ts("refresh done");
 }
 app.prototype.runToScene=function(s) {
 if (typeof(s)=='number') {
 var i;
 }
 this.targetScene = nth;
 this.startScene = this.currentScene;
 this.starttime = Date.now();
 if (this.timer == null) {
-this.timer = setTimeout(function() {
+this.skipFrame();
-	    self.skipFrame()
-}, this.frame_interval);
 }
 }
 app.prototype.skipFrame=function() {
 var self = this;
 if (this.currentScene != this.targetScene) {
-var step = Math.round((Date.now() - this.starttime)/this.frame_interval)*this.skipdir;
+var now = Date.now();
+var step = Math.round((now - this.starttime)/this.frame_interval)*this.skipdir;
 nextframe = this.startScene + step
+//nextframe = this.currentScene + this.skipdir;
+	this.ts("goto begin");
 	if (this.skipdir>0) {
 	    if (nextframe > this.targetScene)
 	        nextframe = this.targetScene;
 	} else {
 	    if (nextframe < this.targetScene)
 	        nextframe = this.targetScene;
 	}
-this.changeScene(nextframe);
 	if (nextframe != this.targetScene) {
+	    var timegap = (nextframe-this.startScene)*this.skipdir*this.frame_interval+this.starttime - Date.now();
+	    sys.puts("goto "+timegap);
+	    if (timegap <200) {
+	        timegap = 0;
+	    } else {
+	    }
 this.timer = setTimeout(function() {
 	        self.skipFrame()
-	    }, this.frame_interval);
+	    }, timegap);
 	} else {
 	    this.timer = null;
 	}
+this.changeScene(nextframe);
+	now = Date.now();
+	this.ts("goto end");
 }
 }
 app.prototype.addSceneListener=function(n, cb) {
 sys.puts("This is not implemented yet")