nuklear 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d829f1e7f4d4d305a18e1d831df3cd95874224581986977a89fd2eb114da0f
-  data.tar.gz: 45da4ef0e277ca42d642919a06c8086952c695a139b45265df6d5b7ceb4d5aaa
+  metadata.gz: c5bca942f9f7773800ed3c18cada4a1c1c0a9d01af36017fb38f80cdd635f85f
+  data.tar.gz: d02823a9278976bff31b19161cc63ac520c7b05f7eee72d695d49300aa26c5da
 SHA512:
-  metadata.gz: baa5798e57b4f1765b4e819ee7dac4db9aa40e172f44fd48c74ff6b6942bc8c0d5afdc55cc137aeb400b4c48f51cd5286000b4b849505e11b94f2de2e8e9ec43
-  data.tar.gz: f37d1e63dcb902f2752c21e37d3ceaebccb0a2b5b9d50d615925049010dc2eedf3c726da9edc0687a63ba9ec651ffcd03cbc052cd0ea16c1b38e28275aa9e777
+  metadata.gz: f3f938721dc6625e984dc57ff44e9be4fcf921be975a041cb28f67f1abdf9a8ab51bfe528397fda26c9ec2d358ca51fdd484fefe3f04251725a87d7874c1cb3e
+  data.tar.gz: 47254f116883251a131bac91b43d465a1fbe34254c77274fe96c6522adb1ce1d97e172b2184f98d8f083dfc90e195b7197fa96ef3eb9be4c1c6d76fd3ca7714d

data/.gitignore

@@ -11,3 +11,4 @@
 *.o
 *.a
 mkmf.log
+.DS_Store

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nuklear (0.1.0)
+    nuklear (0.1.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -18,6 +18,13 @@ This project implements a set of Ruby classes which wrap the Nuklear API. It
 also provides two sample renderers (OpenGL 2 and OpenGL 4).
 
 
+## Screenshots
+
+![Hello Nuklear](https://github.com/sinisterchipmunk/nuklear-ruby/blob/master/examples/hello_nuklear.png)
+
+![Calculator](https://github.com/sinisterchipmunk/nuklear-ruby/blob/master/examples/calculator.png)
+
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -75,7 +82,7 @@ ctx = Nuklear::Context.new(font)
 # to actually implement our real renderer on top of. Here, we'll use the
 # bundled OpenGL 2 renderer.
 require 'nuklear/nuklear_renderer_opengl2'
-ctx.renderer = Nuklear::Renderer::OpenGL2.new(ctx)
+ctx.renderer = Nuklear::Renderer::OpenGL2.new
 ```
 
 ### With DSL
@@ -188,7 +195,7 @@ push git commits and tags, and push the `.gem` file to
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at
-https://github.com/[USERNAME]/nuklear.
+https://github.com/sinisterchipmunk/nuklear-ruby.
 
 ## License
 

data/examples/hello_nuklear.rb

@@ -56,7 +56,7 @@ ctx = Nuklear::Context.new(font)
 # renderer the size of the window and the size of the drawing surface, which
 # aren't always the same thing.
 require 'nuklear/nuklear_renderer_opengl2'
-ctx.renderer = Nuklear::Renderer::OpenGL2.new(ctx)
+ctx.renderer = Nuklear::Renderer::OpenGL2.new
 ctx.renderer.window_size = window.size
 ctx.renderer.drawable_size = window.gl_drawable_size
 

data/examples/lib/window.rb

@@ -35,7 +35,7 @@ module Examples
 
     def nuklear_context=(ctx)
       @nuklear_context = ctx
-      @nuklear_context.renderer = Nuklear::Renderer::OpenGL2.new(@nuklear_context)
+      @nuklear_context.renderer = Nuklear::Renderer::OpenGL2.new
       @nuklear_context.renderer.window_size = @handle.size
       @nuklear_context.renderer.drawable_size = renderable_size
     end

data/ext/nuklear/nkrb_context.c

@@ -220,6 +220,24 @@ VALUE nkrb_context_ui(VALUE self) {
   return ui;
 }
 
+static VALUE nkrb_context_is_any_editor_active(VALUE self) {
+  struct nk_context *ctx = nkrb_context_get(self);
+  struct nk_window *iter;
+  iter = ctx->begin;
+  while (iter) {
+    if (iter->edit.active & NK_EDIT_ACTIVE)
+      return Qtrue;
+    iter = iter->next;
+  }
+  return Qfalse;
+}
+
+static VALUE nkrb_context_is_any_item_active(VALUE self) {
+  struct nk_context *ctx = nkrb_context_get(self);
+  if (nkrb_context_is_any_editor_active(self) == Qtrue) return Qtrue;
+  return nk_item_is_any_active(ctx) ? Qtrue : Qfalse;
+}
+
 void nkrb_context_init(void) {
   cNuklearContext = rb_define_class_under(mNuklear, "Context", rb_cObject);
   rb_define_alloc_func(cNuklearContext, nkrb_context_alloc);
@@ -228,6 +246,8 @@ void nkrb_context_init(void) {
   rb_define_method(cNuklearContext, "initialize", nkrb_context_initialize, 1);
   rb_define_method(cNuklearContext, "tick", nkrb_context_tick, 0);
   rb_define_method(cNuklearContext, "ui", nkrb_context_ui, 0);
+  rb_define_method(cNuklearContext, "any_item_active?", nkrb_context_is_any_item_active, 0);
+  rb_define_method(cNuklearContext, "any_editor_active?", nkrb_context_is_any_editor_active, 0);
 
   cNuklearContextEventSink = rb_define_class_under(cNuklearContext, "EventSink", rb_cObject);
   rb_define_method(cNuklearContextEventSink, "initialize", rb_nkrb_event_sink_initialize, 1);

data/ext/nuklear/nkrb_renderer.c

@@ -33,12 +33,12 @@ static enum nk_draw_vertex_layout_format rb2nk_format(VALUE v) {
   else rb_raise(rb_eArgError, "Invalid vertex layout format name");
 }
 
-VALUE nkrb_renderer_convert(VALUE self) {
+VALUE nkrb_renderer_convert(VALUE self, VALUE rcontext) {
   struct nk_context *context = NULL;
   struct nk_buffer *commands = NULL;
   struct nk_buffer *vertices = NULL;
   struct nk_buffer *indices  = NULL;
-  Data_Get_Struct(rb_funcall(self, rb_intern("context"),  0),       struct nk_context, context);
+  Data_Get_Struct(rcontext, struct nk_context, context);
   Data_Get_Struct(rb_funcall(self, rb_intern("commands"), 0),       struct nk_buffer,  commands);
   Data_Get_Struct(rb_funcall(self, rb_intern("vertices"), 0),       struct nk_buffer,  vertices);
   Data_Get_Struct(rb_funcall(self, rb_intern("vertex_indices"), 0), struct nk_buffer,  indices);
@@ -77,10 +77,10 @@ VALUE nkrb_renderer_convert(VALUE self) {
   return self;
 }
 
-VALUE nkrb_renderer_draw_foreach(VALUE self) {
+VALUE nkrb_renderer_draw_foreach(VALUE self, VALUE rcontext) {
   struct nk_context *context = NULL;
   struct nk_buffer *commands = NULL;
-  Data_Get_Struct(rb_funcall(self, rb_intern("context"),  0), struct nk_context, context);
+  Data_Get_Struct(rcontext, struct nk_context, context);
   Data_Get_Struct(rb_funcall(self, rb_intern("commands"), 0), struct nk_buffer,  commands);
 
   /* convert from command queue into draw list and draw to screen */
@@ -109,6 +109,6 @@ VALUE nkrb_renderer_draw_foreach(VALUE self) {
 
 void nkrb_renderer_init(void) {
   VALUE cRenderer = rb_define_class_under(mNuklear, "Renderer", rb_cObject);
-  rb_define_method(cRenderer, "nk_convert",      nkrb_renderer_convert,      0);
-  rb_define_method(cRenderer, "nk_draw_foreach", nkrb_renderer_draw_foreach, 0);
+  rb_define_method(cRenderer, "nk_convert",      nkrb_renderer_convert,      1);
+  rb_define_method(cRenderer, "nk_draw_foreach", nkrb_renderer_draw_foreach, 1);
 }