lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some refactoring, moved C++ allocation into the *_Alloc function instead of directly in new, removed new in most of classes too. Cloning should work on all copyable classes now.

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1802 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
groogy 2011-02-27 14:07:10 +00:00
parent 0a2abc6933
commit 7d7c4c999f
26 changed files with 235 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

17
bindings/ruby/sfml-graphics/graphics/Drawable.cpp
View file

@ -529,18 +529,28 @@ static VALUE Drawable_Initialize( int argc, VALUE *args, VALUE self )
return rb_call_super( argc, args );
}
static VALUE Drawable_New( int argc, VALUE *args, VALUE aKlass )
static VALUE Drawable_InitializeCopy( VALUE self, VALUE aSource )
{
sf::Drawable *selfDrawable = NULL;
Data_Get_Struct( self, sf::Drawable, selfDrawable );
sf::Drawable *sourceDrawable = NULL;
Data_Get_Struct( aSource, sf::Drawable, sourceDrawable );
*selfDrawable = *sourceDrawable;
return self;
}
static VALUE Drawable_Allocate( VALUE aKlass )
{
rbDrawable *object = new rbDrawable();
VALUE rbData = Data_Wrap_Struct( aKlass, 0, Drawable_Free, object );
object->Init( rbData );
rb_obj_call_init( rbData, argc, args );
return rbData;
}
static VALUE Drawable_Included( VALUE aModule, VALUE aBase )
{
rb_define_singleton_method( aBase, "new", Drawable_New, -1 );
rb_define_singleton_method( aBase, "allocate", Drawable_Allocate, 0 );
return Qnil;
}
@ -615,6 +625,7 @@ void Init_Drawable( void )
// Instance methods
rb_define_method( globalDrawableModule, "initialize", Drawable_Initialize, -1 );
rb_define_method( globalDrawableModule, "initialize_copy", Drawable_Initialize, 1 );
rb_define_method( globalDrawableModule, "setPosition", Drawable_SetPosition, -1 );
rb_define_method( globalDrawableModule, "setX", Drawable_SetX, 1 );
rb_define_method( globalDrawableModule, "setY", Drawable_SetY, 1 );