pixo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f53daf509714285e3142b89c58743c51e9ee3a61
-  data.tar.gz: dea00526ae71fda41cef239d52c7cb7baa479ad2
+  metadata.gz: 36d3fd67327284d98c1b2af1116fc53795fbc177
+  data.tar.gz: c6d741b6de85cb8568cacc1648042635fa9ca4d3
 SHA512:
-  metadata.gz: 2b06708eb866d7457a7622334511201c5441f9a2eba155d59ab930d8af71ff1ad1ecd21a1294412ace7b8ed5e3aa3a0ed9870bccbb3bd6a7e0dbf656d944a269
-  data.tar.gz: c1484baa8eaf8b2cc4172bbc776ec7776cc8af334fdad7360c419ed44c0ec55e12c203f844058582fc6ee719d5f046538f8dda5c47f8fdc82eae667d749e3098
+  metadata.gz: cfdf40df5c80cf377537a973a75d4929fa2b7f7085950518c2dc6770109365ebede55fc105101f0543c60f57e153c011af0fe7de75e214c10696ac274026904b
+  data.tar.gz: 257a874b085cd34a10b6076561a83d6cc12f5196da57c1d5b50cd54ba2978ed4fa4561aca071b17ce228a6f31c7eb8bd19bb02deb2f1fd72cde866c609c85d56

data/ext/libpixgem/src/application.cpp

@@ -14,17 +14,39 @@ ApplicationHolder::~ApplicationHolder() {
     delete app;
     app = nullptr;
   }
+}
+
+VALUE application_close(VALUE self)
+{
+  ApplicationHolder * holder;
+
+  Data_Get_Struct(self, ApplicationHolder, holder);
+  if(holder->window) {
+
+    for(VALUE fc : holder->fade_candies) {
+
+      FadeCandyHolder * holder;
+
+      Data_Get_Struct(fc, FadeCandyHolder, holder);
+      if(holder->fade_candy) {
+        holder->fade_candy->clear();
+      }
+    }
 
-  if (window) {
-    glfwMakeContextCurrent(window);
 
+    glfwMakeContextCurrent(holder->window);
+
+    glfwSetWindowShouldClose(holder->window, true);
+    glfwPollEvents();
     // Close OpenGL window and terminate GLFW
-    glfwDestroyWindow(window);
-    window = nullptr;
+    glfwDestroyWindow(holder->window);
+    holder->window = nullptr;
+    return Qtrue;
   }
-
+  return Qfalse;
 }
 
+
 void application_mark(ApplicationHolder * holder)
 {
   for(VALUE fc : holder->fade_candies) {

data/ext/libpixgem/src/application.hpp

@@ -21,6 +21,8 @@ public:
 
 VALUE application_allocate(VALUE klass);
 
+VALUE application_close(VALUE self);
+
 VALUE application_initialize(VALUE self);
 
 VALUE application_add_fadecandy(VALUE self, VALUE fc);

data/ext/libpixgem/src/gem.cpp

@@ -41,10 +41,10 @@ extern "C" void Init_libpixgem() {
   rb_define_method(PatternClass, "reset_start", (VALUE(*)(ANYARGS))pattern_reset_start, 0);
   rb_define_method(PatternClass, "elapsed",     (VALUE(*)(ANYARGS))pattern_elapsed, 0);
 
-
   VALUE ApplicationClass = rb_define_class_under(Native, "Application", rb_cObject);
   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, "add_fadecandy", (VALUE(*)(ANYARGS))application_add_fadecandy, 1);
 

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

@@ -54,6 +54,6 @@ namespace Pixlib {
     for (LedCluster* led_cluster : led_clusters) {
       led_cluster->render(viewed_from, *pattern);
     }
-    //scene.render(camera, width, height);
+    scene.render(camera, width, height);
   }
 }

data/lib/pixo/version.rb

@@ -1,3 +1,3 @@
 module Pixo
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Constantine
@@ -1511,7 +1511,6 @@ files:
 - lib/pixo.rb
 - lib/pixo/version.rb
 - pixo.gemspec
-- pkg/pixo-0.1.0.gem
 homepage: https://github.com/cconstantine
 licenses:
 - MIT