fml 0.2.3 → 0.2.4

data/.gitignore

@@ -1,3 +1,4 @@
+fml2dae_cache
 *.swp
 *.fml
 *~

data/TODO

@@ -0,0 +1,2 @@
+
+ * Get rid of project FML stuff, and handle only design FML

data/bin/fml2dae.rb

@@ -3,13 +3,18 @@ $: << File.join(File.dirname(__FILE__), "/../lib" )
 require 'floorplanner'
 
 if ARGV.length < 2
-  puts "\n  Usage: fml2dae.rb [-xrefs] design_id|design_name path/to/fml out.dae"
-else
-  xrefs = false
-  if ARGV[0] == "-xrefs"
-    ARGV.shift
-    xrefs = true
-  end
-  doc = Floorplanner::Document.new(ARGV[1])
-  doc.to_dae(ARGV[0],ARGV[2],xrefs)
+  puts "\n  Usage: fml2dae.rb [-xrefs] path/to/fml out.dae"
+  exit
 end
+
+conf = {
+  :ceiling      => false,
+  :window_glass => true
+}
+
+if ARGV[0] == "-xrefs"
+  ARGV.shift
+  conf[:xrefs] = true
+end
+doc = Floorplanner::XML::Document.from_xml(open(ARGV[0]))
+doc.to_dae(ARGV[1], conf)

data/fml.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name    = "fml"
-  s.version = "0.2.3"
-  s.date    = "2010-05-18"
+  s.version = "0.2.4"
+  s.date    = "2010-11-25"
   
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.0") if s.respond_to? :required_rubygems_version=
   
   s.authors = ["Dusan Maliarik"]
   s.description = %q{Floor plan document toolkit}
   s.email = %q{dusan.maliarik@gmail.com}
-  s.executables = ["fml2dae.rb","fml2obj.rb"]
-  s.files = %w(lib/keyhole/archive.rb lib/floorplanner/opening3d.rb bin/fml2dae.rb xml/fml2kml.xsl xml/fml.rng xml/collada_schema_1_4.xsd lib/floorplanner/design.rb lib/floorplanner/collada_export.rb views/design.dae.erb lib/geom/plane.rb lib/geom.rb lib/floorplanner/area_builder.rb lib/config.yml .gitignore lib/geom/intersection.rb lib/geom/ear_trim.rb lib/geom/connection.rb lib/floorplanner.rb fml.gemspec lib/geom/polygon.rb lib/geom/edge.rb lib/floorplanner/asset.rb views/design.rib.erb lib/geom/matrix3d.rb lib/floorplanner/rib_export.rb lib/floorplanner/obj_export.rb Rakefile README views/design.obj.erb lib/geom/triangle.rb lib/geom/triangle_mesh.rb lib/floorplanner/wall_builder.rb lib/floorplanner/svg_export.rb lib/collada/geometry.rb views/design.svg.erb tasks/github-gem.rake lib/geom/vertex.rb lib/geom/glu_tess.rb lib/floorplanner/wall3d.rb lib/floorplanner/document.rb bin/fml2obj.rb lib/geom/number.rb lib/collada/document.rb)
+  s.executables = ["fml2dae.rb"]
+  s.files = %w(.gitignore README Rakefile TODO bin/fml2dae.rb fml.gemspec lib/collada/document.rb lib/collada/geometry.rb lib/config.yml lib/floorplanner.rb lib/floorplanner/area_builder.rb lib/floorplanner/asset.rb lib/floorplanner/collada_export.rb lib/floorplanner/design.rb lib/floorplanner/document.rb lib/floorplanner/opening3d.rb lib/floorplanner/svg_export.rb lib/floorplanner/wall3d.rb lib/floorplanner/wall_builder.rb lib/floorplanner/xml.rb lib/geom.rb lib/geom/connection.rb lib/geom/ear_trim.rb lib/geom/edge.rb lib/geom/glu_tess.rb lib/geom/intersection.rb lib/geom/matrix3d.rb lib/geom/number.rb lib/geom/plane.rb lib/geom/polygon.rb lib/geom/triangle.rb lib/geom/triangle_mesh.rb lib/geom/vertex.rb lib/keyhole/archive.rb tasks/github-gem.rake views/design.dae.erb views/design.svg.erb xml/collada_schema_1_4.xsd xml/fml.rng xml/fml2kml.xsl)
   s.homepage = %q{http://floorplanner.com/}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.1}
@@ -22,15 +22,18 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<libxml-ruby>)
+      s.add_runtime_dependency(%q<nokogiri>)
       s.add_runtime_dependency(%q<rubyzip>)
+      s.add_runtime_dependency(%q<roxml>)
     else
-      s.add_dependency(%q<libxml-ruby>)
+      s.add_dependency(%q<nokogiri>)
       s.add_dependency(%q<rubyzip>)
+      s.add_dependency(%q<roxml>)
     end
   else
-    s.add_dependency(%q<libxml-ruby>)
+    s.add_dependency(%q<nokogiri>)
     s.add_dependency(%q<rubyzip>)
+    s.add_dependency(%q<roxml>)
   end
 end
 

data/lib/collada/document.rb

@@ -1,34 +1,32 @@
 require 'cgi'
 
 module Collada
-  class Document < XML::Document
-    XMLNS = "http://www.collada.org/2005/11/COLLADASchema"
-    VERSION = "1.4.1"
+  class Document < Nokogiri::XML::Document
+    COLLADA_NS = "http://www.collada.org/2005/11/COLLADASchema"
+    COLLADA_VERSION = "1.4.1"
 
-    COLLADA = 'COLLADA'
     ASSET = 'asset'
-    LIBRARY_MATERIALS = 'library_materials'
-    LIBRARY_EFFECTS = 'library_effects'
-    LIBRARY_GEOMETRIES = 'library_geometries'
+    LIBRARY_MATERIALS     = 'library_materials'
+    LIBRARY_EFFECTS       = 'library_effects'
+    LIBRARY_GEOMETRIES    = 'library_geometries'
     LIBRARY_VISUAL_SCENES = 'library_visual_scenes'
-    SCENE = 'scene'
-    VISUAL_SCENE = 'visual_scene'
+    SCENE                 = 'scene'
+    VISUAL_SCENE          = 'visual_scene'
     INSTANCE_VISUAL_SCENE = 'instance_visual_scene'
 
     attr_accessor :assets_libraries
 
     def initialize
       super
-      self.root = XML::Node.new(COLLADA)
-      self.root.namespaces.namespace = XML::Namespace.new(self.root,nil,XMLNS)
-      self.root.attributes['version'] = VERSION
+      root = create_element 'COLLADA'
+      root.namespace = COLLADA_NS
+      root.attr['version'] = COLLADA_VERSION
 
       create_structure
-
-      self.assets_libraries = []
+      assets_libraries = []
     end
 
-    def << (node)
+    def << node
       root << node
     end
 
@@ -51,18 +49,18 @@ module Collada
 
     private
       def create_structure
-        self << XML::Node.new(ASSET)
+        self << create_element(ASSET)
 
-        self << XML::Node.new(LIBRARY_MATERIALS)
-        self << XML::Node.new(LIBRARY_EFFECTS)
-        self << XML::Node.new(LIBRARY_GEOMETRIES)
-        self << (visual_scenes = XML::Node.new(LIBRARY_VISUAL_SCENES))
-        visual_scenes << (visual_scene = XML::Node.new(VISUAL_SCENE))
+        self << create_element(LIBRARY_MATERIALS)
+        self << create_element(LIBRARY_EFFECTS)
+        self << create_element(LIBRARY_GEOMETRIES)
+        self << (visual_scenes = create_element(LIBRARY_VISUAL_SCENES))
+        visual_scenes << (visual_scene = create_element(VISUAL_SCENE))
         visual_scene['id'] = 'MainScene'
         visual_scene['name'] = 'MainScene'
 
-        self << (scene = XML::Node.new(SCENE))
-        scene << (scene_node = XML::Node.new(INSTANCE_VISUAL_SCENE))
+        self << (scene = create_element(SCENE))
+        scene << (scene_node = create_element(INSTANCE_VISUAL_SCENE))
         scene_node['url'] = '#MainScene'
       end
 

data/lib/collada/geometry.rb

@@ -6,14 +6,14 @@ module Collada
     GEOMETRY_QUERY     = '/COLLADA/library_geometries/geometry[@id="%s"]'
     NODE_QUERY         = '/COLLADA/library_nodes//node[@id="%s"]'
 
-    def self.doc(xml)
+    def self.doc doc
       result = Geometry.new
       result.instance_eval do
-        @xml   = xml
+        @doc   = doc
         @cache = {}
 
-        scene_id = xml.find(SCENE_QUERY).first.attributes['url'][1..-1]
-        scene = xml.find(VISUAL_SCENE_QUERY % scene_id).first
+        scene_id = @doc.xpath(SCENE_QUERY).first.attribute('url').value[1..-1]
+        scene = @doc.xpath(VISUAL_SCENE_QUERY % scene_id).first
         scene.children.each do |child|
           eval_node(child) if child.name == "node"
         end
@@ -23,7 +23,7 @@ module Collada
 
     private
 
-    def eval_node(node,parent=nil)
+    def eval_node node, parent=nil
       parent = node.parent unless parent
       parent_matrix = Geom::Matrix3D.identity
       if parent.name == "node"
@@ -43,23 +43,22 @@ module Collada
         when "node"
           eval_node(child,node)
         when "instance_geometry"
-          load_geometry(child.attributes['url'][1..-1],node_matrix)
+          load_geometry(child.attribute('url').value[1..-1],node_matrix)
         when "instance_node"
           eval_node(expand_node(child),node)
         end
       end
     end
 
-    def load_geometry(gid,matrix=nil)
-      geometry = @xml.find(GEOMETRY_QUERY % gid).first
+    def load_geometry gid, matrix=nil
+      geometry = @doc.xpath(GEOMETRY_QUERY % gid).first
       mesh = Geom::TriangleMesh.new
 
       floats = Array.new
-      geometry.find('mesh/triangles').each do |triangles|
-        vertices_id = triangles.find('input[@semantic="VERTEX"]').first.attributes['source'][1..-1]
-        source_id   = geometry.find('mesh/vertices[@id="%s"]/input[@semantic="POSITION"]' % vertices_id).first.attributes['source'][1..-1]
-
-        floats.concat geometry.find('mesh/source[@id="%s"]/float_array' % source_id).first.get_floats
+      geometry.xpath('mesh/triangles').each do |triangles|
+        vertices_id = triangles.xpath('input[@semantic="VERTEX"]').first.attribute('source').value[1..-1]
+        source_id   = geometry.xpath('mesh/vertices[@id="%s"]/input[@semantic="POSITION"]' % vertices_id).first.attribute('source').value[1..-1]
+        floats.concat geometry.xpath('mesh/source[@id="%s"]/float_array' % source_id).first.content.split.map(&:to_f)
       end
 
       (floats.length/3).times do |i|
@@ -71,36 +70,36 @@ module Collada
       @meshes << mesh
     end
 
-    def expand_node(instance)
-      node_id = instance.attributes['url'][1..-1]
-      @xml.find(NODE_QUERY % node_id).first
+    def expand_node instance
+      node_id = instance.attribute('url').value[1..-1]
+      @doc.xpath(NODE_QUERY % node_id).first
     end
 
-    def get_node_matrix(node,source=nil)
+    def get_node_matrix node, source=nil
       result = source ? source : Geom::Matrix3D.identity
       node.children.each do |child|
         case child.name
         when "translate"
           f = child.get_floats
           t = Geom::Matrix3D.translation(f[0],f[1],f[2])
-          result = result.multiply(t)
+          result *= t
         when "scale"
           f = child.get_floats
           t = Geom::Matrix3D.scale(f[0],f[1],f[2])
-          result = result.multiply(t)
+          result *= t
         when "rotate"
           f = child.get_floats
-          t = Geom::Matrix3D.rotation_matrix(f[0],f[1],f[2],f[3])
-          result = result.multiply(t)
+          t = Geom::Matrix3D.rotation(f[0],f[1],f[2],f[3])
+          result *= t
         when "matrix"
-          f = child.get_floats
+          f = child.content.split.map(&:to_f)
           t = Geom::Matrix3D[
             [ *f[0..3]   ],
             [ *f[4..7]   ],
             [ *f[8..11]  ],
             [ *f[12..15] ]
           ]
-          result = result.multiply(t)
+          result *= t
         end
       end
       result

data/lib/config.yml

@@ -1,13 +1,13 @@
 content_base_url: http://cdn.floorplanner.com/assets/
-dae_cache_path: /home/skrat/workspace/floorplanner/fml2dae_cache/
-area_textures_path: /home/skrat/workspace/floorplanner/fml2dae_cache/textures_2d/
+dae_cache_path: fml2dae_cache/
+area_textures_path: fml2dae_cache/textures_2d/
 
 geom_snap:  0.1
 uniq_snap:  0.0000005
 openings:
   window_base:   0.65
-  window_height: 1.6
-  door_height:   2.2
+  window_height: 1.5
+  door_height:   2.1
 
 svg:
   width:   1024

data/lib/floorplanner/area_builder.rb

@@ -21,14 +21,9 @@ module Floorplanner
       end
     end
 
-    HEX_RE = "(?i:[a-f\\d])"
-    def area(vertices,params=nil)
-      a_id = vertices.hash.abs.to_s + "_" +params[:type]
-      if params[:color] =~ /\A#((?:#{HEX_RE}{2,2}){3,4})\z/
-         params[:color] = [*$1.scan(/.{2,2}/).collect {|value| value.hex / 255.0}]
-      else
-         params[:color] = [1,1,1]
-      end
+    def area(vertices, params=nil)
+      a_id = vertices.hash.abs.to_s + "_" + params[:type].to_s
+      params[:color] = Floorplanner.read_color params[:color]
       @meshes[a_id] = Geom::Polygon.new(vertices, nil, params.merge({:id => a_id}))
     end
 

data/lib/floorplanner/asset.rb

@@ -1,5 +1,5 @@
 module Floorplanner
-  class Asset
+  class DAE
     LIBRARY_GEOMETRIES   = '/COLLADA/library_geometries/geometry'
     LIBRARY_EFFECTS      = '/COLLADA/library_effects/effect'
     LIBRARY_MATERIALS    = '/COLLADA/library_materials/material'
@@ -13,15 +13,15 @@ module Floorplanner
 
     attr_reader :id, :name, :title, :dae_path
 
-    def self.get(asset_id,asset_title,asset_url3d)
+    def self.get(asset)
       FileUtils.mkdir_p(CACHE_PATH)
-      asset_url = Floorplanner.config['content_base_url'] + URI.escape(asset_url3d)
+      asset_url = Floorplanner.config['content_base_url'] + URI.escape(asset.url3d)
 
-      cached_path = File.join(CACHE_PATH,asset_id)
+      cached_path = File.join(CACHE_PATH, asset.id)
       if File.exists?(cached_path)
-        $stderr.puts("Cached asset: %s" % asset_id)
+        $stderr.puts("Cached asset: %s" % asset.id)
         @kmz = Keyhole::Archive.new(cached_path)
-        Asset.new(asset_id,asset_title,@kmz)
+        DAE.new(asset.id, asset.name, @kmz)
       else
         $stderr.puts("Downloading asset: %s" % asset_url)
         cached = File.new(cached_path,'w')
@@ -30,19 +30,24 @@ module Floorplanner
         cached.close
 
         @kmz = Keyhole::Archive.new(cached_path)
-        asset = Asset.new(asset_id,asset_title,@kmz)
-        asset.adjust_paths!
-        asset
+        dae = DAE.new(asset.id, asset.name, @kmz)
+        dae.adjust_paths!
+        dae
       end
+    rescue
+      $stderr.puts "Failed to get asset: %s, %s" % [asset.id, asset_url]
+      raise
     end
 
-    def initialize(id,title,kmz)
+    def initialize(id, title, kmz)
       @dae_path = kmz.dae_path(id)
       @kmz   = kmz
       @id    = id
       @title = title
-      @xml   = XML::Document.string(File.read(@dae_path).gsub(/xmlns=".+"/, ''))
       @name  = File.basename(@dae_path.gsub(/\.|dae/,''))
+      
+      @doc   = Nokogiri::XML.parse(open(@dae_path))
+      @doc.remove_namespaces!
       @images_dict = {}
     end
 
@@ -51,46 +56,46 @@ module Floorplanner
 
     def library_materials
       return @materials if @materials
-      materials = @xml.find(LIBRARY_MATERIALS)
+      materials = @doc.xpath(LIBRARY_MATERIALS)
       materials.each {|mat| namespace!(mat)}
       @materials = materials
     end
 
     def library_effects
       return @effects if @effects
-      effects = @xml.find(LIBRARY_EFFECTS)
+      effects = @doc.xpath(LIBRARY_EFFECTS)
       effects.each {|eff| namespace!(eff)}
       @effects = effects
     end
 
     def library_geometries
       return @geometries if @geometries
-      geometries = @xml.find(LIBRARY_GEOMETRIES)
+      geometries = @doc.xpath(LIBRARY_GEOMETRIES)
       geometries.each{|geo| namespace!(geo)}
       @geometries = geometries
     end
 
     def library_nodes
       return @nodes if @nodes
-      nodes = @xml.find(LIBRARY_NODES)
+      nodes = @doc.xpath(LIBRARY_NODES)
       nodes.each{|nod| namespace!(nod)}
       @nodes = nodes
     end
 
     def library_images
       return @images if @images
-      images = @xml.find(LIBRARY_IMAGES)
+      images = @doc.xpath(LIBRARY_IMAGES)
       images.each{|img| namespace!(img) && update_path!(img)}
       @images = images
     end
 
     def visual_scene_node
       return @scene_node if @scene_node
-      @scene_node = namespace!(@xml.find(VISUAL_SCENE_QUERY).first)
+      @scene_node = namespace!(@doc.xpath(VISUAL_SCENE_QUERY).first)
     end
 
     def bounding_box
-      mesh = Collada::Geometry.doc @xml
+      mesh = Collada::Geometry.doc @doc
       mesh.bounding_box
     end
 
@@ -115,11 +120,11 @@ module Floorplanner
     end
 
     def save_textures(root_path)
-      images = @xml.find(LIBRARY_IMAGES)
-      FileUtils.mkdir_p(root_path) unless images.length.zero?
+      images = @doc.xpath(LIBRARY_IMAGES)
+      FileUtils.mkdir_p(root_path)
 
       images.each do |image|
-        relative_to_dae = image.find('init_from').first.content
+        relative_to_dae = image.xpath('init_from').first.content
         img_path = @kmz.image_path(@id,relative_to_dae)
         target_path = File.join(root_path,@id)
         FileUtils.mkdir_p target_path
@@ -132,15 +137,15 @@ module Floorplanner
     end
 
     def adjust_paths!
-      images = @xml.find(LIBRARY_IMAGES)
+      images = @doc.xpath(LIBRARY_IMAGES)
 
       images.each do |image|
-        init_from = image.find('init_from').first
+        init_from = image.xpath('init_from').first
         img_path = @kmz.image_path(@id,init_from.content,true)
         init_from.content = img_path
       end
       open(@dae_path, 'w') do |f|
-        f.write @xml.to_s
+        f.write @doc.to_s
       end
     end
 
@@ -160,12 +165,12 @@ module Floorplanner
       node['texture'] = "#{@name}_#{node['texture'].gsub('#','')}" if node['texture']
 
       if node.name == 'surface'
-        n = node.find('init_from').first
+        n = node.xpath('init_from').first
         n.content = "#{@name}_#{n.content}"
       end
 
       if node.name == 'sampler2D'
-        n = node.find('source').first
+        n = node.xpath('source').first
         n.content = "#{@name}_#{n.content}"
       end
 
@@ -177,7 +182,7 @@ module Floorplanner
 
     # updates image path to export output folder
     def update_path!(node)
-      init_from_node = node.find('init_from').first
+      init_from_node = node.xpath('init_from').first
       relative = init_from_node.content
       init_from_node.content = @images_dict[relative]
     end

data/lib/floorplanner/collada_export.rb

@@ -1,32 +1,37 @@
-module Floorplanner
+module Floorplanner::XML
   class Document
 
-    def to_dae(design_id,out_path,xrefs=false)
-      @design = Design.new(@xml,design_id)
+    def to_dae thing, conf={}
+      @design = Floorplanner::Design.new(self)
       @design.build_geometries
-      @design.save_textures(File.dirname(out_path)) unless xrefs
-      dae = File.new(out_path,'w')
-      dae.write(@design.to_dae(xrefs))
-      dae.close
+      if thing.kind_of? String
+        unless conf[:xrefs]
+          @design.save_textures(File.dirname(thing))
+        end
+        dae = File.new(thing,'w')
+        dae.write @design.to_dae(conf)
+        dae.close
+      elsif thing.respond_to? :write
+        thing.write @design.to_dae(conf)
+      end
     end
-
   end
+end
 
+module Floorplanner
   module ColladaExport
-    DESIGN_QUERY   = "/project/floors/floor/designs/design[id='%s']"
-    ASSET_QUERY    = DESIGN_QUERY+"/assets/asset[@id='%s']"
-    ASSETS_QUERY   = DESIGN_QUERY+"/assets/asset"
-    OBJECTS_QUERY  = DESIGN_QUERY+"/objects/object"
 
-    def to_dae(xrefs=false)
-      raise "No geometries to export. Call build_geometries first" unless @areas && @walls
+    CACHE_PATH = File.join(Floorplanner.config['dae_cache_path'], 'textures_2d')
+
+    def to_dae conf
+      raise "No geometries to export" unless @areas && @walls
       @assets   = assets
       @elements = objects
 
       # somehow...
       @walls.reverse
       @areas.each {|a| a.reverse}
-      @xrefs = xrefs
+      @conf = conf
 
       template = ERB.new(
         File.read(
@@ -37,82 +42,82 @@ module Floorplanner
     def assets
       return @assets if @assets
       @assets = {}
-      @xml.find(ASSETS_QUERY % @design_id).each do |asset_node|
-        asset_id = asset_node.attributes['id']
-        name  = asset_node.find('name').first.content
-        url3d = asset_node.find('url3d').first
-        next unless url3d
-        url3d = url3d.content
+      @doc.assets.each do |asset|
+        next unless asset.url3d && !asset.url3d.empty?
 
         # TODO: store asset bounding box
-        asset = Floorplanner::Asset.get(asset_id,name,url3d)
-        next unless asset
-        @assets.store(asset_id, asset)
+        dae = Floorplanner::DAE.get(asset)
+        next unless dae
+        @assets.store(asset.id, dae)
       end
       @assets
     end
 
     def objects
       result = []
-      @xml.find(OBJECTS_QUERY % @design_id).each do |object|
-        begin
-          refid = object.find('asset').first.attributes['refid']
-          next unless assets[refid]
-
-          asset    = assets[refid]
-          position = Geom::Number3D.from_str(object.find('points').first.content)
-          # correct Flash axis issues
-          position.y *= -1.0
-
-          # correct Flash rotation issues
-          rotation = unless object.find('rotation').empty?
-            object.find('rotation').first.content
-          else
-            '0 0 0'
-          end
-          rotation = Geom::Number3D.from_str(rotation)
-          rotation.z += 360 if rotation.z < 0
-          rotation.z += 180
-
-          # find proper scale for object
-          size     = object.find('size').first.content
-          scale    = asset.scale_ratio(Geom::Number3D.from_str(size))
-
-          mirrored = object.find('mirrored').first
-          reflection = Geom::Matrix3D.reflection(Geom::Plane.new(Geom::Number3D.new(0.0,1.0,0.0), Geom::Number3D.new))
-          if mirrored
-            mirror   = Geom::Number3D.from_str(mirrored)
-            if mirror.x != 0 || mirror.y != 0 || mirror.z != 0
-              mirror.x = mirror.x > 0 ? 1 : 0
-              mirror.y = mirror.y > 0 ? 1 : 0
-              mirror.z = mirror.z > 0 ? 1 : 0
-
-              origin = Geom::Number3D.new
-              plane  = Geom::Plane.new(mirror,origin)
-              reflection = Geom::Matrix3D.reflection(plane).multiply reflection
-            end
+      @doc.objects.each do |item|
+          next unless assets[item.asset]
+          asset = assets[item.asset]
+
+          pos = item.position
+          rot = item.rotation || Geom::Number3D.new
+          scale = asset.scale_ratio(item.size)
+
+          if item.mirrored
+            m_mirror = Geom::Matrix3D.reflection(
+              Geom::Plane.new(item.mirrored, Geom::Number3D.new))
           end
 
+          m_scale     = Geom::Matrix3D.scale(scale.x, scale.y, scale.z)
+          m_rotate    = Geom::Matrix3D.rotation(0, 0, 1, (Math::PI/180)*rot.z)
+          m_translate = Geom::Matrix3D.translation(pos.x, pos.y, pos.z)
+
+          m_combined  = m_rotate * m_scale
+          m_combined  = m_mirror * m_combined if m_mirror
+          m_combined  = m_translate * m_combined
+
           result << {
-            :asset => asset,
-            :position => position,
-            :rotation => rotation,
-            :scale    => scale,
-            :matrix   => reflection
+            :asset  => asset,
+            :matrix => m_combined,
+            :color  => Floorplanner.read_color(item.color)
           }
-        rescue
-          # TODO: handle text
-        end
       end
       result
     end
 
-    def save_textures(root_path)
-      img_path = File.join(root_path,'textures')
+    def save_textures root_path
+      img_path = File.join(root_path, 'textures')
       FileUtils.mkdir_p img_path
       assets.each_value do |asset|
         asset.save_textures img_path
       end
+
+      t2d_path = File.join(img_path, 'textures_2d')
+      FileUtils.mkdir_p t2d_path
+      @areas.each do |area|
+        next unless area.data[:texture]
+        texture_url = area.data[:texture]
+        fn = texture_url.match(/.*\/(.*)/)[1]
+        tex_path = File.join(t2d_path, fn)
+        area.data[:texture] = File.join('textures', 'textures_2d', fn)
+        next if File.exists?(tex_path)
+
+        FileUtils.mkdir_p CACHE_PATH
+        cached_path = File.join(CACHE_PATH, fn)
+        unless File.exists?(cached_path)
+          puts "Downloading texture: %s" % texture_url
+          begin
+            cached = File.new(cached_path, 'w')
+            remote = open(Floorplanner.config['content_base_url'] + 
+              URI.escape(texture_url))
+            cached.write(remote.read)
+            cached.close
+          rescue
+            $stderr.puts "Error downloading texture: %s" % fn
+          end
+        end
+        FileUtils.cp(cached_path, tex_path)
+      end
     end
   end
 end