pixo 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75fb2c5c0651d7735b03609db63ad188253e78a9
-  data.tar.gz: db5e21e1f9965f1c1f7c3a530666232e9e8d9ba4
+  metadata.gz: 6b6f02aec4edb8967668a68b0e5e82d06989a41a
+  data.tar.gz: e7722d6196838c3dc7f3e8c15f04318737f161b0
 SHA512:
-  metadata.gz: 0426b2618eee3d91704d99e61bf4747d5f42c0f1aa2f1927989a8885d726b83ad8675e7bb3525588326cc0f1f0b0caf1536345551ad88b1987bc7e405ac2f95a
-  data.tar.gz: 2052de8af02515ebc49206fcb22855c61b5919f1ed9e5b60424e5f1a80f4df9ad3d7e4bddcc258f216e642837b88bb7c6703bf686d704fd7f57c591497f3e1da
+  metadata.gz: 901ba8065c211abf4e5382139e279ee315befbe652d0743e2bd61816f2984fe20da791f0bd9fbedd601346e234c6c3ffd02f11c08354b306418df282fa97f81d
+  data.tar.gz: 4a6474b8ea8552582c4e6509debc6bd93e2f884d399f54d274765aa4ecd02da7fd793bb07f891af6a4084a769ecce12c7bb2d2281993502ffc0a44814874aa54

data/Gemfile.lock

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

data/exe/pixo

@@ -3,12 +3,8 @@
 require 'pixo'
 require 'pixo/application'
 
-app = Pixo::Application.instance
+app = Pixo::Application.new
 
-service_thread = Thread.new do
-  Pixo::Ipc::Service.new(STDIN, STDOUT).run
-  app.shutdown
-end
 Signal.trap('INT')  { app.shutdown }
 Signal.trap('TERM') { app.shutdown }
 

data/ext/libpixgem/src/application.cpp

@@ -78,6 +78,8 @@ VALUE application_initialize(VALUE self)
   ApplicationHolder * holder;
 
   Data_Get_Struct(self, ApplicationHolder, holder);
+
+  holder->self = self;
  
   glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
   glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
@@ -101,9 +103,24 @@ VALUE application_initialize(VALUE self)
   }
 
   holder->app = new App();
+  glfwSetWindowUserPointer(holder->window, holder);
+
+  glfwSetKeyCallback(holder->window,
+      [](GLFWwindow *window, int key, int scancode, int action, int mods) {
+          if (action == GLFW_REPEAT) {
+            return;
+          }
+
+          ApplicationHolder *holder = (ApplicationHolder *)glfwGetWindowUserPointer(window);
+
+          rb_funcall(holder->self, rb_intern("key_callback"), 4, INT2NUM(key), INT2NUM(scancode), INT2NUM(action), INT2NUM(mods));
+        });
   return self;
 }
 
+VALUE application_key_callback(VALUE self, VALUE key, VALUE scancode, VALUE action, VALUE mods)
+{ }
+
 VALUE application_tick(VALUE self, VALUE r_pattern, VALUE r_brightness)
 {
   GLenum glErr;

data/ext/libpixgem/src/application.hpp

@@ -17,10 +17,14 @@ public:
   GLFWwindow* window;
 
   std::vector<VALUE> fade_candies;
+
+  VALUE self;
 };
 
 VALUE application_allocate(VALUE klass);
 
+VALUE application_key_callback(VALUE self, VALUE key, VALUE scancode, VALUE action, VALUE mods);
+
 VALUE application_close(VALUE self);
 
 VALUE application_initialize(VALUE self);

data/ext/libpixgem/src/gem.cpp

@@ -46,6 +46,7 @@ extern "C" void Init_libpixgem() {
   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, 2);
+  rb_define_method(ApplicationClass, "key_callback", (VALUE(*)(ANYARGS))application_key_callback, 4);
   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/src/renderer.cpp

@@ -23,6 +23,7 @@ namespace Pixlib {
 
   out vec2 TexCoords;
   out vec3 Normal;
+  out vec4 Position;
 
   uniform mat4 view;
   uniform mat4 projection;
@@ -34,6 +35,7 @@ namespace Pixlib {
       gl_Position = projection * view  * positionOffset * vec4(position, 1.0f);
       TexCoords = texCoords + texCoordsOffset;
       Normal = normal;
+      Position = positionOffset*vec4(position, 1.0f);
   })", 
   R"(#version 330 core
 
@@ -42,6 +44,7 @@ namespace Pixlib {
   #endif
 
   in vec2 TexCoords;
+  in vec3 Position;
 
   out vec4 color;
 

data/lib/pixo/application.rb

@@ -7,11 +7,29 @@ module Pixo
   class Application < Pixo::Native::Application
     attr_accessor :running, :leds_on
 
-    def self.instance
-      @instance ||= Pixo::Application.new
+    def initialize()
+      super
+      self.running = false
+      self.brightness = 1.0
+      self.leds_on    = true
+      @procs = Array.new
+
+      @procs_lock = Mutex.new
+    
+      @service = Pixo::Ipc::Service.new(STDIN, STDOUT, user_data: self)
+
+      @service_thread = Thread.new do
+        while(!self.running)
+          sleep 0.1
+        end
+        @service.run
+        self.shutdown
+      end
     end
 
     def run
+      self.running = tick(active_pattern, brightness)
+      
       while(running)
         @procs_lock.synchronize {
           @procs.each {|proc| proc.call(self) }
@@ -29,12 +47,14 @@ module Pixo
     end
 
     def post(proc)
-
       @procs_lock.synchronize {
         @procs << proc
       }
     end
 
+    def key_callback(key, scancode, action, mods)
+      @service.request(Pixo::Renderer::OnKey.new(key, scancode, action, mods))
+    end
 
     def patterns
       unless @patterns
@@ -74,18 +94,12 @@ module Pixo
       leds_on ? @brightness : 0.0
     end
 
-  private
+    private
+
 
-    def initialize()
-      super
-      self.running = true
-      self.brightness = 1.0
-      self.leds_on    = true
-      @procs = Array.new
 
-      @procs_lock = Mutex.new
-      #
-    end
   end
+
+
 end
 

data/lib/pixo/ipc/service.rb

@@ -5,21 +5,25 @@ require 'thread'
 
 module Pixo::Ipc
   class Service
+    attr_reader :user_data
 
-    def initialize(reader_pipe, writer_pipe)
+    def initialize(reader_pipe, writer_pipe, user_data: nil)
       @reader_pipe = reader_pipe
       @writer_pipe = writer_pipe
+
       @running = true
       @live_requests = Concurrent::Hash.new
 
       @pipe_mutex = Mutex.new
+
+      @user_data = user_data
     end
 
     def run
       while @running && (line = @reader_pipe.readline)
         message = Marshal.load(Base64.strict_decode64(line.strip))
         if message.is_a?(Pixo::Ipc::RequestMessage)
-          resp = Pixo::Ipc::ResponseMessage.new(message.data.call, message.rid)
+          resp = Pixo::Ipc::ResponseMessage.new(message.data.call(self), message.rid)
 
           bytes_to_write = Base64.strict_encode64(Marshal.dump(resp))
           @pipe_mutex.synchronize do
@@ -33,8 +37,8 @@ module Pixo::Ipc
           request.send_result(message.data) if request
         end
       end
-    rescue EOFError
-    rescue IOError
+    rescue EOFError => e
+    rescue IOError => e
     end
 
     def shutdown
@@ -43,16 +47,19 @@ module Pixo::Ipc
       @writer_pipe.close
     end 
 
-    def request(message, timeout: nil)
+    def request(message, timeout: 10)
       request = Pixo::Ipc::Request.new(message)
       @live_requests[request.message.rid] = request
 
-      @writer_pipe.write(Base64.strict_encode64(Marshal.dump(request.message)))
-      @writer_pipe.write($/)
-      @writer_pipe.flush
+      bytes_to_write = Base64.strict_encode64(Marshal.dump(request.message))
+      @pipe_mutex.synchronize do
+        @writer_pipe.write(bytes_to_write)
+        @writer_pipe.write($/)
+        @writer_pipe.flush
+      end
 
       unless request.latch.wait(timeout)
-        raise Timeout::Error.new("%s: request timed out after %.3f seconds." % [request.rid, timeout] )
+        raise Timeout::Error.new("%s: request timed out after %.3f seconds." % [request.message.rid, timeout] )
       end
       
       return request.response

data/lib/pixo/renderer.rb

@@ -2,10 +2,43 @@ 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 }
+    class OnKey
+      def initialize(key, scancode, action, mods)
+        @key = key
+        @scancode = scancode
+        @action = action
+        @mods = mods
+      end
+
+      def call(service)
+        service.on_key(@key, @scancode, @action, @mods)
+        self
+      end
+    end
+
+    class Service < Pixo::Ipc::Service
+      attr_reader :renderer
+
+      def initialize(renderer)
+        @renderer = renderer
+        i, o, t = Open3.popen2('bundle exec pixo')
+        super(o, i)
+        @service_thread = Thread.new { self.run }
+      end
+
+
+      def on_key(key, scancode, action, mods)
+        renderer.on_key(key, scancode, action, mods)
+      end
+
+    end
+
+    def initialize
+      @service = Pixo::Renderer::Service.new(self)
+    end
+
+    def on_key(key, scancode, action, mods)
+
     end
 
     def pattern_names
@@ -48,39 +81,39 @@ module Pixo
         @count = count
       end
 
-      def call
-        Pixo::Application.instance.post Proc.new { |app| app.add_fadecandy(Pixo::Native::FadeCandy.new(@hostname, @count)) }
+      def call(service)
+        service.user_data.post Proc.new { |app| app.add_fadecandy(Pixo::Native::FadeCandy.new(@hostname, @count)) }
         self
       end
     end
 
     class GetPatternName
-      def call
-        Pixo::Application.instance.patterns.key(Pixo::Application.instance.active_pattern)
+      def call(service)
+        service.user_data.patterns.key(service.user_data.active_pattern)
       end
     end
     
     class GetPatternNames
-      def call
-        Pixo::Application.instance.patterns.keys
+      def call(service)
+        service.user_data.patterns.keys
       end
     end
 
     class SetPattern
-      def initialize(pattern_name)
+      def initialize(pattern_name = nil)
         @pattern_name = pattern_name    
       end
 
-      def call
-        pattern = Pixo::Application.instance.patterns[@pattern_name]
-        Pixo::Application.instance.active_pattern = pattern if pattern
+      def call(service)
+        pattern = service.user_data.patterns[@pattern_name]
+        service.user_data.active_pattern = pattern
         @pattern_name
       end
     end
 
     class GetBrightness
-      def call
-        Pixo::Application.instance.brightness
+      def call(service)
+        service.user_data.brightness
       end
     end
 
@@ -89,15 +122,15 @@ module Pixo
         @brightness = brightness    
       end
 
-      def call
-        Pixo::Application.instance.brightness = @brightness
+      def call(service)
+        service.user_data.brightness = @brightness
       end
     end
 
 
     class GetLedsOn
-      def call
-        Pixo::Application.instance.leds_on
+      def call(service)
+        service.user_data.leds_on
       end
     end
 
@@ -106,8 +139,8 @@ module Pixo
         @leds_on = leds_on    
       end
 
-      def call
-        Pixo::Application.instance.leds_on = @leds_on
+      def call(service)
+        service.user_data.leds_on = @leds_on
       end
     end
 

data/lib/pixo/version.rb

@@ -1,3 +1,3 @@
 module Pixo
-  VERSION = "0.2.6"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pixo
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Constantine
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby