ray 0.0.0.pre2 → 0.0.1

data/ext/joystick.c

@@ -79,9 +79,17 @@ VALUE ray_joystick_open(VALUE self) {
    return self;
 }
 
+/* @return [true, false] true if the joystick is closed */ 
+VALUE ray_joystick_closed(VALUE self) {
+   ray_joystick *joy = NULL;
+   Data_Get_Struct(self, ray_joystick, joy);
+   
+   return joy->joystick == NULL ? Qtrue : Qfalse;
+}
+
 /* Closes the joystick. Can be called even if closed? is true. */
 VALUE ray_joystick_close(VALUE self) {
-   if (ray_joystick_close(self) == Qtrue)
+   if (ray_joystick_closed(self) == Qtrue)
       return Qnil;
 
    SDL_JoystickClose(ray_rb2joystick(self));
@@ -94,14 +102,6 @@ VALUE ray_joystick_close(VALUE self) {
    return Qnil;
 }
 
-/* @return [true, false] true if the joystick is closed */ 
-VALUE ray_joystick_closed(VALUE self) {
-   ray_joystick *joy = NULL;
-   Data_Get_Struct(self, ray_joystick, joy);
-   
-   return joy->joystick == NULL ? Qtrue : Qfalse;
-}
-
 /* @return [Integer] The number of buttons on this joystick */
 VALUE ray_joystick_button_count(VALUE self) {
    return INT2FIX(SDL_JoystickNumButtons(ray_rb2joystick(self)));

data/ext/ray.c

@@ -1,16 +1,93 @@
 #include "ray.h"
 
+#ifdef HAVE_COCOA
+extern void ray_osx_init();
+extern void ray_osx_close();
+#endif
+
 VALUE ray_mRay = Qnil;
 
-/* Inits ray */
-VALUE ray_init(VALUE self) {
-   SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK);
+/*
+  @overload init(opts = {})
+    Inits Ray.
+  
+    @option opts [Integer] :frequency Audio frequency (defaults to 22050)
+    @option opts [Integer] :format A constant declared in Ray::Audio
+    @option opts [true] :mono or :stereo Set :mono or :stereo to true to enable
+                                         one of them.
+    @option opts [Integer] :chunk_size Size of a chunk (defaults to 1024)
+*/
+VALUE ray_init(int argc, VALUE *argv, VALUE self) {
+   VALUE hash = Qnil;
+   rb_scan_args(argc, argv, "01", &hash);
+
+#ifdef HAVE_COCOA
+   ray_osx_init();
+#endif
+
+   if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) == -1) {
+      rb_raise(rb_eRuntimeError, "Couldn't init the SDL (%s)",
+               SDL_GetError());
+   }
+
+#ifdef HAVE_SDL_TTF
+   if (!TTF_WasInit()) {
+      if (TTF_Init() == -1) {
+         rb_raise(rb_eRuntimeError, "Couldn't init SDL_TTF (%s)",
+                  TTF_GetError());
+      }
+   }
+#endif
+
+#ifdef HAVE_SDL_MIXER
+   int frequency   = MIX_DEFAULT_FREQUENCY;
+   uint16_t format = MIX_DEFAULT_FORMAT;
+   int channels    = MIX_DEFAULT_CHANNELS;
+   int chunk_size = 1024;
+
+   if (!NIL_P(hash)) {
+      VALUE rb_freq, rb_format, rb_chunk_size;
+      if (!NIL_P(rb_freq = rb_hash_aref(hash, RAY_SYM("frequency"))))
+         frequency = NUM2INT(rb_freq);
+
+      if (!NIL_P(rb_format = rb_hash_aref(hash, RAY_SYM("format"))))
+         format = NUM2INT(rb_format);
+      
+      if (RTEST(rb_hash_aref(hash, RAY_SYM("mono"))))
+         channels = 1;
+      else if (RTEST(rb_hash_aref(hash, RAY_SYM("stereo"))))
+         channels = 2;
+
+      if (!NIL_P(rb_chunk_size = rb_hash_aref(hash, RAY_SYM("chunk_size"))))
+         chunk_size = NUM2INT(rb_chunk_size);
+   }
+   
+   if (Mix_OpenAudio(frequency, format, channels, chunk_size) == -1) {
+      rb_raise(rb_eRuntimeError, "Couldn't open audio (%s)",
+               Mix_GetError());
+   }
+#endif
+
    return Qnil;
 }
 
 /* Stops ray */
 VALUE ray_stop(VALUE self) {
+#ifdef HAVE_SDL_MIXER
+   Mix_CloseAudio();
+#endif
+
+#ifdef HAVE_SDL_TTF
+   /*
+     Freeing a font after TTF_Quit causes a segfault, but, Ruby being
+     garbage called, we can't be sure a font won't be freed later.
+   */
+
+   /* TTF_Quit(); */
+#endif
+
    SDL_Quit();
+   /* The pool is never drained on OSX */
    return Qnil;
 }
 
@@ -50,6 +127,9 @@ ray_video_mode ray_parse_video_mode(VALUE hash) {
    if (RTEST(rb_hash_aref(hash, RAY_SYM("no_frame"))))
       flags |= SDL_NOFRAME;
 
+   if (RTEST(rb_hash_aref(hash, RAY_SYM("resizable"))))
+      flags |= SDL_RESIZABLE;
+
    ray_video_mode mode = {
       NUM2INT(width),
       NUM2INT(height),
@@ -63,35 +143,36 @@ ray_video_mode ray_parse_video_mode(VALUE hash) {
 }
 
 /*
-  Creates a new window.
+  @overload create_window(hash)
+    Creates a new window.
 
-  @note If both hw_surface and sws_urface are false, hw_surface
-        will be considered as true. :sw_surface should be true
-        if you want to acess
+    If both hw_surface and sws_urface are false, hw_surface
+    will be considered as true. :sw_surface should be true
+    if you want to acess
 
-  @return [Ray::Image] An image representing the window
+    @return [Ray::Image] An image representing the window
 
-  @option hash [Integer] :width Width of the window
-  @option hash [Integer] :height Height of the window
+    @option hash [Integer] :width Width of the window
+    @option hash [Integer] :height Height of the window
 
-  @option hash [Integer] :w Alias for width
-  @option hash [Integer] :h Alias for height
+    @option hash [Integer] :w Alias for width
+    @option hash [Integer] :h Alias for height
 
-  @option hash [Integer] :bits_per_pixel Bits per pixel. Valid values are
-                                         8, 15, 16, 24, and 32.
-  @option hash [Integer] :bpp Alias for bits_per_pixel
+    @option hash [Integer] :bits_per_pixel Bits per pixel. Valid values are
+                                           8, 15, 16, 24, and 32.
+    @option hash [Integer] :bpp Alias for bits_per_pixel
 
-  @option hash [true, false] :hw_surface Creates the surface in video memory
+    @option hash [true, false] :hw_surface Creates the surface in video memory
                                         (default)
-  @option hash [true, false] :sw_surface Creates the surface in system memory
-  @option hash [true, false] :async_blit Enables asynchronous updates of the
-                                         the surface
-  @option hash [true, false] :double_buf Enables double buffering. Ignored
-                                         if sw_surface is set.
-  @option hash [true, false] :fullscreen Creates a full screen window.
-  @option hash [true, false] :resizable  Creates a resizable window.
-  @option hash [true, false] :no_frame   Disables window decoration if
-                                         possible.
+    @option hash [true, false] :sw_surface Creates the surface in system memory
+    @option hash [true, false] :async_blit Enables asynchronous updates of the
+                                           the surface
+    @option hash [true, false] :double_buf Enables double buffering. Ignored
+                                           if sw_surface is set.
+    @option hash [true, false] :fullscreen Creates a full screen window.
+    @option hash [true, false] :resizable  Creates a resizable window.
+    @option hash [true, false] :no_frame   Disables window decoration if
+                                           possible.
  */
 VALUE ray_create_window(VALUE self, VALUE hash) {
    ray_video_mode mode = ray_parse_video_mode(hash);
@@ -107,8 +188,10 @@ VALUE ray_create_window(VALUE self, VALUE hash) {
 }
 
 /*
-  @return [true, false] True if the video mode described by hash
-                        can be used.
+  @overload can_use_mode?(hash)
+    @param [Hash] hash Same options as in create_window
+    @return [true, false] True if the video mode described by hash
+                          can be used.
 */
 VALUE ray_can_use_mode(VALUE self, VALUE hash) {
    ray_video_mode mode = ray_parse_video_mode(hash);
@@ -118,8 +201,9 @@ VALUE ray_can_use_mode(VALUE self, VALUE hash) {
 }
 
 /*
-  Sets the window icon
-  @param [Ray::Image] icon The icon to display
+  @overload icon=(icon)
+    Sets the window icon
+    @param [Ray::Image] icon The icon to display
 */
 VALUE ray_set_icon(VALUE self, VALUE icon) {
    SDL_WM_SetIcon(ray_rb2surface(icon), NULL);
@@ -136,7 +220,10 @@ VALUE ray_window_title(VALUE self) {
    return rb_str_new2(title);
 }
 
-/* Sets the window title */
+/*
+  @overload window_title=(title)
+    Sets the window title
+*/
 VALUE ray_set_window_title(VALUE self, VALUE title) {
    char *icon = NULL;
 
@@ -158,7 +245,10 @@ VALUE ray_text_icon(VALUE self) {
    return rb_str_new2(icon);   
 }
 
-/* Sets the window title */
+/*
+  @overload text_icon=(val)
+    Sets the window text icon
+*/
 VALUE ray_set_text_icon(VALUE self, VALUE icon) {
    char *title;
    
@@ -180,7 +270,10 @@ VALUE ray_grab_input(VALUE self) {
    return (mode == SDL_GRAB_ON) ? Qtrue : Qfalse;
 }
 
-/* Sets the grab input to true or false */
+/*
+  @overload grab_input=(grab)
+    Sets the grab input to true or false
+*/
 VALUE ray_set_grab_input(VALUE self, VALUE grab) {
    SDL_WM_GrabInput(RTEST(grab) ? SDL_GRAB_ON : SDL_GRAB_OFF);
    return grab;
@@ -204,10 +297,37 @@ VALUE ray_has_image_support(VALUE self) {
 #endif
 }
 
+/* @return [true, false] true if Ray supports graphical effect like rotations */
+VALUE ray_has_gfx_support(VALUE self) {
+#ifdef HAVE_SDL_GFX
+   return Qtrue;
+#else
+   return Qfalse;
+#endif
+}
+
+/* @return [true, false] true if Ray supports ttf fonts */
+VALUE ray_has_font_support(VALUE self) {
+#ifdef HAVE_SDL_TTF
+   return Qtrue;
+#else
+   return Qfalse;
+#endif
+}
+
+/* @return [true, false] true if Ray supports audio playback */
+VALUE ray_has_audio_support(VALUE self) {
+#ifdef HAVE_SDL_MIXER
+   return Qtrue;
+#else
+   return Qfalse;
+#endif
+}
+
 void Init_ray_ext() {
    ray_mRay = rb_define_module("Ray");
 
-   rb_define_module_function(ray_mRay, "init", ray_init, 0);
+   rb_define_module_function(ray_mRay, "init", ray_init, -1);
    rb_define_module_function(ray_mRay, "stop", ray_stop, 0);
 
    rb_define_module_function(ray_mRay, "create_window", ray_create_window, 1);
@@ -227,6 +347,12 @@ void Init_ray_ext() {
 
    rb_define_module_function(ray_mRay, "has_image_support?",
                              ray_has_image_support, 0);
+   rb_define_module_function(ray_mRay, "has_gfx_support?",
+                             ray_has_gfx_support, 0);
+   rb_define_module_function(ray_mRay, "has_font_support?",
+                             ray_has_font_support, 0);
+  rb_define_module_function(ray_mRay, "has_audio_support?",
+                             ray_has_audio_support, 0); 
 
    Init_ray_image();
    Init_ray_color();
@@ -234,33 +360,18 @@ void Init_ray_ext() {
    Init_ray_event();
    Init_ray_joystick();
 
-#ifdef PSP
-   Init_ray_psp();
+#ifdef HAVE_SDL_TTF
+   Init_ray_font();
 #endif
-}
 
-#ifndef PSP
-
-int main(int argc, char *argv[]) {
-#if defined(HAVE_RUBY_RUN_NODE)
-   ruby_init();
-   Init_ray_ext();
-   ruby_run_node(ruby_options(argc, argv));
-#elif defined(HAVE_RUBY_RUN)
-   ruby_init();
-   Init_ray_ext();
-   ruby_init_loadpath();
-   ruby_options(argc, argv);
-   ruby_run();
-#else
-   fprintf(stderr, "Please use \"require 'ray'\" on this platform\n");
-   return 1;
+#ifdef HAVE_SDL_MIXER
+   Init_ray_audio();
 #endif
 
-   return 0;
-}
-
+#ifdef PSP
+   Init_ray_psp();
 #endif
+}
 
 #ifdef PSP
 

data/ext/ray.h

@@ -1,10 +1,13 @@
+#ifndef RAY_H_
+#define RAY_H_
+
 #ifndef PSP
 # include "ruby.h"
 #else
 # include <ruby/ruby.h>
 #endif
 
-#if defined(HAVE_SDL_H) || defined(RAY_USE_FRAMEWORK)
+#if defined(HAVE_SDL_H)
 # include <SDL.h>
 #else
 # include <SDL/SDL.h>
@@ -16,14 +19,66 @@
 # include <pspctrl.h>
 #endif
 
-#if defined(HAVE_SDL_IMAGE)
-# if defined(HAVE_SDL_IMAGE_H) || defined(RAY_USE_FRAMEWORK)
-#  include <SDL_image.h>
-# else
+#if defined(HAVE_SDL_IMAGE_H)
+# if !defined(HAVE_SDL_IMAGE)
+#  define HAVE_SDL_IMAGE
+# endif
+# include <SDL_image.h>
+#else
+# if defined(HAVE_SDL_SDL_IMAGE_H)
+#  if !defined(HAVE_SDL_IMAGE)
+#   define HAVE_SDL_IMAGE
+#  endif
 #  include <SDL/SDL_image.h>
 # endif
 #endif
 
+#if defined(HAVE_SDL_ROTOZOOM_H)
+# if !defined(HAVE_SDL_GFX)
+#  define HAVE_SDL_GFX
+# endif
+# include <SDL_gfxPrimitives.h>
+# include <SDL_rotozoom.h>
+# include <SDL_imageFilter.h>
+#else
+# if defined(HAVE_SDL_SDL_ROTOZOOM_H)
+#  if !defined(HAVE_SDL_GFX)
+#   define HAVE_SDL_GFX
+#  endif
+#  include <SDL/SDL_gfxPrimitives.h>
+#  include <SDL/SDL_rotozoom.h>
+#  include <SDL/SDL_imageFilter.h>
+# endif
+#endif
+
+#if defined(HAVE_SDL_TTF_H)
+# if !defined(HAVE_SDL_TTF)
+#  define HAVE_SDL_TTF
+# endif
+# include <SDL_ttf.h>
+#else
+# if defined(HAVE_SDL_SDL_TTF_H)
+#  if !defined(HAVE_SDL_TTF)
+#   define HAVE_SDL_TTF
+#  endif
+#  include <SDL/SDL_ttf.h>
+# endif
+#endif
+
+#if defined(HAVE_SDL_MIXER_H)
+# if !defined(HAVE_SDL_MIXER)
+#  define HAVE_SDL_MIXER
+# endif
+# include <SDL_mixer.h>
+#else
+# if defined(HAVE_SDL_SDL_MIXER_H)
+#  if !defined(HAVE_SDL_MIXER)
+#   define HAVE_SDL_MIXER
+#  endif
+#  include <SDL/SDL_mixer.h>
+# endif
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #if 0
@@ -39,6 +94,16 @@ extern VALUE ray_cColor;
 extern VALUE ray_cRect;
 extern VALUE ray_cEvent;
 
+#ifdef HAVE_SDL_TTF
+extern VALUE ray_cFont;
+#endif
+
+#ifdef HAVE_SDL_MIXER
+extern VALUE ray_mAudio;
+extern VALUE ray_cSound;
+extern VALUE ray_cMusic;
+#endif
+
 #ifdef PSP
 extern VALUE ray_eTimeoutError;
 extern VALUE ray_mWlan;
@@ -65,10 +130,8 @@ typedef struct {
 } ray_video_mode;
 
 typedef struct {
-   VALUE self;
    SDL_Surface *surface;
-
-   int mustFree; /* Should we call SDL_FreeSurface? */
+   int must_free; /* Should we call SDL_FreeSurface? */
 } ray_image;
 
 typedef struct {
@@ -81,11 +144,30 @@ typedef struct {
    SDL_Joystick *joystick;
 } ray_joystick;
 
+#ifdef HAVE_SDL_TTF
+typedef struct {
+   TTF_Font *font;
+} ray_font;
+#endif
+
+#ifdef HAVE_SDL_MIXER
+typedef struct {
+   Mix_Chunk *sound;
+} ray_sound;
+
+typedef struct {
+   Mix_Music *music;
+} ray_music;
+#endif
+
 /* Convertion functions */
 
-/** Converts a surface into a ruby object */
+/** Converts a surface into a ruby object (won't free it) */
 VALUE ray_create_image(SDL_Surface *surface);
 
+/** Converts a surface into a ruby object (will free it) */
+VALUE ray_create_gc_image(SDL_Surface *surface);
+
 /** Converts a color into a ruby object */
 VALUE ray_col2rb(ray_color color);
 
@@ -107,12 +189,31 @@ SDL_Surface *ray_rb2surface(VALUE object);
 /** Converts a ruby object into a rect */
 ray_rect ray_rb2rect(VALUE object);
 
+/**
+   Converts a ruby object into a rect even if it's not an intance
+   of Ray::Rect.
+ */
+ray_rect ray_convert_to_rect(VALUE obj);
+
 /** Converts a ruby object into an event */
 SDL_Event *ray_rb2event(VALUE object);
 
 /** Converts a ruby object into a joystick */
 SDL_Joystick *ray_rb2joystick(VALUE object);
 
+#ifdef HAVE_SDL_TTF
+/** Converts a ruby object into a font */
+TTF_Font *ray_rb2font(VALUE object);
+#endif
+
+#ifdef HAVE_SDL_MIXER
+/** Converts a ruby object into a sound chunk */
+Mix_Chunk *ray_rb2chunk(VALUE object);
+
+/** Converts a ruby object into a music */
+Mix_Music *ray_rb2music(VALUE object);
+#endif
+
 /* Initializers */
 
 void Init_ray_ext();
@@ -122,6 +223,14 @@ void Init_ray_rect();
 void Init_ray_event();
 void Init_ray_joystick();
 
+#ifdef HAVE_SDL_TTF
+void Init_ray_font();
+#endif
+
+#ifdef HAVE_SDL_MIXER
+void Init_ray_audio();
+#endif
+
 #ifdef PSP
 void Init_ray_psp();
 #endif
@@ -132,3 +241,5 @@ void Init_ray_psp();
 #endif
 }
 #endif
+
+#endif