graphics 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14bae949dfda33879d99ceed119be4186210da6debdd9ea5b9c70e9cfb2597c8
-  data.tar.gz: 594f95ce9bb7ebe278d3809aba41fb87a67e222cd1c002e8709e583f5c8cc6cd
+  metadata.gz: 67d82ed6f28d5e1a85f4bc54a31e67804e6f0071645c8174d96ee7eb72d5fa30
+  data.tar.gz: ef980c42b79b48f48d8ecb143bc912c295b08171479d0e877f58baab4687ea39
 SHA512:
-  metadata.gz: 2af7d58cd09195410f4afe52e56be541a56098e8f53ae5ebc4966b1375b33df765234bfc8dfc378ed779be3f31208417a7ed59eec8e58be6231d3d3915347e91
-  data.tar.gz: c901a48fa9a250c8ae16b6ea552548b646488f6d6477f04c55d2664f209a00842d08f2bddf747b21ed7acef140f2691bd36824819e3f9c4570ebc7dcf1a4bb0f
+  metadata.gz: 2ed3a2b99b78e0910d63b8cc119a6f229364713026d1002a5e139ea8814472392db32051b3385e346b4c619adf27c81c068432dadf9719ca01fee9af994b1f89
+  data.tar.gz: eac5fcf6f1576ac47a2f77e06b46b39fdc7489429f8e9099cbfa49140cfeacde037d8545140ad875542c3532c900c1a0ce550d8e6fcf7629cdf38eb7ff0cbc26

data/History.rdoc

@@ -1,3 +1,18 @@
+=== 1.1.0 / 2023-07-26
+
+* 3 minor enhancements:
+
+  * Added anti-aliasing to polygon. Want to add filling at some point.
+  * Requiring ruby 2.7+. Too many changes to ruby internals to try to maintain.
+  * polygon now takes an array of points.
+
+* 4 bug fixes:
+
+  * Fixed a bunch of compiler warnings for ruby struct changes.
+  * Fixed font lookup on linux. (presidentbeef)
+  * Fixed graphics_setup.sh for obsolete build flag on sdl2_image. (NickSchimek)
+  * ruby 3.2: Fixed warning from ruby headers by explicitly removing alloc funcs.
+
 === 1.0.1 / 2018-11-14
 
 * 2 bug fixes:

data/Rakefile

@@ -16,6 +16,8 @@ Hoe.spec "graphics" do
 
   extension :sdl
 
+  require_ruby_version ">= 2.7"
+
   license "MIT"
 end
 

data/examples/logo.rb

@@ -50,7 +50,7 @@ class Turtle < Graphics::Body
     p2 = w.project(x, y, a+90, 5)
     p3 = w.project(x, y, a-90, 5)
 
-    w.polygon p1, p2, p3, :green
+    w.polygon [p1, p2, p3], :green
   end
 end
 

data/ext/sdl/sdl.c

@@ -8,7 +8,7 @@
 #include <sge/sge_collision.h>
 #include <SDL_mixer.h>
 
-// https://github.com/google/protobuf/blob/master/ruby/ext/google/protobuf_c/defs.c
+// https://github.com/ruby/ruby/blob/master/doc/extension.rdoc#c-struct-to-ruby-object-
 
 #define DEFINE_CLASS_(name, string_name, mark, free, memsize)    \
   static void mark(void*);                                       \
@@ -16,7 +16,15 @@
   static VALUE c##name;                                          \
   static const rb_data_type_t _##name##_type = {                 \
     string_name,                                                 \
-    { mark, free, memsize, { NULL, NULL }, }, NULL, NULL,        \
+    { mark,                                                      \
+      free,                                                      \
+      memsize,                                                   \
+        NULL,     /* compact */                                  \
+      { NULL }                                                   \
+    },                                                           \
+    NULL,         /* parent */                                   \
+    NULL,         /* data */                                     \
+    0,            /* flags */                                    \
   };                                                             \
   static SDL_##name* ruby_to_##name(VALUE val) {                 \
     SDL_##name* ret;                                             \
@@ -30,7 +38,8 @@
                   _##name##_mark, _##name##_free, _##name##_memsize)
 
 #define DEFINE_CLASS_0(name, string_name)                        \
-  DEFINE_CLASS_(name, string_name, _##name##_mark, _##name##_free, NULL)
+  DEFINE_CLASS_(name, string_name,                               \
+                  _##name##_mark, _##name##_free, NULL)
 
 #define DEFINE_SELF(type, var, rb_var)                           \
   SDL_##type* var = ruby_to_##type(rb_var)
@@ -321,7 +330,7 @@ static VALUE Key_s_press_p(VALUE mod, VALUE keycode_) {
   SDL_Keycode keycode   = NUM2INT(keycode_);
   SDL_Scancode scancode = SDL_GetScancodeFromKey(keycode);
 
-  if (0 >= scancode || scancode >= key_state_len)
+  if (0 >= scancode || scancode >= (SDL_Scancode)key_state_len)
     rb_raise(eSDLError, "%d (%d) is out of bounds: %d",
              keycode, scancode, key_state_len);
 
@@ -508,6 +517,10 @@ typedef int (*f_rxyxyc)(SDL_Renderer*,
 typedef int (*f_rxyrc)(SDL_Renderer*,
                         Sint16, Sint16, Sint16,
                         Uint32);
+typedef int  (*f_poly)(SDL_Renderer*,
+                       const Sint16 *, const Sint16 *,
+                       int,
+                       Uint32);
 
 // TODO: ? maybe ?
 // int  hlineColor                  (SDL_Renderer *renderer, Sint16 x1, Sint16 x2, Sint16 y, Uint32 color)
@@ -521,9 +534,7 @@ typedef int (*f_rxyrc)(SDL_Renderer*,
 // int  trigonColor                 (SDL_Renderer *renderer, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color)
 // int  aatrigonColor               (SDL_Renderer *renderer, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color)
 // int  filledTrigonColor           (SDL_Renderer *renderer, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Sint16 x3, Sint16 y3, Uint32 color)
-// int  polygonColor                (SDL_Renderer *renderer, const Sint16 *vx, const Sint16 *vy, int n, Uint32 color)
-// int  aapolygonColor              (SDL_Renderer *renderer, const Sint16 *vx, const Sint16 *vy, int n, Uint32 color)
-// int  filledPolygonColor          (SDL_Renderer *renderer, const Sint16 *vx, const Sint16 *vy, int n, Uint32 color)
+// int  filledPolygonColor (SDL_Renderer *renderer, const Sint16 *vx, const Sint16 *vy, int n, Uint32 color)
 // int  texturedPolygon             (SDL_Renderer *renderer, const Sint16 *vx, const Sint16 *vy, int n, SDL_Surface *texture, int texture_dx, int texture_dy)
 // void gfxPrimitivesSetFont        (const void *fontdata, Uint32 cw, Uint32 ch)
 // void gfxPrimitivesSetFontRotation(Uint32 rotation)
@@ -648,6 +659,46 @@ static VALUE Renderer_draw_line(VALUE self,
   return Qnil;
 }
 
+// int  polygonColor       (SDL_Renderer *renderer, const Sint16 *vx, const Sint16 *vy, int n, Uint32 color)
+// int  aapolygonColor     (SDL_Renderer *renderer, const Sint16 *vx, const Sint16 *vy, int n, Uint32 color)
+
+static f_poly f_polygon[] = { &polygonColor,
+                              &aapolygonColor };
+
+static VALUE Renderer_draw_polygon(VALUE self,
+                                   VALUE xs_,
+                                   VALUE ys_,
+                                   VALUE c,
+                                   VALUE aa) {
+  DEFINE_SELF(Renderer, renderer, self);
+
+  int xlen = RARRAY_LENINT(xs_);
+  int ylen = RARRAY_LENINT(ys_);
+
+  if (xlen != ylen)
+    rb_raise(rb_eArgError, "xs & ys are different length");
+
+  Sint16 *xs = malloc(xlen*sizeof(Sint16));
+  for (int i = 0; i < xlen; i++) {
+    xs[i] = NUM2SINT16(RARRAY_AREF(xs_, i));
+  }
+
+  Sint16 *ys = malloc(ylen*sizeof(Sint16));
+  for (int i = 0; i < ylen; i++) {
+    ys[i] = NUM2SINT16(RARRAY_AREF(ys_, i));
+  }
+
+  Uint8 idx = IDX1(RTEST(aa));
+
+  if (f_polygon[idx](renderer, xs, ys, xlen, VALUE2COLOR(c)))
+    FAILURE("draw_polygon");
+
+  free(xs);
+  free(ys);
+
+  return Qnil;
+}
+
 static f_rxyxyc f_rect[] = { &rectangleColor,
                              &boxColor };
 
@@ -1076,17 +1127,17 @@ void Init_sdl() {
   mKey         = rb_define_module_under(mSDL, "Key");
   mMouse       = rb_define_module_under(mSDL, "Mouse");
 
-  cAudio        = rb_define_class_under(mSDL, "Audio",        rb_cData);
-  cCollisionMap = rb_define_class_under(mSDL, "CollisionMap", rb_cData);
+  cAudio        = rb_define_class_under(mSDL, "Audio",        rb_cObject);
+  cCollisionMap = rb_define_class_under(mSDL, "CollisionMap", rb_cObject);
   cEvent        = rb_define_class_under(mSDL, "Event",        rb_cObject);
-  cPixelFormat  = rb_define_class_under(mSDL, "PixelFormat",  rb_cData);
-  cSurface      = rb_define_class_under(mSDL, "Surface",      rb_cData);
-  cTTFFont      = rb_define_class_under(mSDL, "TTF",          rb_cData); // TODO: Font
+  cPixelFormat  = rb_define_class_under(mSDL, "PixelFormat",  rb_cObject);
+  cSurface      = rb_define_class_under(mSDL, "Surface",      rb_cObject);
+  cTTFFont      = rb_define_class_under(mSDL, "TTF",          rb_cObject); // TODO: Font
 
   cScreen       = rb_define_class_under(mSDL, "Screen",       cSurface);
-  cRenderer     = rb_define_class_under(mSDL, "Renderer",     rb_cData);
-  cWindow       = rb_define_class_under(mSDL, "Window",       rb_cData);
-  cTexture      = rb_define_class_under(mSDL, "Texture",      rb_cData);
+  cRenderer     = rb_define_class_under(mSDL, "Renderer",     rb_cObject);
+  cWindow       = rb_define_class_under(mSDL, "Window",       rb_cObject);
+  cTexture      = rb_define_class_under(mSDL, "Texture",      rb_cObject);
 
   cEventQuit    = rb_define_class_under(cEvent, "Quit",    cEvent);
   cEventKeydown = rb_define_class_under(cEvent, "Keydown", cEvent);
@@ -1098,6 +1149,17 @@ void Init_sdl() {
 
   eSDLError    = rb_define_class_under(mSDL,     "Error",           rb_eStandardError);
 
+  //// T_DATA cleanup: (mirror DEFINE_CLASS* calls above)
+
+  rb_undef_alloc_func(cAudio);
+  rb_undef_alloc_func(cSurface);
+  rb_undef_alloc_func(cCollisionMap);
+  rb_undef_alloc_func(cPixelFormat);
+  rb_undef_alloc_func(cTTFFont);
+  rb_undef_alloc_func(cRenderer);
+  rb_undef_alloc_func(cWindow);
+  rb_undef_alloc_func(cTexture);
+
   //// SDL methods:
 
   rb_define_module_function(mSDL, "init", sdl_s_init, 1);
@@ -1185,6 +1247,7 @@ void Init_sdl() {
   rb_define_method(cRenderer, "draw_ellipse",  Renderer_draw_ellipse, 7);
   rb_define_method(cRenderer, "draw_line",     Renderer_draw_line,    6);
   rb_define_method(cRenderer, "draw_rect",     Renderer_draw_rect,    6);
+  rb_define_method(cRenderer, "draw_polygon",  Renderer_draw_polygon, 4);
   rb_define_method(cRenderer, "fast_rect",     Renderer_fast_rect,    5);
   rb_define_method(cRenderer, "h",             Renderer_h,            0);
   rb_define_method(cRenderer, "new_texture",   Renderer_new_texture,  0);

data/ext/sdl/sge/sge_surface.cpp

@@ -156,7 +156,7 @@ void sge_SetError(const char *format, ...)
 	vsprintf(buf, format, ap);
 	va_end(ap);
 
-	SDL_SetError(buf);
+	SDL_SetError("%s", buf);
 }
 
 

data/graphics_setup.sh

@@ -10,8 +10,8 @@ case `uname` in
 	brew install sdl2
 	brew install sdl2_mixer
 	brew install sdl2_ttf
-	brew install sdl2_image --without-webp
-        brew install sdl2_gfx
+	brew install sdl2_image
+	brew install sdl2_gfx
 	;;
     Linux)
 	echo "I'm on linux, using sudo where needed"

data/lib/graphics/simulation.rb

@@ -206,7 +206,7 @@ class Graphics::AbstractSimulation
     File.expand_path("~/Library/Fonts/"),
 
     # Ubuntu
-    "/usr/share/fonts/truetype/**/",
+    "/usr/share/fonts/**/",
   ]
   FONT_GLOB = "{#{font_dirs.join(",")}}" # :nodoc:
 
@@ -497,11 +497,14 @@ class Graphics::AbstractSimulation
   # Draw a closed form polygon from an array of points in a particular
   # color.
 
-  def polygon *points, color
+  def polygon points, c
+    return unless points.size > 1
+
     points << points.first
-    points.each_cons(2) do |p1, p2|
-      line(*p1, *p2, color)
-    end
+
+    xs, ys = points.transpose
+
+    renderer.draw_polygon xs, ys.map { |y| h-y-1 }, c, :aa
   end
 
   ##

data/lib/graphics.rb

@@ -2,7 +2,7 @@
 # The top-level namespace.
 
 class Graphics
-  VERSION = "1.0.1" # :nodoc:
+  VERSION = "1.1.0" # :nodoc:
 end
 
 require "graphics/simulation"

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: graphics
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE3MTEyMTIxMTExMFoXDTE4MTEyMTIxMTExMFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIzMDEwMTA3NTExN1oXDTI0MDEwMTA3NTExN1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -21,15 +21,15 @@ cert_chain:
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAfAXSQpsW7YSxd1csRtA/M4Zt0AMXFMd76GJ8Lgtg8G0+VFbdChRyDuDb0kPlW
-  h9QQX/YABfCW8vxmssbMGrP+VGBAn7BbdTcfTlgCWrvMX1uL5aRL74nA4urKXqdW
-  a0nP70K4958P3GffBdtE3KGkU5xstFnXGajxuBRnL66E15KU0BNehVxdG258bdPu
-  EKN6MqBPftFiev3tuwqDV11r2GquDpniYcT+Mi8/PgeAgVT/afBeVgbB3KaZeTRR
-  AhXhF6Wi2GTMezlj5jlI5XV7WsJUSwTp/YiVvcmT74ZaCRvexm6EnNhkrvJJ1Xeu
-  V+HB+LYYhXWitInO/eXxDrFB
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
+  AQAkg3y+PBnBAPWdxxITm5sPHqdWQgSyCpRA20o4LTuWr8BWhSXBkfQNa7cY6fOn
+  xyM34VPzBFbExv6XOGDfOMFBVaYTHuN9peC/5/umL7kLl+nflXzL2QA7K6LYj5Bg
+  sM574Onr0dZDM6Vn69bzQ7rBIFDfK/OhlPzqKZad4nsdcsVH8ODCiT+ATMIZyz5K
+  WCnNtqlyiWXI8tdTpahDgcUwfcN/oN7v4K8iU5IbLJX6HQ5DKgmKjfb6XyMth16k
+  ROfWo9Uyp8ba/j9eVG14KkYRaLydAY1MNQk2yd3R5CGfeOpD1kttxjoypoUJ2dOG
+  nsNBRuQJ1UfiCG97a6DNm+Fr
   -----END CERTIFICATE-----
-date: 2018-11-15 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -71,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.17'
+        version: '4.0'
 description: |-
   Graphics provides a simple framework to implement games and/or
   simulations and is designed to follow mathematical conventions, NOT
@@ -182,8 +182,9 @@ files:
 homepage: https://github.com/zenspider/graphics
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/zenspider/graphics
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -193,16 +194,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Graphics provides a simple framework to implement games and/or simulations
   and is designed to follow mathematical conventions, NOT game programming conventions