Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,462 Commits 1 Branch 0 Tags
d55b5ec5b9
Commit Graph

1425 Commits

Author SHA1 Message Date
binary1248
da79517b36 Fix bitmap font resize failing silently when resizing to an unsupported pixel size (), fixed getKerning returning scaled values even for bitmap fonts. 2014-06-12 00:49:23 +02:00
rafoudiablol
0124ad0a85 Show error message everytime a shader uniform's location can't be found. 
Adjusted code style (TankOs).

Original commit message by the author:
  Show only 1 once the message "Parameter not found"

Conflicts:
  src/SFML/Graphics/Shader.cpp
 2014-06-11 14:43:28 +02:00
Stefan Schindler
228038fa8a Check socket descriptor limit. 
When calling select(), there's an upper limit for the socket descriptor
which is defined as FD_SETSIZE. When the socket descriptor is higher
than FD_SETSIZE, a call to select() will not work as expected, at least
for the proper sockets.

This patch adds an error message for this case.
 2014-06-11 14:35:15 +02:00
Mario Liebisch
159176f5ba [Android] Fixed TouchBegan reporting wrong coordinates 
* So far `sf::Event::TouchBegan` always reported the coordinates of the
first pointer/finger.
 2014-06-10 10:15:41 +02:00
Lukas Dürrenberger
265c411c39 Merge branch 'bugfix/osx-implementation' 2014-06-04 11:48:31 +02:00
Marco Antognini
46be2159cb Fixed OS X implementation of sf::Mouse::(get|set)Position 
The code was not updated at all when support for retina display was introduced.
 2014-06-01 20:07:24 +02:00
Jan Haller
bc1127da5b Output error message and abort program when XOpenDisplay() fails 
Fixes issue .

When the X11 display could not be opened, the application crashed without notice. Now, a meaningful error message is output to std::err() and std::abort() is called, causing immediate program termination.
 2014-05-28 12:05:46 +02:00
Marco Antognini
5912d205d3 Removed a dead store in sf::Ftp implementation 2014-05-28 11:18:39 +02:00
Marco Antognini
4f2c6c4489 Fixed potential memory leaks on OS X 
And renamed create* methods to new* to follow more closely Objective-C
naming convention regarding memory management.
 2014-05-28 11:18:38 +02:00
binary1248
1dae89a8e0 Moved glClientActiveTexture and glActiveTexture calls before glEnable(GL_TEXTURE_2D) to make sure texture unit 0 gets affected. () 2014-05-27 10:56:11 +02:00
Mario Liebisch
ff869777a9 Fixed building for OpenGL ES 1.1 platforms 
* Added proper extension handling for `glBlendEquation` and related
  constants (required for OpenGL ES 1.1).
 2014-05-27 10:23:09 +02:00
Remco van Oosterhout
3fa1d0e03d Fixed issue where the viewport's width and/or height could be off by 1 pixel 
Signed-off-by: Stefan Schindler <stefan@boxbox.org>
 2014-05-27 09:14:00 +02:00
Joshua Adam Reisenauer
0375d7588f Fixed soundbuffer contents not being able to be updated when still attached to sounds (), sounds now detach from their buffer when it is reset. Signed-off-by: binary1248 <binary1248@hotmail.com> 2014-05-26 23:39:07 +02:00
binary1248
e6b5ce1f27 Make sure texture unit 0 is active when reseting RenderTarget states (), fix RenderTarget not clearing when a texture used as a RenderTexture color attachment is left bound in a different context (http://en.sfml-dev.org/forums/index.php?topic=9350.0). 2014-05-26 22:50:44 +02:00
Marco Antognini
3f61214571 Improved OS X implementation 
It makes sure the notifications sent to SFOpenGLView are only from its window.
 2014-05-26 15:37:33 +02:00
Marco Antognini
7d4235a38f Optimised OS X implementation regarding scaling factor 
This also adds support for changing the screen profile or moving the window to another screen.
 2014-05-26 15:37:09 +02:00
Lukas Dürrenberger
a3ab6efa23 Fix application crash when calling Shader::isAvailable() . 2014-05-23 10:44:10 +02:00
Marco Antognini
2215f55ef9 Moved more responsibilities to SFOpenGLView 
These changes will ease the implementation of mouse grab ()
 2014-05-23 09:52:18 +02:00
Marco Antognini
aa47dd5d33 Removed old documentation that doesn't apply anymore 2014-05-23 09:52:18 +02:00
Marco Antognini
e33e061e96 Replaced deprecated functions on OS X 10.9 2014-05-23 09:52:17 +02:00
Marco Antognini
b9f5f19f7c Reverted OS X implementation to non-ARC 
* Apparently, there were some leaks not reported as such
 * Support for 32 bits computer is restored
 * Fix memory leak in sfStringToNSString (related to )
 * Unapply context when closing the window, freeing memory

The following commits are related to ARC modifications:

 * 42f6e83dfbd73d8819287caddb250afd697729ba
 * 6edc4b951838771340512f7b91b27f05039ae606
 * f6c94451fb9262f52f537a4c5fff2309c2a89076
 * 324d4a18e716070582fc8e659387f9b72a3d42a3
 * 0d470561326bac4e8985bdbd5e139c9e3a276566

Commit ac28902b57094518e40b138b691b91f0f8004604 is the last one before the introduction of ARC.
 2014-05-23 09:52:17 +02:00
binary1248
1fe22e24d0 Fix the case where not having created a GlResource prior to calling Shader::isAvailable() would break context management. () 2014-05-22 11:53:58 +02:00
firefly2442
749cbb2ff8 add HTTP support for PUT and DELETE 
Signed-off-by: binary1248 <binary1248@hotmail.com>
 2014-05-22 10:45:19 +02:00
Stefan Schindler
5250cc97d5 Updated glext, removed glxext. 
Removed glxext in favor of the system version.
 2014-05-13 15:17:01 +02:00
binary1248
c45039e907 Removed vertical tab support from Text (). 2014-05-13 10:40:38 +02:00
Jan Haller
0c3d361ceb Fixed problem with wrongly initialized sf::RenderStates::Default 
This static variable depended on the global variable sf::BlendAlpha, which may not be constructed yet.
 2014-05-01 00:39:57 +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
Dmitry Marakasov
f1431e416c Use common unix sensor implementation on FreeBSD 2014-04-25 17:46:15 +04:00
Dmitry Marakasov
208164898b Don't use udev on FreeBSD 2014-04-25 17:45:49 +04:00
Marco Antognini
efe4354bc5 Improved resizing windows on OS X (close ) 
sf::Window::setSize will fire a resize event if the view could not be created at the requested size.
 2014-04-23 13:14:42 +02:00
Laurent Gomila
ee336a3037 Merge pull request from binary1248/text_fix 
Fix text being rendered with a vertical offset when the font's ascent doesn't match it's size.
 2014-04-22 22:41:25 +02:00
binary1248
6469f35d99 Fix text being rendered with a vertical offset when the font's ascent doesn't match it's size. 2014-04-22 22:06:51 +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
Marco Antognini
7f0f89bac9 Fixed menu shortcut not working in fullscreen (close ) 2014-04-22 12:47:12 +02:00
Marco Antognini
c222c28aa7 Removed dead code 
AutoreleasePoolWrapper is no more used since ARC is used on Mac.
 2014-04-21 18:29:07 +02:00
Marco Antognini
52bb192cff Removed debug log forgotten in the previous commit 2014-04-21 18:15:24 +02:00
Marco Antognini
2c96d49a03 Fixed mouse tracking in fullscreen on OS X 2014-04-21 18:07:43 +02:00
Marco Antognini
2eb4f69e41 Replaced some deprecated functions on OS X 
NSWindow convertBaseToScreen: -> convertRectToScreen:
NSView   convertPointToBase:  -> convertPointToBacking:
 2014-04-21 18:07:43 +02:00
Marco Antognini
d8812f0f5c Add support for retina displays (close ) 
Based on PR  by Michael Bradshaw

Convert size to match the size requested by the user.
 2014-04-21 18:06:44 +02:00
Marco Antognini
8f0037d84d Improved fullscreen support on OS X (close ) 
No hard resolution switch is done. Instead a view of the requested
size is displayed in the center of the main screen (letter boxing).

Running a stress test showed that the performance were equal
to a hard switch without the inconvenience of resizing the
user's apps. This also follows the guidelines defined by Apple:

> Avoid changing the display resolution from that chosen by the user.

source:
https://developer.apple.com/library/mac/documentation/graphicsimaging/Conceptual/OpenGL-MacProgGuide/opengl_fullscreen/opengl_cgl.html
 2014-04-21 18:06:44 +02:00
James Cowgill
86b29c539d Fixed various linux compile errors in EglContext 2014-04-21 14:42:07 +01:00
Marco Antognini
6e3103464a Fixed unused parameter warning 2014-04-20 21:55:38 +02:00
Marco Antognini
1bfc735a9e Improved style 2014-04-20 21:22:14 +02:00
Jonathan De Wachter
a348428476 [Android] Fixed stream pointer not initialized in Font.cpp 2014-04-20 12:58:59 +02:00
Jonathan De Wachter
273ad4c9ee [Android] Adapted sensor implementation 2014-04-20 12:58:56 +02:00
Mario Liebisch
dd7a3cb30b Fixed missing JoystickImpl member on Android 2014-04-20 12:58:54 +02:00
Laurent
03acb2ad9f Fixed compile errors in SensorImpl.mm and with EGL stuff on iOS 2014-04-20 12:58:52 +02:00
Laurent Gomila
80431deef4 Reviewed the sensor API 2014-04-20 12:58:50 +02:00
Jonathan De Wachter
2d682d324f [Android] Fixed unicode value of text entered event is always 0 2014-04-20 12:58:45 +02:00
Jonathan De Wachter
67c7a5d176 [Android] Forgot to dettach the SFML thread from the JVM at several places 2014-04-20 12:58:43 +02:00