Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,718 Commits 1 Branch 0 Tags 98 MiB
32bafa98a4
Commit Graph

961 Commits

Author SHA1 Message Date
Jonathan De Wachter
f7561f5fa1 Fixed EGL surface not recreated in the right thread 2014-07-24 10:04:27 +02:00
Jonathan De Wachter
796c87295c Improved readability of ?: operator 2014-07-24 08:35:23 +02:00
Foaly
5f3b6cb57a Added a strikethrough text style to sf::Text. Fixes issue #243. 2014-07-18 13:57:57 +02:00
binary1248
520025d904 Fixed a crash caused by the stack being unaligned when entering ThreadImpl::entryPoint if compiled by GCC or clang and run on Windows XP 32-bit. (#412) 2014-07-13 09:22:25 +02:00
Jonathan De Wachter
0a64da654c Merge pull request #656 from MarioLiebisch/android-nosurface-display 
[Android] Don't try to display without a surface
 2014-07-08 18:03:42 +02:00
Jonathan De Wachter
f491e94297 [Android] Redirect error messages to logcat by default 2014-07-08 17:59:33 +02:00
Lukas Dürrenberger
e625d79a04 Merge branch 'bugfix/soundstream' 2014-07-07 09:44:45 +02:00
Mario Liebisch
e73e408885 [Android] Don't try to display without a surface 
* Android apps would still try to call `eglSwapBuffers()` even though
they don't have a valid surface right now (i.e. due to being inactive/in
background).
 2014-07-05 18:42:41 +02:00
binary1248
57941c1696 Fixed invoking a virtual method (onSeek) in the destructor of SoundStream. 2014-07-05 16:19:30 +02:00
binary1248
74e425a9ed Made sure SoundStream adhered to its documented behavior, added a hint to SoundStream and Sound documentation regarding setting the offset while stopped. 2014-07-04 22:24:48 +02:00
Foaly
09aae0240d Fixed calling SoundStream::setPlayingOffset() unpausing a paused SoundStream (#203), guard m_isStreaming by a mutex, fixed calling SoundStream::pause() before the stream thread starts not properly pausing the stream (http://en.sfml-dev.org/forums/index.php?topic=15197.0), minor documentation fix in SoundStream. Signed-off-by: binary1248 <binary1248@hotmail.com> 2014-07-04 20:48:23 +02:00
binary1248
362a590454 Fixed FTP download and upload file sizes being limited by available RAM (#565). 2014-07-04 20:40:18 +02:00
Laurent Gomila
471873dff9 Fixed typo in the sfml-graphics CMake file 2014-07-03 08:01:44 +02:00
Jonathan De Wachter
dd6b54d0eb [Android] Forgot to add two lines to the previous commit 2014-06-26 07:55:49 +02:00
Jonathan De Wachter
c462f7cd0a [Android] Got rid of the unnecessary additional event container 2014-06-26 07:33:03 +02:00
Jonathan De Wachter
57ca180d8d [Android] Hide status and navigation bar only if the fullscreen flag is on 2014-06-26 07:32:44 +02:00
Jonathan De Wachter
73008293ba Window style constraints are handled differently on mobile OSes 2014-06-26 05:22:49 +02:00
Jonathan De Wachter
cf52687203 [Android] onCreate nows waits for sf::Window to be created 2014-06-26 05:15:25 +02:00
Jonathan De Wachter
fb81ddfdcb [Android] VideoMode::getDesktopMode() returns the physical scren size in pixels 2014-06-26 04:56:06 +02:00
Jonathan De Wachter
d73418261b [Android] Do not hardcode java const values (JNI) 2014-06-24 07:40:16 +02:00
Jonathan De Wachter
ed7c80f6bb [Android] No longer force people to have debug version installed 2014-06-24 06:39:11 +02:00
Jonathan De Wachter
3e9f842e59 [Android] Workaround transparency issues on some Android devices 2014-06-21 21:30:58 +02:00
Jonathan De Wachter
b542785ed9 [Android] Keep the screen turned on and bright 2014-06-21 21:30:58 +02:00
Jonathan De Wachter
f0345d5201 [Android] Hide the navigation bar 2014-06-21 21:30:58 +02:00
Jonathan De Wachter
a88bab1d59 [Android] Hide the status bar 2014-06-21 21:30:57 +02:00
Jonathan De Wachter
a4846db016 [Android] Enable the usage of debug version of SFML libraries (#643) 2014-06-21 21:10:45 +02:00
Jonathan De Wachter
214c9b0662 [Android] Removed dependency on the window module from libsfml-main.a 2014-06-21 21:10:31 +02:00
Jonathan De Wachter
c522f6d596 Merge pull request #642 from MarioLiebisch/android-fingerfix 
[Android] Fixed redundant touch moved events
 2014-06-21 20:18:41 +02:00
Jonathan De Wachter
6302cc0762 Merge pull request #641 from MarioLiebisch/android-statesfix 
[Android] Fixed the app crashing on rotation
 2014-06-21 20:07:57 +02:00
Mario Liebisch
121c3b2fd7 [Win32] Fixed Unicode inconsistency 
For Unicode builds this change is more cosmetic, but it should fix
SFML's window class being registered as "S" rather than "SFML_Window"
for non-Unicode builds.
 2014-06-21 00:06:39 +02:00
Mario Liebisch
1bd62b4d14 [Android] Fixed the app crashing on rotation 
Rotating the screen will restart the app with the new window/orientation.
 2014-06-21 00:04:45 +02:00
Mario Liebisch
bc73b12428 [Android] Fixed redundant touch moved events 
Previously moving any finger would create `sf::Event::TouchMoved` events
for all fingers, even if their position didn't change at all.
 2014-06-21 00:04:15 +02:00
Mario Liebisch
5b559f1c08 [Android] Added missing sensor event generation 2014-06-20 23:56:33 +02:00
Jonathan De Wachter
60c34bff19 [Android] Made the remaining sensors available 2014-06-13 15:58:58 +02:00
Jonathan De Wachter
2874ac4aab [Android] Don't disable sensors since it's handled at higher-level 2014-06-13 15:58:50 +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
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. #153 
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 #508.

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. (#523) 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 (#354), 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 (#523), 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() #608. 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 (#394)
 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 #484)
 * Unapply context when closing the window, freeing memory

The following commits are related to ARC modifications:

 * 42f6e83dfb
 * 6edc4b9518
 * f6c94451fb
 * 324d4a18e7
 * 0d47056132

Commit ac28902b57 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