fml 0.2.3 → 0.2.4

data/tasks/github-gem.rake

@@ -127,8 +127,22 @@ module GithubGem
         release_tasks = [:release_checks, :set_version, :build, :github_release, :gemcutter_release]
         # release_tasks << [:rubyforge_release] if gemspec.rubyforge_project
 
-        desc "Release a new verison of the gem"
+        desc "Release a new version of the gem using the VERSION environment variable"
         task(:release => release_tasks) { release_task }
+        
+        namespace(:release) do
+          desc "Release the next version of the gem, by incrementing the last version segment by 1"
+          task(:next => [:next_version] + release_tasks) { release_task }
+
+          desc "Release the next version of the gem, using a patch increment (0.0.1)"
+          task(:patch => [:next_patch_version] + release_tasks) { release_task }
+
+          desc "Release the next version of the gem, using a minor increment (0.1.0)"
+          task(:minor => [:next_minor_version] + release_tasks) { release_task }
+
+          desc "Release the next version of the gem, using a major increment (1.0.0)"
+          task(:major => [:next_major_version] + release_tasks) { release_task }
+        end
 
         # task(:check_rubyforge)   { check_rubyforge_task }
         # task(:rubyforge_release) { rubyforge_release_task }
@@ -137,6 +151,11 @@ module GithubGem
         task(:tag_version) { tag_version_task }
         task(:commit_modified_files) { commit_modified_files_task }
 
+        task(:next_version)       { next_version_task }
+        task(:next_patch_version)  { next_version_task(:patch) }
+        task(:next_minor_version) { next_version_task(:minor) }
+        task(:next_major_version) { next_version_task(:major) }
+        
         desc "Updates the gem release tasks with the latest version on Github"
         task(:update_tasks) { update_tasks_task }
       end
@@ -160,6 +179,32 @@ module GithubGem
       sh "mv #{gemspec.name}-#{gemspec.version}.gem pkg/#{gemspec.name}-#{gemspec.version}.gem"
     end
 
+    def newest_version
+      git.tags.map { |tag| tag.name.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
+    end
+
+    def next_version(increment = nil)
+      next_version = newest_version.segments
+      increment_index = case increment
+        when :micro then 3
+        when :patch then 2
+        when :minor then 1
+        when :major then 0
+        else next_version.length - 1
+      end
+      
+      next_version[increment_index] ||= 0
+      next_version[increment_index] = next_version[increment_index].succ
+      ((increment_index + 1)...next_version.length).each { |i| next_version[i] = 0 }
+      
+      Gem::Version.new(next_version.join('.'))
+    end
+
+    def next_version_task(increment = nil)
+      ENV['VERSION'] = next_version(increment).version
+      puts "Releasing version #{ENV['VERSION']}..."
+    end
+
     # Updates the version number in the gemspec file, the VERSION constant in the main
     # include file and the contents of the VERSION file.
     def version_task
@@ -173,9 +218,7 @@ module GithubGem
     def check_version_task
       raise "#{ENV['VERSION']} is not a valid version number!" if ENV['VERSION'] && !Gem::Version.correct?(ENV['VERSION'])
       proposed_version = Gem::Version.new(ENV['VERSION'] || gemspec.version)
-      # Loads the latest version number using the created tags
-      newest_version   = git.tags.map { |tag| tag.name.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max
-      raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version && newest_version >= proposed_version
+      raise "This version (#{proposed_version}) is not higher than the highest tagged version (#{newest_version})" if newest_version >= proposed_version
     end
 
     # Checks whether the current branch is not diverged from the remote branch

data/views/design.dae.erb

@@ -10,20 +10,6 @@
     <up_axis>Z_UP</up_axis>
   </asset>
   
-  <library_cameras>
-    <camera id="main-cam">
-      <optics>
-        <technique_common>
-          <perspective>
-            <yfov>70</yfov>
-            <znear>0.1</znear>
-            <zfar>100.0</zfar>
-          </perspective>
-        </technique_common>
-      </optics>
-    </camera>
-  </library_cameras>
-
   <library_materials id="surrounding-materials">
     <material id="walls-material" name="WallsMaterial">
       <instance_effect url="#walls-fx"/>
@@ -36,7 +22,7 @@
         <instance_effect url="#area_<%= area_mesh.data[:id] %>-fx"/>
       </material>
     <% end %>
-    <% unless @xrefs; @assets.each_value do |asset| %>
+    <% unless @conf[:xrefs]; @assets.each_value do |asset| %>
       <% asset.library_materials.each do |materials| %>
         <%= materials.to_s %>
       <% end %>
@@ -79,6 +65,7 @@
         </technique>
       </profile_COMMON>
     </effect>
+    <% if @conf[:window_glass] %>
     <effect id="windows-fx">
       <profile_COMMON>
         <technique>
@@ -114,6 +101,7 @@
         </technique>
       </profile_COMMON>
     </effect>
+    <% end %>
     <% @areas.each do |area_mesh|; id = area_mesh.data[:id].to_s %>
       <effect id="area_<%= id %>-fx" name="<%= area_mesh.data[:name] %>">
         <% if area_mesh.data[:texture] %>
@@ -124,18 +112,18 @@
           </extra>
         <% end %>
         <profile_COMMON>
-          <% if area_mesh.data[:texture] %>
+        <% if area_mesh.data[:texture] %>
           <newparam sid="area_<%= id %>-surface">
-              <surface type="2D">
-                <init_from>area_<%= id %>-image</init_from>
-              </surface>
+            <surface type="2D">
+              <init_from>area_<%= id %>-image</init_from>
+            </surface>
           </newparam>
           <newparam sid="area_<%= id %>-sampler">
-              <sampler2D>
-                <source>area_<%= id %>-surface</source>
-              </sampler2D>
+            <sampler2D>
+              <source>area_<%= id %>-surface</source>
+            </sampler2D>
           </newparam>
-          <% end %>
+        <% end %>
           <technique>
             <phong>
               <emission>
@@ -145,11 +133,11 @@
                 <color>0.1 0.1 0.1 1</color>
               </ambient>
               <diffuse>
-                <% if area_mesh.data[:texture] %>
-                <texture texture="area_<%= id %>-sampler"/>
-                <% else %>
+              <% if area_mesh.data[:texture] %>
+                <texture texture="area_<%= id %>-sampler" texcoord="TEXCOORD" />
+              <% else %>
                 <color><%= area_mesh.data[:color].join(' ') %> 1</color>
-                <% end %>
+              <% end %>
               </diffuse>
               <specular>
                 <color>0 0 0 1</color>
@@ -174,7 +162,7 @@
         </profile_COMMON>
       </effect>
     <% end %>
-    <% unless @xrefs; @assets.each_value do |asset| %>
+    <% unless @conf[:xrefs]; @assets.each_value do |asset| %>
       <% asset.library_effects.each do |effects| %>
         <%= effects.to_s %>
       <% end %>
@@ -182,18 +170,16 @@
   </library_effects>
 
   <library_images>
-    <% @areas.each do |area_mesh|; if area_mesh.data[:texture] %>
-    <image id="area_<%= area_mesh.data[:id] %>-image" name="<%= area_mesh.data[:name] %>">
-    <init_from><%= Floorplanner.config['area_textures_path'] + 
-                   area_mesh.data[:texture].gsub('textures/2d/','').gsub(/\.swf$/,'.png') %></init_from>
-    </image>
-    <% end; end %>
-
-    <% unless @xrefs; @assets.each_value do |asset| %>
+    <% unless @conf[:xrefs]; @assets.each_value do |asset| %>
       <% asset.library_images.each do |image| %>
         <%= image.to_s %>
       <% end %>
     <% end; end %>
+    <% @areas.each do |area|; next unless area.data[:texture] %>
+      <image id="area_<%= area.data[:id].to_s %>-image">
+        <init_from><%= area.data[:texture] %></init_from>
+      </image>
+    <% end %>
   </library_images>
 
   <library_geometries id="surrounding-geometry">
@@ -227,6 +213,7 @@
       </mesh>
     </geometry>
 
+    <% if @conf[:window_glass] %>
     <geometry id="windows-geom" name="WindowsGeometry">
     <%
       windows_vertices = @walls.windows.collect {|w| w.vertices}.flatten
@@ -263,6 +250,8 @@
         </triangles>
       </mesh>
     </geometry>
+    <% end %>
+
     <% @areas.each do |area_mesh|; id = area_mesh.data[:id] %>
     <geometry id="area_<%= id %>-geom" name="Area_<%= id %>_<%= area_mesh.data[:name] %>-Geometry">
         <mesh>
@@ -282,11 +271,11 @@
           </source>
 
           <source id="area_<%= id %>-uvs" name="texcoord">
-            <float_array id="area_<%= id %>-uvs-array" count="<%= area_mesh.texcoord.length %>">
+            <float_array id="area_<%= id %>-uvs-array" count="<%= area_mesh.texcoord.length*2 %>">
               <%= area_mesh.texcoord.map{|n| [n.u,n.v]}.flatten.join(' ') %>
             </float_array>
             <technique_common>
-              <accessor count="44" source="#area_<%= id %>-uvs-array" stride="2">
+              <accessor count="<%= area_mesh.texcoord.length %>" source="#area_<%= id %>-uvs-array" stride="2">
                 <param name="S" type="float"/>
                 <param name="T" type="float"/>
               </accessor>
@@ -313,13 +302,13 @@
         </mesh>
       </geometry>
     <% end %>
-    <% unless @xrefs; @assets.each_value do |asset| %>
+    <% unless @conf[:xrefs]; @assets.each_value do |asset| %>
       <% asset.library_geometries.each do |geometries| %>
         <%= geometries.to_s %>
       <% end %>
     <% end; end %>
   </library_geometries>
-  <% unless @xrefs %>
+  <% unless @conf[:xrefs] %>
   <library_nodes>
     <% @assets.each_value do |asset| %>
       <% asset.library_nodes.each do |nodes| %>
@@ -329,42 +318,7 @@
   </library_nodes>
   <% end %>
   <library_visual_scenes>
-  <visual_scene id="VisualSceneNode" name="<%= @name %>">
-      <extra>
-        <technique sid="sunflow">
-          <image>
-            <resolution>800 600</resolution>
-            <aa>0 2</aa>
-            <filter>gaussian</filter>
-            <sampler>ipr</sampler>
-          </image>
-          <trace_depths>
-            <diffuse>4</diffuse>
-            <reflection>2</reflection>
-          </trace_depths>
-          <gi>
-            <type>ambocc</type>
-            <bright>1 1 1</bright>
-            <dark>0 0 0</dark>
-            <samples>64</samples>
-            <maxdist>3.0 </maxdist>
-          </gi>
-          <sunsky>
-            <up>0 0 1</up>
-            <east>1 0 0</east>
-            <sundir>0.2 0.4 0.7</sundir>
-            <ground>1 1 1</ground>
-          </sunsky>
-        </technique>
-      </extra>
-      <node id="Camera" name="Camera">
-        <lookat>
-          9.0 -1.0 1.4
-          8.0 -2.0 1.4
-          0.0 0.0 1.0
-        </lookat>
-        <instance_camera url="#main-cam"/>
-      </node>
+  <visual_scene id="VisualSceneNode" name="<%= @doc.name %>">
       <node id="Walls" name="Walls">
         <instance_geometry url="#walls-geom">
           <bind_material>
@@ -374,6 +328,8 @@
           </bind_material>
         </instance_geometry>
       </node>
+
+      <% if @conf[:window_glass] %>
       <node id="Windows" name="Windows">
         <instance_geometry url="#windows-geom">
           <bind_material>
@@ -383,6 +339,8 @@
           </bind_material>
         </instance_geometry>
       </node>
+      <% end %>
+
       <node id="Areas" name="Areas">
         <% @areas.each do |area_mesh|; id = area_mesh.data[:id] %>
           <node id="Area_<%= id %>" name="Area_<%= id %>">
@@ -394,7 +352,7 @@
               </bind_material>
             </instance_geometry>
           </node>
-          <% if area_mesh.data[:type] == 'generated_area' %>
+          <% if @conf[:ceiling] && area_mesh.data[:type] == :generated_area %>
             <node id="Area_<%= id %>-cap" name="Area_<%= id %>-cap">
               <translate>0.0 0.0 <%= @areas.ceiling_z %></translate>
               <instance_geometry url="#area_<%= id %>-geom">
@@ -410,21 +368,8 @@
       </node>
       <% @elements.each do |element| %>
         <node name="<%= element[:asset].title %>">
-          <translate><%= element[:position].to_floats %></translate>
-          <% if element[:matrix] %>
-            <matrix><%= element[:matrix].to_a.join ' ' %></matrix>
-          <% end %>
-          <% if element[:rotation].x > 0 %>
-            <rotate sid="rotateX">1 0 0 <%= element[:rotation].x %></rotate>
-          <% end %>
-          <% if element[:rotation].y > 0 %>
-            <rotate sid="rotateY">0 1 0 <%= element[:rotation].y %></rotate>
-          <% end %>
-          <% if element[:rotation].z > 0 %>
-            <rotate sid="rotateZ">0 0 1 <%= element[:rotation].z %></rotate>
-          <% end %>
-          <scale><%= element[:scale].to_floats %></scale>
-          <% if @xrefs %>
+          <matrix><%= element[:matrix].to_a.join ' ' %></matrix>
+          <% if @conf[:xrefs] %>
             <instance_node url="<%= element[:asset].dae_path %>"/>
           <% else %>
             <%= element[:asset].visual_scene_node.to_s  %>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Dusan Maliarik
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 +02:00
+date: 2010-11-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: libxml-ruby
+  name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -33,6 +34,7 @@ dependencies:
   name: rubyzip
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -41,59 +43,68 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: roxml
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Floor plan document toolkit
 email: dusan.maliarik@gmail.com
 executables: 
 - fml2dae.rb
-- fml2obj.rb
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- lib/keyhole/archive.rb
-- lib/floorplanner/opening3d.rb
+- .gitignore
+- README
+- Rakefile
+- TODO
 - bin/fml2dae.rb
-- xml/fml2kml.xsl
-- xml/fml.rng
-- xml/collada_schema_1_4.xsd
-- lib/floorplanner/design.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
-- views/design.dae.erb
-- lib/geom/plane.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/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/ear_trim.rb
 - lib/geom/edge.rb
-- lib/floorplanner/asset.rb
-- views/design.rib.erb
+- lib/geom/glu_tess.rb
+- lib/geom/intersection.rb
 - lib/geom/matrix3d.rb
-- lib/floorplanner/rib_export.rb
-- lib/floorplanner/obj_export.rb
-- Rakefile
-- README
-- views/design.obj.erb
+- lib/geom/number.rb
+- lib/geom/plane.rb
+- lib/geom/polygon.rb
 - 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
+- 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
 has_rdoc: true
 homepage: http://floorplanner.com/
 licenses: []
@@ -104,6 +115,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -111,6 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -122,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Floorplanner.com FML document toolkit

data/bin/fml2obj.rb

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-$: << File.join(File.dirname(__FILE__), "/../lib" )
-require 'floorplanner'
-
-if ARGV.length < 2
-  puts "\n  Usage: fml2dae.rb design_id path/to/fml"
-else
-  doc = Floorplanner::Document.new(ARGV[1])
-  doc.to_obj(ARGV[0],ARGV[2])
-end

data/lib/floorplanner/obj_export.rb

@@ -1,24 +0,0 @@
-module Floorplanner
-  class Document
-
-    def to_obj(design_id,out_path)
-      @design = Design.new(@xml,design_id)
-      @design.build_geometries
-      obj = File.new(out_path,'w')
-      obj.write @design.to_obj
-      obj.close
-    end
-
-  end
-
-  module ObjExport
-    def to_obj
-      raise "No geometries to export. Call build_geometries first" unless @areas && @walls
-
-      template = ERB.new(
-        File.read(
-          File.join(Floorplanner.config['views_path'],'design.obj.erb')))
-      template.result(binding)
-    end
-  end
-end

data/lib/floorplanner/rib_export.rb

@@ -1,24 +0,0 @@
-module Floorplanner
-  class Document
-
-    def to_rib(design_id,out_path)
-      @design = Design.new(@xml,design_id)
-      @design.build_geometries
-      rib = File.new(out_path,'w')
-      rib.write @design.to_rib
-      rib.close
-    end
-
-  end
-
-  module RibExport
-    def to_rib
-      raise "No geometries to export. Call build_geometries first" unless @areas && @walls
-
-      template = ERB.new(
-        File.read(
-          File.join(Floorplanner.config['views_path'],'design.rib.erb')))
-      template.result(binding)
-    end
-  end
-end

data/views/design.obj.erb

@@ -1,17 +0,0 @@
-# Floorplanner.com
-# <%= @name %>
-<%
-  vertices = @walls.vertices + @areas.vertices
-  faces    = @walls.faces + @areas.faces
-%>
-<% vertices.each do |v| %>
-v <%= [v.x,v.z,v.y].join(' ') %><% end %>
-<%
-  faces.each do |f|
-    v = [
-      vertices.index(f.vertices[0]),
-      vertices.index(f.vertices[1]),
-      vertices.index(f.vertices[2])
-    ] 
-    if v.compact.length == 3 %>
-f <%= v.collect{|w|w+1}.join(' ') %><% end ; end %>

data/views/design.rib.erb

@@ -1,17 +0,0 @@
-Display "design.tif" "file" "rgb"
-Format 480 320 -1
-Projection "perspective" "fov" 45
-Translate -5 -2 22
-Rotate 240 1 0 0
-Rotate -40 0 0 1
-WorldBegin
-  LightSource "ambientlight" 1 "intensity" 1.0
-  LightSource "distantlight" 2 "from" [0 0 4] "to" [0 0 0] "intensity" 5.0
-  Color [ 0.95 0.95 0.95 ]
-  <% @walls.faces.each do |face| %>
-    Polygon "P" [ <%= face.vertices.collect{|v| [v.x,v.y,v.z]}.flatten.join(' ') %> ]
-  <% end %>
-  <% @areas.faces.each do |face| %>
-    Polygon "P" [ <%= face.vertices.collect{|v| [v.x,v.y,v.z]}.flatten.join(' ') %> ]
-  <% end %>
-WorldEnd