vector_be_winding 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8d63331bdde70ece16ad946c86b40d16651ff6e3
+  data.tar.gz: 757ea390d934c45d3dfb2461d05182955bfafaf3
+SHA512:
+  metadata.gz: 349d180848c2a3a0cda2fdab934c4cf6bacd599c629fcafaaa66e74073b2f8e9cce6553cca95df1fc78d3e15abad77ada9647450724ceab32dffae7c56a8194a
+  data.tar.gz: 02deb594f43de821830d565aa5c5db4d4ac9bae726b6d8b9875624f0f5febaab80f0eaa2c0a5b77708276693f932e90882985bc4553ce566774f3f1382c4780f

data/.gitignore

@@ -0,0 +1,9 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.3.3
+before_install: gem install bundler -v 1.13.7

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in vector_be_winding.gemspec
+gemspec

data/README.md

@@ -0,0 +1,37 @@
+# VectorBeWinding ![Travis](https://travis-ci.org/dagezi/vector_be_winding.svg?branch=master)
+
+Android Vector Drawable is very combinent, but sometimes it missing holes in the shape generated by some tools. `vector_be_winding` will massage such Vector Drawalbes so that the shape will be rendered as expectd!
+
+## Example
+
+TODO: Describe some pipeline which might generate "wrong" Vector Drawable.
+
+1. Skecth + vdtool
+
+TODO: Describe why it happens and how this tool resolve it.
+
+## Installation
+
+just with Gem.
+
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/dagezi/vector_be_winding.
+
+## Lisense 
+
+MIT License.
+
+
+

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/exe/vbw

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+require 'optparse'
+require 'vector_be_winding'
+
+opt = OptionParser.new
+
+@dry_run = false
+@verbose = false
+@debug = false
+@backup_template = '%{p}.bak'
+
+opt.on('-n', 'Dry run') { @dry_run = true }
+opt.on('-v', 'Verbose') { @verbose = true }
+opt.on('-d', 'Debug') { @debug = true }
+opt.on('-i TEMP', 'Template of back-up filename. Default; ".bak"') { |temp|
+  @backup_template = if temp.index('%')
+                      temp
+                    else
+                      '%{p}' + temp
+                    end
+}
+
+opt.parse!(ARGV)
+
+ARGV.each { |file|
+  drawable = VectorBeWinding::Drawable.new
+  drawable.read_from_file(file)
+  if !drawable.is_winding
+    print "Not winding: #{file}\n" if @verbose
+    drawable.dump if @debug
+
+    if !@dry_run
+      args = {
+        d: File.dirname(file),
+        p: file,
+        r: File.basename(file, File.extname(file)),
+        e: File.extname(file)
+      }
+
+      File.rename(file, @backup_template % args)
+      drawable.be_winding
+      drawable.dump if @debug
+      drawable.write_to_file(file)
+    end
+  end
+}

data/lib/vector_be_winding/drawable.rb

@@ -0,0 +1,61 @@
+require "rexml/document"
+
+module VectorBeWinding
+  class Drawable
+    # A class to handle Android's vector drawable
+
+    def read_from_file(filename)
+      open(filename) { |inio|
+        read(inio)
+      }
+    end
+
+    def read(inio)
+      @document = REXML::Document.new inio
+    end
+
+    def write_to_file(filename)
+      open(filename, 'w') {|outio|
+        write(outio)
+      }
+    end
+
+    def write(outio)
+      @document.write outio
+    end
+
+   def be_winding
+      @document.each_recursive {|node|
+        if node.name == 'path'
+          pathString = node.attributes['android:pathData']
+          path = Path.with_string(pathString)
+          newPath = path.be_winding
+
+          node.add_attribute('android:pathData', newPath.to_command)
+        end
+      }
+    end
+
+    def is_winding
+      @document.each_recursive {|node|
+        if node.name == 'path'
+          pathString = node.attributes['android:pathData']
+          path = Path.with_string(pathString)
+          return false if !path.is_winding
+        end
+      }
+      true
+    end
+
+    def dump
+      @document.each_recursive {|node|
+        if node.name == 'path'
+          pathString = node.attributes['android:pathData']
+          path = Path.with_string(pathString)
+          puts "Path"
+          path.dump(1)
+        end
+      }
+    end
+  end
+end

data/lib/vector_be_winding/path.rb

@@ -0,0 +1,52 @@
+module VectorBeWinding
+  class Path < Shape
+    include SpatialTree
+
+    attr_reader :sub_paths
+
+    def self.with_string(path_string)
+      begin
+        svg_path = Savage::Parser.parse(path_string)
+      rescue => e
+        raise ArgumentError, "Possibly wrong path string \"#{path_string}\""
+      end
+      Path.new(svg_path.subpaths.map { |svg_subpath| SubPath.with_svg(svg_subpath) })
+    end
+
+    def initialize(sub_paths, is_tree = false)
+      if is_tree
+        @children = sub_paths
+        @sub_paths = []
+        children.each {|root| root.each { |subpath| @sub_paths << subpath }}
+      else
+        @sub_paths = sub_paths
+        sub_paths.each {|p| insert_to_tree(p)}
+      end
+    end
+
+    def bounding_rect
+      @bounding_rect ||= @sub_paths.map(&:bounding_rect).reduce(:|)
+    end
+
+    def area
+      sub_paths.map(&:area).reduce(:+)
+    end
+
+    def inspect
+      "#<Path>"
+    end
+
+    def is_winding(sign = 1)
+      children.all? { |c| c.is_winding }
+    end
+
+    def be_winding()
+      wounds = children.map(&:be_winding)
+      Path.new(wounds, true)
+    end
+
+    def to_command
+      sub_paths.map(&:to_command).join
+    end
+  end
+end

data/lib/vector_be_winding/rect.rb

@@ -0,0 +1,77 @@
+module VectorBeWinding
+  class Rect < Shape
+    attr_reader :left, :top, :right, :bottom
+
+    def initialize(left, top, right, bottom)
+      @left, @right = if left <= right then [left, right] else [right, left] end
+      @top, @bottom = if top <= bottom then [top, bottom] else [bottom, top] end
+    end
+
+    def self.with_vectors(v0, v1)
+      self.new(v0.x, v0.y, v1.x, v1.y)
+    end
+
+    def bounding_rect
+      self
+    end
+
+    def ==(rect1)
+      left == rect1.left && top == rect1.top &&
+        right == rect1.right && bottom == rect1.bottom
+    end
+
+    def empty?
+      left == right || top == bottom
+    end
+
+    def |(rect1)
+      Rect.new([left, rect1.left].min, [top, rect1.top].min,
+               [right, rect1.right].max, [bottom, rect1.bottom].max)
+    end
+
+    def &(rect1)
+      newLeft = [left, rect1.left].max
+      newTop = [top, rect1.top].max
+      newRight = [right, rect1.right].min
+      newBottom = [bottom, rect1.bottom].min
+
+      if (newLeft <= newRight && newTop <= newBottom) 
+        Rect.new(newLeft, newTop, newRight, newBottom)
+      else
+        nil
+      end
+    end
+
+    def intersectedness(shape1)
+      if shape1.class == Rect
+        [Rect.range_intersectedness(left, right, shape1.left, shape1.right),
+         Rect.range_intersectedness(top, bottom, shape1.top, shape1.bottom)].min
+      else
+        shape1.intersectedness(self)
+      end
+    end
+
+    def self.range_intersectedness(a0, a1, b0, b1)
+      if a0 < b0
+        a1 - b0
+      else
+        b1 - a0
+      end
+    end
+
+    def containingness(shape1)
+      b = shape1.bounding_rect
+      [Rect.range_containingness(left, right, b.left, b.right),
+       Rect.range_containingness(top, bottom, b.top, b.bottom)].min
+    end
+
+    # check [a0, a0] contains [b0, b1]
+    def self.range_containingness(a0, a1, b0, b1)
+      if a0 <= b0 && b1 <= a1
+        (b0 - a0) * (a1 - b1)
+      else
+        -1
+      end
+    end
+  end
+end

data/lib/vector_be_winding/segment.rb

@@ -0,0 +1,101 @@
+module VectorBeWinding
+  class Segment < Shape
+    attr_reader :start_point, :direction, :end_point,
+                :control, :control_1
+
+    def initialize(direction, start_point, end_point_hint, prev_segment = nil)
+      @direction = direction
+      @start_point = start_point
+      @end_point =
+        if @direction.kind_of?(::Savage::Directions::PointTarget)
+          create_vector(@direction.target.x, @direction.target.y, @direction.absolute?)
+        elsif @direction.kind_of?(::Savage::Directions::HorizontalTo)
+          create_vector(@direction.target, nil, @direction.absolute?)
+        elsif @direction.kind_of?(::Savage::Directions::VerticalTo)
+          create_vector(nil, @direction.target, @direction.absolute?)
+        elsif @direction.kind_of?(::Savage::Directions::ClosePath)
+          end_point_hint
+        else
+          raise "Unknown direction: #{@direction}"
+        end
+
+      if @direction.instance_of?(::Savage::Directions::QuadraticCurveTo)
+        control = @direction.control ||
+                  prev_segment.control&.reflect(start_point) ||
+                  start_point
+        @control = create_vector(control.x, control.y, @direction.absolute?)
+      elsif @direction.instance_of?(::Savage::Directions::CubicCurveTo)
+        control = @direction.control
+        control_1 = @direction.control_1 ||
+                  prev_segment.control&.reflect(start_point) ||
+                  start_point
+        @control = create_vector(control.x, control.y, @direction.absolute?)
+        @control_1 = create_vector(control_1.x, control_1.y, @direction.absolute?)
+      end
+
+      # TODO: Support 'A'
+    end
+
+    def control_2
+      control
+    end
+
+    def create_vector(x, y, absolute)
+      if absolute
+        Vector.new(x || start_point.x, y || start_point.y)
+      else
+        start_point + Vector.new(x || 0, y || 0)
+      end
+    end
+
+    def bounding_rect
+      @bounding_rect ||=
+        Rect.new(start_point.x, start_point.y, end_point.x, end_point.y)
+    end
+
+    # Calculate direction area of the triangle (p, start_point, end_point)
+    # It must be positive iff the three points forms clockwise order.
+    def area(p)
+      if @direction.kind_of?(::Savage::Directions::QuadraticCurveTo)
+        # Approximate with triangle
+        (start_point - p).cross(control - start_point) +
+          (control - p).cross(end_point - control)
+     elsif @direction.kind_of?(::Savage::Directions::CubicCurveTo)
+        # Approximate with quadrangle
+        (start_point - p).cross(control_1 - start_point) +
+          (control_1 - p).cross(control_2 - control_1) +
+          (control_2 - p).cross(end_point - control_2)
+      else
+        # TODO: Support arc
+        (start_point - p).cross(end_point - start_point) / 2.0
+      end
+    end
+
+    def reverse
+      Segment.new(reverse_dir, end_point, start_point)
+    end
+
+    def reverse_dir
+      case @direction.command_code.upcase
+      when 'Z', 'L'
+        ::Savage::Directions::LineTo.new(start_point.x, start_point.y, true)
+      when 'M'
+        nil  # Unable to reverse
+      when 'H'
+        ::Savage::Directions::HorizontalTo.new(start_point.x, true)
+      when 'V'
+        ::Savage::Directions::VerticalTo.new(start_point.y, true)
+      when 'Q', 'T'
+        ::Savage::Directions::QuadraticCurveTo.new(
+          control.x, control.y, start_point.x, start_point.y, true)
+      when 'C', 'S'
+        ::Savage::Directions::CubicCurveTo.new(
+          control.x, control.y, control_1.x, control_1.y,
+          start_point.x, start_point.y, true)
+      else
+        # TODO: Support 'A'
+        raise "Unknown direction: #{@direction}"
+      end
+    end
+  end
+end

data/lib/vector_be_winding/shape.rb

@@ -0,0 +1,28 @@
+module VectorBeWinding
+  class Shape
+    # Each subclass must override it
+    def bounding_rect
+      raise 'implment this'
+    end
+
+    def intersects?(shape1)
+      intersectedness(shape1) >= 0
+    end
+
+    # Very naive definition. Each subclass is expected to override it
+    # negative: no intersected, 0: touched, positive: intersected
+    def intersectedness(shape1)
+      bounding_rect.intersectedness(shape1.bounding_rect)
+    end
+
+    def contains?(shape1)
+      containingness(shape1) >= 0
+    end
+
+    # Very naive definition. Each subclass is expected to override it
+    # negative: no containing, 0: containing with border, positive: inside
+    def containingness(shape1)
+      bounding_rect.containingness(shape1.bounding_rect)
+    end
+  end  
+end

data/lib/vector_be_winding/spatial_tree.rb

@@ -0,0 +1,39 @@
+module VectorBeWinding
+  module SpatialTree
+    def children
+      @children ||= []
+    end
+
+    def insert_to_tree(node)
+      raise "#{node} is same node: " if equal?(node)
+
+      containers = children.select {|n1| n1.contains?(node)}
+      if containers.empty?
+        components = children.select {|n1| node.contains?(n1)}
+        components.each{|n1| children.delete(n1)}
+        node.children.concat(components)
+        children << node
+      else
+        containers.first.insert_to_tree(node)
+      end
+    end
+
+    def depth
+      if children.empty?
+        1
+      else
+        children.map(&:depth).max + 1
+      end
+    end
+
+    def each &pr
+      pr.call(self)
+      children.each {|node| node.each(&pr) }
+    end
+
+    def dump(indent = 0)
+      puts ' ' * (indent * 2) + (area < 0 ? '-' : '+') + inspect
+      children.each {|node| node.dump(indent + 1)}
+    end
+  end
+end

data/lib/vector_be_winding/sub_path.rb

@@ -0,0 +1,93 @@
+module VectorBeWinding
+  class SubPath < Shape
+    include SpatialTree
+
+    attr_reader :start_point, :svg_subpath, :segments
+
+    def self.with_segments(segments)
+      SubPath.new.init_with_segment(segments)
+    end
+
+    # Suppose all segments are connected
+    def init_with_segment(segments)
+      raise "No segments" if segments.empty?
+      @segments = segments
+      @start_point = segments.first.start_point
+      @svg_subpath = Savage::SubPath.new(start_point.x, start_point.y)
+      @svg_subpath.directions.concat(segments.map(&:direction))
+      self
+    end
+
+    def self.with_string(path_string)
+      path = Savage::Parser.parse(path_string)
+      raise "No subpaths: ${path_string}" if path.subpaths.empty?
+      SubPath.with_svg(path.subpaths.last)
+    end
+
+    def self.with_svg(svg_subpath, start_point = nil)
+      SubPath.new.init_with_svg(svg_subpath, start_point)
+    end
+                                                      
+    def init_with_svg(svg_subpath, start_point = nil)
+      start_point ||= Vector.new(0,0)
+      @svg_subpath = svg_subpath
+      @segments = []
+
+      point = start_point
+      @svg_subpath.directions.each { |dir|
+        segment = Segment.new(dir, point, start_point, segments.last)
+        point = segment.end_point
+        if segment.direction.kind_of?(Savage::Directions::MoveTo)
+          start_point = point
+        else
+          @segments << segment
+        end
+      }
+      @start_point = start_point
+      self
+    end
+
+    def bounding_rect
+      unless @bounding_rect
+        rect = Rect.with_vectors(start_point, start_point)
+        segments.each { |segment|
+          rect |= segment.bounding_rect
+        }
+        @bounding_rect = rect
+      end
+      @bounding_rect
+    end
+
+    # Calculate direction area of this path.
+    # It's positive iff the path forms clockwise.
+    def area()
+      segments.map { |seg| seg.area(start_point) }.reduce(:+)
+    end
+
+    def reverse
+      SubPath.with_segments(segments.map(&:reverse).reverse)
+    end
+
+    def be_winding(sign = 1)
+      wound = if area * sign >= 0
+                SubPath.with_svg(svg_subpath)
+              else
+                reverse
+              end
+      wound.children.concat(children.map { |c| c.be_winding(-sign) })
+      wound
+    end
+
+    def is_winding
+      children.all? { |c| c.is_winding && c.area * area < 0}
+    end
+
+    def inspect
+      "#<SubPath \"#{svg_subpath.to_command}\">"
+    end
+
+    def to_command
+      @svg_subpath.to_command
+    end
+  end
+end

data/lib/vector_be_winding/vector.rb

@@ -0,0 +1,47 @@
+module VectorBeWinding
+  class Vector
+    attr_accessor :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+
+    def ==(v)
+      x == v.x && y == v.y
+    end
+
+    def -@()
+      Vector.new(-x, -y)
+    end
+
+    def +(v)
+      Vector.new(x + v.x, y + v.y)
+    end
+
+    def -(v)
+      Vector.new(x - v.x, y - v.y)
+    end
+
+    def *(s)
+      Vector.new(x * s, y * s)
+    end
+
+    def dot(v)
+      x * v.x + y * v.y
+    end
+
+    def norm
+      dot(self)
+    end
+
+    def cross(v)
+      x * v.y - y * v.x
+    end
+
+    # Create reflection point of self 
+    def reflect(v)
+      v + (v - self)
+    end
+  end
+end

data/lib/vector_be_winding/version.rb

@@ -0,0 +1,3 @@
+module VectorBeWinding
+  VERSION = "0.9.0"
+end

data/lib/vector_be_winding.rb

@@ -0,0 +1,10 @@
+require "savage"
+require "vector_be_winding/version"
+require "vector_be_winding/shape"
+require "vector_be_winding/vector"
+require "vector_be_winding/rect"
+require "vector_be_winding/segment"
+require "vector_be_winding/spatial_tree"
+require "vector_be_winding/sub_path"
+require "vector_be_winding/path"
+require "vector_be_winding/drawable"

data/vector_be_winding.gemspec

@@ -0,0 +1,29 @@
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'vector_be_winding/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = "vector_be_winding"
+  spec.version       = VectorBeWinding::VERSION
+  spec.authors       = ["Takeshi SASAKI"]
+  spec.email         = ["dagezi@gmail.com"]
+
+  spec.summary       = %q{Let Android vector drawable follow winding-rule.}
+  spec.description   = %q{Let Android vector drawable follow winding-rule.}
+  spec.homepage      = "http://github.com/dagezi/vector-be-winding"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features|bin|sampleApp)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency "savage"
+
+  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+end

metadata

@@ -0,0 +1,120 @@
+--- !ruby/object:Gem::Specification
+name: vector_be_winding
+version: !ruby/object:Gem::Version
+  version: 0.9.0
+platform: ruby
+authors:
+- Takeshi SASAKI
+autorequire: 
+bindir: exe
+cert_chain: []
+date: 2017-04-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: savage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: Let Android vector drawable follow winding-rule.
+email:
+- dagezi@gmail.com
+executables:
+- vbw
+extensions: []
+extra_rdoc_files: []
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- Gemfile
+- README.md
+- Rakefile
+- exe/vbw
+- lib/vector_be_winding.rb
+- lib/vector_be_winding/drawable.rb
+- lib/vector_be_winding/path.rb
+- lib/vector_be_winding/rect.rb
+- lib/vector_be_winding/segment.rb
+- lib/vector_be_winding/shape.rb
+- lib/vector_be_winding/spatial_tree.rb
+- lib/vector_be_winding/sub_path.rb
+- lib/vector_be_winding/vector.rb
+- lib/vector_be_winding/version.rb
+- vector_be_winding.gemspec
+homepage: http://github.com/dagezi/vector-be-winding
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.6.10
+signing_key: 
+specification_version: 4
+summary: Let Android vector drawable follow winding-rule.
+test_files: []
+has_rdoc: