Commit Graph

2571 Commits

Author SHA1 Message Date
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
LaurentGom
b31495fa01 Fixed number of joysticks in sf::Input (was still 2)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1323 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-05 19:16:54 +00:00
LaurentGom
4472f81469 Updated CSFML to properly handle the new way of storing views in render targets
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1322 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-05 19:15: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
bc6beac402 FS#144 - Implement copy "constructors" in CSFML
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1320 4e206d99-4929-0410-ac5d-dfc041789085
2010-01-05 17:52:56 +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
54e70a47f0 Fixed documentation of sf::NonCopyable
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1314 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-30 10:22:07 +00:00
LaurentGom
e8f2136890 Removed an unused header in SFML/Network
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1313 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-29 16:34:46 +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
tankbo
839c80556d Adjusted PySFML to work with the current SFML2 branch.
Note that it's just compatible. A lot of the new functionality is still in the pipeline.

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1308 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-07 11:53:38 +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
148626ed5b Applied to CSFML makefiles the same modifications as the SFML ones
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1301 4e206d99-4929-0410-ac5d-dfc041789085
2009-12-03 09:19:25 +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
acfc296150 Removed sfFont_Create() from CSFML
Removed sfText_GetWidth() and sfFont_GetHeight() declarations from SFML.Net (these functions don't exist)

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1294 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-29 10:06:34 +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
LaurentGom
49fbdb56df Fixed endless recursion in audio initialization
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1291 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-26 22:32:38 +00:00
LaurentGom
d979ca254e Fixed linker errors in sfml-network and csfml-network
Made every read-only pointer "const" in CSFML

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1290 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-26 20:09:57 +00:00
LaurentGom
29ecc552c2 Fixed crashes at startup when using the audio module
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1289 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-26 09:03:00 +00:00
LaurentGom
5669793e9e Updated the API documentation of Utf and String classes
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1288 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-26 08:51:39 +00:00
LaurentGom
ae57e56a98 FS#70 - Add support for unicode strings in sf::Packet
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1287 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-26 08:26:01 +00:00
LaurentGom
78247bd386 FS#90 - Improve Unicode string classes
Added the sf::String class to replace (and enhance) sf::Unicode::Text
FS#138 - Rename sf::String to sf::Text


git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1286 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-26 08:07:38 +00:00
LaurentGom
9f063921c9 Fixed RenderWindow being automatically deactivated sometimes
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1285 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-26 07:33:03 +00:00
remi-k
f3f630142a Minor fix in sf.Window
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1284 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-24 11:25:46 +00:00
LaurentGom
8bc4460d15 Added an automatic Flush() when drawing with a shader (temporary workaround to make shaders parameters work properly)
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1283 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-22 22:15:56 +00:00
laurentgom
b735c7f3d1 Fixed a memory leak in sf::Window on Linux
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1282 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-22 10:08:11 +00:00
LaurentGom
2d886a366d Added missing #include in SFML/Window.hpp
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1281 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-21 23:38:25 +00:00
LaurentGom
a32d30c1be Fixed a memory leak in sf::Window implementation on Windows
Synchronized sfml2 with trunk

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1280 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-21 21:39:31 +00:00
LaurentGom
17cf6873aa Fixed a memory leak in sf::Window implementation on Windows
Synchronized sfml2 with trunk

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1280 4e206d99-4929-0410-ac5d-dfc041789085
2009-11-21 21:39:31 +00:00