mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-12-01 15:51:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,976 Commits 54 Branches 18 Tags 134 MiB
2df9abf341
Commit Graph

467 Commits

Author SHA1 Message Date
Jan Haller
cdf32a7881 Merge branch 'blendmodes' 
Introduces the sf::BlendMode class that supports separate blend functions and equations.
Replaces the old sf::BlendMode enum.

Further changes:
* Fixed merge conflicts resulting from GLExtensions in mobile branch
* GLExtensions: Added GLEXT_blend_equation_separate
* Added file BlendMode.cpp
* Replaced occurrences of sf::BlendMode value parameters with const-references
* Adapted rendering code in sf::RenderTarget
 2014-04-26 19:43:36 +02:00
James Cowgill
b188814937 Fix Config.hpp so SFML compiles on Debian FreeBSD 2014-04-25 15:41:47 +01:00
Jan Haller
3a7b425fb7 Improved sf::Http documentation concerning HTTPS 2014-04-23 19:31:31 +02:00
Laurent Gomila
f99bbfc534 Reviewed the sf::BlendMode class (added a constructor, made minor modifications in comments) 2014-04-22 21:37:39 +02:00
Laurent Gomila
80431deef4 Reviewed the sensor API 2014-04-20 12:58:50 +02:00
Laurent Gomila
ffd4b71722 Fixed erroneous comments in the sf::Touch class documentation 2014-04-20 12:58:47 +02:00
Jonathan De Wachter
7daaaa649e Implemented sensor API 2014-04-20 12:58:13 +02:00
Jonathan De Wachter
45f23cdbbb Made the OpenGL ES implementation available on ARM-based Linux OSes 2014-04-20 12:58:00 +02:00
Jonathan De Wachter
634c3dc2a7 [Android] Fixed memory leak when loading asset files 2014-04-20 12:57:38 +02:00
Jonathan De Wachter
4626e95491 [Android] Fixed WindowHandle and getSystemHandle() 2014-04-20 12:57:23 +02:00
Laurent Gomila
2c409e5145 Added touch events and the sf::Touch class (and iOS implementation) 2014-04-20 12:56:53 +02:00
Jonathan De Wachter
60894d1c1a [Android] Rewrote CMake scripts to compile SFML with our new toolchain 2014-04-20 12:56:40 +02:00
Laurent Gomila
3872b27569 Reworked the sfml-main module, added Main.hpp, moved the main() internal entry point for iOS from sfml-window to sfml-main 2014-04-20 12:53:17 +02:00
Jonathan De Wachter
63bbe2c91e Added the Android port 2014-04-20 12:52:04 +02:00
Laurent Gomila
d50f94ca97 Fixed render buffers not correctly resized on orientation changes 2014-04-20 12:48:02 +02:00
Laurent
e5ee38fc26 Added the iOS port 2014-04-20 12:48:00 +02:00
Jan Haller
e9243b7ef6 Improved documentation for sf::Shape and derived classes 2014-04-19 11:21:35 +02:00
Marco Antognini
49f2a76d93 Fixed a few glitches in the documentation 2014-04-15 20:18:19 +02:00
Jan Haller
666da801a1 Cached sf::Text attributes 
Two optimizations:
- If a value remains the same, nothing happens
- Recompute geometry only before drawing and bound access, not after each set

Closes #413
 2014-03-29 18:34:49 +01:00
Jan Haller
59e920cf10 Fixed several Doxygen warnings, limited input to *.hpp files 2014-03-29 12:42:13 +01:00
Jan Haller
1319a0a096 Improved Ftp::sendCommand() documentation 2014-03-29 11:54:20 +01:00
Jan Haller
2c5cab5454 Made Ftp::sendCommand() public 2014-03-28 13:38:19 +01:00
Jan Haller
50e3052773 Exposed up vector in sf::Listener API 
Closes #545
 2014-03-23 20:16:42 +01:00
Jan Haller
1fd6fae073 Minor improvements in sf::Ftp documentation 2014-03-22 14:41:46 +01:00
Jan Haller
9d5eb14dde Minor improvements in sf::Window and sf::RenderWindow documentation 2014-03-22 14:12:59 +01:00
Jan Haller
ec494babbe Passed BlendMode objects by const-reference 2014-03-16 11:58:45 +01:00
Jan Haller
330db58bc1 Improved documentation 2014-03-16 11:54:32 +01:00
Jan Haller
fab46cdfd7 Improved formatting 2014-03-16 10:50:27 +01:00
Jan Haller
75784dbb9a Omitted "Blend" prefix for nested BlendMode enums 
BlendMode::Factor instead of BlendMode::BlendFactor
BlendMode::Equation instead of BlendMode::BlendEquation
 2014-03-12 12:22:47 +01:00
Jan Haller
05d196d86d Fixed compile error (trailing enum comma) and other minor things 2014-03-12 12:19:38 +01:00
Jan Haller
fe7d6f513d Created branch for experimental blending mode API 
See issue #298.
Based on branch 'new_blending_api' of github.com:tomgalvin594/SFML.
 2014-03-09 13:38:39 +01:00
Thomas Galvin
951b774c70 Implemented a more flexible blending system (fixes #298) 2014-03-05 17:19:14 -05:00
NoobsArePeople2
29c0f14911 Adds name, vendor ID and product ID for joysticks. 
- Implemented on Windows, Mac OS and Linux.
- Adds sf::Joystick::Identification structure to hold
  name, vendor ID and product ID.
 2014-03-04 09:01:46 -08:00
Jan Haller
09860f7a02 Added String::substring() method 
Based on pull request #355 from abodelot
 2014-02-09 22:23:06 +01:00
Jan Haller
12d81304e6 Updated copyright year to 2014 2014-02-06 20:08:26 +01:00
Jan Haller
48db71fb69 Added String::replace() methods 
Based on pull request #355 from abodelot
 2014-02-06 12:39:59 +01:00
Jan Haller
e074b6775e Added documentation note on coordinates and undistorted rendering 2014-02-05 22:28:06 +01:00
Laurent Gomila
4a300547f3 Added String::toUtf8/16/32 functions (#501) 2013-12-04 22:54:38 +01:00
Strahinja Val Markovic
c3813f71ee Fix 'instanciate' typo; correct is 'instantiate' 2013-11-26 12:57:54 -08:00
Laurent Gomila
f69a35e63d Whitespace fix 2013-11-01 15:14:18 +01:00
Mario Liebisch
306b77bfc5 Added support for chunked http transfers 
sf::Http now understands transfers that are sent using Chunked Transfer
Encoding (RFC 2616; section 3.6.1).
 2013-10-24 11:49:00 +02:00
Laurent Gomila
db77b76d91 Merge pull request #470 from Foaly/MultiSoundInput 
Added support for selecting the audio capture device (fixes #220)
 2013-10-11 07:39:07 -07:00
Foaly
b1ad9dceac Added support for selecting audio capture device (fixes #220) 2013-10-09 09:24:02 +02:00
Laurent Gomila
fe12270d62 Fixed window size not correctly updated when changed through Window::setSize (#474) 2013-10-08 22:59:53 +02:00
Laurent Gomila
4dcd1f9c75 Fixed compiler warnings in sf::Rect (#458) 2013-10-02 22:39:57 +02:00
Marco Antognini
6f68192272 Update © dates 2013-09-20 18:52:57 +02:00
Laurent Gomila
5ffe258320 Forgot to include <Utf.hpp> in <String.hpp> 2013-08-24 23:43:33 +02:00
Laurent Gomila
c6651bfd30 Fixed stupid compile error in previous commit 2013-08-24 23:40:48 +02:00
Laurent Gomila
a89874f733 Added String::fromUtf8/16/32 functions (#196) 2013-08-24 14:45:59 +02:00
Jan Haller
6cf30e1751 Added operator for division of two sf::Time objects 2013-08-21 12:20:47 +02:00
Laurent Gomila
5173f51d52 Minor corrections in comments and syntax 2013-08-15 09:28:43 +02:00
Laurent Gomila
424c424376 Minor indentation and namespace fix 2013-08-12 19:02:12 +02:00
Laurent Gomila
a7f7c57a72 Merge pull request #430 from Foaly/timeOperators 
Added modulo operators for sf::Time (#429)
 2013-08-11 22:46:21 -07:00
Laurent Gomila
b9d0295c89 Added SoundRecorder::setProcessingInterval (#333) 2013-08-11 19:39:52 +02:00
Laurent Gomila
7caf2e64b6 Added Font::getInfo to retrieve various information about the font (for now, only the family name) (#164) 2013-08-09 16:02:53 +02:00
Laurent Gomila
6d4c844959 Added operator - for sf::Color (#114) 2013-08-09 14:57:32 +02:00
Laurent Gomila
6c1899d0f7 Updated version number 2013-07-21 09:30:08 +02:00
Foaly
0c0b3c2a3a Modulo operators for sf::Time (fixes #429) 2013-07-17 12:24:24 +02:00
Christian Neumüller
891e9de0fe Don't reimplement std::copy(). 
Using std::copy() potentially makes available helpful checks in debug mode and
can also lead to faster code by calling memcpy() in release mode.
The <algorithm> header was already included.
 2013-06-24 00:51:31 +02:00
Laurent Gomila
7554c86f7d Optimized Shader::setParameter functions, by using a cache internally (#316, #358) 2013-06-18 11:55:21 +02:00
Laurent Gomila
da96ec5811 Improved the performances of Window::getSize() (the size is now cached) 2013-06-12 20:27:18 +02:00
Laurent Gomila
11837e9fc8 sf::Rect::contains and sf::Rect::intersects now handle rectangles with negative dimensions correctly (#219) 2013-05-11 22:56:17 +02:00
Laurent Gomila
d9629cfca7 Fixed typo in sf::Transformable documentation 2013-05-11 08:51:20 +02:00
Laurent Gomila
b92dc572e3 Fixed documentation of sf::Image 2013-05-10 09:48:55 +02:00
Laurent Gomila
ae11207cdf InputStream.hpp was missing from the source file listing in CMake files, and added an important comment in the doc of InputStream::read (#349) 2013-05-09 13:37:24 +02:00
Laurent Gomila
4e8c144879 Updated the year in the copyright notice 2013-04-06 09:34:44 +02:00
Laurent Gomila
5c46daacd4 Fixed sf::Text constructor declaration (no longer explicit) and the API documentation 2013-03-15 08:13:00 +01:00
Foaly
ba2d08684c Added repeating to sf::RenderTexture 
Added the missing setRepeated() and isRepeated() methods to sf::RenderTexture.
 2013-03-06 18:11:48 +01:00
Shiz
6bc077688e Added Unicode window title support. 
- Changed SFML API to receive an sf::String as the window title instead
  of a std::string (in Window::Window and Window::setTitle).
- Changed RenderWindow and WindowImpl APIs accordingly.
- Changed WindowImplWin32 to use a Unicode window title only if the
  target OS supports it.
- Changed WindowImplCocoa to always use Unicode window titles and added
  a utility function to Window/OSX/cpp_objc_conversion.mm.
- Changed WindowImplX11 to set the Unicode window title as part of the
  _NET_WM_NAME specification, which sadly is not part of the official X
  standard, but the closest anything can get. Still set regular ASCII
  title as fallback.
 2013-02-12 02:14:52 +01:00
Laurent Gomila
9cf259c365 Minor addition in the API documentation 2013-02-02 20:42:00 +01:00
Laurent Gomila
91e1743516 Changed Texture::bind and Shader::bind to be static functions, that can accept a null argument 2013-01-08 22:24:43 +01:00
Laurent Gomila
527bb287a5 Minor modification to the API documentation 2012-12-30 09:54:09 +01:00
Laurent Gomila
d41837bf16 Fixed example in the API doc of sf::SocketSelector 2012-12-14 15:06:03 +01:00
Laurent Gomila
2e22038be7 Correction in the API documentation 2012-12-04 20:39:29 +01:00
Laurent Gomila
3eb32ded68 Correction in the API documentation 2012-12-04 20:36:39 +01:00
Laurent Gomila
8ddf513216 Updated the description of modules 2012-12-02 23:13:16 +01:00
Laurent Gomila
37d6e72a14 Moved some functions of RenderTarget to private access 2012-12-02 00:10:24 +01:00
Laurent Gomila
4afe83d934 Removed the endianness detection macros (were not used) 2012-11-28 20:44:03 +01:00
Laurent Gomila
6ce6014dd8 Renamed RenderTarget::convertCoords to mapPixelToCoords, and added its inverse mapCoordsToPixel 2012-11-10 10:30:01 +01:00
Laurent Gomila
42118dc217 Minor modification to the API doc 2012-11-01 16:13:07 +01:00
Laurent Gomila
c02e375399 Renamed Ftp::ListingDirectory::getFilenames() to getListing() 2012-10-26 17:09:43 +02:00
Laurent Gomila
121cfeb6a3 Removed Shader::unbind (was not used internally, less consistent with sf::Texture and could be confusing for users) 2012-10-20 23:38:39 +02:00
Laurent Gomila
7656693013 Minor updates in the documentation of sf::Shader 2012-10-02 08:19:21 +02:00
Laurent Gomila
57f81d4051 Disabled an optimization in sf::Shape that could break rendering 2012-09-21 22:06:27 +02:00
Laurent Gomila
2308c5a627 Minor correction in API doc 2012-09-18 18:51:24 +02:00
Laurent Gomila
6790904c80 Minor correction in API documentation 2012-09-01 23:26:20 +02:00
Marco Antognini
1d80eaa59b Revert Transformable documentation 
I was a bit too enthusiastic on this one. (see http://en.sfml-dev.org/forums/index.php?topic=8943.msg60213#msg60213)
 2012-08-23 17:15:03 +02:00
Marco Antognini
f970a6441f Minor corrections in API documentation 2012-08-23 13:22:17 +02:00
Laurent Gomila
1336a70eac Minor corrections in API documentation 2012-08-11 20:27:30 +02:00
Laurent Gomila
0670bad198 Minor correction in API documentation 2012-08-07 17:31:45 +02:00
Laurent Gomila
a0c1f5f50f Removed the built-in default font 2012-08-04 00:08:14 +02:00
Laurent Gomila
db1f1b8fa1 Minor corrections in API documentation 2012-07-31 17:51:01 +02:00
Laurent Gomila
81e4209482 Minor correction in API documentation 2012-07-28 20:45:00 +02:00
Laurent Gomila
3e2c3b8c95 Corrections in API documentation 2012-07-15 15:04:37 +02:00
Laurent Gomila
e85bd1baf6 Corrections in API documentation 2012-07-15 14:55:13 +02:00
Laurent Gomila
26d5620817 Shape::setOutlineThickness now allows negative values 2012-07-15 13:47:14 +02:00
Laurent Gomila
e3261f0430 Corrections in API documentation 2012-07-14 17:26:21 +02:00
Laurent Gomila
e7284cd665 Minor correction in API documentation 2012-07-10 20:22:08 +02:00
Laurent Gomila
7faf5857ec Added a sf::Key::Unknown key code for unsupported keys 2012-07-09 23:26:37 +02:00
Laurent Gomila
bba63dfae0 Minor correction in API doc 2012-06-30 20:11:43 +02:00
Laurent Gomila
aa534a0936 Fixed crash in SocketSelector::add when passing an invalid socket 2012-06-26 21:55:45 +02:00
Laurent Gomila
dd51b3d8ff Renamed Keyboard::Back to Keyboard::BackSpace 2012-06-19 18:21:16 +02:00
Laurent Gomila
c4c2c77686 Minor fix in the API doc 2012-06-13 17:21:27 +02:00
Laurent Gomila
eadd0b1596 Minor corrections in API doc 2012-06-06 22:06:45 +02:00
Laurent Gomila
8eb5073c33 Minor correction the API doc of sf::Shader 2012-05-30 17:22:13 +02:00
Laurent Gomila
ac9bda51ca Improved the API documentation of sf::Event (added the mapping between event types and members) 2012-05-24 15:56:51 +02:00
Laurent Gomila
945c848b37 Minor correction in API doc 2012-05-18 18:47:26 +02:00
Laurent Gomila
1187c29327 Minor correction API doc 2012-05-02 19:30:28 +02:00
Laurent Gomila
66a1ed7825 Minor corrections in API doc 2012-04-24 17:40:49 +02:00
Laurent Gomila
233fe32fab Minor corrections in API doc 2012-04-23 18:15:32 +02:00
Laurent Gomila
e9a6840e7d Minor corrections in API doc 2012-04-22 08:53:57 +02:00
Laurent Gomila
eebaa27d17 Minor corrections in API doc 2012-04-20 22:28:45 +02:00
Laurent Gomila
3a64ca8943 Minor corrections in API doc 2012-04-20 18:04:01 +02:00
Laurent Gomila
b623975fcf Minor correction in API doc 2012-04-07 17:07:40 +02:00
Laurent Gomila
cef3df4649 Minor corrections in API doc 2012-04-06 19:06:06 +02:00
Laurent Gomila
f3be2da018 Minor correction in API doc 2012-04-05 14:01:14 +02:00
Laurent Gomila
8c776f33c1 Private virtual functions are now protected, so that sub-classes can call them if necessary (and they appear in the API doc :) 2012-04-04 22:33:53 +02:00
Laurent Gomila
1a8488bd7b Minor corrections in API doc 2012-04-04 22:19:29 +02:00
Laurent Gomila
8d0da1d9d6 Replaced char* arguments with void* for raw data 2012-04-03 19:06:32 +02:00
Laurent Gomila
17e6a45a90 Replaced getWidth/getHeight with getSize in sf::Texture and sf::Image 2012-03-31 22:37:13 +02:00
Laurent Gomila
859074b3cc RenderTarget::convertCoords now takes a Vector2i argument 2012-03-27 17:17:59 +02:00
Laurent Gomila
74f9388f31 Made some 1 argument constructors explicit 2012-03-27 17:13:46 +02:00
Laurent Gomila
ac45dc9cba GL states are no longer polluted by SFML's ones when mixing with custom OpenGL code 2012-03-27 17:09:19 +02:00
Laurent Gomila
ee7cd94220 Fixed various minor warnings 2012-03-17 17:00:19 +01:00
Laurent Gomila
9163d04517 Merge branch 'master' of github.com:LaurentGomila/SFML 2012-03-14 19:06:55 +01:00
Laurent Gomila
ac4efb54f3 Improved the documentation of Music::openFromXxx functions 2012-03-14 19:05:51 +01:00
Marco Antognini
c741b6459f Updated the copyright text 2012-03-14 14:37:17 +01:00
Laurent Gomila
d592b2a7d1 Updated the copyright text 2012-03-13 18:37:34 +01:00
Laurent Gomila
4119c3bb31 Fixed compile error in sf::Rect 2012-03-12 18:01:36 +01:00
Laurent Gomila
14ac411542 Changed the naming convention for public member variables/functions and free functions (using lowerCase instead of UpperCase) 2012-03-11 19:10:37 +01:00
Laurent Gomila
ff5b69d312 Changed the naming convention for member variables (prefix changed from "my" to "m_") 2012-03-09 01:48:45 +01:00
Laurent Gomila
15e9d999b3 Added Window::GetPosition, and renamed some setters in Window for better consistency 2012-03-07 23:29:54 +01:00
Laurent Gomila
b8ea003eae Changed Transform::Combine to modify *this (more consistent with other functions) 2012-02-20 20:18:48 +01:00
Laurent Gomila
73b037b244 Updated the comments of Window::SetFramerateLimit 2012-01-31 19:56:51 +01:00
Laurent Gomila
84d75ed487 Fixed Window::SetFramerateLimit 2012-01-31 07:53:02 +01:00
Laurent Gomila
c2c924f512 Minor fixes in comments 2012-01-29 11:39:29 +01:00
Laurent Gomila
10cd729296 The UDP broadcast address is now a valid IpAddress, IpAddress::None is now 0. 2012-01-23 23:01:12 +01:00
Laurent Gomila
108984f71b sf::Time operators now take arguments by value instead of const reference 2012-01-21 15:41:10 +01:00
Laurent Gomila
369f450502 Minor fixes in documentation 2012-01-21 11:53:31 +01:00
Laurent Gomila
906a62df0f Each module now has its own export macro, which solves the "unresolved symbol" error with sf::Time::Zero 2012-01-21 10:34:17 +01:00
Laurent Gomila
4116ad033c Added the sf::Time class 2012-01-19 23:51:06 +01:00
Laurent Gomila
e775bd0169 Renamed SoundStream::Chunk::NbSamples to SampleCount, and renamed other nbSamples variables to sampleCount 2012-01-13 15:09:30 +01:00
Laurent Gomila
c2039e866c Renamed Window::IsOpened to IsOpen 
Made some minor consistency modifications in internal code
 2012-01-13 14:53:36 +01:00
Laurent Gomila
1e34d04aac Minor fix in comments 2012-01-04 20:38:02 +01:00
Laurent Gomila
8de7fca241 Minor improvements to the API documentation 2011-12-28 22:36:09 +01:00
Laurent Gomila
aaa21dfaf6 Corrected the name of some functions/variable 2011-12-25 23:42:43 +01:00
Laurent Gomila
f55da8d8bc Merge branch 'drawables' 2011-12-25 23:08:02 +01:00
Laurent Gomila
191730ac0d Added a render states cache to improve performances 2011-12-25 22:30:38 +01:00
Laurent Gomila
b65b19343a Changed the type of Vertex::TexCoords from integers to floats, to make it compatible with buggy ATI drivers 2011-12-21 22:44:21 +01:00
Laurent Gomila
5a4e8d58af Minor modifications 2011-12-21 22:31:42 +01:00