gosu 0.8.0.pre1 → 0.8.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44a9c34018bb68377bbebea3d2b032802164035f
-  data.tar.gz: c54379a8fc21c22f1134e25fcab64eb86b03affb
+  metadata.gz: 05c915ec5bb6741b2f1e7096cc1a434a7dac9e44
+  data.tar.gz: aa4c3de8acefbe1587f34adff4704bb55772f9e0
 SHA512:
-  metadata.gz: 1097c5da7679685396bbd3dafa24ad914813a025277ad110b039a9ae8d8b70cae79b5188d3def18e08b5a668c0c32102d303957f3163c7ee3730069bf9ce795c
-  data.tar.gz: 47e91556e91d55cead8de660b37c621ab40a5f712f6047147f4424fce9b55f069a94b5c2b3eb6d378b1aee95139d7b82df5724789b7fc4cfd68129ffd4f67cd9
+  metadata.gz: 9bce8f59fd4cb6a79e3e366487c97fef09b7ee22f35cd8e45d23c71917e01125eb8394c5b51e7f8244be4342adf1bff007dd2483ff392d164946dd641efbb05d
+  data.tar.gz: ead46c15ca34bd1a930335fef40734e0242d38cadd2f0f07456eb7f56b94fbb8c66b9bfdb1954dedcd3d16d15da08d0fed782ed77946c60b8519c41c60d3f50c

data/Gosu/Version.hpp

@@ -4,7 +4,7 @@
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 8
 #define GOSU_POINT_VERSION 0
-#define GOSU_VERSION "0.8.0.pre1"
+#define GOSU_VERSION "0.8.0.pre2"
 
 #define GOSU_COPYRIGHT_NOTICE \
   " " \

data/GosuImpl/RubyGosu.swg

@@ -355,6 +355,10 @@ namespace Gosu
 %ignore Gosu::FontFlags;
 %ignore Gosu::TextAlign;
 %ignore Gosu::BorderFlags;
+%ignore Gosu::concat;
+%ignore Gosu::translate;
+%ignore Gosu::rotate;
+%ignore Gosu::scale;
 %include "../Gosu/GraphicsBase.hpp"
 
 // For screenWidth/screenHeight
@@ -647,6 +651,7 @@ namespace Gosu {
 
 // TextInput
 %ignore Gosu::TextInput::feedNSEvent(void*);
+%ignore Gosu::TextInput::feedSDLEvent(void*);
 %ignore Gosu::TextInput::feedMessage(unsigned long, unsigned long, unsigned long);
 %ignore Gosu::TextInput::feedButtonId(unsigned);
 %ignore Gosu::TextInput::caretPos() const;

data/GosuImpl/RubyGosu_wrap.cxx

@@ -2894,13 +2894,13 @@ SwigDirector_TextInput::SwigDirector_TextInput(VALUE self): Gosu::TextInput(), S
 SwigDirector_TextInput::~SwigDirector_TextInput() {
 }
 
-std::wstring SwigDirector_TextInput::filter(std::wstring const &textIn) const {
+std::wstring SwigDirector_TextInput::filter(std::wstring const &text) const {
   std::wstring c_result ;
   VALUE obj0 = Qnil ;
   VALUE result;
   
   {
-    obj0 = rb_str_new2(Gosu::wstringToUTF8(textIn).c_str());
+    obj0 = rb_str_new2(Gosu::wstringToUTF8(text).c_str());
     FIX_ENCODING(obj0);
   }
   result = rb_funcall(swig_get_self(), rb_intern("filter"), 1,obj0);
@@ -3458,246 +3458,6 @@ fail:
 }
 
 
-SWIGINTERN VALUE
-_wrap_translate(int argc, VALUE *argv, VALUE self) {
-  double arg1 ;
-  double arg2 ;
-  double val1 ;
-  int ecode1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  Gosu::Transform result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_double(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","Gosu::translate", 1, argv[0] ));
-  } 
-  arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Gosu::translate", 2, argv[1] ));
-  } 
-  arg2 = static_cast< double >(val2);
-  {
-    try {
-      result = Gosu::translate(arg1,arg2);
-    } catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
-  }
-  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_std__tr1__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_rotate(int argc, VALUE *argv, VALUE self) {
-  double arg1 ;
-  double arg2 = (double) 0 ;
-  double arg3 = (double) 0 ;
-  double val1 ;
-  int ecode1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
-  Gosu::Transform result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 3)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_double(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","Gosu::rotate", 1, argv[0] ));
-  } 
-  arg1 = static_cast< double >(val1);
-  if (argc > 1) {
-    ecode2 = SWIG_AsVal_double(argv[1], &val2);
-    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Gosu::rotate", 2, argv[1] ));
-    } 
-    arg2 = static_cast< double >(val2);
-  }
-  if (argc > 2) {
-    ecode3 = SWIG_AsVal_double(argv[2], &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "double","Gosu::rotate", 3, argv[2] ));
-    } 
-    arg3 = static_cast< double >(val3);
-  }
-  {
-    try {
-      result = Gosu::rotate(arg1,arg2,arg3);
-    } catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
-  }
-  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_std__tr1__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_scale__SWIG_0(int argc, VALUE *argv, VALUE self) {
-  double arg1 ;
-  double val1 ;
-  int ecode1 = 0 ;
-  Gosu::Transform result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_double(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","Gosu::scale", 1, argv[0] ));
-  } 
-  arg1 = static_cast< double >(val1);
-  {
-    try {
-      result = Gosu::scale(arg1);
-    } catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
-  }
-  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_std__tr1__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_scale__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  double arg1 ;
-  double arg2 ;
-  double arg3 = (double) 0 ;
-  double arg4 = (double) 0 ;
-  double val1 ;
-  int ecode1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  double val3 ;
-  int ecode3 = 0 ;
-  double val4 ;
-  int ecode4 = 0 ;
-  Gosu::Transform result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 4)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
-  }
-  ecode1 = SWIG_AsVal_double(argv[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","Gosu::scale", 1, argv[0] ));
-  } 
-  arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(argv[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","Gosu::scale", 2, argv[1] ));
-  } 
-  arg2 = static_cast< double >(val2);
-  if (argc > 2) {
-    ecode3 = SWIG_AsVal_double(argv[2], &val3);
-    if (!SWIG_IsOK(ecode3)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "double","Gosu::scale", 3, argv[2] ));
-    } 
-    arg3 = static_cast< double >(val3);
-  }
-  if (argc > 3) {
-    ecode4 = SWIG_AsVal_double(argv[3], &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "double","Gosu::scale", 4, argv[3] ));
-    } 
-    arg4 = static_cast< double >(val4);
-  }
-  {
-    try {
-      result = Gosu::scale(arg1,arg2,arg3,arg4);
-    } catch (const std::exception& e) {
-      SWIG_exception(SWIG_RuntimeError, e.what());
-    }
-  }
-  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_std__tr1__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
-  return vresult;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE _wrap_scale(int nargs, VALUE *args, VALUE self) {
-  int argc;
-  VALUE argv[4];
-  int ii;
-  
-  argc = nargs;
-  if (argc > 4) SWIG_fail;
-  for (ii = 0; (ii < argc); ++ii) {
-    argv[ii] = args[ii];
-  }
-  if (argc == 1) {
-    int _v;
-    {
-      int res = SWIG_AsVal_double(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      return _wrap_scale__SWIG_0(nargs, args, self);
-    }
-  }
-  if ((argc >= 2) && (argc <= 4)) {
-    int _v;
-    {
-      int res = SWIG_AsVal_double(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_double(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        if (argc <= 2) {
-          return _wrap_scale__SWIG_1(nargs, args, self);
-        }
-        {
-          int res = SWIG_AsVal_double(argv[2], NULL);
-          _v = SWIG_CheckState(res);
-        }
-        if (_v) {
-          if (argc <= 3) {
-            return _wrap_scale__SWIG_1(nargs, args, self);
-          }
-          {
-            int res = SWIG_AsVal_double(argv[3], NULL);
-            _v = SWIG_CheckState(res);
-          }
-          if (_v) {
-            return _wrap_scale__SWIG_1(nargs, args, self);
-          }
-        }
-      }
-    }
-  }
-  
-fail:
-  Ruby_Format_OverloadedError( argc, 4, "scale", 
-    "    Gosu::Transform scale(double factor)\n"
-    "    Gosu::Transform scale(double factorX, double factorY, double fromX, double fromY)\n");
-  
-  return Qnil;
-}
-
-
 SWIGINTERN VALUE
 _wrap_language(int argc, VALUE *argv, VALUE self) {
   std::string result;
@@ -11106,9 +10866,9 @@ 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 >(50)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.50"));
+  rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(8)));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(0)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.8.0.pre2"));
   rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr(" \t\t  GNU LIBRARY GENERAL PUBLIC LICENSE\t\t       Version 2, June 1991\n\n\n\n Copyright (C) 1991 Free Software Foundation, Inc.                    675 Mass Ave, Cambridge, MA 02139, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.\n\n[This is the first released version of the library GPL.  It is numbered 2 because it goes with version 2 of the ordinary GPL.]\n\n\t\t\t    Preamble\n\n  The licenses for most software are designed to take away yourfreedom to share and change it.  By contrast, the GNU General PublicLicenses are intended to guarantee your freedom to share and changefree software--to make sure the software is free for all its users.\n\n  This license, the Library General Public License, applies to somespecially designated Free Software Foundation software, and to anyother libraries whose authors decide to use it.  You can use it foryour libraries, too.\n\n  When we speak of free software, we are referring to freedom, notprice.  Our General Public Licenses are designed to make sure that youhave the freedom to distribute copies of free software (and charge forthis service if you wish), that you receive source code or can get itif you want it, that you can change the software or use pieces of itin new free programs; and that you know you can do these things.\n\n  To protect your rights, we need to make restrictions that forbidanyone to deny you these rights or to ask you to surrender the rights.These restrictions translate to certain responsibilities for you ifyou distribute copies of the library, or if you modify it.\n\n  For example, if you distribute copies of the library, whether gratisor for a fee, you must give the recipients all the rights that we gaveyou.  You must make sure that they, too, receive or can get the sourcecode.  If you link a program with the library, you must providecomplete object files to the recipients so that they can relink themwith the library, after making changes to the library and recompilingit.  And you must show them these terms so they know their rights.\n\n  Our method of protecting your rights has two steps: (1) copyrightthe library, and (2) offer you this license which gives you legalpermission to copy, distribute and/or modify the library.\n\n  Also, for each distributor\'s protection, we want to make certainthat everyone understands that there is no warranty for this freelibrary.  If the library is modified by someone else and passed on, wewant its recipients to know that what they have is not the originalversion, so that any problems introduced by others will not reflect onthe original authors\' reputations.\14  Finally, any free program is threatened constantly by softwarepatents.  We wish to avoid the danger that companies distributing freesoftware will individually obtain patent licenses, thus in effecttransforming the program into proprietary software.  To prevent this,we have made it clear that any patent must be licensed for everyone\'sfree use or not licensed at all.\n\n  Most GNU software, including some libraries, is covered by the ordinaryGNU General Public License, which was designed for utility programs.  Thislicense, the GNU Library General Public License, applies to certaindesignated libraries.  This license is quite different from the ordinaryone; be sure to read it in full, and don\'t assume that anything in it isthe same as in the ordinary license.\n\n  The reason we have a separate public license for some libraries is thatthey blur the distinction we usually make between modifying or adding to aprogram and simply using it.  Linking a program with a library, withoutchanging the library, is in some sense simply using the library, and isanalogous to running a utility program or application program.  However, ina textual and legal sense, the linked executable is a combined work, aderivative of the original library, and the ordinary General Public Licensetreats it as such.\n\n  Because of this blurred distinction, using the ordinary GeneralPublic License for libraries did not effectively promote softwaresharing, because most developers did not use the libraries.  Weconcluded that weaker conditions might promote sharing better.\n\n  However, unrestricted linking of non-free programs would deprive theusers of those programs of all benefit from the free status of thelibraries themselves.  This Library General Public License is intended topermit developers of non-free programs to use free libraries, whilepreserving your freedom as a user of such programs to change the freelibraries that are incorporated in them.  (We have not seen how to achievethis as regards changes in header files, but we have achieved it as regardschanges in the actual functions of the Library.)  The hope is that thiswill lead to faster development of free libraries.\n\n  The precise terms and conditions for copying, distribution andmodification follow.  Pay close attention to the difference between a\"work based on the library\" and a \"work that uses the library\".  Theformer contains code derived from the library, while the latter onlyworks together with the library.\n\n  Note that it is possible for a library to be covered by the ordinaryGeneral Public License rather than by this special one.\14\t\t  GNU LIBRARY GENERAL PUBLIC LICENSE   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n\n  0. This License Agreement applies to any software library whichcontains a notice placed by the copyright holder or other authorizedparty saying it may be distributed under the terms of this LibraryGeneral Public License (also called \"this License\").  Each licensee isaddressed as \"you\".\n\n  A \"library\" means a collection of software functions and/or dataprepared so as to be conveniently linked with application programs(which use some of those functions and data) to form executables.\n\n  The \"Library\", below, refers to any such software library or workwhich has been distributed under these terms.  A \"work based on theLibrary\" means either the Library or any derivative work undercopyright law: that is to say, a work containing the Library or aportion of it, either verbatim or with modifications and/or translatedstraightforwardly into another language.  (Hereinafter, translation isincluded without limitation in the term \"modification\".)\n\n  \"Source code\" for a work means the preferred form of the work formaking modifications to it.  For a library, complete source code meansall the source code for all modules it contains, plus any associatedinterface definition files, plus the scripts used to control compilationand installation of the library.\n\n  Activities other than copying, distribution and modification are notcovered by this License; they are outside its scope.  The act ofrunning a program using the Library is not restricted, and output fromsuch a program is covered only if its contents constitute a work basedon the Library (independent of the use of the Library in a tool forwriting it).  Whether that is true depends on what the Library doesand what the program that uses the Library does.    1. You may copy and distribute verbatim copies of the Library\'scomplete source code as you receive it, in any medium, provided thatyou conspicuously and appropriately publish on each copy anappropriate copyright notice and disclaimer of warranty; keep intactall the notices that refer to this License and to the absence of anywarranty; and distribute a copy of this License along with theLibrary.\n\n  You may charge a fee for the physical act of transferring a copy,and you may at your option offer warranty protection in exchange for afee.\14  2. You may modify your copy or copies of the Library or any portionof it, thus forming a work based on the Library, and copy anddistribute such modifications or work under the terms of Section 1above, provided that you also meet all of these conditions:\n\n    a) The modified work must itself be a software library.\n\n    b) You must cause the files modified to carry prominent notices    stating that you changed the files and the date of any change.\n\n    c) You must cause the whole of the work to be licensed at no    charge to all third parties under the terms of this License.\n\n    d) If a facility in the modified Library refers to a function or a    table of data to be supplied by an application program that uses    the facility, other than as an argument passed when the facility    is invoked, then you must make a good faith effort to ensure that,    in the event an application does not supply such function or    table, the facility still operates, and performs whatever part of    its purpose remains meaningful.\n\n    (For example, a function in a library to compute square roots has    a purpose that is entirely well-defined independent of the    application.  Therefore, Subsection 2d requires that any    application-supplied function or table used by this function must    be optional: if the application does not supply it, the square    root function must still compute square roots.)\n\nThese requirements apply to the modified work as a whole.  Ifidentifiable sections of that work are not derived from the Library,and can be reasonably considered independent and separate works inthemselves, then this License, and its terms, do not apply to thosesections when you distribute them as separate works.  But when youdistribute the same sections as part of a whole which is a work basedon the Library, the distribution of the whole must be on the terms ofthis License, whose permissions for other licensees extend to theentire whole, and thus to each and every part regardless of who wroteit.\n\nThus, it is not the intent of this section to claim rights or contestyour rights to work written entirely by you; rather, the intent is toexercise the right to control the distribution of derivative orcollective works based on the Library.\n\nIn addition, mere aggregation of another work not based on the Librarywith the Library (or with a work based on the Library) on a volume ofa storage or distribution medium does not bring the other work underthe scope of this License.\n\n  3. You may opt to apply the terms of the ordinary GNU General PublicLicense instead of this License to a given copy of the Library.  To dothis, you must alter all the notices that refer to this License, sothat they refer to the ordinary GNU General Public License, version 2,instead of to this License.  (If a newer version than version 2 of theordinary GNU General Public License has appeared, then you can specifythat version instead if you wish.)  Do not make any other change inthese notices.\14  Once this change is made in a given copy, it is irreversible forthat copy, so the ordinary GNU General Public License applies to allsubsequent copies and derivative works made from that copy.\n\n  This option is useful when you wish to copy part of the code ofthe Library into a program that is not a library.\n\n  4. You may copy and distribute the Library (or a portion orderivative of it, under Section 2) in object code or executable formunder the terms of Sections 1 and 2 above provided that you accompanyit with the complete corresponding machine-readable source code, whichmust be distributed under the terms of Sections 1 and 2 above on amedium customarily used for software interchange.\n\n  If distribution of object code is made by offering access to copyfrom a designated place, then offering equivalent access to copy thesource code from the same place satisfies the requirement todistribute the source code, even though third parties are notcompelled to copy the source along with the object code.\n\n  5. A program that contains no derivative of any portion of theLibrary, but is designed to work with the Library by being compiled orlinked with it, is called a \"work that uses the Library\".  Such awork, in isolation, is not a derivative work of the Library, andtherefore falls outside the scope of this License.\n\n  However, linking a \"work that uses the Library\" with the Librarycreates an executable that is a derivative of the Library (because itcontains portions of the Library), rather than a \"work that uses thelibrary\".  The executable is therefore covered by this License.Section 6 states terms for distribution of such executables.\n\n  When a \"work that uses the Library\" uses material from a header filethat is part of the Library, the object code for the work may be aderivative work of the Library even though the source code is not.Whether this is true is especially significant if the work can belinked without the Library, or if the work is itself a library.  Thethreshold for this to be true is not precisely defined by law.\n\n  If such an object file uses only numerical parameters, datastructure layouts and accessors, and small macros and small inlinefunctions (ten lines or less in length), then the use of the objectfile is unrestricted, regardless of whether it is legally a derivativework.  (Executables containing this object code plus portions of theLibrary will still fall under Section 6.)\n\n  Otherwise, if the work is a derivative of the Library, you maydistribute the object code for the work under the terms of Section 6.Any executables containing that work also fall under Section 6,whether or not they are linked directly with the Library itself.\14  6. As an exception to the Sections above, you may also compile orlink a \"work that uses the Library\" with the Library to produce awork containing portions of the Library, and distribute that workunder terms of your choice, provided that the terms permitmodification of the work for the customer\'s own use and reverseengineering for debugging such modifications.\n\n  You must give prominent notice with each copy of the work that theLibrary is used in it and that the Library and its use are covered bythis License.  You must supply a copy of this License.  If the workduring execution displays copyright notices, you must include thecopyright notice for the Library among them, as well as a referencedirecting the user to the copy of this License.  Also, you must do oneof these things:\n\n    a) Accompany the work with the complete corresponding    machine-readable source code for the Library including whatever    changes were used in the work (which must be distributed under    Sections 1 and 2 above); and, if the work is an executable linked    with the Library, with the complete machine-readable \"work that    uses the Library\", as object code and/or source code, so that the    user can modify the Library and then relink to produce a modified    executable containing the modified Library.  (It is understood    that the user who changes the contents of definitions files in the    Library will not necessarily be able to recompile the application    to use the modified definitions.)\n\n    b) Accompany the work with a written offer, valid for at    least three years, to give the same user the materials    specified in Subsection 6a, above, for a charge no more    than the cost of performing this distribution.\n\n    c) If distribution of the work is made by offering access to copy    from a designated place, offer equivalent access to copy the above    specified materials from the same place.\n\n    d) Verify that the user has already received a copy of these    materials or that you have already sent this user a copy.\n\n  For an executable, the required form of the \"work that uses theLibrary\" must include any data and utility programs needed forreproducing the executable from it.  However, as a special exception,the source code distributed need not include anything that is normallydistributed (in either source or binary form) with the majorcomponents (compiler, kernel, and so on) of the operating system onwhich the executable runs, unless that component itself accompaniesthe executable.\n\n  It may happen that this requirement contradicts the licenserestrictions of other proprietary libraries that do not normallyaccompany the operating system.  Such a contradiction means you cannotuse both them and the Library together in an executable that youdistribute.\14  7. You may place library facilities that are a work based on theLibrary side-by-side in a single library together with other libraryfacilities not covered by this License, and distribute such a combinedlibrary, provided that the separate distribution of the work based onthe Library and of the other library facilities is otherwisepermitted, and provided that you do these two things:\n\n    a) Accompany the combined library with a copy of the same work    based on the Library, uncombined with any other library    facilities.  This must be distributed under the terms of the    Sections above.\n\n    b) Give prominent notice with the combined library of the fact    that part of it is a work based on the Library, and explaining    where to find the accompanying uncombined form of the same work.\n\n  8. You may not copy, modify, sublicense, link with, or distributethe Library except as expressly provided under this License.  Anyattempt otherwise to copy, modify, sublicense, link with, ordistribute the Library is void, and will automatically terminate yourrights under this License.  However, parties who have received copies,or rights, from you under this License will not have their licensesterminated so long as such parties remain in full compliance.\n\n  9. You are not required to accept this License, since you have notsigned it.  However, nothing else grants you permission to modify ordistribute the Library or its derivative works.  These actions areprohibited by law if you do not accept this License.  Therefore, bymodifying or distributing the Library (or any work based on theLibrary), you indicate your acceptance of this License to do so, andall its terms and conditions for copying, distributing or modifyingthe Library or works based on it.\n\n  10. Each time you redistribute the Library (or any work based on theLibrary), the recipient automatically receives a license from theoriginal licensor to copy, distribute, link with or modify the Librarysubject to these terms and conditions.  You may not impose any furtherrestrictions on the recipients\' exercise of the rights granted herein.You are not responsible for enforcing compliance by third parties tothis License.\14  11. If, as a consequence of a court judgment or allegation of patentinfringement or for any other reason (not limited to patent issues),conditions are imposed on you (whether by court order, agreement orotherwise) that contradict the conditions of this License, they do notexcuse you from the conditions of this License.  If you cannotdistribute so as to satisfy simultaneously your obligations under thisLicense and any other pertinent obligations, then as a consequence youmay not distribute the Library at all.  For example, if a patentlicense would not permit royalty-free redistribution of the Library byall those who receive copies directly or indirectly through you, thenthe only way you could satisfy both it and this License would be torefrain entirely from distribution of the Library.\n\nIf any portion of this section is held invalid or unenforceable under anyparticular circumstance, the balance of the section is intended to apply,and the section as a whole is intended to apply in other circumstances.\n\nIt is not the purpose of this section to induce you to infringe anypatents or other property right claims or to contest validity of anysuch claims; this section has the sole purpose of protecting theintegrity of the free software distribution system which isimplemented by public license practices.  Many people have madegenerous contributions to the wide range of software distributedthrough that system in reliance on consistent application of thatsystem; it is up to the author/donor to decide if he or she is willingto distribute software through any other system and a licensee cannotimpose that choice.\n\nThis section is intended to make thoroughly clear what is believed tobe a consequence of the rest of this License.\n\n  12. If the distribution and/or use of the Library is restricted incertain countries either by patents or by copyrighted interfaces, theoriginal copyright holder who places the Library under this License may addan explicit geographical distribution limitation excluding those countries,so that distribution is permitted only in or among countries not thusexcluded.  In such case, this License incorporates the limitation as ifwritten in the body of this License.\n\n  13. The Free Software Foundation may publish revised and/or newversions of the Library General Public License from time to time.Such new versions will be similar in spirit to the present version,but may differ in detail to address new problems or concerns.\n\nEach version is given a distinguishing version number.  If the Libraryspecifies a version number of this License which applies to it and\"any later version\", you have the option of following the terms andconditions either of that version or of any later version published bythe Free Software Foundation.  If the Library does not specify alicense version number, you may choose any version ever published bythe Free Software Foundation.\14  14. If you wish to incorporate parts of the Library into other freeprograms whose distribution conditions are incompatible with these,write to the author to ask for permission.  For software which iscopyrighted by the Free Software Foundation, write to the FreeSoftware Foundation; we sometimes make exceptions for this.  Ourdecision will be guided by the two goals of preserving the free statusof all derivatives of our free software and of promoting the sharingand reuse of software generally.\n\n\t\t\t    NO WARRANTY\n\n  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NOWARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OROTHER PARTIES PROVIDE THE LIBRARY \"AS IS\" WITHOUT WARRANTY OF ANYKIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THEIMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULARPURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THELIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUMETHE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO INWRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFYAND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOUFOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL ORCONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THELIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEINGRENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR AFAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IFSUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCHDAMAGES.\n\n\t\t     END OF TERMS AND CONDITIONS\14     Appendix: How to Apply These Terms to Your New Libraries\n\n  If you develop a new library, and you want it to be of the greatestpossible use to the public, we recommend making it free software thateveryone can redistribute and change.  You can do so by permittingredistribution under these terms (or, alternatively, under the terms of theordinary General Public License).\n\n  To apply these terms, attach the following notices to the library.  It issafest to attach them to the start of each source file to most effectivelyconvey the exclusion of warranty; and each file should have at least the\"copyright\" line and a pointer to where the full notice is found.\n\n    <one line to give the library\'s name and a brief idea of what it does.>    Copyright (C) <year>  <name of author>\n\n    This library is free software; you can redistribute it and/or    modify it under the terms of the GNU Library General Public    License as published by the Free Software Foundation; either    version 2 of the License, or (at your option) any later version.\n\n    This library is distributed in the hope that it will be useful,    but WITHOUT ANY WARRANTY; without even the implied warranty of    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU    Library General Public License for more details.\n\n    You should have received a copy of the GNU Library General Public    License along with this library; if not, write to the Free    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n\nAlso add information on how to contact you by electronic and paper mail.\n\nYou should also get your employer (if you work as a programmer) or yourschool, if any, to sign a \"copyright disclaimer\" for the library, ifnecessary.  Here is a sample; alter the names:\n\n  Yoyodyne, Inc., hereby disclaims all copyright interest in the  library `Frob\' (a library for tweaking knobs) written by James Random Hacker.\n\n  <signature of Ty Coon>, 1 April 1990  Ty Coon, President of Vice\n\nThat\'s all there is to it!\n\nSee http://www.gnu.org/copyleft/lesser.html.May contain `ogg\', `vorbis\' libraries (c) 2002-2008 Xiph.org Foundation\n\nRedistribution and use in source and binary forms, with or withoutmodification, are permitted provided that the following conditionsare met:\n\n- Redistributions of source code must retain the above copyrightnotice, this list of conditions and the following disclaimer.\n\n- Redistributions in binary form must reproduce the above copyrightnotice, this list of conditions and the following disclaimer in thedocumentation and/or other materials provided with the distribution.\n\n- Neither the name of the Xiph.org Foundation nor the names of itscontributors may be used to endorse or promote products derived fromthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS``AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOTLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATIONOR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOTLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANYTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USEOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
@@ -11123,9 +10883,6 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_module_function(mGosu, "default_font_name", VALUEFUNC(_wrap_default_font_name), -1);
   rb_define_module_function(mGosu, "screen_width", VALUEFUNC(_wrap_screen_width), -1);
   rb_define_module_function(mGosu, "screen_height", VALUEFUNC(_wrap_screen_height), -1);
-  rb_define_module_function(mGosu, "translate", VALUEFUNC(_wrap_translate), -1);
-  rb_define_module_function(mGosu, "rotate", VALUEFUNC(_wrap_rotate), -1);
-  rb_define_module_function(mGosu, "scale", VALUEFUNC(_wrap_scale), -1);
   rb_define_const(mGosu, "MAX_TEXTURE_SIZE", SWIG_From_unsigned_SS_int(static_cast< unsigned int >(Gosu::MAX_TEXTURE_SIZE)));
   rb_define_module_function(mGosu, "language", VALUEFUNC(_wrap_language), -1);
   rb_define_module_function(mGosu, "enable_undocumented_retrofication", VALUEFUNC(_wrap_enable_undocumented_retrofication), -1);

data/GosuImpl/RubyGosu_wrap.h

@@ -21,7 +21,7 @@ class SwigDirector_TextInput : public Gosu::TextInput, public Swig::Director {
 public:
     SwigDirector_TextInput(VALUE self);
     virtual ~SwigDirector_TextInput();
-    virtual std::wstring filter(std::wstring const &textIn) const;
+    virtual std::wstring filter(std::wstring const &text) const;
 };
 
 

data/linux/extconf.rb

@@ -72,14 +72,14 @@ $CFLAGS << " -DGOSU_DEPRECATED="
 $INCFLAGS << " -I../ -I../GosuImpl"
 
 if `uname`.chomp == 'Darwin' then
-  SOURCE_FILES = BASE_FILES + MAC_FILES# + OGG_VORBIS_FILES
+  SOURCE_FILES = BASE_FILES + MAC_FILES + OGG_VORBIS_FILES
   
   # Apple curiously distributes libpng only inside X11
   $INCFLAGS  << " -I/usr/X11/include"
   # Use included libogg, libvorbis to make Gosu easier to install on OS X
-  #$INCFLAGS  << " -I../dependencies/libogg/include"
-  #$INCFLAGS  << " -I../dependencies/libvorbis/include"
-  #$INCFLAGS  << " -I../dependencies/libvorbis/lib"
+  $INCFLAGS  << " -I../dependencies/libogg/include"
+  $INCFLAGS  << " -I../dependencies/libvorbis/include"
+  $INCFLAGS  << " -I../dependencies/libvorbis/lib"
   # To make everything work with the Objective C runtime
   $CFLAGS    << " -x objective-c -DNDEBUG"
   # Compile all C++ files as Objective C++ on OS X since mkmf does not support .mm
@@ -93,7 +93,7 @@ if `uname`.chomp == 'Darwin' then
     # TODO: This can probably be enabled starting from 10.6?
     CONFIG['CXXFLAGS'] << " -std=gnu++11"
   end
-  $LDFLAGS   << " -L/usr/X11/lib -liconv -lSDL2 -logg -lvorbis -lvorbisfile"
+  $LDFLAGS   << " -L/usr/X11/lib -liconv -lSDL2"
   %w(AudioToolbox IOKit OpenAL OpenGL AppKit ApplicationServices Foundation Carbon).each do |f|
     $LDFLAGS << " -framework #{f}"
   end
@@ -128,7 +128,7 @@ end
 # TODO - would be nicer if the Rakefile would just create these shim files and
 # ship them along with the gem
 SOURCE_FILES.each do |file|
-  shim_name = File.basename(file).sub(/\.mm$/, '.cpp')
+  shim_name = file.gsub('/', '-').sub(/\.mm$/, '.cpp')
   File.open(shim_name, "w") do |shim|
     shim.puts "#include \"../GosuImpl/#{file}\""
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre1
+  version: 0.8.0.pre2
 platform: ruby
 authors:
 - Julian Raschke