hwping 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c18dfab7c8e9e20c071cc51f6a36f6d0e2c21c04
-  data.tar.gz: 08c791adf1bd917fc072b880c28b4d24d7d65ddf
+  metadata.gz: 32cbdfd706a94a81aecf8807cd2de61b4ade411c
+  data.tar.gz: 22eb2499eb61d123e2d1e5307cf2ca2d9d978e1a
 SHA512:
-  metadata.gz: 1d0d79a4f4dfef09e164812079e186828d2e70f16f29a147e0a76991b83649e32b59eecee8cc8ba0122c5f93dae3401a3e67ac3866bf04b33f79abbb7110b9b1
-  data.tar.gz: 6c8c25675325b49a02dd98be552241fbbdc060a633aeaf2f22c1b290690205b14aeae3777a11c5caf875e9536330f4a1349c072b003bd7e8a26f8da5ad4cca20
+  metadata.gz: 4dc074af5d06181bd539ef541cc940eb659f4505880d1278f449eaef4cc46e388df2e26c72d3ede91813acc8015ba0093a3fa4b148acf43ff5e91fa9639a9bbe
+  data.tar.gz: 5171b07619fc5debb1b11fbf087b63e02fa53c8de66ab768e3a06ad7853ef205efd438dcf75831f6663c9340c5b784940084186a668556808d9acb9b2edd59c4

data/ext/hwping/extconf.rb

@@ -0,0 +1,12 @@
+require 'mkmf'
+$CFLAGS = '--std=gnu++14 -O3'
+$LDFLAGS = '-lopencv_core -lopencv_highgui -lopencv_stitching'
+
+have_library('opencv_core')
+have_library('opencv_highui')
+have_library('opencv_stitching')
+
+create_header
+extension_name = 'webcam'
+dir_config(extension_name)
+create_makefile(extension_name)

data/ext/hwping/webcam.cpp

@@ -0,0 +1,70 @@
+#include "webcam.h"
+
+using namespace cv;
+VALUE mHWPing = Qnil;
+
+void destroy_snapshot(void *ptr) {
+  ((Mat*) ptr)->release();
+  delete (Mat*) ptr;
+}
+
+void* stitch_without_gvl(void *data) {
+  cv::Stitcher stitcher = cv::Stitcher::createDefault();
+  VALUE snapshots = *((VALUE*)data);
+  std::vector<Mat> images;
+  Mat *image, panorama;
+
+  for (int i = 0; i < RARRAY_LEN(snapshots); i++) {
+    Data_Get_Struct(rb_ary_entry(snapshots, i), Mat, image);
+    images.push_back(*image);
+  }
+
+  stitcher.stitch(images, panorama);
+  images.clear();
+
+  image = new Mat(panorama.rows, panorama.cols, CV_8U, 3);
+  panorama.copyTo(*image);
+  return (void*) image;
+}
+
+static VALUE rb_create_snapshot(VALUE self) {
+  VideoCapture cap(0);
+  cap.set(CV_CAP_PROP_FRAME_WIDTH, 1280);
+  cap.set(CV_CAP_PROP_FRAME_HEIGHT, 720);
+  Mat frame, *image = new Mat(frame.rows, frame.cols, CV_8U, 3);
+
+  Scalar mean;
+  cap >> frame;
+  for (int i=0; i<3; i++) {
+    mean = cv::mean(frame);
+    if (mean[0] + mean[1] + mean[2] > 100) break;
+    frame.release();
+    cap >> frame;
+  }
+
+  frame.copyTo(*image);
+  frame.release();
+  cap.release();
+
+  return Data_Wrap_Struct(self, NULL, destroy_snapshot, image);
+}
+
+static VALUE rb_save_snapshot(VALUE self, VALUE file) {
+  Mat *image;
+  Data_Get_Struct(self, Mat, image);
+  return INT2NUM(imwrite(StringValuePtr(file), *image));
+}
+
+static VALUE rb_stitch_snapshots(VALUE self, VALUE snapshots) {
+  Mat *image = (Mat*) rb_thread_call_without_gvl(stitch_without_gvl, (void*) &snapshots, RUBY_UBF_IO, NULL);
+  return Data_Wrap_Struct(self, NULL, destroy_snapshot, image);
+}
+
+void Init_webcam(void) {
+  mHWPing = rb_define_module("HWPing");
+
+  VALUE webcam = rb_define_class_under(mHWPing, "Webcam", rb_cObject);
+  rb_define_alloc_func(webcam, rb_create_snapshot);
+  rb_define_method(webcam, "write", RUBY_METHOD_FUNC(rb_save_snapshot), 1);
+  rb_define_singleton_method(webcam, "stitch", RUBY_METHOD_FUNC(rb_stitch_snapshots), 1);
+}

data/ext/hwping/webcam.h

@@ -0,0 +1,17 @@
+#ifndef __hwping_webcam_h__
+#define __hwping_webcam_h__
+
+#include <ruby.h>
+#include <ruby/thread.h>
+#include <opencv2/opencv.hpp>
+#include <opencv2/stitching/stitcher.hpp>
+
+extern VALUE mHWPing;
+
+extern "C" void Init_webcam(void);
+
+static VALUE rb_create_snapshot(VALUE self);
+static VALUE rb_save_snapshot(VALUE self, VALUE file);
+static VALUE rb_stitch_snapshots(VALUE self, VALUE snapshots);
+
+#endif

data/lib/hwping.rb

@@ -1,6 +1,7 @@
 require 'hwping/constants'
 require 'hwping/config'
 require 'hwping/launcher'
+require 'hwping/webcam'
 require 'hwping/handler'
 require 'hwping/bot'
 require 'hwping/hwping'

data/lib/hwping/bot.rb

@@ -4,6 +4,7 @@ module HWPing
   class Bot
     MESSAGES = {
       :unauthorized => "Sorry, you're unauthorized to use this bot!",
+      :image        => 'Image saved at http://%s/%s',
       :firing       => 'Firing rocket in 5 seconds!',
       :notarget     => 'Unknown target!',
       :fire         => 'Rocket launch initiated!',

data/lib/hwping/config.rb

@@ -1,10 +1,11 @@
 module HWPing
   class Config
-    attr_reader :server
-    attr_reader :port
-    attr_reader :nick
-    attr_reader :channels
     attr_reader :auth
+    attr_reader :channels
+    attr_reader :nick
+    attr_reader :port
+    attr_reader :server
+    attr_reader :webcam
     attr_accessor :targets
 
     def initialize(hash = {})
@@ -14,6 +15,7 @@ module HWPing
       @channels = Array(hash.fetch('channels', ['hwping-test']))
       @auth     = Array(hash.fetch('auth', []))
       @targets  = hash.fetch('targets', {}).to_h
+      @webcam   = hash.fetch('webcam', {}).to_h
     end
 
     def to_hash

data/lib/hwping/constants.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module HWPing
-  VERSION = '0.2'.freeze
+  VERSION = '0.3'.freeze
   APP_NAME = 'hwping'.freeze
   REPO_URL = 'http://github.com/skateman/hwping'.freeze
   CONFIG_FILE = 'config.yml'.freeze

data/lib/hwping/handler.rb

@@ -5,6 +5,7 @@ module HWPing
       @targets    = config.targets
       @auth       = config.auth
       @nick       = config.nick
+      @webcam     = config.webcam
       @launcher   = launcher
     end
 
@@ -28,6 +29,10 @@ module HWPing
     def private(event)
       if authorized?(event.user.to_s)
         case event.message
+        when 'snap'
+          return [:image, ip_address(event), Webcam.new(@webcam).save]
+        when 'panorama'
+          return [:image, ip_address(event), panorama]
         when 'fire'
           @launcher.fire
           return [:fire]
@@ -79,5 +84,22 @@ module HWPing
       end
       false
     end
+
+    def panorama
+      @launcher.reset
+      images = []
+      12.times do
+        images << Webcam.new(@webcam)
+        @launcher.right(400)
+      end
+      @launcher.reset
+      pano = Webcam.panorama(images, @webcam)
+      images.clear # garbage collection
+      pano.save
+    end
+
+    def ip_address(event)
+      event.bot.irc.socket.addr[3]
+    end
   end
 end

data/lib/hwping/webcam.rb

@@ -0,0 +1,22 @@
+require 'hwping/webcam.so'
+
+module HWPing
+  class Webcam
+    def initialize(options = {})
+      @dir = options.fetch('path', './tmp')
+      @path = 'image.jpg'
+    end
+
+    def save
+      write(File.join(@dir, @path))
+      @path
+    end
+
+    def self.panorama(images, options = {})
+      pano = stitch(images)
+      pano.instance_variable_set(:@dir, options.fetch('path', './tmp'))
+      pano.instance_variable_set(:@path, 'image.jpg')
+      pano
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hwping
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Dávid Halász
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libusb
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -112,10 +126,14 @@ description: IRC bot for HW pinging with the Dream Cheeky Thunder missile launch
 email: skateman@skateman.eu
 executables:
 - hwping
-extensions: []
+extensions:
+- ext/hwping/extconf.rb
 extra_rdoc_files: []
 files:
 - bin/hwping
+- ext/hwping/extconf.rb
+- ext/hwping/webcam.cpp
+- ext/hwping/webcam.h
 - lib/hwping.rb
 - lib/hwping/bot.rb
 - lib/hwping/config.rb
@@ -123,6 +141,7 @@ files:
 - lib/hwping/handler.rb
 - lib/hwping/hwping.rb
 - lib/hwping/launcher.rb
+- lib/hwping/webcam.rb
 homepage: http://github.com/skateman/hwping
 licenses:
 - GPL-2