mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-01-20 00:05:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added specialized getWidth and getHeight to SFML::RenderImage and SFML::RenderWindow. Also removed documentation from the specialized methods.

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1728 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
groogy 2010-11-30 05:33:44 +00:00
parent fef70e1280
commit 501c0030f5
2 changed files with 38 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
bindings/ruby/sfml-graphics/graphics/RenderImage.cpp
View File

@ -93,16 +93,6 @@ static VALUE RenderImage_Create( int argc, VALUE *args, VALUE self )
}
}
/* call-seq:
* render_image.draw( drawable )
* render_image.draw( drawable, shader )
*
* Draw an object into the target with a shader.
*
* This function draws anything that inherits from the sf::Drawable base class (SFML::Sprite, SFML::Shape, SFML::Text,
* or even your own derived classes). The shader alters the way that the pixels are processed right before being
* written to the render target.
*/
static VALUE RenderImage_Draw( int argc, VALUE *args, VALUE self )
{
sf::RenderImage *object = NULL;
@ -246,15 +236,6 @@ static VALUE RenderImage_SetSmooth( VALUE self, VALUE aSmoothFlag )
return Qnil;
}
/* call-seq:
* render_target.setView( view )
*
* Change the current active view.
*
* The new view will affect everything that is drawn, until another view is activated. The render target keeps its own
* copy of the view object, so it is not necessary to keep the original one alive as long as it is in use. To restore
* the original view of the target, you can pass the result of getDefaultView() to this function.
*/
static VALUE RenderImage_SetView( VALUE self, VALUE aView )
{
VALIDATE_CLASS( aView, globalViewClass, "view" );
@ -266,11 +247,6 @@ static VALUE RenderImage_SetView( VALUE self, VALUE aView )
return Qnil;
}
/* call-seq:
* render_target.getView() -> view
*
* Retrieve the view currently in use in the render target.
*/
static VALUE RenderImage_GetView( VALUE self )
{
sf::RenderImage *object = NULL;
@ -282,13 +258,6 @@ static VALUE RenderImage_GetView( VALUE self )
return rbData;
}
/* call-seq:
* render_target.getDefaultView() -> VIEW
*
* Get the default view of the render target.
*
* The default view has the initial size of the render target, and never changes after the target has been created.
*/
static VALUE RenderImage_GetDefaultView( VALUE self )
{
sf::RenderImage *object = NULL;
@ -300,6 +269,20 @@ static VALUE RenderImage_GetDefaultView( VALUE self )
return rbData;
}
static VALUE RenderImage_GetWidth( VALUE self )
{
sf::RenderImage *object = NULL;
Data_Get_Struct( self, sf::RenderImage, object );
return INT2FIX( object->GetWidth() );
}
static VALUE RenderTarget_GetHeight( VALUE self )
{
sf::RenderImage *object = NULL;
Data_Get_Struct( self, sf::RenderImage, object );
return INT2FIX( object->GetHeight() );
}
/* call-seq:
* RenderImage.new() -> render_image
*
@ -410,6 +393,8 @@ void Init_RenderImage( void )
rb_define_method( globalRenderImageClass, "getView", RenderImage_GetView, 0 );
rb_define_method( globalRenderImageClass, "setView", RenderImage_SetView, 1 );
rb_define_method( globalRenderImageClass, "getDefaultView", RenderImage_GetDefaultView, 0 );
rb_define_method( globalRenderImageClass, "getWidth", RenderImage_GetWidth, 0 );
rb_define_method( globalRenderImageClass, "getHeight", RenderImage_GetHeight, 0 );
// Class Aliases
rb_define_alias( CLASS_OF( globalRenderImageClass ), "is_available", "isAvailable" );
@ -432,4 +417,7 @@ void Init_RenderImage( void )
rb_define_alias( globalRenderImageClass, "defaultView", "getDefaultView" );
rb_define_alias( globalRenderImageClass, "default_view", "getDefaultView" );
rb_define_alias( globalRenderImageClass, "width", "getWidth" );
rb_define_alias( globalRenderImageClass, "height", "getHeight" );
}

50
bindings/ruby/sfml-graphics/graphics/RenderWindow.cpp
View File

@ -43,16 +43,6 @@ static void View_Free( sf::View *anObject )
delete anObject;
}
/* call-seq:
* render_window.draw( drawable )
* render_window.draw( drawable, shader )
*
* Draw an object into the target with a shader.
*
* This function draws anything that inherits from the SFML::Drawable base class (SFML::Sprite, SFML::Shape,
* SFML::Text, or even your own derived classes). The shader alters the way that the pixels are processed right before
* being written to the render target.
*/
static VALUE RenderWindow_Draw( int argc, VALUE *args, VALUE self )
{
sf::RenderWindow *object = NULL;
@ -84,15 +74,6 @@ static VALUE RenderWindow_Draw( int argc, VALUE *args, VALUE self )
return Qnil;
}
/* call-seq:
* render_target.setView( view )
*
* Change the current active view.
*
* The new view will affect everything that is drawn, until another view is activated. The render target keeps its own
* copy of the view object, so it is not necessary to keep the original one alive as long as it is in use. To restore
* the original view of the target, you can pass the result of getDefaultView() to this function.
*/
static VALUE RenderWindow_SetView( VALUE self, VALUE aView )
{
VALIDATE_CLASS( aView, globalViewClass, "view" );
@ -104,11 +85,6 @@ static VALUE RenderWindow_SetView( VALUE self, VALUE aView )
return Qnil;
}
/* call-seq:
* render_target.getView() -> view
*
* Retrieve the view currently in use in the render target.
*/
static VALUE RenderWindow_GetView( VALUE self )
{
sf::RenderWindow *object = NULL;
@ -120,13 +96,6 @@ static VALUE RenderWindow_GetView( VALUE self )
return rbData;
}
/* call-seq:
* render_target.getDefaultView() -> VIEW
*
* Get the default view of the render target.
*
* The default view has the initial size of the render target, and never changes after the target has been created.
*/
static VALUE RenderWindow_GetDefaultView( VALUE self )
{
sf::RenderWindow *object = NULL;
@ -138,6 +107,20 @@ static VALUE RenderWindow_GetDefaultView( VALUE self )
return rbData;
}
static VALUE RenderWindow_GetWidth( VALUE self )
{
sf::RenderWindow *object = NULL;
Data_Get_Struct( self, sf::RenderWindow, object );
return INT2FIX( object->GetWidth() );
}
static VALUE RenderWindow_GetHeight( VALUE self )
{
sf::RenderWindow *object = NULL;
Data_Get_Struct( self, sf::RenderWindow, object );
return INT2FIX( object->GetHeight() );
}
/* call-seq:
* Window.new() -> render_window
* Window.new( mode, title, style = SFML::Style::Default, settings = SFML::ContextSettings.new ) -> render_window
@ -260,6 +243,8 @@ void Init_RenderWindow( void )
rb_define_method( globalRenderWindowClass, "getView", RenderWindow_GetView, 0 );
rb_define_method( globalRenderWindowClass, "setView", RenderWindow_SetView, 1 );
rb_define_method( globalRenderWindowClass, "getDefaultView", RenderWindow_GetDefaultView, 0 );
rb_define_method( globalRenderWindowClass, "getWidth", RenderWindow_GetWidth, 0 );
rb_define_method( globalRenderWindowClass, "getHeight", RenderWindow_GetHeight, 0 );
// Alias
rb_define_alias( globalRenderWindowClass, "view=", "setView" );
@ -267,4 +252,7 @@ void Init_RenderWindow( void )
rb_define_alias( globalRenderWindowClass, "defaultView", "getDefaultView" );
rb_define_alias( globalRenderWindowClass, "default_view", "getDefaultView" );
rb_define_alias( globalRenderWindowClass, "width", "getWidth" );
rb_define_alias( globalRenderWindowClass, "height", "getHeight" );
}