circle_speech_balloon 0.0.2 → 0.0.3

data/lib/circle_speech_balloon/version.rb

@@ -1,3 +1,3 @@
 module CircleSpeechBalloon
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/circle_speech_balloon.rb

@@ -14,46 +14,72 @@ module CircleSpeechBalloon
     end
     
     def extend_speech_balloon
-      @extend_speech_balloon ||= SquareSpeechBalloon::SpeechBalloon.new
+      @extend_speech_balloon ||= CircleSpeechBalloon::SpeechBalloon.new
     end
     
     def extend_speech_balloon= params
-      @extend_speech_balloon = SquareSpeechBalloon::SpeechBalloon.new params
+      @extend_speech_balloon = CircleSpeechBalloon::SpeechBalloon.new params
     end
     
   end
   
   module BalloonModule
-    def supply_default parsed_settings
-      s = parsed_settings['all']['balloon']
+    def new_speech_balloon
+      @new_speech_balloon
+    end
+    
+    def new_speech_balloon= v
+      @new_speech_balloon = v
+    end
+    
+    def get_speech_balloon
+      self.speech_balloon || @new_speech_balloon
+    end
+    
+    def supply_default 
+      parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
       self.x = 0
       self.y = 0
       self.width = parsed_settings['speech_balloon']['default_width']
       self.height = parsed_settings['speech_balloon']['default_height']
-      self.r = 0
+      self.r = parsed_settings['speech_balloon']['default_r']
     end
     
     def extend_balloon
-      @extend_balloon ||= SquareSpeechBalloon::Balloon.new
+      @extend_balloon ||= CircleSpeechBalloon::Balloon.new
     end
     
     def extend_balloon= params
-      @extend_balloon = SquareSpeechBalloon::Balloon.new params
+      @extend_balloon = CircleSpeechBalloon::Balloon.new params
     end
     
-    def select_system_picture parsed_settings
-      tr = r % 360
+    def select_system_picture 
+      parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
+      tr = self.r % 360
       tr = 360 - tr if tr < 0
-      br = (tr / 22.5).to_i
-      s = parsed_settings[br.to_s]['balloon']
-      self.system_picture_id = s['system_picture_id']
+      br = (tr / parsed_settings['speech_balloon']['r_step']).to_i
+      self.system_picture_id = parsed_settings[br.to_s]['balloon']['system_picture_id']
+      self.system_picture_id
     end
     
   end
   
   module SpeechModule
-    def supply_default parsed_settings
-      s = parsed_settings['all']['speech']
+    def new_speech_balloon
+      @new_speech_balloon
+    end
+    
+    def new_speech_balloon= v
+      @new_speech_balloon = v
+    end
+    
+    def get_speech_balloon
+      self.speech_balloon || @new_speech_balloon
+    end
+    
+    def supply_default 
+      parsed_settings = get_speech_balloon.speech_balloon_template.parsed_settings
+      s = parsed_settings['0']['speech']
       self.x = s['x_rate']
       self.y = s['y_rate']
       self.width = s['width_rate']
@@ -61,11 +87,11 @@ module CircleSpeechBalloon
     end
     
     def extend_speech
-      @extend_speech ||= SquareSpeechBalloon::Speech.new
+      @extend_speech ||= CircleSpeechBalloon::Speech.new
     end
     
     def extend_speech= params
-      @extend_speech = SquareSpeechBalloon::Speech.new params
+      @extend_speech = CircleSpeechBalloon::Speech.new params
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circle_speech_balloon
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails