Commit Graph

205 Commits

Author SHA1 Message Date
LaurentGom
57194f4d4b Synchronized with trunk
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1372 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-26 10:52:36 +00:00
LaurentGom
3247f441f8 Made the assignment operator in sf::Sound work with the last modification
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1371 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-26 10:31:09 +00:00
LaurentGom
362f374732 FS#104 - Fix crash when destroying a SoundBuffer used by a Sound
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1370 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-26 09:49:03 +00:00
LaurentGom
4220795de4 Synchronized with trunk
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1369 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-21 10:13:44 +00:00
LaurentGom
6341b569db FS#139 - Fix tiny musics ignoring the "loop" flag
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1368 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-21 10:00:31 +00:00
LaurentGom
5a0feadb8f Made the management of the "current shader" more consistent
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1366 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-20 15:43:40 +00:00
LaurentGom
4eed417158 Fixed a bug about shaders in the new Renderer class
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1365 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-20 12:53:15 +00:00
LaurentGom
b6b423bd8f Fixed possible crash in sf::Font
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1364 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-19 22:19:29 +00:00
LaurentGom
2e40f341ba Some minor modifications in RenderImage implementation
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1363 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-19 22:07:31 +00:00
LaurentGom
c237305f9b Removed all the automatic batching stuff and replaced it with a more straight-forward implementation using a state cache for optimizing performances
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1362 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-19 20:39:32 +00:00
LaurentGom
40f13c7302 Removed all the remaining const_cast, and replaced them with mutable members (this is needed for optimized lazy calculations)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1353 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-13 13:55:20 +00:00
LaurentGom
273cba055c Added Style::Default for windows' style
Removed unused #includes from RenderWindow.cpp

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1345 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-11 12:46:44 +00:00
LaurentGom
7ad6c64358 Fixed current view not being updated when window is resized (bug introduced with the latest modifications on view handling)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1344 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-11 09:33:55 +00:00
LaurentGom
7b83fbc544 Merged all the joystick fixes from trunk
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1343 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-11 09:04:59 +00:00
LaurentGom
b2b0cb2144 Fixed memory leak in sf::Font (reference counter was never initialized)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1342 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-10 15:52:08 +00:00
LaurentGom
8df50b9774 Fixed wrong joystick POV values in the Linux implementation
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1341 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-09 17:24:51 +00:00
LaurentGom
489ee2b17b Fixed POV handling on Linux
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1339 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-09 09:13:06 +00:00
LaurentGom
44c943e651 FS#146 - Fix current OpenGL matrix mode not properly saved when PreserveOpenGLStates is activated
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1338 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-08 17:21:03 +00:00
LaurentGom
b9a2d3a8f4 Fixed joystick axes mapping (to be tested)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1332 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-06 14:28:20 +00:00
LaurentGom
cbee33e764 Fixed POV value initialized to 0 instead of -1 in sf::Input
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1331 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-06 14:19:37 +00:00
LaurentGom
5eaec85d87 Added a special value of -1 for centered joystick POV position
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1329 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-06 08:51:25 +00:00
LaurentGom
db72c6e47c Renamed Mouse::Count to Mouse::ButtonCount
Renamed Joy::Count to Joy::AxisCount
Added Joy::Count and Joy::ButtonCount

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1328 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-06 08:48:57 +00:00
LaurentGom
e2d0ffcdcf Fixed the number of supported joysticks in sf::Input
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1327 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-06 08:36:55 +00:00
LaurentGom
bd9a60fef2 Reverted last modifications in sf::Input (they were supposed to happen in trunk)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1326 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-06 08:32:26 +00:00
LaurentGom
9bda3a4ef2 git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1325 4e206d99-4929-0410-ac5d-dfc041789085 2010-01-06 07:16:22 +00:00
LaurentGom
5c68de5e80 Forgot something in last commit :)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1324 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-05 19:18:20 +00:00
ceylo
42b97d230f Replaced GetAxesCount() with HasAxis().
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1321 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-05 18:10:29 +00:00
LaurentGom
63867b654c Fixed error in last commit
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1319 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-05 16:50:21 +00:00
LaurentGom
8bbf7dfc46 FS#143 - Increase the number of supported joysticks to 4
FS#142 - Fix joystick axes being sometimes ignored


git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1318 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-05 16:48:32 +00:00
laurentgom
da44e3d8e5 Applied the anti-aliasing modifications to the Linux implementation
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1317 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-02 18:37:02 +00:00
LaurentGom
f2a1ba3cda Improved the anti-aliasing level selection algorithm
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1316 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-02 13:42:32 +00:00
LaurentGom
6d717f3c87 Modified sf::RenderTarget so that it handles views by value rather than by reference
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1315 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-31 16:43:24 +00:00
LaurentGom
1f2b441c9a Fixed alpha calculation in Image::Copy with applyAlpha = true
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1312 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-27 23:23:45 +00:00
LaurentGom
7947044a83 Fixed character weight too high for the sf::Text::Bold style
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1311 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-19 23:17:24 +00:00
LaurentGom
c72312f9a4 Improved the quality of sf::Text::Bold and made it more efficient
Made sf::Text::Underlined style more robust

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1310 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-14 21:26:30 +00:00
LaurentGom
3a34f81561 Complete rewrite of sf::Font to make it more flexible (no more fixed charset and size)
FS#125 - Fix tab character not working in sf::String

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1309 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-13 15:49:30 +00:00
LaurentGom
fb7470cbc3 FS#133 - Add a function to make fast updates of an image's pixels from an external source
Removed sf::Image constructors that called CreateXxx or LoadXxx (there was no way to check errors)


git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1307 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-05 11:35:27 +00:00
LaurentGom
aff5c1a47c Renamed Image::GetValidTextureSize to Image::GetValidSize
Added Image::GetMaximumSize

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1306 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-04 13:55:16 +00:00
LaurentGom
cacd150569 Fixed typo
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1305 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-04 07:10:37 +00:00
LaurentGom
053042bf5a Fixed wglChoosePixelFormatARB crashing when not supported
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1304 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-04 06:35:03 +00:00
LaurentGom
4051c1d99d Fixed a bug in GeometryRendererVBO which caused some quads to be ignored
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1303 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-03 19:36:49 +00:00
LaurentGom
a8a3b423bf Fixed endless loop when creating an OpenGL 3.x context (bug introduced by the last modification)
Updated the API documentation of the graphics module

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1302 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-03 16:47:56 +00:00
LaurentGom
08f819e49e WGL implementations not supporting wglChoosePixelFormatARB (for antialiasing) no longer crash
When an OpenGL 3.x context cannot be created, the minor version is decreased until it reaches 0 (instead of giving up and switching to a 2.x context immediately)


git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1300 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-03 08:49:45 +00:00
LaurentGom
4418469d97 Added SetSmooth / IsSmooth to sf::RenderImage
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1299 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-03 08:29:35 +00:00
LaurentGom
10296333be Fixed minor warnings after the last commit
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1298 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-02 20:50:21 +00:00
LaurentGom
6bd654b854 Fixed wrong type for OpenGL indices (std::size_t could be 64 bits on 64 bits platforms -- now using sf::Uint32)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1297 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-02 20:45:53 +00:00
LaurentGom
cf9ffb0d27 Fixed a const issue in SelectorBase::GetSocketReady on Mac OS X
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1296 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-02 18:41:22 +00:00
LaurentGom
35cfe7a8e4 Removed the workaround for shaders parameters (too slow!)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1295 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-29 10:10:10 +00:00
LaurentGom
642c4fecfa Fixed compile warnings in sfml-graphics
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1293 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-27 08:21:41 +00:00
LaurentGom
092720c0c2 Fixed wrong #include in WindowImplX11.cpp on Linux
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1292 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-27 07:43:25 +00:00