swf_ruby 0.2.0 → 0.2.1

data/lib/swf_ruby/replace_target.rb

@@ -31,6 +31,7 @@ module SwfRuby
     attr_accessor :idmap
     attr_accessor :target_define_tags_string
     attr_accessor :target_control_tags_string
+    attr_reader :target_swf_dumper
 
     def initialize(offset, swf)
       @offset = offset
@@ -39,7 +40,7 @@ module SwfRuby
       @frame_count = @target_swf_dumper.header.frame_count
       @define_tags = @target_swf_dumper.tags.select { |t| t.define_tag? }
       @control_tags = @target_swf_dumper.tags - @define_tags
-      @idmap = {}
+      @idmap = { 65535 => 65535 }
     end
 
     def self.build_list_by_instance_var_names(swf_dumper, var_name_to_swf)
@@ -61,10 +62,21 @@ module SwfRuby
         if t.character_id
           sprite_indices[t.character_id] = i
         end
-        if var_name == t.refer_character_inst_name
-          refer_character_id = t.refer_character_id
-          break
+        if Swf::TAG_TYPE[t.code] == "DefineSprite"
+          sd = SwfRuby::SpriteDumper.new
+          sd.dump(t)
+          sd.tags.each do |t2|
+            if var_name == t2.refer_character_inst_name
+              refer_character_id = t2.refer_character_id
+              break
+            end
+          end
+        else
+          if var_name == t.refer_character_inst_name
+            refer_character_id = t.refer_character_id
+          end
         end
+        break if refer_character_id
       end
       raise ReplaceTargetError unless refer_character_id
       offset = swf_dumper.tags_addresses[sprite_indices[refer_character_id]]

data/lib/swf_ruby/swf/tag.rb

@@ -90,9 +90,7 @@ module SwfRuby
         when "RemoveObject"
           @refer_character_id_offset = data_offset
           @refer_character_id = @data[0, 2].unpack("v").first
-        when "DefineShape"
-        when "DefineShape2"
-        when "DefineShape3"
+        when "DefineShape", "DefineShape2", "DefineShape3"
           version = Swf::TAG_TYPE[@code][-1].to_i
           version = 1 if version == 0
           @refer_bitmap_offsets_to_ids = {}
@@ -135,9 +133,22 @@ module SwfRuby
         if self.define_tag?
           offset = @long_header ? 6 : 2
           @rawdata[offset, 2] = [character_id].pack("v")
-          @refer_bitmap_offsets_to_ids.each do |bitmap_id_offset, bitmap_id|
-            @rawdata[bitmap_id_offset, 2] = [idmap[bitmap_id]].pack("v")
-          end if @refer_bitmap_offsets_to_ids
+          if Swf::TAG_TYPE[@code] == "DefineSprite"
+            sd = SwfRuby::SpriteDumper.new.dump(self)
+            rdata = ""
+            sd.tags.each do |t|
+              if t.refer_character_id
+                rdata << t.rawdata_with_refer_character_id(idmap[t.refer_character_id])
+              else
+                rdata << t.rawdata
+              end
+            end
+            @rawdata[offset+4..-1] = rdata
+          else
+            @refer_bitmap_offsets_to_ids.each do |bitmap_id_offset, bitmap_id|
+              @rawdata[bitmap_id_offset, 2] = [idmap[bitmap_id]].pack("v")
+            end if @refer_bitmap_offsets_to_ids
+          end
         end
         @rawdata
       end

data/lib/swf_ruby/version.rb

@@ -1,3 +1,3 @@
 module SwfRuby
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: swf_ruby
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors: []
 
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 +09:00
+date: 2011-05-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,12 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        - 5
         version: 1.0.0.rc.5
   type: :runtime
   version_requirements: *id001
@@ -42,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 13
-        - 0
         version: 2.13.0
   type: :runtime
   version_requirements: *id002
@@ -117,23 +103,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: swf_ruby
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Utilities to dump or manipulate Swf binary file.