jenncad 1.0.0.pre.alpha11 → 1.0.0.pre.alpha12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e77957381ff8c5d69c62508dad6309d647b56377085319443b6938c2bf88ce2
-  data.tar.gz: 0f1893fcea231e2009fc6a3b5f6224483e413e648f7681d6ae0e85be64bba92e
+  metadata.gz: ceeccb1511db4a12b24c38116c2daa1835f9a64f3c62fe8446feea6712c9f200
+  data.tar.gz: 5b25c737ac0ba61039f7a54d8810a6fd94f2057ca2c482027683105adc767e54
 SHA512:
-  metadata.gz: '047058746e5a8bb3c44995c5ea21edf308272844722f02820300de08493bfc24bec0cd74e26c4343d9fe2ffe514f9c8c57a3ba0981c871c0b161f18705099652'
-  data.tar.gz: 724cbde8c1efa685b3762b7a51c27efd0812a8839d7147e832bede775a695b9e05af0dfbc996b139c531b5f78af26e6560a27efc99024fbbda54f8cf2835e3ef
+  metadata.gz: e509d98347b1a96093fb62ccea12c3e71733f3af4e946694286783e54958245b99373c9721b338bc4da17ddac531a7b215b8394364b4af31aa82c3be8a183cc0
+  data.tar.gz: 14ecaa2c0698e5fad95d311f373f2399f98eaa5b1e0220dce807053ce7ea0b505f879dce042006232cac8b6d25dd6e9c08eb1a713f78a09aba9c47c1e9bbdf08

data/lib/jenncad/exporters/openscad.rb

@@ -1,8 +1,10 @@
 module JennCad::Exporters
   class OpenScadObject
-    def initialize(cmd, args, children=[])
+    def initialize(cmd, args, children=[], modifier=nil)
       @command = cmd
       @args = args
+      @modifier = modifier || ""
+
       case children
       when Array
         @children = children
@@ -43,11 +45,11 @@ module JennCad::Exporters
     def handle_command(i=1)
       case @children.size
       when 0
-        "#{@command}(#{handle_args});"
+        "#{@modifier}#{@command}(#{handle_args});"
       when 1
-        "#{@command}(#{handle_args})#{@children.first.handle_command(i+1)}"
+        "#{@modifier}#{@command}(#{handle_args})#{@children.first.handle_command(i+1)}"
       when (1..)
-        res = "#{@command}(#{handle_args}){"
+        res = "#{@modifier}#{@command}(#{handle_args}){"
         res += nl
         inner = @children.map do |c|
           next if c == nil
@@ -185,7 +187,8 @@ module JennCad::Exporters
     def new_obj(part, cmd, args=nil, children=[])
       transform(part) do
         apply_color(part) do
-          OpenScadObject.new(cmd, args, children)
+          modifier = part.openscad_modifier || nil
+          OpenScadObject.new(cmd, args, children, modifier)
         end
       end
     end

data/lib/jenncad/shortcuts.rb

@@ -39,7 +39,7 @@ module JennCad
   end
 
   def stl(file, args={})
-    StlImport.new(file, args)
+    StlImport.new(file, args).set_parent(self)
   end
 
   def extrude(args={})

data/lib/jenncad/thing.rb

@@ -529,6 +529,37 @@ module JennCad
       JennCad::Exporters::OpenScad.new(self).save(file)
     end
 
+    def ghost
+      set_option :ghost, true
+      set_option :no_auto_color, true
+      set_option :color, nil
+      set_option :auto_color, false
+      self
+    end
+
+    def hide
+      set_option :hide, true
+      self
+    end
+
+    def only
+      set_option :only, true
+      self
+    end
+
+    def hl
+      set_option :highlight, true
+      self
+    end
+
+    def openscad_modifier
+      return "%" if option(:ghost)
+      return "#" if option(:highlight)
+      return "!" if option(:only)
+      return "*" if option(:hide)
+      nil
+    end
+
     def referenced_z
      return false if @z.to_f != 0.0
      return option(:zref) if option(:zref)

data/lib/jenncad/version.rb

@@ -1,4 +1,4 @@
 module JennCad
-  VERSION = "1.0.0-alpha11"
+  VERSION = "1.0.0-alpha12"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenncad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha11
+  version: 1.0.0.pre.alpha12
 platform: ruby
 authors:
 - Jennifer Glauche