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

15
bindings/ruby/sfml-system/system/Clock.cpp
View file

@ -75,12 +75,10 @@ static VALUE Clock_InitializeCopy( VALUE self, VALUE aSource )
*
* The clock starts automatically after being constructed.
*/
static VALUE Clock_New( int argc, VALUE *args, VALUE aKlass )
static VALUE Clock_Allocate( VALUE aKlass )
{
sf::Clock *object = new sf::Clock();
VALUE rbData = Data_Wrap_Struct( aKlass, 0, Clock_Free, object );
rb_obj_call_init( rbData, argc, args );
return rbData;
return Data_Wrap_Struct( aKlass, 0, Clock_Free, object );
}
void Init_Clock( void )
@ -94,16 +92,17 @@ void Init_Clock( void )
* Its resolution depends on the underlying OS, but you can generally expect a 1 ms resolution.
*/
globalClockClass = rb_define_class_under( sfml, "Clock", rb_cObject );
rb_define_alloc_func( globalClockClass, Clock_Allocate );
// Class methods
rb_define_singleton_method( globalClockClass, "new", Clock_New, -1 );
//rb_define_singleton_method( globalClockClass, "new", Clock_New, -1 );
// Instance methods
rb_define_method( globalClockClass, "initialize_copy", Clock_InitializeCopy, 1 );
rb_define_method( globalClockClass, "getElapsedTime", Clock_GetElapsedTime, 0 );
rb_define_method( globalClockClass, "elapsed_time", Clock_GetElapsedTime, 0 );
rb_define_method( globalClockClass, "reset", Clock_Reset, 0 );
// Aliases
rb_define_alias( globalClockClass, "elapsedTime", "getElapsedTime" );
rb_define_alias( globalClockClass, "elapsed_time", "getElapsedTime" );
rb_define_alias( globalClockClass, "elapsedTime", "elapsed_time" );
rb_define_alias( globalClockClass, "getElapsedTime", "elapsed_time" );
}