Added automatic batching to improve performances

Moved the ConvertCoords function from RenderWindow to RenderTarget

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1221 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2009-09-24 07:50:08 +00:00
parent 1852614e16
commit 565172fc75
51 changed files with 2835 additions and 865 deletions

View file

@ -128,12 +128,15 @@
<Unit filename="..\..\include\SFML\Graphics\Rect.hpp" />
<Unit filename="..\..\include\SFML\Graphics\Rect.inl" />
<Unit filename="..\..\include\SFML\Graphics\RenderImage.hpp" />
<Unit filename="..\..\include\SFML\Graphics\RenderQueue.hpp" />
<Unit filename="..\..\include\SFML\Graphics\RenderTarget.hpp" />
<Unit filename="..\..\include\SFML\Graphics\RenderWindow.hpp" />
<Unit filename="..\..\include\SFML\Graphics\Shape.hpp" />
<Unit filename="..\..\include\SFML\Graphics\Sprite.hpp" />
<Unit filename="..\..\include\SFML\Graphics\String.hpp" />
<Unit filename="..\..\include\SFML\Graphics\View.hpp" />
<Unit filename="..\..\src\SFML\Graphics\Batch.cpp" />
<Unit filename="..\..\src\SFML\Graphics\Batch.hpp" />
<Unit filename="..\..\src\SFML\Graphics\Color.cpp" />
<Unit filename="..\..\src\SFML\Graphics\Drawable.cpp" />
<Unit filename="..\..\src\SFML\Graphics\Font.cpp" />
@ -147,6 +150,14 @@
<Unit filename="..\..\src\SFML\Graphics\GLEW\glew.h" />
<Unit filename="..\..\src\SFML\Graphics\GLEW\glxew.h" />
<Unit filename="..\..\src\SFML\Graphics\GLEW\wglew.h" />
<Unit filename="..\..\src\SFML\Graphics\GeometryRenderer.cpp" />
<Unit filename="..\..\src\SFML\Graphics\GeometryRenderer.hpp" />
<Unit filename="..\..\src\SFML\Graphics\GeometryRendererIM.cpp" />
<Unit filename="..\..\src\SFML\Graphics\GeometryRendererIM.hpp" />
<Unit filename="..\..\src\SFML\Graphics\GeometryRendererVA.cpp" />
<Unit filename="..\..\src\SFML\Graphics\GeometryRendererVA.hpp" />
<Unit filename="..\..\src\SFML\Graphics\GeometryRendererVBO.cpp" />
<Unit filename="..\..\src\SFML\Graphics\GeometryRendererVBO.hpp" />
<Unit filename="..\..\src\SFML\Graphics\Image.cpp" />
<Unit filename="..\..\src\SFML\Graphics\ImageLoader.cpp" />
<Unit filename="..\..\src\SFML\Graphics\ImageLoader.hpp" />
@ -159,6 +170,7 @@
<Unit filename="..\..\src\SFML\Graphics\RenderImageImplFBO.cpp" />
<Unit filename="..\..\src\SFML\Graphics\RenderImageImplFBO.hpp" />
<Unit filename="..\..\src\SFML\Graphics\RenderImageImplPBuffer.hpp" />
<Unit filename="..\..\src\SFML\Graphics\RenderQueue.cpp" />
<Unit filename="..\..\src\SFML\Graphics\RenderTarget.cpp" />
<Unit filename="..\..\src\SFML\Graphics\RenderWindow.cpp" />
<Unit filename="..\..\src\SFML\Graphics\SOIL\SOIL.c">

View file

@ -351,14 +351,6 @@
RelativePath="..\..\src\SFML\Audio\AudioDevice.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Audio\AudioResource.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Audio\AudioResource.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Audio\Listener.cpp"
>

View file

@ -362,18 +362,6 @@
<References>
</References>
<Files>
<Filter
Name="Win32"
>
<File
RelativePath="..\..\src\SFML\Graphics\Win32\RenderImageImplPBuffer.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Win32\RenderImageImplPBuffer.hpp"
>
</File>
</Filter>
<Filter
Name="External libs"
>
@ -3298,6 +3286,138 @@
</File>
</Filter>
</Filter>
<Filter
Name="Drawables"
>
<File
RelativePath="..\..\src\SFML\Graphics\Drawable.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Drawable.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Shape.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Shape.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Sprite.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Sprite.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\String.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\String.hpp"
>
</File>
</Filter>
<Filter
Name="RenderImage"
>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImage.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\RenderImage.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImpl.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImpl.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplFBO.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplFBO.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplPBuffer.hpp"
>
</File>
<Filter
Name="Win32"
>
<File
RelativePath="..\..\src\SFML\Graphics\Win32\RenderImageImplPBuffer.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Win32\RenderImageImplPBuffer.hpp"
>
</File>
</Filter>
</Filter>
<Filter
Name="RenderQueue"
>
<File
RelativePath="..\..\src\SFML\Graphics\Batch.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Batch.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRenderer.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRenderer.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererIM.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererIM.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererVA.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererVA.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererVBO.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererVBO.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderQueue.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\RenderQueue.hpp"
>
</File>
</Filter>
<File
RelativePath="..\..\src\SFML\Graphics\Color.cpp"
>
@ -3306,14 +3426,6 @@
RelativePath="..\..\include\SFML\Graphics\Color.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Drawable.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Drawable.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Font.cpp"
>
@ -3418,34 +3530,6 @@
RelativePath="..\..\include\SFML\Graphics\Rect.inl"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImage.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\RenderImage.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImpl.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImpl.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplFBO.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplFBO.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplPBuffer.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderTarget.cpp"
>
@ -3462,30 +3546,6 @@
RelativePath="..\..\include\SFML\Graphics\RenderWindow.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Shape.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Shape.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Sprite.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Sprite.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\String.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\String.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\View.cpp"
>

View file

@ -324,6 +324,7 @@
WarningLevel="4"
DebugInformationFormat="0"
DisableSpecificWarnings="4996"
EnablePREfast="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -361,14 +362,61 @@
</References>
<Files>
<Filter
Name="Win32"
Name="RenderQueue"
>
<File
RelativePath="..\..\src\SFML\Graphics\Win32\RenderImageImplPBuffer.cpp"
RelativePath="..\..\src\SFML\Graphics\Batch.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Win32\RenderImageImplPBuffer.hpp"
RelativePath="..\..\src\SFML\Graphics\Batch.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRenderer.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRenderer.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererIM.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererIM.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererVA.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererVA.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererVBO.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\GeometryRendererVBO.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderQueue.cpp"
>
<FileConfiguration
Name="Release static|Win32"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\RenderQueue.hpp"
>
</File>
</Filter>
@ -3296,6 +3344,94 @@
</File>
</Filter>
</Filter>
<Filter
Name="RenderImage"
>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImage.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\RenderImage.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImpl.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImpl.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplFBO.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplFBO.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplPBuffer.hpp"
>
</File>
<Filter
Name="Win32"
>
<File
RelativePath="..\..\src\SFML\Graphics\Win32\RenderImageImplPBuffer.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Win32\RenderImageImplPBuffer.hpp"
>
</File>
</Filter>
</Filter>
<Filter
Name="Drawables"
>
<File
RelativePath="..\..\src\SFML\Graphics\Drawable.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Drawable.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\PostFX.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\PostFX.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Shape.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Shape.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Sprite.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Sprite.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\String.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\String.hpp"
>
</File>
</Filter>
<File
RelativePath="..\..\src\SFML\Graphics\Color.cpp"
>
@ -3304,14 +3440,6 @@
RelativePath="..\..\include\SFML\Graphics\Color.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Drawable.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Drawable.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Font.cpp"
>
@ -3400,14 +3528,6 @@
RelativePath="..\..\include\SFML\Graphics\Matrix3.inl"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\PostFX.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\PostFX.hpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Rect.hpp"
>
@ -3416,34 +3536,6 @@
RelativePath="..\..\include\SFML\Graphics\Rect.inl"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImage.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\RenderImage.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImpl.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImpl.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplFBO.cpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplFBO.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderImageImplPBuffer.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\RenderTarget.cpp"
>
@ -3460,30 +3552,6 @@
RelativePath="..\..\include\SFML\Graphics\RenderWindow.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Shape.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Shape.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\Sprite.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\Sprite.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\String.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\Graphics\String.hpp"
>
</File>
<File
RelativePath="..\..\src\SFML\Graphics\View.cpp"
>