nuklear 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d829f1e7f4d4d305a18e1d831df3cd95874224581986977a89fd2eb114da0f
-  data.tar.gz: 45da4ef0e277ca42d642919a06c8086952c695a139b45265df6d5b7ceb4d5aaa
+  metadata.gz: 71711825cf0d022f9c47979905f5bf685067e9f2c1fdd8f9755a21142de60c6b
+  data.tar.gz: 23eae0b964a56384d2224018b3a5c54414286ee4ddcdab5a64e84db408e0d35e
 SHA512:
-  metadata.gz: baa5798e57b4f1765b4e819ee7dac4db9aa40e172f44fd48c74ff6b6942bc8c0d5afdc55cc137aeb400b4c48f51cd5286000b4b849505e11b94f2de2e8e9ec43
-  data.tar.gz: f37d1e63dcb902f2752c21e37d3ceaebccb0a2b5b9d50d615925049010dc2eedf3c726da9edc0687a63ba9ec651ffcd03cbc052cd0ea16c1b38e28275aa9e777
+  metadata.gz: 609432ea3c0dad02a1814ae94c6a42f7b96da73c1b2b8f1934481e22767473bb97723389c7f8dd698c07e2c343715d47be137918b93b4fa3b423b29ff7dd6102
+  data.tar.gz: e740ab30d11e8a9fb607342e5c150758510c06ebae411acf2609c7cd82bf4a4c11098c0b2d34d49864212cd637230b644bd9bbeb937f31496f0a105286d87c72

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.1)
 
 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,11 @@ VALUE nkrb_context_ui(VALUE self) {
   return ui;
 }
 
+static VALUE nkrb_context_is_any_item_active(VALUE self) {
+  struct nk_context *ctx = nkrb_context_get(self);
+  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 +233,7 @@ 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);
 
   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);
 }

data/ext/nuklear_renderer_opengl2/nuklear_renderer_opengl2.c

@@ -52,17 +52,17 @@ static enum nk_draw_vertex_layout_format rb2nk_format(VALUE v) {
   else rb_raise(rb_eArgError, "Invalid vertex layout format name");
 }
 
-VALUE renderer_initialize(VALUE self, VALUE context) {
+VALUE renderer_initialize(VALUE self) {
   if (!gladLoadGL())
     rb_raise(rb_eStandardError, "Failed to init GLAD");
   // printf("OpenGL %s, GLSL %s\n", glGetString(GL_VERSION), glGetString(GL_SHADING_LANGUAGE_VERSION));
 
-  rb_call_super(1, &context);
+  rb_call_super(0, NULL);
 
   return self;
 }
 
-VALUE renderer_render_gl(VALUE self) {
+VALUE renderer_render_gl(VALUE self, VALUE rcontext) {
   VALUE window_size = rb_funcall(self, rb_intern("window_size"), 0);
   VALUE drawable_size = rb_funcall(self, rb_intern("drawable_size"), 0);
   VALUE window_width = rb_ary_entry(window_size, 0);
@@ -96,7 +96,7 @@ VALUE renderer_render_gl(VALUE self) {
   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
   glEnableClientState(GL_COLOR_ARRAY);
 
-  rb_call_super(0, NULL);
+  rb_call_super(1, &rcontext);
   
   /* default OpenGL state */
   glDisableClientState(GL_VERTEX_ARRAY);
@@ -119,8 +119,8 @@ VALUE renderer_render_gl(VALUE self) {
   return self;
 }
 
-VALUE renderer_nk_convert_gl(VALUE self) {
-  VALUE result = rb_call_super(0, NULL);
+VALUE renderer_nk_convert_gl(VALUE self, VALUE rcontext) {
+  VALUE result = rb_call_super(1, &rcontext);
   VALUE rconfig = rb_funcall(self, rb_intern("convert_config"), 0);
   GLsizei vs = (GLsizei) FIX2INT(rb_hash_aref(rconfig, ID2SYM(rb_intern("vertex_size"))));
 
@@ -190,8 +190,8 @@ void Init_nuklear_renderer_opengl2(void) {
   cNuklearRendererOpenGL2 = rb_define_class_under(cNuklearRenderer, "OpenGL2", cNuklearRenderer);
   cNuklearBuffer = rb_const_get(mNuklear, rb_intern("Buffer"));
 
-  rb_define_method(cNuklearRendererOpenGL2, "initialize", renderer_initialize, 1);
-  rb_define_method(cNuklearRendererOpenGL2, "nk_convert", renderer_nk_convert_gl, 0);
+  rb_define_method(cNuklearRendererOpenGL2, "initialize", renderer_initialize, 0);
+  rb_define_method(cNuklearRendererOpenGL2, "nk_convert", renderer_nk_convert_gl, 1);
   rb_define_method(cNuklearRendererOpenGL2, "draw",       renderer_draw_gl, 1);
-  rb_define_method(cNuklearRendererOpenGL2, "render",     renderer_render_gl, 0);
+  rb_define_method(cNuklearRendererOpenGL2, "render",     renderer_render_gl, 1);
 }

data/ext/nuklear_renderer_opengl4/nuklear_renderer_opengl4.c

@@ -54,12 +54,12 @@ void nuklear_command_buffer_free(struct nk_buffer *buf) {
   nk_buffer_free(buf);
 }
 
-VALUE renderer_initialize(VALUE self, VALUE context) {
+VALUE renderer_initialize(VALUE self) {
   if (!gladLoadGL())
     rb_raise(rb_eStandardError, "Failed to init GLAD");
   // printf("OpenGL %s, GLSL %s\n", glGetString(GL_VERSION), glGetString(GL_SHADING_LANGUAGE_VERSION));
 
-  rb_call_super(1, &context);
+  rb_call_super(0, NULL);
 
   int status;
   int prog = glCreateProgram();
@@ -124,8 +124,7 @@ VALUE renderer_initialize(VALUE self, VALUE context) {
   return self;
 }
 
-VALUE renderer_render_gl(VALUE self) {
-  struct nk_context *ctx;
+VALUE renderer_render_gl(VALUE self, VALUE rcontext) {
   struct nk_buffer *cmds;
   VALUE window_size = rb_funcall(self, rb_intern("window_size"), 0);
   VALUE drawable_size = rb_funcall(self, rb_intern("drawable_size"), 0);
@@ -144,7 +143,6 @@ VALUE renderer_render_gl(VALUE self) {
   struct nk_vec2 scale;
   VALUE context = rb_ivar_get(self, rb_intern("@context"));
   Data_Get_Struct(rb_ivar_get(context, rb_intern("@null")), struct nk_draw_null_texture, null_tex);
-  Data_Get_Struct(context, struct nk_context, ctx);
   Data_Get_Struct(rb_ivar_get(self, rb_intern("@commands")), struct nk_buffer, cmds);
 
   GLfloat ortho[4][4] = {
@@ -174,7 +172,7 @@ VALUE renderer_render_gl(VALUE self) {
   glUniform1i(uniform_tex, 0);
   glUniformMatrix4fv(uniform_proj, 1, GL_FALSE, &ortho[0][0]);
 
-  rb_call_super(0, NULL);
+  rb_call_super(1, &rcontext);
 
   glUseProgram(0);
   glBindBuffer(GL_ARRAY_BUFFER, 0);
@@ -187,8 +185,8 @@ VALUE renderer_render_gl(VALUE self) {
   return self;
 }
 
-VALUE renderer_nk_convert_gl(VALUE self) {
-  VALUE result = rb_call_super(0, NULL);
+VALUE renderer_nk_convert_gl(VALUE self, VALUE rcontext) {
+  VALUE result = rb_call_super(1, &rcontext);
 
   struct nk_buffer *vertices = NULL;
   struct nk_buffer *indices  = NULL;
@@ -248,8 +246,8 @@ void Init_nuklear_renderer_opengl4(void) {
   cNuklearRendererOpenGL4 = rb_define_class_under(cNuklearRenderer, "OpenGL4", cNuklearRenderer);
   cNuklearBuffer = rb_const_get(mNuklear, rb_intern("Buffer"));
 
-  rb_define_method(cNuklearRendererOpenGL4, "initialize", renderer_initialize, 1);
-  rb_define_method(cNuklearRendererOpenGL4, "nk_convert", renderer_nk_convert_gl, 0);
+  rb_define_method(cNuklearRendererOpenGL4, "initialize", renderer_initialize, 0);
+  rb_define_method(cNuklearRendererOpenGL4, "nk_convert", renderer_nk_convert_gl, 1);
   rb_define_method(cNuklearRendererOpenGL4, "draw",       renderer_draw_gl, 1);
-  rb_define_method(cNuklearRendererOpenGL4, "render",     renderer_render_gl, 0);
+  rb_define_method(cNuklearRendererOpenGL4, "render",     renderer_render_gl, 1);
 }

data/lib/nuklear/context.rb

@@ -31,7 +31,7 @@ module Nuklear
     # Nuklear frame update process. It should not be called directly.
     protected def paint
       run_commands(self)
-      renderer.render
+      renderer.render(self)
     end
 
     # Events (window events, input events, etc) will accumulate over time.

data/lib/nuklear/renderer.rb

@@ -46,11 +46,10 @@ module Nuklear
 
     # For all renderer implementations, override #initialize to set up your
     # initial state (e.g. compiling shaders) and call `super`.
-    def initialize(context)
+    def initialize
       @commands = Nuklear::Buffer.new
       @vertices = Nuklear::Buffer.new
       @vertex_indices = Nuklear::Buffer.new
-      @context = context
       @window_size = [640, 480]
       @drawable_size = nil
       @null_texture_handle = 0
@@ -84,9 +83,9 @@ module Nuklear
     # Called at the start of a render pass. Renderers may wish to override
     # this method to apply once-per-frame state updates. They should call
     # `super` when they are ready to proceed.
-    def render
-      nk_convert
-      nk_draw_foreach { |command| draw(command) }
+    def render(context)
+      nk_convert(context)
+      nk_draw_foreach(context) { |command| draw(command) }
     end
 
     # Called for each Nuklear draw command, numerous times per render pass.

data/lib/nuklear/version.rb

@@ -1,3 +1,3 @@
 module Nuklear
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuklear
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Colin MacKenzie IV
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,7 +114,9 @@ files:
 - bin/console
 - bin/setup
 - examples/arial.ttf
+- examples/calculator.png
 - examples/calculator.rb
+- examples/hello_nuklear.png
 - examples/hello_nuklear.rb
 - examples/lib/opengl_font.rb
 - examples/lib/opengl_init.rb