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

Updated CSFML and SFML.Net in the sfml2 branch

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1233 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2009-10-12 10:24:49 +00:00
parent fc22927874
commit 7f4de9033c
15 changed files with 164 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CSFML/build/VC2008/csfml-graphics-d.def
View file

@ -171,6 +171,7 @@ EXPORTS
sfRenderImage_GetWidth
sfRenderImage_GetHeight
sfRenderImage_SetActive
sfRenderImage_Flush
sfRenderImage_DrawPostFX
sfRenderImage_DrawSprite
sfRenderImage_DrawShape
@ -200,6 +201,7 @@ EXPORTS
sfRenderWindow_EnableKeyRepeat
sfRenderWindow_SetIcon
sfRenderWindow_SetActive
sfRenderWindow_Flush
sfRenderWindow_Display
sfRenderWindow_GetInput
sfRenderWindow_SetFramerateLimit
@ -209,7 +211,6 @@ EXPORTS
sfRenderWindow_DrawSprite
sfRenderWindow_DrawString
sfRenderWindow_DrawShape
sfRenderWindow_Capture
sfRenderWindow_Clear
sfRenderWindow_SetView
sfRenderWindow_GetView

3
CSFML/build/VC2008/csfml-graphics.def
View file

@ -171,6 +171,7 @@ EXPORTS
sfRenderImage_GetWidth
sfRenderImage_GetHeight
sfRenderImage_SetActive
sfRenderImage_Flush
sfRenderImage_DrawPostFX
sfRenderImage_DrawSprite
sfRenderImage_DrawShape
@ -201,6 +202,7 @@ EXPORTS
sfRenderWindow_EnableKeyRepeat
sfRenderWindow_SetIcon
sfRenderWindow_SetActive
sfRenderWindow_Flush
sfRenderWindow_Display
sfRenderWindow_GetInput
sfRenderWindow_SetFramerateLimit
@ -210,7 +212,6 @@ EXPORTS
sfRenderWindow_DrawSprite
sfRenderWindow_DrawString
sfRenderWindow_DrawShape
sfRenderWindow_Capture
sfRenderWindow_Clear
sfRenderWindow_SetView
sfRenderWindow_GetView

18
CSFML/include/SFML/Graphics/RenderImage.h
View file

@ -83,6 +83,24 @@ CSFML_API unsigned int sfRenderImage_GetHeight(sfRenderImage* renderImage);
////////////////////////////////////////////////////////////
CSFML_API sfBool sfRenderImage_SetActive(sfRenderImage* renderImage, sfBool active);
////////////////////////////////////////////////////////////
/// Make sure that what has been drawn so far is rendered
///
/// Use this function if you use OpenGL rendering commands,
/// and you want to make sure that things will appear on top
/// of all the SFML objects that have been drawn so far.
/// This is needed because SFML doesn't use immediate rendering,
/// it first accumulates drawables into a queue and
/// trigger the actual rendering afterwards.
///
/// You don't need to call this function if you're not
/// dealing with OpenGL directly.
///
/// \param Renderimage : Renderwindow object
///
////////////////////////////////////////////////////////////
CSFML_API void sfRenderImage_Flush(sfRenderImage* renderImage);
////////////////////////////////////////////////////////////
/// Draw something on a renderimage
///

28
CSFML/include/SFML/Graphics/RenderWindow.h
View file

@ -213,6 +213,24 @@ CSFML_API void sfRenderWindow_SetIcon(sfRenderWindow* renderWindow, unsigned int
////////////////////////////////////////////////////////////
CSFML_API sfBool sfRenderWindow_SetActive(sfRenderWindow* renderWindow, sfBool active);
////////////////////////////////////////////////////////////
/// Make sure that what has been drawn so far is rendered
///
/// Use this function if you use OpenGL rendering commands,
/// and you want to make sure that things will appear on top
/// of all the SFML objects that have been drawn so far.
/// This is needed because SFML doesn't use immediate rendering,
/// it first accumulates drawables into a queue and
/// trigger the actual rendering afterwards.
///
/// You don't need to call this function if you're not
/// dealing with OpenGL directly.
///
/// \param renderWindow : Renderwindow object
///
////////////////////////////////////////////////////////////
CSFML_API void sfRenderWindow_Flush(sfRenderWindow* renderWindow);
////////////////////////////////////////////////////////////
/// Display a window on screen
///
@ -272,16 +290,6 @@ CSFML_API void sfRenderWindow_DrawSprite(sfRenderWindow* renderWindow, sfSprite*
CSFML_API void sfRenderWindow_DrawShape (sfRenderWindow* renderWindow, sfShape* shape);
CSFML_API void sfRenderWindow_DrawString(sfRenderWindow* renderWindow, sfString* string);
////////////////////////////////////////////////////////////
/// Save the content of a renderwindow to an image
///
/// \param renderWindow : Renderwindow to capture
///
/// \return Image instance containing the contents of the screen
///
////////////////////////////////////////////////////////////
CSFML_API sfImage* sfRenderWindow_Capture(sfRenderWindow* renderWindow);
////////////////////////////////////////////////////////////
/// Clear the screen with the given color
///

22
CSFML/src/SFML/Graphics/RenderImage.cpp
View file

@ -87,6 +87,28 @@ sfBool sfRenderImage_SetActive(sfRenderImage* renderImage, sfBool active)
}
////////////////////////////////////////////////////////////
/// Make sure that what has been drawn so far is rendered
///
/// Use this function if you use OpenGL rendering commands,
/// and you want to make sure that things will appear on top
/// of all the SFML objects that have been drawn so far.
/// This is needed because SFML doesn't use immediate rendering,
/// it first accumulates drawables into a queue and
/// trigger the actual rendering afterwards.
///
/// You don't need to call this function if you're not
/// dealing with OpenGL directly.
///
/// \param Renderimage : Renderwindow object
///
////////////////////////////////////////////////////////////
void sfRenderImage_Flush(sfRenderImage* renderImage)
{
CSFML_CALL(renderImage, Flush())
}
////////////////////////////////////////////////////////////
/// Draw something on a renderimage
////////////////////////////////////////////////////////////

33
CSFML/src/SFML/Graphics/RenderWindow.cpp
View file

@ -292,6 +292,26 @@ sfBool sfRenderWindow_SetActive(sfRenderWindow* renderWindow, sfBool active)
}
////////////////////////////////////////////////////////////
/// Make sure that what has been drawn so far is rendered
///
/// Use this function if you use OpenGL rendering commands,
/// and you want to make sure that things will appear on top
/// of all the SFML objects that have been drawn so far.
/// This is needed because SFML doesn't use immediate rendering,
/// it first accumulates drawables into a queue and
/// trigger the actual rendering afterwards.
///
/// You don't need to call this function if you're not
/// dealing with OpenGL directly.
///
////////////////////////////////////////////////////////////
void sfRenderWindow_Flush(sfRenderWindow* renderWindow)
{
CSFML_CALL(renderWindow, Flush())
}
////////////////////////////////////////////////////////////
/// Display a window on screen
////////////////////////////////////////////////////////////
@ -365,19 +385,6 @@ void sfRenderWindow_DrawString(sfRenderWindow* renderWindow, sfString* string)
}
////////////////////////////////////////////////////////////
/// Save the content of a renderwindow to an image
////////////////////////////////////////////////////////////
sfImage* sfRenderWindow_Capture(sfRenderWindow* renderWindow)
{
CSFML_CHECK_RETURN(renderWindow, NULL);
sfImage* image = new sfImage;
*image->This = renderWindow->This.Capture();
return image;
}
////////////////////////////////////////////////////////////
/// Clear the screen with the given color
////////////////////////////////////////////////////////////