Cleanup

.gitmodules

@@ -2,3 +2,12 @@
 	path = libs/mruby
 	url = https://github.com/mruby/mruby.git
   ignore = dirty
+[submodule "libs/mgems/mruby-process"]
+	path = libs/mgems/mruby-process
+	url = https://github.com/katzer/mruby-process
+[submodule "libs/mgems/mruby-env"]
+	path = libs/mgems/mruby-env
+	url = https://github.com/iij/mruby-env.git
+[submodule "libs/mgems/mruby-marshal-c"]
+	path = libs/mgems/mruby-marshal-c
+	url = https://github.com/LanzaSchneider/mruby-marshal-c.git

Makefile

@@ -29,14 +29,12 @@ MRUBY_LIBS := $(MRUBY_LIB)
 CFLAGS_DEBUG := \
 	-std=c++20 -Wall -Wextra \
 	-Og -g -fno-omit-frame-pointer \
-	-Wno-unused-command-line-argument \
 	-I./include -I./libs/mruby/build/host/include \
 	$(SDL_CFLAGS) $(MRUBY_CFLAGS)
 
 CFLAGS_RELEASE := \
 	-std=c++20 -O3 -mtune=generic \
 	-fno-rtti -fomit-frame-pointer -DNDEBUG -s \
-	-Wno-unused-command-line-argument \
 	-I./include -I./libs/mruby/build/host/include \
 	$(SDL_CFLAGS) $(MRUBY_CFLAGS)
 

flake.nix

@@ -81,12 +81,20 @@
         '';
       };
 
+      pythonEnv = pkgs.python3.withPackages (
+        ps: with ps; [
+          pandas
+          matplotlib
+        ]
+      );
+
     in
     {
       packages.${system} = {
         default = misth;
         misth = misth;
         mruby = mruby;
+        pythonEnv = pythonEnv;
       };
 
       devShells.${system}.default = pkgs.mkShell {
@@ -104,6 +112,9 @@
           sdl3
           sdl3-ttf
           sdl3-image
+
+          pythonEnv
+          ruff
         ];
 
         shellHook = ''

include/app/app.h

@@ -38,4 +38,4 @@ private:
 
 inline app::App *app_ = nullptr;
 
-#endif
+#endif

include/bindings/definitions.h

@@ -60,4 +60,4 @@ inline void setup() {
 }
 } // namespace definitions
 
-#endif
+#endif

include/bindings/ruby.h

@@ -124,4 +124,4 @@ DEF_SYM(w)
 DEF_SYM(h)
 DEF_SYM(z)
 
-#endif
+#endif

include/localization/localization.h

@@ -47,4 +47,4 @@ Key key_from_sym(mrb_state *mrb, mrb_sym sym);
 std::string get_key_name(Key key);
 } // namespace Localization
 
-#endif
+#endif

include/utils.h

@@ -226,8 +226,7 @@ struct Pool {
   bool is_valid(uint64_t index) const {
     uint32_t id = (uint32_t)(index & 0xFFFFFFFFULL);
     uint32_t gen = (uint32_t)(index >> 32);
-    return id >= 0
+    return id < slots.size()
-           && id < slots.size()
            && slots[id].alive
            && slots[id].generation == gen;
   }
@@ -243,4 +242,4 @@ private:
   std::vector<uint32_t> free_indices;
 };
 
-#endif
+#endif

include/window/keybinds.h

@@ -218,4 +218,4 @@ inline Key get_key(std::string &name) {
   return get_key_from_name(name);
 }
 
-#endif
+#endif

libs/changes.patch

@@ -20,6 +20,17 @@
  
    # Use mrbgems
    # conf.gem 'examples/mrbgems/ruby_extension_example'
+@@ -16,6 +28,10 @@
+   # include the GEM box
+   conf.gembox 'default'
+ 
++  conf.gem '../mgems/mruby-env'
++  conf.gem '../mgems/mruby-process'
++  conf.gem '../mgems/mruby-marshal-c'
++
+   # C compiler settings
+   # conf.cc do |cc|
+   #   cc.command = ENV['CC'] || 'gcc'
 @@ -79,5 +79,5 @@
    # Turn on `enable_debug` for better debugging
    # conf.enable_debug
@@ -28,3 +39,15 @@
 +  # conf.enable_bintest
 +  # conf.enable_test
  end
+--- ./mgems/mruby-process/mrbgem.rake
++++ ./mgems/mruby-process/mrbgem.rake
+@@ -54,4 +54,9 @@
+   else
+     spec.objs.delete objfile("#{build_dir}/src/win32")
+   end
++
++  spec.objs.delete objfile("#{build_dir}/src/internal")
++  spec.objs.delete objfile("#{build_dir}/src/dln")
++  spec.objs.delete objfile("#{build_dir}/src/signal")
++  spec.objs.delete objfile("#{build_dir}/src/status")
+ end

samples/button.rb

@@ -19,7 +19,7 @@ bg_image1_a = Animation.from(bg_image1)
 App.language = :en
 App.localize(:en, :btn_text, "Click %{name}!")
 
-text = ElementText.new :btn_text, default_font, 0xFFFF00, {name: "Me"}, position: {x: 50, y: 50}, z: 1, click_mode: :block, alpha: 1
+text = ElementText.new :btn_text, default_font, 0xFFFF00, {name: ENV.fetch("name", "me")}, position: {x: 50, y: 50}, z: 1, click_mode: :block, alpha: 1
 
 rect = ElementRect.new 100, 25, 0xFF0000, position: {x: 50, y: 50}, z: 0, rotation: 60, scale: { x: 1, y: 1 }, alpha: 0.8, click_mode: :block
 

src/app/elements.cc

@@ -74,4 +74,4 @@ Vec2<float> ERect::size() {
 void ERect::render(uint64_t) {
   window.draw_rect(Rect::from(position, shape), color, z, rotation, pivot, scale, alpha);
 }
-} // namespace app
+} // namespace app

src/app/scene.cc

@@ -88,4 +88,4 @@ Vec2<float> Scene::world_to_local(Vec2<float> p, Element *e) {
 
   return p;
 }
-} // namespace app
+} // namespace app

src/bindings/element_image.cc

@@ -323,4 +323,4 @@ void register_element_image() {
 
   bindings.ElementImage = {ElementImage_class, &ElementImage_type};
 }
-} // namespace definitions
+} // namespace definitions

src/bindings/element_rect.cc

@@ -346,4 +346,4 @@ void register_element_rect() {
 
   bindings.ElementRect = {ElementRect_class, &ElementRect_type};
 }
-} // namespace definitions
+} // namespace definitions

src/bindings/element_text.cc

@@ -408,4 +408,4 @@ void register_element_text() {
 
   bindings.ElementText = {ElementText_class, &ElementText_type};
 }
-} // namespace definitions
+} // namespace definitions

src/bindings/font.cc

@@ -69,4 +69,4 @@ void register_font() {
   ADD_METHOD(Font, "hash", font_hash, MRB_ARGS_NONE());
   bindings.Font = {Font_class, &Font_type};
 }
-} // namespace definitions
+} // namespace definitions

src/bindings/image.cc

@@ -157,4 +157,4 @@ void register_image() {
 
   bindings.Image = {Image_class, &Image_type};
 }
-} // namespace definitions
+} // namespace definitions

src/bindings/params.cc

@@ -65,4 +65,4 @@ void register_params() {
   ADD_METHOD(Params, "[]=", params_set, MRB_ARGS_REQ(2));
   bindings.Params = {Params_class, &Params_type};
 }
-} // namespace definitions
+} // namespace definitions

src/bindings/vec2.cc

@@ -87,4 +87,4 @@ mrb_value Vec2_wrap(uint64_t id, Vec2<float> *vec) {
 
   return obj;
 }
-} // namespace definitions
+} // namespace definitions

src/localization/localization.cc

@@ -111,4 +111,4 @@ std::string get_key_name(Key key) {
       return str;
   return "Unknown Key";
 }
-} // namespace Localization
+} // namespace Localization

src/main.cc

@@ -15,7 +15,15 @@ int main(int argc, char *argv[]) {
       fseek(file, 0, SEEK_SET);
 
       char *script_content = (char *)malloc(size + 1);
-      fread(script_content, 1, size, file);
+      size_t read = fread(script_content, 1, size, file);
+
+      if (read != size) {
+        fprintf(stderr, "Failed to read startup script: %s\n", startup_script);
+        free(script_content);
+        fclose(file);
+        return 1;
+      }
+
       script_content[size] = '\0';
 
       fclose(file);

src/ruby/query.rb

@@ -37,4 +37,4 @@ end
 def anti(query)
   query.type = :"not_#{query.type}"
   query
-end
+end

src/window/window.cc

@@ -653,4 +653,4 @@ bool Window::mouse_in_window(const Vec2<float> real_position, Vec2<float> &virtu
   virtual_position = (real_position - offset) / scale;
 
   return virtual_position.x >= 0 && virtual_position.x <= virtual_size.x && virtual_position.y >= 0 && virtual_position.y <= virtual_size.y;
-}
+}

tests/grapher.py

@@ -21,4 +21,4 @@ plt.legend()
 
 plt.show()
 
-plt.savefig("benchmark.png", dpi=200, bbox_inches="tight")
+plt.savefig("benchmark.png", dpi=200, bbox_inches="tight")