texplay 0.4.3 → 0.4.4.pre

data/ext/texplay/bindings.h

@@ -1,46 +1,46 @@
-#ifndef GUARD_BINDINGS_H
-#define GUARD_BINDINGS_H
-
-/* class methods */
-VALUE M_create_macro(VALUE self , VALUE method_name);
-VALUE M_remove_macro(VALUE self, VALUE method_name);
-VALUE M_refresh_cache_all(VALUE self);
-VALUE M_create_blank(VALUE self, VALUE window, VALUE width, VALUE height);
-
-/* instance methods */
-VALUE m_paint(int argc, VALUE * argv, VALUE self);
-VALUE m_getpixel(int argc, VALUE * argv, VALUE self);
-VALUE m_circle(int argc, VALUE * argv, VALUE self);
-VALUE m_line(int argc, VALUE * argv, VALUE self);
-VALUE m_rect(int argc, VALUE * argv, VALUE self);
-VALUE m_pixel(int argc, VALUE * argv, VALUE self);
-VALUE m_flood_fill(int argc, VALUE * argv, VALUE self);
-VALUE m_bezier(int argc, VALUE * argv, VALUE self);
-VALUE m_polyline(int argc, VALUE * argv, VALUE self);
-VALUE m_ngon(int argc, VALUE * argv, VALUE self);
-VALUE m_special_pixel(int argc, VALUE * argv, VALUE self);
-VALUE m_splice(int argc, VALUE * argv, VALUE self);
-VALUE m_clear(int argc, VALUE * argv, VALUE self);
-VALUE m_offset(int argc, VALUE * argv, VALUE self);
-VALUE m_color(int argc, VALUE * argv, VALUE self);
-VALUE m_missing(int argc, VALUE * argv, VALUE self);
-VALUE m_bitmask(int argc, VALUE * argv, VALUE self);
-VALUE m_lshift(int argc, VALUE * argv, VALUE self);
-VALUE m_rshift(int argc, VALUE * argv, VALUE self);
-
-VALUE m_each(int argc, VALUE * argv, VALUE self);
-
-VALUE m_quad_cached(VALUE self);
-VALUE m_cache_refresh(VALUE self);
-
-VALUE m_user_set_options(VALUE self, VALUE options);
-VALUE m_user_delete_options(VALUE self);
-VALUE m_get_options(VALUE self);
-VALUE m_force_sync(VALUE self, VALUE ary);
-
-VALUE m_dup_image(VALUE self);
-VALUE m_clone_image(VALUE self);
-
-VALUE m_to_blob(VALUE self);
-
-#endif
+#ifndef GUARD_BINDINGS_H
+#define GUARD_BINDINGS_H
+
+/* class methods */
+VALUE M_create_macro(VALUE self , VALUE method_name);
+VALUE M_remove_macro(VALUE self, VALUE method_name);
+VALUE M_refresh_cache_all(VALUE self);
+VALUE M_create_blank(VALUE self, VALUE window, VALUE width, VALUE height);
+
+/* instance methods */
+VALUE m_paint(int argc, VALUE * argv, VALUE self);
+VALUE m_getpixel(int argc, VALUE * argv, VALUE self);
+VALUE m_circle(int argc, VALUE * argv, VALUE self);
+VALUE m_line(int argc, VALUE * argv, VALUE self);
+VALUE m_rect(int argc, VALUE * argv, VALUE self);
+VALUE m_pixel(int argc, VALUE * argv, VALUE self);
+VALUE m_flood_fill(int argc, VALUE * argv, VALUE self);
+VALUE m_bezier(int argc, VALUE * argv, VALUE self);
+VALUE m_polyline(int argc, VALUE * argv, VALUE self);
+VALUE m_ngon(int argc, VALUE * argv, VALUE self);
+VALUE m_special_pixel(int argc, VALUE * argv, VALUE self);
+VALUE m_splice(int argc, VALUE * argv, VALUE self);
+VALUE m_clear(int argc, VALUE * argv, VALUE self);
+VALUE m_offset(int argc, VALUE * argv, VALUE self);
+VALUE m_color(int argc, VALUE * argv, VALUE self);
+VALUE m_missing(int argc, VALUE * argv, VALUE self);
+VALUE m_bitmask(int argc, VALUE * argv, VALUE self);
+VALUE m_lshift(int argc, VALUE * argv, VALUE self);
+VALUE m_rshift(int argc, VALUE * argv, VALUE self);
+
+VALUE m_each(int argc, VALUE * argv, VALUE self);
+
+VALUE m_quad_cached(VALUE self);
+VALUE m_cache_refresh(VALUE self);
+
+VALUE m_user_set_options(VALUE self, VALUE options);
+VALUE m_user_delete_options(VALUE self);
+VALUE m_get_options(VALUE self);
+VALUE m_force_sync(VALUE self, VALUE ary);
+
+VALUE m_dup_image(VALUE self);
+VALUE m_clone_image(VALUE self);
+
+VALUE m_to_blob(VALUE self);
+
+#endif

data/ext/texplay/cache.c

@@ -1,118 +1,123 @@
-/* cache.c */
-
-#include <ruby.h>
-
-#ifdef __APPLE__
-#include <glut.h>
-#else
-#include <GL/glut.h>
-#endif
-
-#include "cache.h"
-#include "texplay.h"
-
-typedef struct {
-    int len;
-    cache_entry entry[CACHE_SIZE];                                          
-} cache_t;
-
-/* var has internal linkage, static duration */
-/* contains cache data */
-static cache_t cache = {0}; 
-
-/* create a new cache entry */
-cache_entry*
-cache_create_entry(int tname) {
-    float * new_array;
-    int sidelength, new_element = cache.len;
-
-    if(cache.len >= CACHE_SIZE) {  rb_raise(rb_eRuntimeError, "cache is full! increase CACHE_SIZE");  }
-
-    /* opengl initialization code */
-    glEnable(GL_TEXTURE_2D);
-    glBindTexture(GL_TEXTURE_2D, tname);
-
-    /* get length of a side, since square texture */
-    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &sidelength);
-
-    /* initialize texture data array, mult. by 4 because {rgba} */
-    new_array = malloc(sidelength * sidelength * 4 * sizeof(float));
-
-    /* get texture data from video memory */
-    glGetTexImage(GL_TEXTURE_2D,  0, GL_RGBA, GL_FLOAT,(void*)(new_array));
-
-    /* save texture data in the cache */
-    cache.entry[new_element].tname = tname;
-    cache.entry[new_element].sidelength = sidelength;
-    cache.entry[new_element].tdata = new_array;
-
-    /* update size of cache */
-    cache.len++;
-
-    glDisable(GL_TEXTURE_2D);
-
-    return &cache.entry[new_element];
-}
-
-/* return the entry if it exists, otherwise return NULL */
-cache_entry*
-find_in_cache(int tname) {
-    /* check if entry exists in cache */
-    int index;
-    for(index = 0; index < cache.len; index++) 
-        if(cache.entry[index].tname == tname) 
-            return &cache.entry[index];
-    
-    
-    return NULL;
-}
-
-/* if the entry doesn't exist then create it and return it.
-   otherwise just return it */
-cache_entry*
-find_or_create_cache_entry(int tname) {
-    cache_entry * entry;
-
-    if((entry=find_in_cache(tname)))
-        return entry;
-    else
-        return cache_create_entry(tname);
-}
-
-/* refresh the cache for all quads */
-void
-cache_refresh_all(void) {
-    float * tdata;
-    int tname, index;
-
-    /* opengl initialization code */
-    glEnable(GL_TEXTURE_2D);
-
-    for(index = 0; index < cache.len; index++) {
-        tdata = cache.entry[index].tdata;
-        tname = cache.entry[index].tname;
-
-        glBindTexture(GL_TEXTURE_2D, tname);
-
-        glGetTexImage(GL_TEXTURE_2D,  0, GL_RGBA, GL_FLOAT, (void*)(tdata));
-    }
-
-    glDisable(GL_TEXTURE_2D);
-}
-
-/* refresh the cache for a specific quad */
-void
-cache_refresh_entry(int tname) {
-    cache_entry * entry;
-
-    entry = find_in_cache(tname);
-    
-    /* opengl initialization code */
-    glEnable(GL_TEXTURE_2D);
-    glBindTexture(GL_TEXTURE_2D, entry->tname);
-
-    glGetTexImage(GL_TEXTURE_2D,  0, GL_RGBA, GL_FLOAT, (void*)(entry->tdata));
-
-    glDisable(GL_TEXTURE_2D);
-}
-
+/* cache.c */
+
+#include <ruby.h>
+
+#ifdef __APPLE__
+# include <AvailabilityMacros.h>
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9
+# include <GLUT/glut.h>
+#else
+# include <GL/glut.h>
+#endif
+#else
+# include <GL/glut.h>
+#endif
+
+#include "cache.h"
+#include "texplay.h"
+
+typedef struct {
+    int len;
+    cache_entry entry[CACHE_SIZE];                                          
+} cache_t;
+
+/* var has internal linkage, static duration */
+/* contains cache data */
+static cache_t cache = {0}; 
+
+/* create a new cache entry */
+cache_entry*
+cache_create_entry(int tname) {
+    float * new_array;
+    int sidelength, new_element = cache.len;
+
+    if(cache.len >= CACHE_SIZE) {  rb_raise(rb_eRuntimeError, "cache is full! increase CACHE_SIZE");  }
+
+    /* opengl initialization code */
+    glEnable(GL_TEXTURE_2D);
+    glBindTexture(GL_TEXTURE_2D, tname);
+
+    /* get length of a side, since square texture */
+    glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &sidelength);
+
+    /* initialize texture data array, mult. by 4 because {rgba} */
+    new_array = malloc(sidelength * sidelength * 4 * sizeof(float));
+
+    /* get texture data from video memory */
+    glGetTexImage(GL_TEXTURE_2D,  0, GL_RGBA, GL_FLOAT,(void*)(new_array));
+
+    /* save texture data in the cache */
+    cache.entry[new_element].tname = tname;
+    cache.entry[new_element].sidelength = sidelength;
+    cache.entry[new_element].tdata = new_array;
+
+    /* update size of cache */
+    cache.len++;
+
+    glDisable(GL_TEXTURE_2D);
+
+    return &cache.entry[new_element];
+}
+
+/* return the entry if it exists, otherwise return NULL */
+cache_entry*
+find_in_cache(int tname) {
+    /* check if entry exists in cache */
+    int index;
+    for(index = 0; index < cache.len; index++) 
+        if(cache.entry[index].tname == tname) 
+            return &cache.entry[index];
+    
+    
+    return NULL;
+}
+
+/* if the entry doesn't exist then create it and return it.
+   otherwise just return it */
+cache_entry*
+find_or_create_cache_entry(int tname) {
+    cache_entry * entry;
+
+    if((entry=find_in_cache(tname)))
+        return entry;
+    else
+        return cache_create_entry(tname);
+}
+
+/* refresh the cache for all quads */
+void
+cache_refresh_all(void) {
+    float * tdata;
+    int tname, index;
+
+    /* opengl initialization code */
+    glEnable(GL_TEXTURE_2D);
+
+    for(index = 0; index < cache.len; index++) {
+        tdata = cache.entry[index].tdata;
+        tname = cache.entry[index].tname;
+
+        glBindTexture(GL_TEXTURE_2D, tname);
+
+        glGetTexImage(GL_TEXTURE_2D,  0, GL_RGBA, GL_FLOAT, (void*)(tdata));
+    }
+
+    glDisable(GL_TEXTURE_2D);
+}
+
+/* refresh the cache for a specific quad */
+void
+cache_refresh_entry(int tname) {
+    cache_entry * entry;
+
+    entry = find_in_cache(tname);
+    
+    /* opengl initialization code */
+    glEnable(GL_TEXTURE_2D);
+    glBindTexture(GL_TEXTURE_2D, entry->tname);
+
+    glGetTexImage(GL_TEXTURE_2D,  0, GL_RGBA, GL_FLOAT, (void*)(entry->tdata));
+
+    glDisable(GL_TEXTURE_2D);
+}
+

data/ext/texplay/cache.h

@@ -1,24 +1,24 @@
-/* cache.h */
-/* see cache.c for annotations */
-
-#ifndef GUARD_CACHE_H
-#define GUARD_CACHE_H
-
-/* defines */
-#define CACHE_SIZE 10000
-
-/* data types */
-typedef struct {
-    int tname;
-    int sidelength;
-    float * tdata;
-} cache_entry;
-
-/* functions */
-void cache_refresh_all(void);
-void cache_refresh_entry(int tname);
-cache_entry * cache_create_entry(int texture_name);
-cache_entry * find_in_cache(int texture_name);
-cache_entry * find_or_create_cache_entry(int texture_name);
-
-#endif
+/* cache.h */
+/* see cache.c for annotations */
+
+#ifndef GUARD_CACHE_H
+#define GUARD_CACHE_H
+
+/* defines */
+#define CACHE_SIZE 10000
+
+/* data types */
+typedef struct {
+    int tname;
+    int sidelength;
+    float * tdata;
+} cache_entry;
+
+/* functions */
+void cache_refresh_all(void);
+void cache_refresh_entry(int tname);
+cache_entry * cache_create_entry(int texture_name);
+cache_entry * find_in_cache(int texture_name);
+cache_entry * find_or_create_cache_entry(int texture_name);
+
+#endif

data/ext/texplay/compat.h

@@ -1,27 +1,21 @@
-/* contains basic macros to facilitate ruby 1.8 and ruby 1.9 compatibility */
-
-#ifndef GUARD_COMPAT_H
-#define GUARD_COMPAT_H
-
-#include <ruby.h>
-
-/* this is the test we use to identify ruby 1.9.1 */
-
-/* commenting out this test because it doesn't seem to work in 1.8.7 */
-/*
-#ifdef RCLASS_M_TBL
-# define RUBY_19
-#endif
-*/
-
-/* macros for backwards compatibility with 1.8 */
-#ifndef RUBY_19
-# define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
-# define RCLASS_SUPER(c) (RCLASS(c)->super)
-# define RCLASS_IV_TBL(c) (RCLASS(c)->iv_tbl)
-#endif
-
-/* a useful macro. cannot use ordinary CLASS_OF as it does not return an lvalue */
-#define KLASS_OF(c) (RBASIC(c)->klass)
-
-#endif
+/* contains basic macros to facilitate ruby 1.8 and ruby 1.9 compatibility */
+
+#ifndef GUARD_COMPAT_H
+#define GUARD_COMPAT_H
+
+#include <ruby.h>
+
+/* macros for backwards compatibility with 1.8 */
+#ifndef RCLASS_M_TBL
+# define RCLASS_M_TBL(c) (RCLASS(c)->m_tbl)
+#endif
+
+#ifndef RCLASS_SUPER
+# define RCLASS_SUPER(c) (RCLASS(c)->super)
+#endif
+
+#ifndef RCLASS_IV_TBL
+# define RCLASS_IV_TBL(c) (RCLASS(c)->iv_tbl)
+#endif
+
+#endif

data/ext/texplay/extconf.rb

@@ -1,38 +1,38 @@
-require 'mkmf'
-
-name = 'texplay/texplay'
-
-dir_config name
-
-
-# linux
-if RUBY_PLATFORM =~ /linux/
-  exit unless have_library("glut")
-  exit unless have_library("GL")
-    
-# macosx
-elsif RUBY_PLATFORM =~ /darwin/
-  $LDFLAGS +=  " -framework GLUT"
-  $CFLAGS += " -I/System/Library/Frameworks/GLUT.framework/Headers"
-
-# windows    
-else
-  freeglut_path = File.expand_path "vendor/freeglut", File.dirname(__FILE__)
-
-  $CFLAGS << " -I#{File.join freeglut_path, "include"}"
-
-  exit unless find_library "freeglut_static", 'main', File.join(freeglut_path, "lib")
-  exit unless have_library "opengl32"
-
-end
-
-# Stop getting annoying warnings for valid C99 code.
-$warnflags.gsub!('-Wdeclaration-after-statement', '') if $warnflags
-
-# 1.9 compatibility
-$CFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /^1\.9/
-
-# let's use c99
-$CFLAGS += " -std=c99"
-
-create_makefile name
+require 'mkmf'
+
+name = 'texplay/texplay'
+
+dir_config name
+
+
+# linux
+if RUBY_PLATFORM =~ /linux/
+  exit unless have_library("glut")
+  exit unless have_library("GL")
+
+# macosx
+elsif RUBY_PLATFORM =~ /darwin/
+  $LDFLAGS +=  " -framework GLUT"
+  $CFLAGS += " -I/System/Library/Frameworks/GLUT.framework/Headers"
+
+# windows
+else
+  freeglut_path = File.expand_path "vendor/freeglut", File.dirname(__FILE__)
+
+  $CFLAGS << " -I#{File.join freeglut_path, "include"}"
+
+  exit unless find_library "freeglut_static", 'main', File.join(freeglut_path, "lib")
+  exit unless have_library "opengl32"
+
+end
+
+# Stop getting annoying warnings for valid C99 code.
+$warnflags.gsub!('-Wdeclaration-after-statement', '') if $warnflags
+
+# 1.9 compatibility
+$CFLAGS += " -DRUBY_19" if RUBY_VERSION =~ /^1\.9/
+
+# let's use c99
+$CFLAGS += " -std=c99"
+
+create_makefile name