mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,358 Commits 56 Branches 18 Tags 134 MiB
eb4170796a
Commit Graph

292 Commits

Author SHA1 Message Date
Mario Liebisch
146f63874a Added a geometry shader effect to the Shader example 2016-02-18 20:20:43 +01:00
Zachariah Brown
957cabb816 Added support for outlined text 2015-12-31 10:41:59 +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
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
binary1248
e80bf0ba92 Fix whitespace: Convert tabs to spaces and remove trailing whitespace. 2015-04-15 01:53:43 +02:00
Lukas Dürrenberger
20f213bfac Added a FLAC file to the Sound example to cover all three supported formats. 2015-03-28 22:49:46 +01:00
Lukas Dürrenberger
23cc8cfe3f Only link sfml-main for the GUI examples in release mode. 2015-03-26 10:23:28 +01:00
binary1248
650e792350 Improved OpenGL and X11 rotating cube examples. 2015-03-23 16:16:07 +01:00
binary1248
e2420dfe76 Removed support for GLU. 2015-03-23 16:16:06 +01:00
binary1248
97bdf72ce1 Adjusted OpenGL and Window example to request a 24-bit instead of a 32-bit depth buffer since it might not be supported on all systems. 2015-03-23 16:16:05 +01:00
Mario Liebisch
34692d5a39 Android: Updated the toolchain file and CMake scripts 
* Replaced the toolchain file with a new version based on [zuhowei's fork](https://github.com/zhuowei/android-cmake), which enables x64 builds as well as support for the latest NDK. This breaks compatibility with old build directories.
* Removed the STL dependency from **sfml-activity** rather than relying on *some* implementation implicitly linked by default.
* Deleted *project.properties*, which wasn't supposed to be part of the repository code. You have to use the Android SDK to recreate it (`android update project --path to/your/example --target 1 --name SFML-Example`).
* Made it possible to select a STL implementation to be used (default: `c++_shared`). Keep in mind that not all available configurations are necessarily compatible with SFML.
* Fixed linker flags to be compatible with Nvidia's Nsight Tegra for Visual Studio.
* It is now possible to compile the Android version using Nvidia's Nsight Tegra for Visual Studio (requires up-to-date CMake and `CMAKE_SFML_SYSTEM` to be set to `Android`; keep in mind that this is still experimental and requires further CMake updates).
* Updated and renamed some Android specific CMake variables.
* Made `armeabi-v7a` the default ABI for Android builds.
 2015-03-04 09:05:22 +01:00
Zachariah Brown
1de7644277 Updated copyright year and Laurent's email address 2015-03-02 13:41:54 -05:00
Stefan Schindler
92ca32b2f9 Code adjustments to fix warnings. 
Change-Id: Iba40752c6c5baaadc2a1b6a0fd03cbb0e3cde8a3
 2015-01-05 22:23:16 +01:00
Stefan Schindler
c7549cd292 Adjusted and fixed XCB patch. 
* Adjusted xcb_icccm calls (for recent XCB versions).
* Fixed wrong parameter order in xcb_icccm_set_wm_protocols call.
* Fixed XCB_BUTTON_RELEASE spawning a MouseButtonPressed event.
* Moved files from obsolete Linux/ to Unix/ directory.
* Added m_useSizeHints fix.
* setTitle() converts to UTF-8 before passing to XCB -> Unicode window title
  support.
* Added XCB-util dependency.
* Replaced XSelectInput. Obtaining XCB connection when taking window handle.
* Adjusted X11 example for XCB.
* Removed AutoPointer, replaced by direct XCB and free() calls.
* Added key repeat workaround.
 2014-12-29 08:59:20 +01:00
Lukas Dürrenberger
188f713900 Merge branch 'bugfix/doc_n_spaces' 2014-11-19 10:11:46 +01:00
Lukas Dürrenberger
45810a1345 Fixed additional comments and documention spelling mistakes. 2014-11-18 01:02:07 +01:00
Stefan Schindler
40ae3ce175 Examples adjustments. 
* French to English punctuation.
* Pong and Shader use fixed-sized windows now (especially on tiling
  window managers, the windows will be resized automatically, thus
  making the examples look and also behave weirdly).
 2014-11-17 09:44:46 +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
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
Arnold Dumas
700c2e3823 I missed one exclamation mark in the previous commit. 2014-08-03 21:18:27 +02:00
Arnold Dumas
1fa2ff0458 No space before exclamation mark. 2014-08-03 20:44:38 +02:00
Jonathan De Wachter
a06ecb0c7f [Android] Changed APP_PLATFORM value to android-9 in Application.mk 2014-06-21 21:31:21 +02:00
Jonathan De Wachter
9e3b466ee0 [Android] Fixed <uses-sdk> appears after <application> tag warning 2014-06-21 21:31:21 +02:00
Jonathan De Wachter
06b73f36bd [Android] Updated target SDK version to 19 2014-06-21 21:30:58 +02:00
Jonathan De Wachter
e726c24de4 [Android] Avoid hardcoding the debug mode in AndroidManifest.xml 2014-06-21 21:30:58 +02:00
Jonathan De Wachter
775277b8fb [Android] Updated example to handle screen rotation events (#531) 2014-06-21 20:11:41 +02:00
Marco Antognini
6e01d1fde7 Improved style of Cocoa example 2014-05-23 09:52:18 +02:00
Marco Antognini
6a5391c0b6 Fixed warnings in Cocoa example 2014-05-23 09:52:18 +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
Jonathan De Wachter
76fddc0729 [Android] The armeabi version of SFML is now built by default (the example as well) 2014-04-20 12:58:41 +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
6e57380e4f [Android] Added the example 2014-04-20 12:57:47 +02:00
Laurent Gomila
c35b48bcea [iOS] Removed support for examples, it was too much trouble and not as robust as true iOS App Xcode projects 2014-04-20 12:53:22 +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
Laurent Gomila
239921b456 [iOS] Improved support for examples, removed the need for a toolchain file 2014-04-20 12:53:04 +02:00
Laurent Gomila
4e8e1629d1 Adapted the examples for iOS (WIP) 2014-04-20 12:52:10 +02:00
Marco Antognini
ac28902b57 Removed support for OS X 10.6 and below 2014-04-15 20:18:20 +02:00
Jan Haller
12d81304e6 Updated copyright year to 2014 2014-02-06 20:08:26 +01:00
Laurent Gomila
9b0ed300b5 Made compiler and OS variable names much clearer in CMake files 2013-10-09 08:01:10 +02:00
Marco Antognini
6f68192272 Update © dates 2013-09-20 18:52:57 +02:00
Marco Antognini
2b8f20c89f Remove trailing spaces 2013-09-20 18:52:57 +02:00
Marco Antognini
95678e851a Update logos for Cocoa example 2013-06-27 23:29:27 +02:00
Laurent Gomila
7051d43c72 Fixed IDE folder of example "Cococa" 2013-06-14 15:01:29 +02:00
Laurent Gomila
7c9f9cc41c Minor fix in Window and OpenGL examples 2013-06-03 20:48:24 +02:00
Laurent Gomila
8cb05fc6d0 Updated the Window and OpenGL examples (got rid of GLU and immediate mode) 2013-05-21 16:57:02 +02:00
Marco Antognini
e11ed81f72 Fix compilation issue on 10.5 2013-01-19 10:55:52 +01:00
Laurent Gomila
c02e375399 Renamed Ftp::ListingDirectory::getFilenames() to getListing() 2012-10-26 17:09:43 +02:00
Marco Antognini
757a785ed7 Updated Cocoa example 
Now load correctly a font instead of displaying nothing at all.
 2012-08-20 19:26:30 +02:00
Laurent Gomila
a0c1f5f50f Removed the built-in default font 2012-08-04 00:08:14 +02:00
Laurent Gomila
e92a3120c7 Fixed a bug in the pong example 2012-04-06 13:17:23 +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
ee7cd94220 Fixed various minor warnings 2012-03-17 17:00:19 +01:00
Marco Antognini
c741b6459f Updated the copyright text 2012-03-14 14:37:17 +01:00
Marco Antognini
2ef92a2af2 Updated Mac OS X code according to commits ff5b69d312 and 14ac411542 2012-03-12 23:04:06 +01:00
Laurent Gomila
1dad4219a6 Merge branch 'master' of github.com:LaurentGomila/SFML 2012-03-11 19:11:00 +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
Marco Antognini
2680d3df65 Updated Mac OS X code according to 15e9d999b3 commit 2012-03-09 11:45: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
fa4415cf8a Removed useless line 2012-02-22 22:53:18 +01:00
Laurent Gomila
2ee4b99f4d Minor fix (rotation speed) in the Window example 2012-02-15 22:47:10 +01:00
Laurent Gomila
feae26e15b Merge branch 'master' of github.com:LaurentGomila/SFML 2012-01-30 19:43:42 +01:00
Marco Antognini
7417870042 Updates readme.txt of cocoa example 2012-01-30 14:50:11 +01:00
Marco Antognini
2a083ea202 SFML-Cocoa is now part of the cmake-based examples 
Removes Xcode project
Fixes a crash and
Silences system alerts in this example
 2012-01-30 12:23:18 +01:00
Laurent Gomila
4488f7f345 Fixed errors in examples after switching to sf::Time 2012-01-25 10:27:29 +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
8630c88e70 Removed warning in Shader.cpp 2011-12-29 19:24:47 +01:00
Laurent Gomila
aaa21dfaf6 Corrected the name of some functions/variable 2011-12-25 23:42:43 +01:00
Laurent Gomila
c817f882e6 Enabled v-sync in OpenGL and Pong examples (to make them smoother) 2011-12-25 23:13:13 +01:00
Laurent Gomila
78e1e8732b Fixed (?) a fragment shader in the "Shader" example 2011-12-14 07:34:47 +01:00
Laurent Gomila
c9b87ec8a9 Added support for vertex shaders in sf::Shader 
Rewrote the Shader example
 2011-12-10 13:02:38 +01:00
Laurent Gomila
eeff685255 Merge branch 'master' into drawables 
Conflicts:
	include/SFML/Graphics/Sprite.hpp
	include/SFML/Graphics/Text.hpp
	src/SFML/Graphics/Sprite.cpp
 2011-12-02 20:58:14 +01:00
Laurent Gomila
5bae08a2d8 Implemented the new graphics API: 
- Removed the internal classes sf::Renderer and sf::Matrix3
- Split sf::Drawable into sf::Drawable and sf::Transformable
- Added sf::Transform
- Added sf::Vertex
- Added sf::VertexArray
- Types of shapes are now handled with their own derived class
- Modified the Pong example
 2011-12-01 23:24:58 +01:00
Laurent Gomila
d58d6e51bc Added explicit include directories for OpenGL and X11 in CMake files 2011-09-30 13:43:52 +02:00
Martin Foot
13986b2a3b Fix CMake variables to allow adding SFML as a dependency. 2011-08-07 14:33:42 +01:00
Laurent Gomila
e509f01180 Split sf::Image into sf::Image and sf::Texture (implements issue #18) 2011-07-22 22:31:27 +02:00
Laurent Gomila
270f505570 Removed Window::GetCursorPosition/SetCursorPosition, added Mouse::GetPosition/SetPosition (two versions: one that handles desktop coordinates, one that handles window coordinates) 2011-07-08 07:56:14 +02:00
Laurent Gomila
8621e45960 Implemented global inputs (sf::Keyboard, sf::Mouse, sf::Joystick) and removed the event-based sf::Input. 
Window::WaitEvent now works with joystick events as well.
Added Event::JoystickConnected and Event::JoystickDisconnected.
Added Window::GetCursorPosition.
 2011-07-04 08:21:40 +02:00
Laurent Gomila
f0ed4ba446 Removed forgotten debug stuff from the "shader" example 2011-05-31 23:12:52 +02:00
Laurent Gomila
e4c6c30e0b Times in SFML are now Uint32 milliseconds instead of float seconds 
Added the sf::Uint64 and sf::Int64 types
 2011-05-19 08:19:42 +02:00
Marco Antognini
0e826d8dec Fixed shader examples 2011-05-15 13:37:29 +02:00
Laurent Gomila
a4f6e915a0 Removed the sf::Randomizer class from the system module 2011-05-10 08:16:22 +02:00
Laurent Gomila
df6874273a Renamed Window::GetEvent to PollEvent 2011-04-11 18:20:21 +02:00
Laurent Gomila
6676d77ea1 Updated the C and .Net bindings according to the previous modifications 2011-04-04 23:37:20 +02:00
laurentgom
a94ed51702 ATI fix! 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1809 4e206d99-4929-0410-ac5d-dfc041789085
 2011-03-21 07:08:26 +00:00
LaurentGom
7ed866667d Removed old projects/makefiles for SFML examples 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1613 4e206d99-4929-0410-ac5d-dfc041789085
 2010-11-05 13:29:20 +00:00
LaurentGom
8525a7cb92 Changed the output names of SFML libraries in projects/makefiles (sfml-xxx -> sfml2-xxx) 
Fixed OpenAL include path in Linux makefiles

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1555 4e206d99-4929-0410-ac5d-dfc041789085
 2010-08-27 21:37:50 +00:00
LaurentGom
a991fe8e4d Added support for the CMake build system 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1550 4e206d99-4929-0410-ac5d-dfc041789085
 2010-08-19 15:59:24 +00:00