チェンジセット 1525

コミット日時:

2008/10/06 03:04:28 (3 年前)

コミッタ:

gyuque

ログメッセージ:

optimized?

ファイル:

• ruby/jsplash/trunk/client2/index.xml (更新) (1 diff)
• ruby/jsplash/trunk/client2/jsplash/executor.js (更新) (5 diffs)
• ruby/jsplash/trunk/client2/jsplash/objects.js (更新) (10 diffs)
• ruby/jsplash/trunk/client2/jsplash/player.js (更新) (1 diff)
• ruby/jsplash/trunk/client2/jsplash/shaperenderer.js (更新) (12 diffs)
• ruby/jsplash/trunk/client2/jsplash/tags.js (更新) (1 diff)

ruby/jsplash/trunk/client2/index.xml

@@ -54 +54 @@
-                <div id="progbar"><div>  </div></div>
-                <p id="statusout"> </p>
-4
+5
-                <svg id="svgrt" xmlns="http://www.w3.org/2000/svg" style="width: 100px; height: 100px;">
-                </svg>

ruby/jsplash/trunk/client2/jsplash/executor.js

@@ -8 +8 @@
-                this.targets = {};
-                this.reservedActions = null;
+                this.executed_stat = 0;
-
-                this.additionals = null;
@@ -74 +75 @@
-        
-        tick: function() {
+                this.executed_stat = 0;
-                var eid, tlist = this.targets;
-                var mobj;
@@ -125 +127 @@
-//                              JSplash.$putstat("view objects: " + topsvg.length + " / " + icounts.join(' '));
-
-
+ + "  executed tags: "+this.executed_stat 
-
-                }
-//////////////////////////////////// debug
-                
-100
+95
-                
-                
@@ -140 +142 @@
-        
-        advanceFrame: function(mobj, jumps) {
+                if (mobj.sleeping)
+                        return;
+        
-                if (this.executed[mobj.instance_uid] && !jumps && mobj.context.tagC)
-                        return;
@@ -146 +151 @@
-                for(;jumps>=0;jumps--) {
-                        while(1) {
+this.executed_stat++;
-                                var res = mobj.executeNextTag(jumps != 0);
-                                if (res == JSplash.EXECUTED_SHOWFRAME) break;
-                        }
-                }
+        },
+        
+        sleepAll: function() {
+                var eid, tlist = this.targets;
+                for (eid in tlist)
+                        tlist[eid].sleep();
-        },
-        

ruby/jsplash/trunk/client2/jsplash/objects.js

@@ -61 +61 @@
-        
-        getProxy: function() {
+                if (this.klass.isShapeObject)
+                        return null;
+        
-                if (!this.proxy)
-                        this.proxy = new JSplash.MovieClipProxy(this);
@@ -128 +131 @@
-        
-                        this.sleeping = false;
-
-
+
+
+
+
+
-                }
-
@@ -180 +186 @@
-        },
-        
-
+replace_flg, 
-                if (clip_depth)
-                        this.clipMap[depth] = clip_depth;
@@ -219 +225 @@
-                        /* when replace previous frame */
-                        var g_before = null;
-
-
+
+
+
-                                g_before = replaced.g; /* to correct draw order*/
-                        }
@@ -239 +246 @@
-                        {
-//try    {
-
-
-
+
+
+
+
+
+
+
+
+
-//} catch (e) {
-//this.trace();
@@ -348 +361 @@
-                        this.hideClippers();
-
-
+ && !this.klass.isShapeObject
-                        this.updateProxy();
-        },
@@ -381 +394 @@
-                        }
-                }
-
+
-                this.context.frameC = 0;
-                this.context.tagC   = 0;
@@ -526 +539 @@
-                
-                this.updateTransform();
-
+
+
+
-        },
-        
@@ -538 +553 @@
-                
-                this.updateTransform();
-
+
+
+
-        },      
-        
@@ -633 +650 @@
-        s.label_map = label_map;
-        s.mouse_down = false;
+        s.is_stage = true;
-        
-        Object.extend(s, {

ruby/jsplash/trunk/client2/jsplash/player.js

@@ -51 +51 @@
-        onTopMouseDown: function(e) {
-                if (Event.isLeftClick(e))
+                {
-                        this.stage.setMouseDown();
+                        e.preventDefault();
+                }
-        },
-

ruby/jsplash/trunk/client2/jsplash/shaperenderer.js

@@ -14 +14 @@
-                this.te_id = 0;
-                this.fillDefMap = {};
+                this.hitCount  = 0;
+                this.pathCache = null;
+                this.do_cache = false;
-        },
-        
@@ -53 +56 @@
-                {
-                        attrs.r  = 819;
+                        attrs.fx = 0;
+                        attrs.fy = 0;
-                }
-                
@@ -279 +284 @@
-                return a.index - b.index;
-        },
-
+/*
-        buildFills: function(g) {
-                var loopss = this.fillLoops;
@@ -289 +294 @@
-                        this.buildAFill(loopss[i].loops, this.fillStyles[loopss[i].fill_index-1], g);
-                }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        buildAFill: function(list, fi, g) {
@@ -339 +309 @@
-                if (!style_str) return;
-
-                
-                var len = list.length;
-                var commands = [], lp, k, llen, E;
@@ -371 +340 @@
-                        attrs.opacity = style.a;
-                }
-
-
-
+
+
+
+
+
+
+
-        buildALoop: function(lp, style, g) {
-                if (!style) return;
@@ -402 +375 @@
-                g.appendChild( JSplash.$svg('path', {d: commands.join(' '), fill: style_str}) );
-        },
-
+*/
-        buildEdges: function(g, edge_start, edge_end) {
-
+, elem
-                var edges = this.edgeList;
-                var len = edges.length;
@@ -432 +405 @@
-                                                attrs = {d: commands.join(' '), fill: 'none', stroke: curStyle, 'stroke-width': curWidth};
-                                                if (curAlpha != undefined) attrs['stroke-opacity'] = curAlpha;
+
+                                                elem = JSplash.$svg('path', attrs);
+                                                if (this.do_cache)
+                                                        this.pathCache.stock(elem);
-                                        
-JSplash.$svg('path', attrs)
+elem
-                                        }
-                                }
@@ -469 +446 @@
-                        if (curAlpha != undefined) attrs['stroke-opacity'] = curAlpha;
-
-
+
+
+
+
+
-                }
-                for (;paths.length;)
@@ -476 +457 @@
-        
-        buildSVG: function(g) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return g;
-        },
@@ -509 +502 @@
-                        var lps = this.makeLoop(collected_edges, fi);
-                        if (lps.length > 0) {
-
+ /* cache: undefined */ 
-                        }
-                }
@@ -704 +697 @@
-        }
-}
+
+JSplash.ShapeRenderer.PathCache = Class.create();
+JSplash.ShapeRenderer.PathCache.prototype = {
+        initialize: function() {
+                this.stocks = [];
+        },
+
+        stock: function(elem) {
+                this.stocks.push(elem /* not clone! don't modify... */ );
+        },
+        
+        tearOff: function(target) {
+                var len = this.stocks.length;
+                for (var i = 0;i < len;i++)
+                        target.appendChild( this.stocks[i].cloneNode(false) );
+        }
+}

ruby/jsplash/trunk/client2/jsplash/tags.js

@@ -11 +11 @@
-
-                tPlaceObject2: function(data, owner) {
-
+
+
+
-                        if (!inst) {
-                                console.warn("WARNING: unregistered object id="+data.d);
-                                return;
-                        }
-data.mov || data.scl || data.skw
+has_trans
-                                var tx = 0, ty = 0;
-                                var sx = 1, sy = 1;