チェンジセット 1464

コミット日時:

2008/10/01 23:34:23 (4 年前)

コミッタ:

gyuque

ログメッセージ:

supported solid fill

ファイル:

• ruby/jsplash/trunk/client2/jsplash/executor.js (更新) (1 diff)
• ruby/jsplash/trunk/client2/jsplash/objects.js (更新) (2 diffs)
• ruby/jsplash/trunk/client2/jsplash/player.js (更新) (1 diff)
• ruby/jsplash/trunk/client2/jsplash/shaperenderer.js (更新) (10 diffs)

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

@@ -122 +122 @@
-                
-                t = Math.floor(1000 / this.frameRate);
-
+
+
-                window.setTimeout(this.tick.bind(this), t);
-        },

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

@@ -177 +177 @@
-        
-        doReservedAction: function() {
-//              console.log("+++++ DoAction +++++ "+this+"  "+(this.context.frameC));
-                if (!this.klass)
-                        return;
@@ -231 +230 @@
-                }
-                
-
+
+
+
+
+
-                {
-                        act.vlist = vlist;
-                        act.tweaked_action = ( JSplash.injectScriptVariables(act.action, vlist) ).bind( this.getProxy() );
+                        act.tweaked_action._binded_this_ = this.getProxy();
-                }
-                        

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

@@ -126 +126 @@
-
-JSplash.$putstat = function(s) {
-
+
+
+
-}
-

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

@@ -3 +3 @@
-        initialize: function(source) {
-                this.edgeStyles = source.line_styles.slice();
+                this.fillStyles = source.fill_styles;
-                this.defineShape = source;
-                this.leftFillEdges  = {};
-                this.rightFillEdges = {};
-                this.edgeList = [];
+                
+                this.fillLoops = null;
+                this.te_id = 0;
-        },
-
@@ -26 +30 @@
-                var x2, y2;
-                
-////////////////////////
-if (this.edgeStyles.length < 1) {
-this.edgeStyles.push({w:30});
-cur_lineStyle=1;
-}
-
-                for (var i = 0;i < len;i++) {
-                        rcd = records[i];
@@ -89 +87 @@
-                }
-                
-_dump
+commitFill
-        },
-        
@@ -134 +132 @@
-        },
-        
+        buildFills: function(g) {
+                var loopss = this.fillLoops;
+                if (!loopss) return;
+                
+                var len = loopss.length;
+                
+                for (var i = 0;i < len;i++) {
+                        this.buildAFill(loopss[i].loops, this.fillStyles[loopss[i].fill_index-1], g);
+                }
+        },
+
+        buildAFill: function(list, style, g) {
+                if (!style) return;
+                
+                var style_str = null;
+                if (style.rgb)
+                        style_str = '#'+style.rgb;
+                        
+                if (!style_str) return;
+
+                
+                var len = list.length;
+                var commands = [], lp, k, llen, E;
+                for (var i = 0;i < len;i++) {
+                        lp = list[i];
+                        llen = lp.length;
+                        
+                        if (i) {
+                                commands.push('Z');
+                        }
+                        
+                        for (k = 0;k < llen;k++) {
+                                E = lp[k];
+                                E.calcPx();
+                                if (k==0)
+                                        commands.push('M '+E.px1+','+E.py1);
+                                        
+                                if (E.original.curved) {
+                                        commands.push('Q ' + E.pxC +','+ E.pyC);
+                                        commands.push(E.px2 +','+ E.py2);
+                                }
+                                else
+                                        commands.push('L ' + E.px2 +','+ E.py2);
+                        }
+                }
+                
+                commands.push('Z');
+                
+                g.appendChild( JSplash.$svg('path', {d: commands.join(' '), fill: style_str}) );
+        },
+        
-        buildSVG: function(g) {
+                this.buildFills(g);
+        
-                var E;
-                var edges = this.edgeList;
@@ -142 +193 @@
-                var paths = [];
-                var curWidth = 0;
+                var curStyle = null;
-                
-                for (var i = 0;i < len;i++) {
@@ -152 +204 @@
-                                        //commands.push('Z');
-                                        if (commands.length > 1)
-'black'
+curStyle
-                                }
-                                
@@ -158 +210 @@
-                                        commands = [( 'M ' + E.px1 +','+ E.py1 )];
-                                        curWidth = JSplash.$twips( this.edgeStyles[ E.lineStyle-1 ].w );
+                                        curStyle = '#' + this.edgeStyles[ E.lineStyle-1 ].rgb;
-                                }
-                        }
@@ -175 +228 @@
-
-                if (commands.length > 1)
-'black'
+curStyle
-                for (;paths.length;)
-                        g.appendChild(paths.shift());
@@ -182 +235 @@
-        },
-        
+        commitFill: function() {
+                var len, i;
+
+                var fi;
+                var elist;
+                var nFills = this.fillStyles.length;
+
+                this.fillLoops = [];
+                for (fi = 1;fi <= nFills;fi++)
+                {
+                        var collected_edges = [];
+                        elist = this.rightFillEdges[fi];
+                        if (elist) {
+                                len = elist.length;
+                                for (i = 0;i < len;i++)
+                                        collected_edges.push(elist[i].tearOff(false, this.te_id++));
+                        }
+
+                        elist = this.leftFillEdges[fi];
+                        if (elist) {
+                                len = elist.length;
+                                for (i = 0;i < len;i++)
+                                        collected_edges.push(elist[i].tearOff(true, this.te_id++));
+
+                        }
+                        
+                        var lps = this.makeLoop(collected_edges, fi);
+                        if (lps.length > 0) {
+                                this.fillLoops.push({fill_index: fi, loops: lps});
+                        }
+                }
+                
+                /* clear */
+                this.leftFillEdges  = {};
+                this.rightFillEdges = {};
+        },
+        
+        makeLoop: function(elist, fi) {
+                var pmap = {}, loops = [];
+                var i, len, te, k;
+
+                len = elist.length;
+                for (i = 0;i < len;i++)
+                {
+                        te = elist[i];
+                        k = this.make_key(te.getTx1(), te.getTy1());
+                        if (!pmap[k]) pmap[k] = [];
+                        pmap[k].push(te);
+                }
+                
+                var parts, start_k, fst, nxt;
+                len = elist.length;
+                for (i = 0;i < len;i++)
+                {
+                        te = elist[i];
+                        if (te.has_loop)
+                                continue;
+                
+                        // assume that this is the first part
+                        te.has_loop = true;
+                        parts = [te];
+                        fst = te;
+                        var usedmap = {};
+                        for (start_k = this.make_key( te.getTx1(), te.getTy1() );;)
+                        {
+                                k = this.make_key( te.getTx2(), te.getTy2() );
+                                if (k == start_k) // looped!
+                                {
+                                        this.use_all(parts);
+                                        loops.push(parts);
+                                        break;
+                                }
+                                
+                                if (!pmap[k] || pmap[k].length == 0) break; // no next edge
+                                
+                                nxt = this.seq_next(pmap[k], elist[i+1], usedmap);
+                                if (!nxt) break;
+                                
+                                te = nxt;
+                                usedmap[te.eid] = true;
+                                parts.push(te);
+                        }
+                }
+
+                return loops;
+        },
+        
+
+        seq_next: function(list, t, usedmap) {
+                if (!t) return null;
+
+                var i, len = list.length;
+                for (i = 0;i < len;i++)
+                {
+                        if (list[i] == t && !list[i].has_loop)
+                        {
+                                var ret = list[i];
+                                list.splice(i, 1);
+
+                                return ret;
+                        }
+                }
+
+                for (i = 0;i < len;i++)
+                {
+                        if (!list[i].has_loop && !usedmap[list[i].eid])
+                                return list[i];
+                }
+
+                return null;
+        },
+        
+        use_all: function(a) {
+                var i, len = a.length;
+                for (i = 0;i < len;i++)
+                        a[i].has_loop = true;
+        },
+        
+        make_key: function(x, y) {
+                return (x+50000)*100000+y;
+        },
+        
-        _dump: function() {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}
@@ -194 +385 @@
-        /* tx1, ty1, tx2, ty2, txC, tyC */
-}
+
+JSplash.EdgePart.prototype = {
+        tearOff: function(rev, eid) {
+                return new JSplash.TearedEdge(this, rev, eid);
+        },
+}
+
+
+JSplash.TearedEdge = function(org, rev, eid)
+{
+        this.rev = rev;
+        this.original = org;
+        this.has_loop = false;
+        this.px1 = null;
+        this.eid = eid;
+}
+
+JSplash.TearedEdge.prototype = {
+        getTx1: function() {
+                return this.rev ? this.original.tx2 : this.original.tx1;
+        },
+
+        getTy1: function() {
+                return this.rev ? this.original.ty2 : this.original.ty1;
+        },
+
+
+        getTx2: function() {
+                return this.rev ? this.original.tx1 : this.original.tx2;
+        },
+
+        getTy2: function() {
+                return this.rev ? this.original.ty1 : this.original.ty2;
+        },
+        
+        calcPx: function() {
+                if (this.px1 == null) {
+                        this.px1 = JSplash.$twips(this.getTx1());
+                        this.py1 = JSplash.$twips(this.getTy1());
+                        this.px2 = JSplash.$twips(this.getTx2());
+                        this.py2 = JSplash.$twips(this.getTy2());
+                        this.pxC = JSplash.$twips(this.original.txC);
+                        this.pyC = JSplash.$twips(this.original.tyC);
+                }
+        }
+}
+
+
-
-JSplash.EdgePart.prototype.calcPx = function() {