チェンジセット 1579

コミット日時:

2008/10/11 20:13:10 (3 年前)

コミッタ:

gyuque

ログメッセージ:

0.4.10: supported DefineBits? bitmap fill

ファイル:

• ruby/jsplash/trunk/client2/demo_20081001.xml (更新) (1 diff)
• ruby/jsplash/trunk/client2/index.xml (更新) (1 diff)
• ruby/jsplash/trunk/client2/jsplash/objects.js (更新) (2 diffs)
• ruby/jsplash/trunk/client2/jsplash/player.js (更新) (2 diffs)
• ruby/jsplash/trunk/client2/jsplash/shaperenderer.js (更新) (3 diffs)
• ruby/jsplash/trunk/client2/rocket_demo.xml (更新) (1 diff)
• ruby/jsplash/trunk/jextract.rb (更新) (10 diffs)
• ruby/jsplash/trunk/rawswf.rb (更新) (1 diff)

ruby/jsplash/trunk/client2/demo_20081001.xml

@@ -56 +56 @@
-                <p id="statusout"> </p>
-                <p>playing on javascript with JSplash</p>
-9
+10
-                <svg id="svgrt" xmlns="http://www.w3.org/2000/svg" style="width: 100px; height: 100px;">
-                </svg>

ruby/jsplash/trunk/client2/index.xml

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

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

@@ -782 +782 @@
-        s.mouse_down = false;
-        s.is_stage = true;
+        s.bitmapRefs = {};
-        
-        Object.extend(s, {
@@ -817 +818 @@
-                toString: function() {
-                        return "Stage";
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } ); // extend
-        

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

@@ -23 +23 @@
-                svg.style.height = swf.pxHeight + "px";
-                this.stage = new JSplash.ObjectInstance.createStageObject(swf.taglist, svg, swf.label_map);
+                
+                if (swf.bitmaps)
+                        this.stage.registerBitmaps(swf.bitmaps);
+                
-                this.disposer = new JSplash.ShapeDisposer(this.stage);
-                
@@ -206 +210 @@
-        this.frameRate = h.frameRate;
-        this.taglist   = sdat.taglist;
-
+
+
-}
-

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

@@ -78 +78 @@
-                var fid = "gf"+this.shape_id+"_"+fi;
-                var filldata = this.fillStyles[fi-1];
-
+
+
-                        return null;
-
-
+
+
+
+
+
+
+
+
+
+
+
-                if (filldata.mov || filldata.scl || filldata.skw) {
-                        var M =[1, 0, 0, 1, 0, 0];
@@ -98 +108 @@
-                                M[2] = filldata.skw[1];
-                        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-                
@@ -490 +527 @@
-                if (style.rgb)
-                        style_str = '#'+style.rgb;
-
+ || style.bmp
-                        style_str = 'url(#' + this.lookupFillId(fi)+')';
-                        

ruby/jsplash/trunk/client2/rocket_demo.xml

@@ -56 +56 @@
-                <p id="statusout"> </p>
-                <p>playing on javascript with JSplash</p>
-9
+10
-                <svg id="svgrt" xmlns="http://www.w3.org/2000/svg" style="width: 100px; height: 100px;">
-                </svg>

ruby/jsplash/trunk/jextract.rb

@@ -1 +1 @@
-$KCODE = 's'
-require 'rexml/document'
+require 'rawswf'
-
-$top_frame_index = 0
-$top_tag_index = 0
+
+$shared_jpeg_table = nil
+$bitmap_refs = nil
-
-def make_rgb(attrs)
@@ -20 +24 @@
-
-        "L:#{vL},R:#{vR},T:#{vT},B:#{vB}"
+end
+
+def read_bitmap_fill(ls)
+        bid = ls.attributes['objectID'].to_i
+
+        trans_elem = ls.elements['./matrix/Transform']
+        trans = nil
+
+        trans = trans_elem.attributes if trans_elem
+        mov = nil
+        scl = nil
+        skw = nil
+        if trans
+                a = trans
+
+                mov = ",mov:[#{a['transX'].to_f},#{a['transY'].to_f}]" if a['transX']
+                scl = ",scl:[#{a['scaleX'].to_f},#{a['scaleY'].to_f}]" if a['scaleX']
+                skw = ",skw:[#{a['skewX'].to_f},#{a['skewY'].to_f}]"   if a['skewX']
+        end     
+
+        "{bmp:#{bid}#{mov}#{scl}#{skw}}"
-end
-
@@ -71 +96 @@
-                when 'RadialGradient'
-                        styles << read_gradient(ch, 1)
+                when 'ClippedBitmap'
+                        styles << read_bitmap_fill(ch)
-                end
-        }
@@ -151 +178 @@
-        end
-
+        def self.readJPEGTables(tg, nest, fi)
+                $shared_jpeg_table = tg.elements['./data'].text
+        end
+
-        def self.readDefineShape5(tg, nest, fi)
-                TagReaders.readDefineShape(tg, nest, fi, 5)
@@ -175 +206 @@
-
-                "{tag:JSplash.tDefineShape#{v}, id:#{tg.attributes['objectID']}, bounds:{#{make_bounds(bds)}}, fill_styles:[\n #{f_json}\n], line_styles:[\n #{l_json}\n], shape:[\n#{shapes}\n]}"
+        end
+
+        def self.readDefineBits(tg, nest, fi)
+                $bitmap_refs = [] if !$bitmap_refs
+
+                db = RawSWF::RawDefineBitsTag.new(tg.elements['./data/data'].text)
+                db.id = tg.attributes['objectID'].to_i
+                $bitmap_refs << db
-        end
-
@@ -308 +347 @@
-                if tg.name == "Export" || tg.name == "DoInitAction"
-                        STDERR.puts "ignored [#{tg.name}] at #{$top_tag_index}"
+                        next
+                elsif tg.name == "UnknownTag" && tg.attributes['id'].to_i(16) == 8 # JPEGTables
+                        TagReaders.readJPEGTables(tg, nest, findex)
+                        next
+                elsif tg.name == "DefineBits"
+                        TagReaders.readDefineBits(tg, nest, findex)
-                        next
-                end
@@ -338 +383 @@
-end
-
+def check_res_dir(outdir)
+        rdir = "#{outdir}/res"
+        Dir::mkdir(rdir) if !File.exists?(rdir)
+
+        return rdir
+end
+
+def export_bitmaps(outdir)
+        return if !$bitmap_refs
+
+        rdir = check_res_dir(outdir)
+        $bitmap_refs.each {|b|
+                out_name = "#{rdir}/#{b.id}"
+                if RawSWF::RawDefineBitsTag === b
+                        raise "JPEGTables not found in input SWF" if !$shared_jpeg_table
+
+                        b.table_data = $shared_jpeg_table
+                        b.export_file(out_name + ".jpg")
+                end
+        }
+end
+
-#----------------------------
-
-
-
+
+
+
+
-if !in_swf
-        puts "USAGE: ruby jconvert.rb [in.swf]"
@@ -347 +416 @@
-end
-
-
-
-
-
+
+
+
+
+
-
-STDERR.puts "extracting..."
@@ -371 +441 @@
-
-top_tags   = parse_taglist(tags.elements, lmap)
-25000
+split_thresh
-
-out1 = "#{out_dir}/movie1.js"
+
+export_bitmaps(out_dir)
-
-File.open(out1,'w'){|f1|
-        next_file = nil
-25000
+split_thresh
-        if split_file
-                next_file = ", 'movie2.js'"
@@ -384 +456 @@
-        f1.puts "JSplash.load_swf( {"
-        f1.puts " header: {frameRate: #{swf.frame_rate}, frames: #{swf.frames}, width: #{swf.width}, height: #{swf.height}},"
+        f1.puts " bitmaps: [#{$bitmap_refs.map{|b| "{n:'#{b.id}.#{b.ftype}',w:#{b.width},h:#{b.height}}"}.join(',')}]," if $bitmap_refs
-        f1.puts " taglist: ["
-        f1.puts tags_1.join(",\n")

ruby/jsplash/trunk/rawswf.rb

@@ -26 +26 @@
-
-class RawDefineBitsTag
+        attr_accessor :id
+
+        attr_reader :width
+        attr_reader :height
+
-        def initialize(b64)
-                @raw = Base64.decode64(b64)
+                extract_size
+        end
+
+        def extract_size
+                i = 0
+                while(true)
+                        break if @raw[i] == 0xff && @raw[i+1] == 0xc0
+                        i += 1
+
+                        raise if i > 10000
+                end
+
+                i += 5
+                @height = (@raw[i]<<8) | @raw[i+1]
+
+                i += 2
+                @width = (@raw[i]<<8) | @raw[i+1]
-        end
-
-        def table_data=(b64)
-                @raw_tbl = Base64.decode64(b64)
+        end
+
+        def ftype
+                "jpg"
-        end
-