Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,428 Commits 1 Branch 0 Tags 98 MiB
541e83ed12
Commit Graph

261 Commits

Author SHA1 Message Date
binary1248
043fb83cd8 Rewrite RenderWindow::capture to make use of a single texture transfer instead of transferring each row of the framebuffer individually. 2016-02-19 17:30:22 +01:00
Mrowqa
1763861b26 Added support for geometry shaders 2016-02-18 20:20:43 +01:00
Zachariah Brown
957cabb816 Added support for outlined text 2015-12-31 10:41:59 +01:00
Krozark
7ff9478061 add a new BlendMode::Equation : ReverseSubtract 2015-12-03 00:28:32 +01:00
Jan Haller
9c5c750e60 Added new methods to set uniforms in sf::Shader 
Implements a new design for the shader uniform API.
* Added Shader::setUniform() and Shader::setUniformArray() overloads for the following types:
  -> scalars: float, int, bool
  -> vectors: 2D, 3D, 4D
  -> matrices: 3x3, 4x4
  -> arrays of basic types
  -> samplers (sf::Texture)
  -> conversions for SFML types (sf::Transform, sf::Color)
* Added sf::Glsl namespace with GLSL-equivalent types
* Deprecated Shader::setParameter() overloads

Other related changes:
* Refactored sf::Shader internals to avoid code duplication
* Improved documentation
* Added SFML_DEPRECATED macro to Doxyfile
* Defined _SCL_SECURE_NO_WARNINGS to disable std::copy() warnings on MSVC
 2015-10-21 10:29:07 +02:00
Alec Iverson
ecede1119a Fixed small typo in setActive \brief 2015-09-30 08:17:18 +02:00
binary1248
2752bbcfb0 Added methods to get the currently active context, query whether an OpenGL extension is available and query the actual OpenGL version of a context, made context switches during initialization of texture and shader static values unnecessary, fixed code style in loaders. 2015-09-21 20:29:55 +02:00
Lukas Dürrenberger
df8260a1c4 Fixed a typo of the example in the font header. 2015-08-24 13:37:49 +02:00
Matthew Szekely
7c179193e6 Fixed RenderTexture::clear() not always working on certain hardware 2015-08-04 10:14:54 +02:00
Jan Haller
6de027f198 Clarified lifetime requirements of underlying resources for Music and Font 2015-06-04 21:06:54 +02:00
Jan Haller
6cec972338 Removed unnecessary sf:: prefixes 2015-05-20 17:30:23 +02:00
Juhani Numminen
1b1d92d6bb Fix function name in short example snippet in RenderStates.hpp 2015-05-20 16:37:32 +02:00
Jan Haller
947427cb8d Clarified semantics of Shape::getGlobalBounds(), improved related documentation 2015-05-03 14:51:44 +02:00
Jan Haller
e0174545e6 Fixed Color::toInteger() not being const-qualified 2015-04-28 21:44:31 +02:00
binary1248
e80bf0ba92 Fix whitespace: Convert tabs to spaces and remove trailing whitespace. 2015-04-15 01:53:43 +02:00
binary1248
c17486857f Implemented methods to retrieve the OpenGL handles from sf::Texture and sf::Shader. 2015-03-23 16:16:07 +01:00
Zachariah Brown
1de7644277 Updated copyright year and Laurent's email address 2015-03-02 13:41:54 -05:00
Lukas Dürrenberger
1f2bc148fe Implemented sf::Color::toInteger() to complement the new sf::Color constructor. 2015-02-23 11:38:49 +01:00
FRex
88ec48cb85 Added a new constructor that takes single Uint32 to Color 2015-02-23 11:38:48 +01:00
Jan Haller
1cfa5c6f1d Replaced unsigned int with std::size_t for array indices/sizes 2014-12-28 18:21:59 +01:00
Jan Haller
0a64f50605 Further corrections of typos and dash inconsistences 2014-11-18 11:14:18 +01:00
Lukas Dürrenberger
45810a1345 Fixed additional comments and documention spelling mistakes. 2014-11-18 01:02:07 +01:00
Stefan Schindler
f24ca9a840 Source code changes. 
* Changed newlines to \n.
* Removed whitespace before colons.
* Fixed several alignments.
 2014-10-06 01:18:47 +02:00
binary1248
b27cbd5036 Fixed font glyphs always being 2 pixels larger than they are supposed to be in each dimension, fixed wrong underline offset with some fonts, offset underline and strike through by half of their thickness so their center is positioned correctly, changed glyph and font metrics to use floats instead of ints to support scaling better. 2014-10-02 23:30:58 +02:00
Lukas Dürrenberger
ef1b9d6b20 Merge branch 'feature/strikethrough' 2014-08-19 23:02:21 +02:00
binary1248
6959c1a826 Added notes to documentation and adjusted OpenGL example as a workaround for the side effects of making static functions that require a context work. If the user wants to make use of both sfml-graphics and OpenGL, they should make sure sf::Texture::getMaximumSize() and/or sf::Shader::isAvailable() are called at least once before setting their final context active as those functions will cause a context switch the first time they are called. 2014-08-15 13:39:06 +02:00
Foaly
5f3b6cb57a Added a strikethrough text style to sf::Text. Fixes issue #243. 2014-07-18 13:57:57 +02:00
binary1248
bdcdfffe11 Replaced Text underline offset/thickness with nicer font dependent values. 2014-06-12 00:49:23 +02:00
binary1248
da79517b36 Fix bitmap font resize failing silently when resizing to an unsupported pixel size (#448), fixed getKerning returning scaled values even for bitmap fonts. 2014-06-12 00:49:23 +02:00
Stefan Schindler
9690a7edee Fixed minor documentation issue. 2014-06-06 13:09:25 +02:00
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
Laurent Gomila
f99bbfc534 Reviewed the sf::BlendMode class (added a constructor, made minor modifications in comments) 2014-04-22 21:37:39 +02:00
Jonathan De Wachter
634c3dc2a7 [Android] Fixed memory leak when loading asset files 2014-04-20 12:57:38 +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
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
Jan Haller
12d81304e6 Updated copyright year to 2014 2014-02-06 20:08:26 +01:00
Jan Haller
e074b6775e Added documentation note on coordinates and undistorted rendering 2014-02-05 22:28:06 +01:00
Laurent Gomila
f69a35e63d Whitespace fix 2013-11-01 15:14:18 +01: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
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
7554c86f7d Optimized Shader::setParameter functions, by using a cache internally (#316, #358) 2013-06-18 11:55:21 +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
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
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
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
37d6e72a14 Moved some functions of RenderTarget to private access 2012-12-02 00:10:24 +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
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
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
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
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
8eb5073c33 Minor correction the API doc of sf::Shader 2012-05-30 17:22:13 +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
e9a6840e7d Minor corrections in API doc 2012-04-22 08:53:57 +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
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
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
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
c2c924f512 Minor fixes in comments 2012-01-29 11:39:29 +01:00
Laurent Gomila
369f450502 Minor fixes in documentation 2012-01-21 11:53:31 +01:00