crystalscad 0.4.1 → 0.4.2

data/lib/crystalscad/CrystalScad.rb

@@ -217,9 +217,32 @@ module CrystalScad
 
 	#	2d primitives
 	class Square < Primitive
+	  def initialize(*args)
+	    super(args)
+	    @x,@y = args[0][:size].map{|l| l.to_f}
+	  end
+
 		def to_rubyscad
 			return RubyScadBridge.new.square(@args)		
 		end			
+		
+		def center_xy
+			@transformations << Translate.new({x:-@x/2,y:-@y/2})
+			self
+		end
+    alias center center_xy
+
+		def center_x
+			@transformations << Translate.new({x:-@x/2})
+			self
+		end
+
+		def center_y
+			@transformations << Translate.new({y:-@y/2})
+			self
+		end
+
+				
 	end
 
 	def square(args)
@@ -272,6 +295,32 @@ module CrystalScad
 		end
 	end
 
+  class AdvancedPrimitive < Primitive
+    
+    
+    def initialize(attributes)
+      @attr = attributes.collect { |k, v| "#{k} = \"#{v}\"" }.join(', ')
+      super
+    end
+    
+  	def to_rubyscad
+			"#{@operation}(#{@attr});"
+		end
+  
+  end
+
+
+  class Text < AdvancedPrimitive
+		def initialize(attributes)
+			@operation = "text"
+			super(attributes)
+		end
+  end
+
+	def text(args={})
+		return Text.new(args)				
+	end
+
 
 	class CSGModelling < Primitive
 		def initialize(*list)
@@ -365,15 +414,28 @@ module CrystalScad
 
 
 	class Import < Primitive
-		def initialize(filename)
+		def initialize(args)
 			@transformations = []
+			
+			if args.kind_of? String
+			  filename = args
+			else # assume hash otherwise
+			  filename = args[:file]
+			  @layer = args[:layer]
+			end			
+			
+			
 			# we need to convert relative to absolute paths if the openscad output is not in the same directory
 			# as the crystalscad program.
 			@filename = File.expand_path(filename) 		
 		end		
 		
 		def to_rubyscad	
-			return RubyScadBridge.new.import("\""+@filename.to_s+"\"") # apparently the quotes get lost otherwise
+		  layer = ""
+		  if @layer
+		    layer = ",layer=\"#{@layer}\""
+		  end
+			return RubyScadBridge.new.import("file=\""+@filename.to_s+"\"#{layer}") # apparently the quotes get lost otherwise
 		end	
 	end
 
@@ -440,7 +502,6 @@ module CrystalScad
 			super(object, attributes)
 		end
 	end
-
 	
 	def color(args)
 		return Color.new(self,args)		
@@ -469,7 +530,6 @@ module CrystalScad
 		return Projection.new(self,args)				
 	end
 
-	
 
 	#	Stacks parts along the Z axis
 	# works on all Assemblies that have a @height definition

data/lib/crystalscad/version.rb

@@ -1,4 +1,4 @@
 module CrystalScad
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crystalscad
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyscad