チェンジセット 1494

コミット日時:

2008/10/04 09:50:39 (3 年前)

コミッタ:

gyuque

ログメッセージ:

v0.4: correct draw order, disposing unused shape, radial gradient, alpha support

ファイル:

• ruby/jsplash/trunk/client2/demo_20081001.xml (更新) (1 diff)
• ruby/jsplash/trunk/client2/index.xml (更新) (2 diffs)
• ruby/jsplash/trunk/client2/jsplash/executor.js (更新) (4 diffs)
• ruby/jsplash/trunk/client2/jsplash/objects.js (更新) (11 diffs)
• ruby/jsplash/trunk/client2/jsplash/player.js (更新) (2 diffs)
• ruby/jsplash/trunk/client2/jsplash/shapedisposer.js (追加)
• ruby/jsplash/trunk/client2/jsplash/shaperenderer.js (更新) (7 diffs)
• ruby/jsplash/trunk/client2/jsplash/tags.js (更新) (4 diffs)
• ruby/jsplash/trunk/jextract.rb (更新) (9 diffs)

ruby/jsplash/trunk/client2/demo_20081001.xml

@@ -14 +14 @@
-                <script type="text/javascript" src="./jsplash/objects.js"></script>
-                <script type="text/javascript" src="./jsplash/shaperenderer.js"></script>
+                <script type="text/javascript" src="./jsplash/shapedisposer.js"></script>
-                <script type="text/javascript" src="./jsplash/executor.js"></script>
-                <script type="text/javascript" src="./jsplash/swfglobal.js"></script>

ruby/jsplash/trunk/client2/index.xml

@@ -14 +14 @@
-                <script type="text/javascript" src="./jsplash/objects.js"></script>
-                <script type="text/javascript" src="./jsplash/shaperenderer.js"></script>
+                <script type="text/javascript" src="./jsplash/shapedisposer.js"></script>
-                <script type="text/javascript" src="./jsplash/executor.js"></script>
-                <script type="text/javascript" src="./jsplash/swfglobal.js"></script>
@@ -53 +54 @@
-                <div id="progbar"><div>  </div></div>
-                <p id="statusout"> </p>
-2.4
+4.0
-                <svg id="svgrt" xmlns="http://www.w3.org/2000/svg" style="width: 100px; height: 100px;">
-                </svg>

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

@@ -17 +17 @@
-        
-        registerObject: function(obj) {
+                if (this.additionals)
+                        this.additionals.push(obj);
+        
-                if (obj._execid_) return;
-                
-                obj._execid_ = JSplash.Executor._nextid++;
-                this.targets[obj._execid_] = obj;
-                
-                if (this.additionals)
-                        this.additionals.push(obj);
-        },
-        
@@ -117 +117 @@
-                                var icounts = [];
-                                var topsvg = JSplash.gPlayer.svg.childNodes;
-
-
-
-
+
+
+
+
+
+
+
-                }
-//////////////////////////////////// debug
@@ -126 +129 @@
-                t = Math.floor(1000 / this.frameRate);
-                
-
+
+
+
+
-                window.setTimeout(this.tick.bind(this), t);
-        },
@@ -138 +144 @@
-                }
-        },
+        
+        invokeDisposer: function() {
+                var stg = JSplash.gPlayer.stage;
+
+                var fi = stg.context.frameC - 100;
+                if (fi < 1) {
+                        if (stg.context.reachedFrame > 500)
+                                fi += stg.context.reachedFrame - 1;
+                        else
+                                return;
+                }
+                
+                JSplash.gPlayer.disposer.sweep(fi);
+
+                fi = stg.context.frameC - 1000;
+                if (fi < 1) {
+                        if (stg.context.reachedFrame > 2500)
+                                fi += stg.context.reachedFrame - 1;
+                        else
+                                return;
+                }
+                
+                JSplash.gPlayer.disposer.sweep(fi);
+        }
-}

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

@@ -1 +1 @@
-JSplash.ObjectInstance = Class.create();
+JSplash.ObjectInstance.next_id = 1;
-JSplash.EXECUTED_OK        = 1;
-JSplash.EXECUTED_SHOWFRAME = 2;
@@ -36 +37 @@
-                this.klass     = null;
-                this.proxy     = null;
+                this.appended = false;
+                this.shape_disposed = false;
-
-                this.framePersists = {};
@@ -42 +45 @@
-                this.nameMap     = {};
-                this.frameActionFuncs = {};
+                this.topDepths = [0];
+                
+                this.instance_uid = JSplash.ObjectInstance.next_id++;
-        
-                if (g)
@@ -77 +83 @@
-        
-        dispose: function() {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        },
-        
-        sleep: function() {
-
-
+
+
+
+
+
-                this.destroyProxy();
-        },
-        
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (this.sleeping) {
+                        this.g.style.display = "";
+        
-                        this.sleeping = false;
-                        this.play();
-                        this.rewind();
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if (clip_depth)
-                        this.clipMap[depth] = clip_depth;
-
+
-                if (this.context.reachedFrame > this.context.frameC) {
+                
-                        var po = this.framePersists[this.context.frameC+1].pickDepth(depth) || null;
-                        
-                        if (this.depthMap[depth] != po)
+                        {
-                                this.removeObject(depth);
-
+
+
-                        if (po) {
+                                po.resume(depth);
+                                if (inherit_transform && this.depthMap[depth])
+                                        po.copyTransformFrom(this.depthMap[depth]);
+                                
-                                this.depthMap[depth] = po;
-                                po.resume();
-                        }
-                
-                        return po;
-                }
-
+       
-                var inst = null;
-                if (oid) {
-this.removeObject(depth
-
+var replaced = this.removeObject(depth, true
+
-                        var klass = JSplash.gPlayer.stage.fetchObject(oid);
-                        if (!klass)
-                                return null;
-                        inst = klass.createInstance(this);
+                        if (klass.isShapeObject)
+                                JSplash.gPlayer.disposer.register(inst);
-
-                        if (klass.renderer)
-                                inst.renderer = klass.renderer;
+
+                        /* when replace previous frame */
+                        var g_before = null;
+                        if (inherit_transform && inst && replaced) {
+                                inst.copyTransformFrom(replaced);
+                                g_before = replaced.g; /* to correct draw order*/
+                        }
-                        
+                        inst.render();
+
+                        if (!g_before)
+                        {
+//try    {
+                                this.appendViewAtDepth(inst, depth);
+//} catch (e) {
+//this.trace();
+//console.log(g_before+" "+depth+" "+oid+" "+replaced.appended);
+//throw "DOM ERR "+e;
+//}
+                        }
+                        else
+                        {
+//try    {
+try{
+                                this.g.insertBefore(inst.g, g_before);
+}catch(e){return null;}
+//} catch (e) {
+//this.trace();
+//console.log(g_before+" "+depth+" "+oid+" "+replaced.appended);
+//throw "DOM ERR";
+//}
+                                inst.appended = true;
+                        }
-                        this.depthMap[depth] = inst;
-                        inst.render();
-                        this.g.appendChild(inst.g);
-                        
-                        if (iname) {
@@ -137 +254 @@
-                                inst.registerExecutor(JSplash.gPlayer.executor);
-                        }
+                        
+                        if (replaced && replaced.appended)
+                        {
+                                this.g.removeChild(replaced.g);
+                                replaced.appended = false;
+                        }
-                }
-                else {
@@ -148 +271 @@
-                return inst;
-        },
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                var o = this.pickPlacedObjectAt(depth);
+
-                if (o)
-                {
+                
-                        delete this.clipMap[depth];
-
+// 
-                        o.sleep();
+try {                   
+                        if (!to_replace)
+                                this.removeIfTop(o, depth);
+}catch(e) {
+console.log(this+" "+o.g + "  "+arguments.callee.caller);
+throw "DOM ERR";
+}
-//                      console.log( this + " removed at depth " +depth );
-                }
+                
+                return o;
-        },
-                
@@ -176 +339 @@
-                if (!skip_visual_change)        
-                        this.hideClippers();
+        },
+        
+        setAlpha: function(a) {
+                this.g.style.opacity = a;
-        },
-        
@@ -193 +360 @@
-        },
-        
-
+
+
+
+
+
+
+
+
+
+
+
-                this.context.frameC = 0;
-                this.context.tagC   = 0;
@@ -242 +419 @@
-                for (objname in this.nameMap) {
-                        vlist.push(objname);
-this.getProxy()
-       this.getProxy().__setChidrenRefs__();
-}
+P
+}
+P.__setChidrenRefs__();
-
-                if (local_vlist) {
@@ -312 +489 @@
-        toString: function() {
-                return "Inst@"+this.klass+" belongs to " +this.parent;
+        },
+        
+        copyTransformFrom: function(src) {
+                this.pxTransform.mx = src.pxTransform.mx;
+                this.pxTransform.my = src.pxTransform.my;
+                this.pxTransform.sx = src.pxTransform.sx;
+                this.pxTransform.sy = src.pxTransform.sy;
+                this.pxTransform.kx = src.pxTransform.kx;
+                this.pxTransform.ky = src.pxTransform.ky;
+                
+                this.updateTransform();
+                this.updateProxy();
-        },
-        
@@ -443 +632 @@
-                        ch = dmap[depth];
-                        if (!ch.sleeping)
+                        {
-                                this.depthMap[depth] = ch;
+                        }
-                }
-        },

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

@@ -1 +1 @@
-var JSplash = {swfdata: null, gPlayer: null};
-if (!window.console)
-
+, warn:function(){}
-
-
@@ -21 +21 @@
-                svg.style.height = swf.pxHeight + "px";
-                this.stage = new JSplash.ObjectInstance.createStageObject(swf.taglist, svg, swf.label_map);
+                this.disposer = new JSplash.ShapeDisposer(this.stage);
-                
-                this.stage.klass = new JSplash.TagClass(null);

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

@@ -50 +50 @@
-                }
-                
-
+
+
+
+
+
+
-                JSplash.defsElement.appendChild(gdef);
-                
@@ -56 +61 @@
-                var len = filldata.s.length;
-                for (var i = 0;i < len;i++) {
-
+
+
+
+
+
-                        gdef.appendChild(stp);
-                }
@@ -357 +366 @@
-                
-                commands.push('Z');
-
-
+
+
+
+
+
+
-        },
-
@@ -394 +407 @@
-                var edges = this.edgeList;
-                var len = edges.length;
-
+, attrs
-                
-                var paths = [];
-                var curWidth = 0;
-                var curStyle = null;
+                var curAlpha = undefined;
-                
-                var oneshot = 0;
@@ -415 +429 @@
-                                        //commands.push('Z');
-                                        if (commands.length > 1)
-
+
+
+
+
+
+
-                                }
-
@@ -425 +444 @@
-                                        curWidth = JSplash.$twips( this.edgeStyles[ E.lineStyle-1 ].w );
-                                        curStyle = '#' + this.edgeStyles[ E.lineStyle-1 ].rgb;
+                                        curAlpha =       this.edgeStyles[ E.lineStyle-1 ].a;
-                                }
-                                
@@ -445 +465 @@
-
-                if (commands.length > 1)
-
+
+
+
+
+
+
-                for (;paths.length;)
-                        g.appendChild(paths.shift());

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

@@ -11 +11 @@
-
-                tPlaceObject2: function(data, owner) {
-
+, data.r
-                        if (!inst) {
-log
+warn
-                                return;
-                        }
-
+ || data.skw
-                                var tx = 0, ty = 0;
-                                var sx = 1, sy = 1;
@@ -35 +35 @@
-                                        ky = data.skw[1];
-                                }
-
-
+
-                                inst.setTransform(tx, ty, sx, sy, kx, ky);
+}catch(e) {
+        throw inst;
+}
+                        }
+                        
+                        if (data.cfct || data.cofs) {
+                                /* Google Chrome does not support feColorMatrix now. */
+                                
+                                // ...but alpha transform is available with opacity style.
+                                var a = data.cfct ? data.cfct[3] : 1 
+                                a += data.cofs ? data.cofs[3] : 0;
+                                
+                                if (a <= 0.99)
+                                        inst.setAlpha(a);
-                        }
-                },
@@ -56 +69 @@
-                        if (owner.context.frameC == 1) // stop when single frame MC ends
-                                owner.stop();
-
+true
-//                      console.log("END");
-                },
@@ -87 +100 @@
-                                        this.renderer = new JSplash.ShapeRenderer(data);
-                                        this.renderer.buildEdgeIndex();
+                                        this.isShapeObject = true;
-                                }
-                                else if (data.tag == JSplash.tDefineSprite) {

ruby/jsplash/trunk/jextract.rb

@@ -28 +28 @@
-        stops = []
-        rgbs = []
+        alphas = []
+        has_alpha = false
-
-        glist.each {|gi|
-                stp = gi.attributes['position']
-                stops << stp
-
+
+
+
+
+
-        }
-
@@ -47 +53 @@
-        end
-
-
+
+
-end
-
@@ -55 +62 @@
-                case ch.name
-                when 'Solid'
-
+
+
+
+
+
-                when 'LinearGradient'
-                        styles << read_gradient(ch, 0)
+                when 'RadialGradient'
+                        styles << read_gradient(ch, 1)
-                end
-        }
@@ -71 +84 @@
-                case ch.name
-                when 'LineStyle'
-
+
+
+
+
+
-                end
-        }
@@ -158 +175 @@
-                trans = tg.elements['./transform/Transform'].attributes if tg.elements['./transform']
-
+                ctrans = nil
+                ctrans = tg.elements['./colorTransform/ColorTransform2'].attributes if tg.elements['./colorTransform/ColorTransform2']
+
-                rep = nil
-                rep = ",r:true" if tg.attributes['replace'].to_i == 1
@@ -167 +187 @@
-                cl = ",cl:#{tg.attributes['clipDepth']}" if tg.attributes['clipDepth']
-
+                mov = nil
+                scl = nil
+                skw = nil
-                if trans
-                        a = trans
-                        mov = nil
-                        scl = nil
-                        skw = nil
-
-                        mov = ",mov:[#{a['transX']},#{a['transY']}]" if a['transX']
@@ -178 +198 @@
-                end
-
+                cfct = nil
+                cofs = nil
+                if ctrans
+                        a = ctrans
+
+                        if a['factorRed']
+                                cfct = ",cfct:[#{a['factorRed'].to_f/255},#{a['factorGreen'].to_f/255},#{a['factorBlue'].to_f/255},#{a['factorAlpha'].to_f/255}]"
+                        end
+
+                        if a['offsetRed']
+                                cofs = ",cofs:[#{a['offsetRed'].to_f/255},#{a['offsetGreen'].to_f/255},#{a['offsetBlue'].to_f/255},#{a['offsetAlpha'].to_f/255}]"
+                        end
+                end
+
-                pid = nil
-                pid = ",id:#{tg.attributes['objectID']}" if tg.attributes['objectID'] != nil
-
-
+#{cofs}#{cfct}
-        end
-
@@ -325 +359 @@
-
-top_tags   = parse_taglist(tags.elements, lmap)
-0
+5
-
-out1 = "#{out_dir}/movie1.js"
@@ -331 +365 @@
-File.open(out1,'w'){|f1|
-        next_file = nil
-0
+5
-        if split_file
-                next_file = ", 'movie2.js'"