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

1354 Commits

Author SHA1 Message Date
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 #484)
 * 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. (#211) 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 (#442). 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 #474) 
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 #576 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 #537) 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 #353) 
Based on PR #388 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 #343) 
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
Jonathan De Wachter
83306e72a2 [Android] Don't attach the same thread twice to the JVM 
ANativeActivity_onCreate is called by NaviteActivity from Java (which is the main thread). Thus, this thread is already attached to the JVM.
 2014-04-20 12:58:39 +02:00
Mario Liebisch
84bd8c6c5b Fixed several issues 
- Cmake errored out due to the ANDROID_NDK_* variables being used before being set/detected for the first time.
- Fixed one warning regarding one string replace in CMake.
- Fixed warnings when compiling SFML-Activity.
 2014-04-20 12:58:37 +02:00
Jonathan De Wachter
038401b8d5 [Android] Forgot to add EGLCheck.cpp to the list of file to build 2014-04-20 12:58:33 +02:00
Jonathan De Wachter
595df2a1a9 [Android] Fixed invalid drawable error 2014-04-20 12:58:29 +02:00
Jonathan De Wachter
2caec961ee [Android] Dropped stlport in favor of libc++ which supports C++11 2014-04-20 12:58:27 +02:00
Jonathan De Wachter
a1b0e73ac5 [Android] SFML activity allows a custom library name for the user application 2014-04-20 12:58:17 +02:00
Jonathan De Wachter
349fe380e4 [Android] Moved sensor implementation to the right place 2014-04-20 12:58:15 +02:00
Jonathan De Wachter
7daaaa649e Implemented sensor API 2014-04-20 12:58:13 +02:00
Jonathan De Wachter
59c3c2c0b0 Improved X11 visual selection algorithm to match the EGL config 2014-04-20 12:58:11 +02:00
Jonathan De Wachter
ba0555fd1a Implemented getBestConfig() in EglContext to retrieve the best EGL config 2014-04-20 12:58:09 +02:00
Jonathan De Wachter
2627c3579f Forgot to initialize the EGL display 2014-04-20 12:58:07 +02:00
Jonathan De Wachter
43aa313280 Don't link against freetype and jpeg library twice 2014-04-20 12:58:05 +02:00
Jonathan De Wachter
e12b94c989 Xrandr was missing in the list of external libraries on Linux 2014-04-20 12:58:02 +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
565bc69a4e Uniformized the way CMake find and link against external libraries 2014-04-20 12:57:58 +02:00
Laurent Gomila
1c9a8310ff Fixed missing modification after last commit 2014-04-20 12:57:53 +02:00
Laurent Gomila
62941c4264 Now using an explicit prefix for OpenGL extension macros, to avoid conflicts 2014-04-20 12:57:51 +02:00
Laurent Gomila
2c259c8f49 Added missing include of <System/Err.hpp> 2014-04-20 12:57:49 +02:00
Jonathan De Wachter
860c232507 [Android] No longer cache the window size 
Because onContextRectChanged happens after the surface creation thus, the window doesn't return the correct value when the surface gets created.
 2014-04-20 12:57:45 +02:00