nuklear 0.1.0 → 0.1.3

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/ui/edit_string.rb

@@ -2,14 +2,18 @@ module Nuklear
   module UI
     class EditString < Nuklear::UI::Base
       attr_accessor :flags, :max_length, :filter, :text
+      attr_reader :text_was
 
-      def initialize(text: "", flags: 0, max_length: 255, filter: nil, enabled: true)
+      def initialize(text: "", flags: :simple, max_length: 255, filter: nil,
+                     enabled: true, &on_change)
         super enabled: enabled
         @text         = text
         @flags        = Nuklear.parse_flags :edit, flags
         @max_length   = max_length
         @filter       = filter
         @demand_focus = false
+        @text_was = text.dup
+        on(:change, &on_change) if block_given?
       end
 
       def demand_focus?
@@ -42,6 +46,11 @@ module Nuklear
         trigger(:committed)   if (result & Nuklear::NK_EDIT_COMMITED)    > 0
         trigger(:active)      if (result & Nuklear::NK_EDIT_ACTIVE)      > 0
         trigger(:inactive)    if (result & Nuklear::NK_EDIT_INACTIVE)    > 0
+        if @text != @text_was
+          trigger :change
+          @text_was.clear
+          @text_was.concat @text
+        end
       end
     end
   end

data/lib/nuklear/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuklear
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Colin MacKenzie IV
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-12 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