gosu 0.7.38 → 0.7.39

data/GosuImpl/Graphics/TexChunk.cpp

@@ -10,10 +10,11 @@ Gosu::TexChunk::TexChunk(Graphics& graphics, Transforms& transforms, DrawOpQueue
     texture(texture), x(x), y(y), w(w), h(h), padding(padding)
 {
     info.texName = texture->texName();
-    info.left    = float(x) / texture->size();
-    info.top     = float(y) / texture->size();
-    info.right   = float(x + w) / texture->size();
-    info.bottom  = float(y + h) / texture->size();
+    float textureSize = texture->size();
+    info.left = x / textureSize;
+    info.top = y / textureSize;
+    info.right = (x + w) / textureSize;
+    info.bottom = (y + h) / textureSize;
 }
 
 Gosu::TexChunk::~TexChunk()
@@ -27,25 +28,31 @@ void Gosu::TexChunk::draw(double x1, double y1, Color c1,
     double x4, double y4, Color c4,
     ZPos z, AlphaMode mode) const
 {
-    DrawOp newDrawOp(transforms->back());
+    DrawOp op;
+    op.renderState.texName = texName();
+    op.renderState.transform = &transforms->back();
+    op.renderState.mode = mode;
     
     reorderCoordinatesIfNecessary(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
     
-    newDrawOp.usedVertices = 4;
-    newDrawOp.vertices[0] = DrawOp::Vertex(x1, y1, c1);
-    newDrawOp.vertices[1] = DrawOp::Vertex(x2, y2, c2);
+    op.verticesOrBlockIndex = 4;
+    op.vertices[0] = DrawOp::Vertex(x1, y1, c1);
+    op.vertices[1] = DrawOp::Vertex(x2, y2, c2);
 // TODO: Should be harmonized
 #ifdef GOSU_IS_IPHONE
-    newDrawOp.vertices[2] = DrawOp::Vertex(x3, y3, c3);
-    newDrawOp.vertices[3] = DrawOp::Vertex(x4, y4, c4);
+    op.vertices[2] = DrawOp::Vertex(x3, y3, c3);
+    op.vertices[3] = DrawOp::Vertex(x4, y4, c4);
 #else
-    newDrawOp.vertices[3] = DrawOp::Vertex(x3, y3, c3);
-    newDrawOp.vertices[2] = DrawOp::Vertex(x4, y4, c4);
+    op.vertices[3] = DrawOp::Vertex(x3, y3, c3);
+    op.vertices[2] = DrawOp::Vertex(x4, y4, c4);
 #endif
-    newDrawOp.chunk = this;
-    newDrawOp.mode = mode;
+    op.left = info.left;
+    op.top = info.top;
+    op.right = info.right;
+    op.bottom = info.bottom;
     
-    queues->back().scheduleDrawOp(newDrawOp, z);
+    op.z = z;
+    queues->back().scheduleDrawOp(op);
 }
 
 const Gosu::GLTexInfo* Gosu::TexChunk::glTexInfo() const
@@ -84,7 +91,7 @@ void Gosu::TexChunk::insert(const Bitmap& original, int x, int y)
         bitmap = &alternate;
     }
     
-    glBindTexture(GL_TEXTURE_2D, texture->texName());
+    glBindTexture(GL_TEXTURE_2D, texName());
     glTexSubImage2D(GL_TEXTURE_2D, 0, this->x + x, this->y + y, bitmap->width(), bitmap->height(),
         Color::GL_FORMAT, GL_UNSIGNED_BYTE, bitmap->data());
 }

data/GosuImpl/Graphics/TexChunk.hpp

@@ -19,18 +19,18 @@ class Gosu::TexChunk : public Gosu::ImageData
     
     // Cached for faster access.
     GLTexInfo info;
-
+    
 public:
     TexChunk(Graphics& graphics, Transforms& transforms, DrawOpQueueStack& queues,
              std::tr1::shared_ptr<Texture> texture, int x, int y, int w, int h, int padding);
     ~TexChunk();
 
-    unsigned int width() const
+    int width() const
     {
         return w;
     }
     
-    unsigned int height() const
+    int height() const
     {
         return h;
     }
@@ -40,14 +40,6 @@ public:
         return info.texName;
     }
     
-    void getCoords(float& left, float& top, float& right, float& bottom) const
-    {
-        left = info.left;
-        top = info.top;
-        right = info.right;
-        bottom = info.bottom;
-    }
-
     void draw(double x1, double y1, Color c1,
         double x2, double y2, Color c2,
         double x3, double y3, Color c3,

data/GosuImpl/Graphics/Texture.cpp

@@ -36,12 +36,12 @@ Gosu::Texture::Texture(unsigned size)
     else
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     
-#ifdef GOSU_IS_WIN
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-#else
+#ifdef GL_CLAMP_TO_EDGE
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+#else
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
 #endif
 }
 

data/GosuImpl/Input/AccelerometerReader.hpp

@@ -2,7 +2,7 @@
 
 typedef UIAccelerationValue Acceleration[3];
 
-@interface AccelerometerReader : NSObject {
+@interface AccelerometerReader : NSObject <UIAccelerometerDelegate> {
     Acceleration acceleration;
 }
 -(AccelerometerReader*)initWithUpdateInterval:(float)updateInterval;

data/GosuImpl/RubyGosu.swg

@@ -767,10 +767,10 @@ namespace Gosu {
         $self->graphics().endClipping();
     }
     %newobject record;
-    Gosu::Image* record() {
+    Gosu::Image* record(int width, int height) {
         $self->graphics().beginRecording();
         rb_yield(Qnil);
-        return new Gosu::Image($self->graphics().endRecording());
+        return new Gosu::Image($self->graphics().endRecording(width, height));
     }
     void transform(double m0, double m1, double m2, double m3, double m4, double m5, double m6, double m7,
         double m8, double m9, double m10, double m11, double m12, double m13, double m14, double m15) {

data/GosuImpl/RubyGosu_wrap.cxx

@@ -2823,10 +2823,10 @@ SWIGINTERN void Gosu_Window_clipTo(Gosu::Window *self,double x,double y,double w
         rb_yield(Qnil);
         self->graphics().endClipping();
     }
-SWIGINTERN Gosu::Image *Gosu_Window_record(Gosu::Window *self){
+SWIGINTERN Gosu::Image *Gosu_Window_record(Gosu::Window *self,int width,int height){
         self->graphics().beginRecording();
         rb_yield(Qnil);
-        return new Gosu::Image(self->graphics().endRecording());
+        return new Gosu::Image(self->graphics().endRecording(width, height));
     }
 SWIGINTERN void Gosu_Window_transform(Gosu::Window *self,double m0,double m1,double m2,double m3,double m4,double m5,double m6,double m7,double m8,double m9,double m10,double m11,double m12,double m13,double m14,double m15){
         Gosu::Transform transform = {
@@ -10359,22 +10359,38 @@ fail:
 SWIGINTERN VALUE
 _wrap_Window_record(int argc, VALUE *argv, VALUE self) {
   Gosu::Window *arg1 = (Gosu::Window *) 0 ;
+  int arg2 ;
+  int arg3 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
   Gosu::Image *result = 0 ;
   VALUE vresult = Qnil;
   
-  if ((argc < 0) || (argc > 0)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Window, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Window *","record", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Window * >(argp1);
+  ecode2 = SWIG_AsVal_int(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "int","record", 2, argv[0] ));
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(argv[1], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","record", 3, argv[1] ));
+  } 
+  arg3 = static_cast< int >(val3);
   {
     try {
-      result = (Gosu::Image *)Gosu_Window_record(arg1);
+      result = (Gosu::Image *)Gosu_Window_record(arg1,arg2,arg3);
     } catch (const std::exception& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -11227,8 +11243,8 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(7)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(38)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.38"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(39)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.39"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
   rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);

data/GosuImpl/Utility.cpp

@@ -8,6 +8,8 @@
 #include <algorithm>
 #include <vector>
 
+#ifndef GOSU_IS_IPHONE
+
 #ifndef GOSU_IS_WIN
 #include <GosuImpl/Iconv.hpp>
 #endif
@@ -101,6 +103,8 @@ string Gosu::narrow(const wstring& ws)
     return string(buf.begin(), buf.end() - 1);
 }
 
+#endif
+
 // TODO: This function needs to go into some internal header.
 namespace Gosu
 {

data/GosuImpl/WindowX.cpp

@@ -22,6 +22,8 @@
 #include <X11/Xutil.h>
 #include "X11vroot.h"
 
+#include <X11/extensions/Xinerama.h>
+
 using namespace std::tr1::placeholders;
 
 namespace
@@ -236,20 +238,52 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     Atom atoms[] = { XInternAtom(pimpl->display, "WM_DELETE_WINDOW", false) };
     XSetWMProtocols(pimpl->display, pimpl->window, atoms, 1);
 
+    // Get xinerama screen info
+    int screen_count = 0;
+    XineramaScreenInfo *screen_info = XineramaQueryScreens(pimpl->display, &screen_count);
+
+    // Holders for screen info
+    int screen_origin_x = 0;
+    int screen_origin_y = 0;
+    int screen_width = 0;
+    int screen_height = 0;
+
+    // Literal X screen, different from Xinerama screens
     Screen* screen = XScreenOfDisplay(pimpl->display,
                         DefaultScreen(pimpl->display));
 
+    // Get origin/size from first xinerama screen if it
+    // exists; convention seems to be that the first
+    // screen is always the default screen with xinerama.
+    if(screen_info != NULL){
+        screen_origin_x = screen_info[0].x_org;
+        screen_origin_y = screen_info[0].y_org;
+        screen_width = screen_info[0].width;
+        screen_height = screen_info[0].height;
+    
+    // ... or just use the whole X screen if we don't
+    // seem to have any xinerama information.
+    }else{
+        screen_width = screen->width;
+        screen_height = screen->height;
+    }
+
+    // Free the screen info, cause I guess we don't
+    // need it after this?
+    XFree(screen_info);
+
     if (fullscreen)
     {
-        pimpl->width = screen->width;
-        pimpl->height = screen->height;
-        XMoveResizeWindow(pimpl->display, pimpl->window, 0, 0,
-            screen->width, screen->height);
+        pimpl->width = screen_width;
+        pimpl->height = screen_height;
+        XMoveResizeWindow(pimpl->display, pimpl->window, screen_origin_x, screen_origin_y,
+            screen_width, screen_height);
             
         XSetWindowAttributes windowAttributes;
         windowAttributes.override_redirect = true;
         unsigned mask = CWOverrideRedirect;
         XChangeWindowAttributes(pimpl->display, pimpl->window, mask, &windowAttributes);
+        
     }
     else
         ; // Window already has requested size
@@ -348,9 +382,11 @@ void Gosu::Window::show()
     // Make glx current
     glXMakeCurrent(pimpl->display, pimpl->window, pimpl->context);
     
-    if (pimpl->fullscreen)
+    if (pimpl->fullscreen){
         XSetInputFocus(pimpl->display, pimpl->window, RevertToParent, CurrentTime);
-
+        XGrabPointer(pimpl->display, pimpl->window, true, 0, GrabModeAsync, GrabModeAsync, pimpl->window, None, CurrentTime);
+    }
+    
     setCaption(pimpl->title);
 
     unsigned startTime, endTime;

data/examples/Tutorial.rb

@@ -65,9 +65,9 @@ class Star
   def initialize(animation)
     @animation = animation
     @color = Gosu::Color.new(0xff000000)
-    @color.red = rand(255 - 40) + 40
-    @color.green = rand(255 - 40) + 40
-    @color.blue = rand(255 - 40) + 40
+    @color.red = rand(256 - 40) + 40
+    @color.green = rand(256 - 40) + 40
+    @color.blue = rand(256 - 40) + 40
     @x = rand * 640
     @y = rand * 480
   end

data/lib/gosu.rb

@@ -5,12 +5,12 @@ if defined? RUBY_PLATFORM and
   ENV['PATH'] = "#{File.dirname(__FILE__)};#{ENV['PATH']}"
 end
 
-if File.exist? "#{File.dirname(__FILE__)}/gosu.#{Config::CONFIG['DLEXT']}"
-  require "gosu.#{Config::CONFIG['DLEXT']}"
+if File.exist? "#{File.dirname(__FILE__)}/gosu.#{RbConfig::CONFIG['DLEXT']}"
+  require "gosu.#{RbConfig::CONFIG['DLEXT']}"
 elsif defined? RUBY_VERSION and RUBY_VERSION >= '1.9' then
-  require "gosu.for_1_9.#{Config::CONFIG['DLEXT']}"
+  require "gosu.for_1_9.#{RbConfig::CONFIG['DLEXT']}"
 else
-  require "gosu.for_1_8.#{Config::CONFIG['DLEXT']}"
+  require "gosu.for_1_8.#{RbConfig::CONFIG['DLEXT']}"
 end
 
 require "gosu/swig_patches"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 77
   prerelease: 
   segments: 
   - 0
   - 7
-  - 38
-  version: 0.7.38
+  - 39
+  version: 0.7.39
 platform: ruby
 authors: 
 - Julian Raschke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-28 00:00:00 Z
+date: 2011-11-19 00:00:00 Z
 dependencies: []
 
 description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and OpenGL.\n"
@@ -111,6 +111,7 @@ files:
 - GosuImpl/Graphics/BitmapUtils.cpp
 - GosuImpl/Graphics/BlockAllocator.cpp
 - GosuImpl/Graphics/BlockAllocator.hpp
+- GosuImpl/Graphics/ClipRectStack.hpp
 - GosuImpl/Graphics/Color.cpp
 - GosuImpl/Graphics/Common.hpp
 - GosuImpl/Graphics/DrawOp.hpp
@@ -178,12 +179,19 @@ files:
 - GosuImpl/WinUtility.cpp
 - GosuImpl/X11vroot.h
 - linux/extconf.rb
-homepage: http://libgosu.org/
+homepage: http://www.libgosu.org/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- README.txt
+- COPYING
+- reference/gosu.rb
+- reference/*.rdoc
+- --title
+- Gosu
+- --main
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -209,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - See https://github.com/jlnr/gosu/wiki/Getting-Started-on-Linux
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: 2D game development library.