pixo 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa1f77b18b26d4780cb42129a19d2d287001a9a
-  data.tar.gz: 7029163344d64ce5696b5f6aca011662c2f1b665
+  metadata.gz: f0682c352898cecd4796798bf2ab28253d1f5d05
+  data.tar.gz: 31f453e1d0410a72cc41223469c946144b1af45c
 SHA512:
-  metadata.gz: '0925db69c959cf66caac3972316390f9539f54d81db691dd3079d27a354cfc79223726be2715c0e90f4b737cd2284581c2530a5aa5e7912511cd021977eb4360'
-  data.tar.gz: 5e109416c55cf554aa8c9125402a6bef21fd86f51d8ca22e679b3620bd892e0aaf2f385ab3cab2528ba8431a2a1495941b5146fe4d53c4c72654eebddd2cf57c
+  metadata.gz: c5d8c6b7e35a86d771ce5d035b924d7cf2f243115d0ab5aa1a5d88f3b61b5c2b314aff770d1b0cc0c8b33e3b405cc315269e93e103496e10e1fb5ae7368cc5b1
+  data.tar.gz: e889dcd34ecbc87ffdc6b26546338b7a84f73d32d248ae693ce745c7a94caa20d7fee2bfeb110db55f2b1498b4fa53675508e467c4b48e555c9da02344a44479

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pixo (0.2.1)
+    pixo (0.2.2)
       concurrent-ruby
 
 GEM

data/ext/libpixgem/src/application.cpp

@@ -104,7 +104,7 @@ VALUE application_initialize(VALUE self)
   return self;
 }
 
-VALUE application_tick(VALUE self, VALUE r_pattern)
+VALUE application_tick(VALUE self, VALUE r_pattern, VALUE r_brightness)
 {
   GLenum glErr;
   ApplicationHolder * app_holder;
@@ -113,6 +113,8 @@ VALUE application_tick(VALUE self, VALUE r_pattern)
   PatternHolder * pattern_holder;
   Data_Get_Struct(r_pattern, PatternHolder, pattern_holder);
 
+  float brightness = (float)NUM2DBL(r_brightness);
+
   if (app_holder->window) {
     glfwMakeContextCurrent(app_holder->window);
 
@@ -132,7 +134,7 @@ VALUE application_tick(VALUE self, VALUE r_pattern)
     int width, height;
     glfwGetFramebufferSize(app_holder->window, &width, &height);
 
-    app_holder->app->tick(pattern_holder->pattern, width, height);
+    app_holder->app->tick(pattern_holder->pattern, brightness, width, height);
 
     app_holder->app->move_perspective_to_camera();
 

data/ext/libpixgem/src/application.hpp

@@ -27,4 +27,4 @@ VALUE application_initialize(VALUE self);
 
 VALUE application_add_fadecandy(VALUE self, VALUE fc);
 
-VALUE application_tick(VALUE self, VALUE r_pattern);
+VALUE application_tick(VALUE self, VALUE r_pattern, VALUE r_brightness);

data/ext/libpixgem/src/gem.cpp

@@ -45,7 +45,7 @@ extern "C" void Init_libpixgem() {
   rb_define_alloc_func(ApplicationClass, application_allocate);
   rb_define_method(ApplicationClass, "initialize", (VALUE(*)(ANYARGS))application_initialize, 0);
   rb_define_method(ApplicationClass, "close", (VALUE(*)(ANYARGS))application_close, 0);
-  rb_define_method(ApplicationClass, "tick", (VALUE(*)(ANYARGS))application_tick, 1);
+  rb_define_method(ApplicationClass, "tick", (VALUE(*)(ANYARGS))application_tick, 2);
   rb_define_method(ApplicationClass, "add_fadecandy", (VALUE(*)(ANYARGS))application_add_fadecandy, 1);
 
   VALUE FadeCandyClass = rb_define_class_under(Native, "FadeCandy", rb_cObject);

data/ext/pixo/pixlib/include/pixlib/app.hpp

@@ -28,7 +28,7 @@ namespace Pixlib {
 
     void move_perspective_to_camera();
 
-    void tick(Pattern* pattern, int width, int height);
+    void tick(Pattern* pattern, float brightness, int width, int height);
   private:
     Scene scene;
     std::vector<LedCluster*> led_clusters;

data/ext/pixo/pixlib/include/pixlib/led_cluster.hpp

@@ -31,7 +31,7 @@ namespace Pixlib {
     // Render the mesh
     virtual void Draw(const Shader& shader);
 
-    void render(const IsoCamera& viewed_from, const Pattern& pattern);
+    void render(const IsoCamera& viewed_from, const Pattern& pattern, float brightness);
 
     const Texture& getPatternTexture();
 

data/ext/pixo/pixlib/include/pixlib/led_renderer.hpp

@@ -14,12 +14,13 @@ namespace Pixlib {
   public:
     LedRender(const Texture& renderTo);
 
-    void render(const IsoCamera& perspective, uint8_t* data, size_t size);
+    void render(const IsoCamera& perspective, float brightness, uint8_t* data, size_t size);
 
     Texture getTexture();
 
     LedMesh* leds;
 
+
   private:
     GLuint FramebufferName;
     Texture renderedTexture;
@@ -29,7 +30,6 @@ namespace Pixlib {
     GLuint active_pbo;
     OrthoCamera camera;
 
-
     Shader shader;
     void setupLights(const IsoCamera& perspective);
   };

data/ext/pixo/pixlib/src/app.cpp

@@ -48,11 +48,11 @@ namespace Pixlib {
     viewed_from.moveTowards(camera, scene.getTimeDelta()*0.8);
   }
 
-  void App::tick(Pattern* pattern, int width, int height) {
+  void App::tick(Pattern* pattern, float brightness, int width, int height) {
     camera.rotate(scene_render_time() * 5);
 
     for (LedCluster* led_cluster : led_clusters) {
-      led_cluster->render(viewed_from, *pattern);
+      led_cluster->render(viewed_from, *pattern, brightness);
     }
     scene.render(camera, width, height);
   }

data/ext/pixo/pixlib/src/led_cluster.cpp

@@ -56,11 +56,11 @@ namespace Pixlib {
     leds_for_display.Draw(shader);
   }
 
-  void LedCluster::render(const IsoCamera& viewed_from, const Pattern& pattern) 
+  void LedCluster::render(const IsoCamera& viewed_from, const Pattern& pattern, float brightness) 
   {
     render_timer.start();
     pattern_render.render(pattern);
-    fb_render.render(viewed_from, fadecandy->getData(), numLeds()*3);
+    fb_render.render(viewed_from, brightness, fadecandy->getData(), numLeds()*3);
     render_timer.end();
 
     fadecandy->update();

data/ext/pixo/pixlib/src/led_renderer.cpp

@@ -50,9 +50,11 @@ namespace Pixlib {
   uniform sampler2D texture0;
   uniform sampler2D texture1;
 
+  uniform float brightness;
+
   void main()
   {
-    color = texture(texture1, TexCoords);
+    color = texture(texture1, TexCoords) * brightness;
   })")
   {
     // The framebuffer, which regroups 0, 1, or more textures, and 0 or 1 depth buffer.
@@ -89,7 +91,7 @@ namespace Pixlib {
     active_pbo = 0;
   }
 
-  void LedRender::render(const IsoCamera& perspective, uint8_t* buffer, size_t size) {
+  void LedRender::render(const IsoCamera& perspective, float brightness, uint8_t* buffer, size_t size) {
     glEnable(GL_DEPTH_TEST);
     glDepthFunc(GL_LESS);
 
@@ -111,6 +113,8 @@ namespace Pixlib {
     glUniformMatrix4fv(glGetUniformLocation(shader.Program, "proj_from"), 1, GL_FALSE, glm::value_ptr(led_projection));
     glUniformMatrix4fv(glGetUniformLocation(shader.Program, "view_from"), 1, GL_FALSE, glm::value_ptr(led_view));
 
+    glUniform1f(glGetUniformLocation(shader.Program, "brightness"), brightness);
+
     leds->Draw(shader);
 
     glBindBuffer(GL_PIXEL_PACK_BUFFER, pbos[active_pbo]);

data/lib/pixo/application.rb

@@ -5,7 +5,7 @@ require File.expand_path('../../libpixgem', __FILE__)
 
 module Pixo
   class Application < Pixo::Native::Application
-    attr_accessor :running
+    attr_accessor :running, :leds_on
 
     def self.instance
       @instance ||= Pixo::Application.new
@@ -13,7 +13,7 @@ module Pixo
 
     def run
       while(running)
-        self.running = tick(active_pattern) && running
+        self.running = tick(active_pattern, brightness) && running
       end
       close
     end
@@ -47,12 +47,27 @@ module Pixo
       pattern.reset_start
       @active_pattern = pattern
     end
-  
+
+    def brightness=(val)
+      if val > 1.0
+        val = 1.0
+      elsif val < 0.0
+        val = 0.0
+      end
+      @brightness = val
+    end
+
+    def brightness
+      leds_on ? @brightness : 0.0
+    end
+
   private
 
     def initialize()
       super
       self.running = true
+      self.brightness = 1.0
+      self.leds_on    = true
 
       add_fadecandy(Pixo::Native::FadeCandy.new('localhost', 8))
     end

data/lib/pixo/renderer.rb

@@ -0,0 +1,98 @@
+module Pixo
+  class Renderer
+    attr_reader :service, :service_thread
+
+    def initialize()
+      i, o, t = Open3.popen2('bundle exec pixo') 
+      @service = Pixo::Ipc::Service.new(o, i)
+      @service_thread = Thread.new { self.service.run }
+    end
+
+    def pattern_names
+      service.request(Pixo::Renderer::GetPatternNames.new)
+    end
+
+    def active_pattern
+      service.request(Pixo::Renderer::GetPatternName.new)
+    end
+
+    def set_pattern(name)
+      service.request(Pixo::Renderer::SetPattern.new(name))
+    end
+
+    def brightness=(brightness)
+      service.request(Pixo::Renderer::SetBrightness.new(brightness))
+    end
+
+    def brightness
+      service.request(Pixo::Renderer::GetBrightness.new())
+    end
+
+    def leds_on=(leds_on)
+      service.request(Pixo::Renderer::SetLedsOn.new(leds_on))
+    end
+
+    def leds_on
+      service.request(Pixo::Renderer::GetLedsOn.new())
+    end
+
+    private
+    class GetPatternName
+      def call
+        Pixo::Application.instance.patterns.key(Pixo::Application.instance.active_pattern)
+      end
+    end
+    
+    class GetPatternNames
+      def call
+        Pixo::Application.instance.patterns.keys
+      end
+    end
+
+    class SetPattern
+      def initialize(pattern_name)
+        @pattern_name = pattern_name    
+      end
+
+      def call
+        pattern = Pixo::Application.instance.patterns[@pattern_name]
+        Pixo::Application.instance.active_pattern = pattern if pattern
+        @pattern_name
+      end
+    end
+
+    class GetBrightness
+      def call
+        Pixo::Application.instance.brightness
+      end
+    end
+
+    class SetBrightness
+      def initialize(brightness)
+        @brightness = brightness    
+      end
+
+      def call
+        Pixo::Application.instance.brightness = @brightness
+      end
+    end
+
+
+    class GetLedsOn
+      def call
+        Pixo::Application.instance.leds_on
+      end
+    end
+
+    class SetLedsOn
+      def initialize(leds_on)
+        @leds_on = leds_on    
+      end
+
+      def call
+        Pixo::Application.instance.leds_on = @leds_on
+      end
+    end
+
+  end
+end

data/lib/pixo/version.rb

@@ -1,3 +1,3 @@
 module Pixo
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/pixo.rb

@@ -1,51 +1,8 @@
 require "pixo/version"
 require "pixo/ipc/service"
+require "pixo/renderer"
 require "open3"
 
 module Pixo
-  class GetPatternName
-    def call
-      Pixo::Application.instance.patterns.key(Pixo::Application.instance.active_pattern)
-    end
-  end
-  
-  class GetPatternNames
-    def call
-      Pixo::Application.instance.patterns.keys
-    end
-  end
 
-  class SetPattern
-    def initialize(pattern_name)
-      @pattern_name = pattern_name    
-    end
-
-    def call
-      pattern = Pixo::Application.instance.patterns[@pattern_name]
-      Pixo::Application.instance.active_pattern = pattern if pattern
-      @pattern_name
-    end
-  end
-
-  class Renderer
-    attr_reader :service, :service_thread
-
-    def initialize()
-      i, o, t = Open3.popen2('bundle exec pixo') 
-      @service = Pixo::Ipc::Service.new(o, i)
-      @service_thread = Thread.new { self.service.run }
-    end
-
-    def pattern_names
-      service.request(Pixo::GetPatternNames.new)
-    end
-
-    def active_pattern
-      service.request(Pixo::GetPatternName.new)
-    end
-
-    def set_pattern(name)
-      service.request(Pixo::SetPattern.new(name))
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixo
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Constantine
@@ -1541,6 +1541,7 @@ files:
 - lib/pixo.rb
 - lib/pixo/application.rb
 - lib/pixo/ipc/service.rb
+- lib/pixo/renderer.rb
 - lib/pixo/version.rb
 - pixo.gemspec
 homepage: https://github.com/cconstantine