courbet 0.0.1 → 0.0.2

data/lib/courbet/camera.rb

@@ -3,11 +3,26 @@ module Courbet
     def initialize opts={}
       @position = opts[:position]
       @watching = opts[:watching]
+      @type = opts[:type]
       file = File.join($templates,'camera.erb')
       @template = ERB.new File.open(file).read
+      @frame = 0
+    end
+
+    def frame
+      x= @frame
+      @frame += 1
+      return x
     end
 
     def render
+      if @position.is_a? Proc
+        position = @position.call(frame) 
+      else
+        position = @position
+      end
+      type = @type
+      watching = @watching
       @template.result(binding)
     end
   end

data/lib/courbet/create.rb

@@ -3,6 +3,7 @@ module Courbet
     attr_accessor :objects
     def initialize
       @objects = {}
+      @objects['lights'] = []
       @atoms = 0
     end
 
@@ -10,9 +11,9 @@ module Courbet
       @atoms = n
     end
 
-    def draw atom
+    def draw atom,time,id
       begin
-        @objects[atom[0]].render atom[1..3].map {|d| d.to_f}
+        @objects[atom[0]].render atom[1..3].map {|d| d.to_f},time,id
       rescue
        # $stderr.puts "atom '#{atom[0]}': no design was given for this atom type"
       end
@@ -26,7 +27,7 @@ module Courbet
       ARGF.each do |line|
         atom = line.chomp.split("\t")
         if atom.count == 4 and atom[0].length < 2
-          @file.puts draw atom
+          @file.puts draw atom,frame,lineno
           lineno += 1
         end
 
@@ -58,11 +59,11 @@ module Courbet
     end
 
     def light opts
-      @objects['light'] = Light.new(opts)
+      @objects['lights'] << Light.new(opts)
     end
 
     def stage
-      @objects['camera'].render + @objects['light'].render
+      @objects['camera'].render + @objects['lights'].map {|l| l.render}.join("\n")
     end
   end
 end

data/lib/courbet/sphere.rb

@@ -3,17 +3,24 @@ module Courbet
     def initialize opts={}
       @color = opts[:color]
       @radius = opts[:radius]
+      @transmit = opts[:transmit]
       file = File.join($templates,'sphere.erb')
       @template = ERB.new File.open(file).read
     end
 
-    def render coords
+    def render coords,time,id
       if @color.is_a? Proc
         color = @color.call(*coords)
       else
         color = @color
       end
-      @template.result(binding)
+
+      if @transmit.is_a? Proc
+        transmit = @transmit.call(time,id)
+      else
+        transmit = @transmit
+      end
+      @template.result(binding) unless transmit == 1.0
     end
   end
 end

data/lib/courbet/templates/camera.erb

@@ -1,6 +1,6 @@
-camera{ ultra_wide_angle
+camera{ <%= type %>
   angle 75
   right x*image_width/image_height
-  location <%= @position.to_pov %>
-  look_at <%= @watching.to_pov %> }
+  location <%= position.to_pov %>
+  look_at <%= watching.to_pov %> }
 

data/lib/courbet/templates/sphere.erb

@@ -1,6 +1,7 @@
 sphere { <%= coords.to_pov %>, <%= @radius %>
-  texture { pigment { color rgb <%= color.to_pov %> }
+texture { pigment { color rgb <%= color.to_pov %> transmit <%= transmit %> }
     finish {
       diffuse 0.9
-      phong 1.0 }}
+      ambient 0.2
+      phong 0.2 }}
   }

data/lib/courbet/version.rb

@@ -1,3 +1,3 @@
 module Courbet
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: courbet
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000Z
+date: 2012-04-03 00:00:00.000000000Z
 dependencies: []
 description: Turn Molecular Dynamics XYZ files into PovRay files
 email: