diff --git a/CSFML/build/VC2008/csfml-graphics-d.def b/CSFML/build/VC2008/csfml-graphics-d.def index c46662c9..bd8aca5b 100644 --- a/CSFML/build/VC2008/csfml-graphics-d.def +++ b/CSFML/build/VC2008/csfml-graphics-d.def @@ -172,6 +172,7 @@ EXPORTS sfRenderImage_GetHeight sfRenderImage_SetActive sfRenderImage_Flush + sfRenderImage_Display sfRenderImage_DrawPostFX sfRenderImage_DrawSprite sfRenderImage_DrawShape diff --git a/CSFML/build/VC2008/csfml-graphics.def b/CSFML/build/VC2008/csfml-graphics.def index d5a93a5b..4460d253 100644 --- a/CSFML/build/VC2008/csfml-graphics.def +++ b/CSFML/build/VC2008/csfml-graphics.def @@ -172,6 +172,7 @@ EXPORTS sfRenderImage_GetHeight sfRenderImage_SetActive sfRenderImage_Flush + sfRenderImage_Display sfRenderImage_DrawPostFX sfRenderImage_DrawSprite sfRenderImage_DrawShape diff --git a/CSFML/include/SFML/Graphics/RenderImage.h b/CSFML/include/SFML/Graphics/RenderImage.h index 6478edc1..fd2bd2ce 100644 --- a/CSFML/include/SFML/Graphics/RenderImage.h +++ b/CSFML/include/SFML/Graphics/RenderImage.h @@ -96,11 +96,19 @@ CSFML_API sfBool sfRenderImage_SetActive(sfRenderImage* renderImage, sfBool acti /// You don't need to call this function if you're not /// dealing with OpenGL directly. /// -/// \param Renderimage : Renderwindow object +/// \param Renderimage : Renderimage object /// //////////////////////////////////////////////////////////// CSFML_API void sfRenderImage_Flush(sfRenderImage* renderImage); +//////////////////////////////////////////////////////////// +/// Update the contents of the target image +/// +/// \param renderImage : Renderimage object +/// +//////////////////////////////////////////////////////////// +CSFML_API void sfRenderImage_Display(sfRenderImage* renderImage); + //////////////////////////////////////////////////////////// /// Draw something on a renderimage /// diff --git a/CSFML/src/SFML/Graphics/RenderImage.cpp b/CSFML/src/SFML/Graphics/RenderImage.cpp index f158f9d5..657b375b 100644 --- a/CSFML/src/SFML/Graphics/RenderImage.cpp +++ b/CSFML/src/SFML/Graphics/RenderImage.cpp @@ -99,9 +99,6 @@ sfBool sfRenderImage_SetActive(sfRenderImage* renderImage, sfBool active) /// /// 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) { @@ -109,6 +106,15 @@ void sfRenderImage_Flush(sfRenderImage* renderImage) } +//////////////////////////////////////////////////////////// +/// Update the contents of the target image +//////////////////////////////////////////////////////////// +void sfRenderImage_Display(sfRenderImage* renderImage) +{ + CSFML_CALL(renderImage, Display()) +} + + //////////////////////////////////////////////////////////// /// Draw something on a renderimage //////////////////////////////////////////////////////////// diff --git a/dotnet/extlibs/csfml-audio.dll b/dotnet/extlibs/csfml-audio.dll index 30d42053..a13fc46d 100644 Binary files a/dotnet/extlibs/csfml-audio.dll and b/dotnet/extlibs/csfml-audio.dll differ diff --git a/dotnet/extlibs/csfml-graphics.dll b/dotnet/extlibs/csfml-graphics.dll index 01268cd0..1d78341c 100644 Binary files a/dotnet/extlibs/csfml-graphics.dll and b/dotnet/extlibs/csfml-graphics.dll differ diff --git a/dotnet/extlibs/csfml-window.dll b/dotnet/extlibs/csfml-window.dll index 4491b12a..0c266f23 100644 Binary files a/dotnet/extlibs/csfml-window.dll and b/dotnet/extlibs/csfml-window.dll differ diff --git a/dotnet/src/Graphics/RenderImage.cs b/dotnet/src/Graphics/RenderImage.cs index 646406dc..2618801f 100644 --- a/dotnet/src/Graphics/RenderImage.cs +++ b/dotnet/src/Graphics/RenderImage.cs @@ -211,6 +211,16 @@ namespace SFML sfRenderImage_Flush(This); } + //////////////////////////////////////////////////////////// + /// + /// Update the contents of the target image + /// + //////////////////////////////////////////////////////////// + public void Display() + { + sfRenderImage_Display(This); + } + //////////////////////////////////////////////////////////// /// /// Target image of the render image @@ -280,6 +290,9 @@ namespace SFML [DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity] static extern bool sfRenderImage_Flush(IntPtr This); + [DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity] + static extern bool sfRenderImage_Display(IntPtr This); + [DllImport("csfml-graphics"), SuppressUnmanagedCodeSecurity] static extern void sfRenderImage_SetView(IntPtr This, IntPtr View);