From 31b72b6385d671f57ece0d376f635cef045ed27d Mon Sep 17 00:00:00 2001 From: LaurentGom Date: Wed, 21 Oct 2009 07:37:56 +0000 Subject: [PATCH] Fixed sfView_GetRotation missing in CSFML (and thus causing a crash in SFML.Net) Updated Visual C++ 2005 export files for CSFML git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1244 4e206d99-4929-0410-ac5d-dfc041789085 --- CSFML/build/VC2005/csfml-audio-d.def | 4 ++-- CSFML/build/VC2005/csfml-audio.def | 4 ++-- CSFML/build/VC2005/csfml-graphics-d.def | 18 ++++++++++++------ CSFML/build/VC2005/csfml-graphics.def | 23 +++++++++++++++-------- CSFML/build/VC2008/csfml-graphics-d.def | 1 + CSFML/build/VC2008/csfml-graphics.def | 1 + dotnet/extlibs/csfml-graphics.dll | Bin 1169920 -> 1169920 bytes src/SFML/Graphics/RenderQueue.cpp | 20 ++++++++++---------- 8 files changed, 43 insertions(+), 28 deletions(-) diff --git a/CSFML/build/VC2005/csfml-audio-d.def b/CSFML/build/VC2005/csfml-audio-d.def index 1e7c9ba6f..253fa36d2 100644 --- a/CSFML/build/VC2005/csfml-audio-d.def +++ b/CSFML/build/VC2005/csfml-audio-d.def @@ -4,8 +4,8 @@ EXPORTS sfListener_GetGlobalVolume sfListener_SetPosition sfListener_GetPosition - sfListener_SetTarget - sfListener_GetTarget + sfListener_SetDirection + sfListener_GetDirection sfMusic_CreateFromFile sfMusic_CreateFromMemory sfMusic_Destroy diff --git a/CSFML/build/VC2005/csfml-audio.def b/CSFML/build/VC2005/csfml-audio.def index b779a5abd..84032e68d 100644 --- a/CSFML/build/VC2005/csfml-audio.def +++ b/CSFML/build/VC2005/csfml-audio.def @@ -4,8 +4,8 @@ EXPORTS sfListener_GetGlobalVolume sfListener_SetPosition sfListener_GetPosition - sfListener_SetTarget - sfListener_GetTarget + sfListener_SetDirection + sfListener_GetDirection sfMusic_CreateFromFile sfMusic_CreateFromMemory sfMusic_Destroy diff --git a/CSFML/build/VC2005/csfml-graphics-d.def b/CSFML/build/VC2005/csfml-graphics-d.def index 0734be7bc..701ec03e1 100644 --- a/CSFML/build/VC2005/csfml-graphics-d.def +++ b/CSFML/build/VC2005/csfml-graphics-d.def @@ -171,6 +171,8 @@ EXPORTS sfRenderImage_GetWidth sfRenderImage_GetHeight sfRenderImage_SetActive + sfRenderImage_Flush + sfRenderImage_Display sfRenderImage_DrawPostFX sfRenderImage_DrawSprite sfRenderImage_DrawShape @@ -200,6 +202,7 @@ EXPORTS sfRenderWindow_EnableKeyRepeat sfRenderWindow_SetIcon sfRenderWindow_SetActive + sfRenderWindow_Flush sfRenderWindow_Display sfRenderWindow_GetInput sfRenderWindow_SetFramerateLimit @@ -209,7 +212,6 @@ EXPORTS sfRenderWindow_DrawSprite sfRenderWindow_DrawString sfRenderWindow_DrawShape - sfRenderWindow_Capture sfRenderWindow_Clear sfRenderWindow_SetView sfRenderWindow_GetView @@ -220,12 +222,16 @@ EXPORTS sfView_CreateFromRect sfView_Destroy sfView_SetCenter - sfView_SetHalfSize - sfView_SetFromRect + sfView_SetSize + sfView_SetRotation + sfView_SetViewport + sfView_Reset sfView_GetCenterX sfView_GetCenterY - sfView_GetHalfSizeX - sfView_GetHalfSizeY - sfView_GetRect + sfView_GetWidth + sfView_GetHeight + sfView_GetRotation + sfView_GetViewport sfView_Move + sfView_Rotate sfView_Zoom diff --git a/CSFML/build/VC2005/csfml-graphics.def b/CSFML/build/VC2005/csfml-graphics.def index ad5ec2d12..710d629da 100644 --- a/CSFML/build/VC2005/csfml-graphics.def +++ b/CSFML/build/VC2005/csfml-graphics.def @@ -171,6 +171,8 @@ EXPORTS sfRenderImage_GetWidth sfRenderImage_GetHeight sfRenderImage_SetActive + sfRenderImage_Flush + sfRenderImage_Display sfRenderImage_DrawPostFX sfRenderImage_DrawSprite sfRenderImage_DrawShape @@ -179,7 +181,8 @@ EXPORTS sfRenderImage_SetView sfRenderImage_GetView sfRenderImage_GetDefaultView - sfRenderImage_PreserveOpenGLStates + sfRenderImage_GetViewport + sfRenderImage_ConvertCoords sfRenderImage_GetImage sfRenderImage_CanUseRenderImage sfRenderWindow_Create @@ -200,6 +203,7 @@ EXPORTS sfRenderWindow_EnableKeyRepeat sfRenderWindow_SetIcon sfRenderWindow_SetActive + sfRenderWindow_Flush sfRenderWindow_Display sfRenderWindow_GetInput sfRenderWindow_SetFramerateLimit @@ -209,23 +213,26 @@ EXPORTS sfRenderWindow_DrawSprite sfRenderWindow_DrawString sfRenderWindow_DrawShape - sfRenderWindow_Capture sfRenderWindow_Clear sfRenderWindow_SetView sfRenderWindow_GetView sfRenderWindow_GetDefaultView + sfRenderWindow_GetViewport sfRenderWindow_ConvertCoords - sfRenderWindow_PreserveOpenGLStates sfView_Create sfView_CreateFromRect sfView_Destroy sfView_SetCenter - sfView_SetHalfSize - sfView_SetFromRect + sfView_SetSize + sfView_SetRotation + sfView_SetViewport + sfView_Reset sfView_GetCenterX sfView_GetCenterY - sfView_GetHalfSizeX - sfView_GetHalfSizeY - sfView_GetRect + sfView_GetWidth + sfView_GetHeight + sfView_GetRotation + sfView_GetViewport sfView_Move + sfView_Rotate sfView_Zoom diff --git a/CSFML/build/VC2008/csfml-graphics-d.def b/CSFML/build/VC2008/csfml-graphics-d.def index bd8aca5b6..701ec03e1 100644 --- a/CSFML/build/VC2008/csfml-graphics-d.def +++ b/CSFML/build/VC2008/csfml-graphics-d.def @@ -230,6 +230,7 @@ EXPORTS sfView_GetCenterY sfView_GetWidth sfView_GetHeight + sfView_GetRotation sfView_GetViewport sfView_Move sfView_Rotate diff --git a/CSFML/build/VC2008/csfml-graphics.def b/CSFML/build/VC2008/csfml-graphics.def index 4460d2531..710d629da 100644 --- a/CSFML/build/VC2008/csfml-graphics.def +++ b/CSFML/build/VC2008/csfml-graphics.def @@ -231,6 +231,7 @@ EXPORTS sfView_GetCenterY sfView_GetWidth sfView_GetHeight + sfView_GetRotation sfView_GetViewport sfView_Move sfView_Rotate diff --git a/dotnet/extlibs/csfml-graphics.dll b/dotnet/extlibs/csfml-graphics.dll index 1d78341ca98476fc07f3aaa4cabc5f178089ef1f..04d2582492bc4ad8fb94873c6d52344c3807883d 100644 GIT binary patch delta 12796 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%0AV&Im6#|N4RIt2R$ z4-K9kydwC^;2ptNgViCKJwoC`=7ormEg|PaZid_qsSkM?;uh)|>K7Us8XfvU=*rOC z(EQM^L$`+(g&q$zhqAEnu<2nd!VZO92>UC{DZEd3c=+q#`fx+|&*AsOpM-lw_(i-N z@oL1xh}R=Nh*%r3F=AiD=?HVglL#rYbL0z=eIkcMCPvPTd?#{A**pnxI9EqkTWUH>2A;k@Yp delta 12770 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%0DRA)5?kVh!RA zg%~h$N&tVmvVW=R(6O3_g z{|f8RWYIK(6AtZf@Z-o6S0U0gNSNTrC@CkugAAs^E{< zYH{j355NbhKhERbp^pf-z6}XDG1ncgIipIS<@DEB zE8}rET2%fBd0!4GuNP7-hwPO@I#Ec{i;!kY8hgxYIVP22{KT7=@Ihf(1vTiV(vYtG z(2&LCzJGu^eaV_C`>_V)hHh#Pe-Zglz@H2Mh6Gru$g)Q+QDJQ>m#9!mOhbvB{?O

X0x4!RS&GOqOz5uiR}Ag(NN=ekLmWbK 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 diff --git a/src/SFML/Graphics/RenderQueue.cpp b/src/SFML/Graphics/RenderQueue.cpp index 1d0a747fd..7319f904f 100644 --- a/src/SFML/Graphics/RenderQueue.cpp +++ b/src/SFML/Graphics/RenderQueue.cpp @@ -38,16 +38,16 @@ namespace { // Fast float to int conversion inline sf::Int32 Round(double value) - { - // Use a union rather than reinterpret_cast, because it doesn't break strict-aliasing - // rules and results in a correct behaviour when compiling in optimized mode - union DoubleToInt - { - double d; - sf::Int32 i[2]; - }; - - DoubleToInt u; + { + // Use a union rather than reinterpret_cast, because it doesn't break strict-aliasing + // rules and results in a correct behaviour when compiling in optimized mode + union DoubleToInt + { + double d; + sf::Int32 i[2]; + }; + + DoubleToInt u; u.d = value + 6755399441055744.0; #if defined(SFML_ENDIAN_LITTLE)