Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced non-ASCII symbols with equivalents

Browse Source
This commit is contained in:
Oleh Prypin 2015-03-10 01:56:04 +02:00
parent 20af2a4dfa
commit 01d5d1b463
10 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -263,7 +263,7 @@ else()
POST_BUILD
COMMAND cp -r ${PROJECT_SOURCE_DIR}/include/SFML/* $<TARGET_FILE_DIR:SFML>/Headers)
# adapt install directory to allow distributing dylibs/frameworks in user’s frameworks/application bundle
# adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle
# NOTE: it's not required to link agains SFML.framework
set_target_properties(SFML PROPERTIES
BUILD_WITH_INSTALL_RPATH 1

2
cmake/Macros.cmake
View File

@ -81,7 +81,7 @@ macro(sfml_add_library target)
MACOSX_FRAMEWORK_BUNDLE_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
endif()
# adapt install directory to allow distributing dylibs/frameworks in user’s frameworks/application bundle
# adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle
set_target_properties(${target} PROPERTIES
BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@rpath")

2
doc/footer.html
View File

@ -2,7 +2,7 @@
<div id="footer-container">
<div id="footer">
SFML is licensed under the terms and conditions of the <a href="http://www.sfml-dev.org/license.php">zlib/png license</a>.<br>
Copyright © Laurent Gomila &nbsp;::&nbsp;
Copyright &copy; Laurent Gomila &nbsp;::&nbsp;
Documentation generated by <a href="http://www.doxygen.org/" title="doxygen website">doxygen</a> &nbsp;::&nbsp;
</div>
</div>

6
include/SFML/Window/Sensor.hpp
View File

@ -49,11 +49,11 @@ public:
////////////////////////////////////////////////////////////
enum Type
{
Accelerometer, ///< Measures the raw acceleration (m/s²)
Accelerometer, ///< Measures the raw acceleration (m/s^2)
Gyroscope, ///< Measures the raw rotation rates (degrees/s)
Magnetometer, ///< Measures the ambient magnetic field (micro-teslas)
Gravity, ///< Measures the direction and intensity of gravity, independent of device acceleration (m/s²)
UserAcceleration, ///< Measures the direction and intensity of device acceleration, independent of the gravity (m/s²)
Gravity, ///< Measures the direction and intensity of gravity, independent of device acceleration (m/s^2)
UserAcceleration, ///< Measures the direction and intensity of device acceleration, independent of the gravity (m/s^2)
Orientation, ///< Measures the absolute 3D orientation (degrees)
Count ///< Keep last -- the total number of sensor types

6
src/SFML/Window/OSX/HIDInputManager.mm
View File

@ -777,7 +777,7 @@ Keyboard::Key HIDInputManager::nonLocalizedKeys(UniChar virtualKeycode)
case 0x33: return sf::Keyboard::BackSpace;
case 0x30: return sf::Keyboard::Tab;
// Duplicates (see next §).
// Duplicates (see next section).
case 0x74: return sf::Keyboard::PageUp;
case 0x79: return sf::Keyboard::PageDown;
case 0x77: return sf::Keyboard::End;
@ -798,7 +798,7 @@ Keyboard::Key HIDInputManager::nonLocalizedKeys(UniChar virtualKeycode)
case 0x43: return sf::Keyboard::Multiply;
case 0x4b: return sf::Keyboard::Divide;
// Duplicates (see next §).
// Duplicates (see next section).
case 0x7b: return sf::Keyboard::Left;
case 0x7c: return sf::Keyboard::Right;
case 0x7e: return sf::Keyboard::Up;
@ -820,7 +820,7 @@ Keyboard::Key HIDInputManager::nonLocalizedKeys(UniChar virtualKeycode)
case 0x5b: return sf::Keyboard::Numpad8;
case 0x5c: return sf::Keyboard::Numpad9;
// Duplicates (see next §).
// Duplicates (see next section).
case 0x7a: return sf::Keyboard::F1;
case 0x78: return sf::Keyboard::F2;
case 0x63: return sf::Keyboard::F3;

12
src/SFML/Window/OSX/SFApplication.m
View File

@ -92,11 +92,11 @@
// Services >
// / default empty menu /
// --------------------
// Hide AppName ⌘H
// Hide Others ⌥⌘H
// Hide AppName Command+H
// Hide Others Option+Command+H
// Show All
// --------------------
// Quit AppName ⌘Q
// Quit AppName Command+Q
NSString* appName = [SFApplication applicationName];
@ -112,7 +112,7 @@
[appleMenu addItem:[NSMenuItem separatorItem]];
// PREFERENCES
[appleMenu addItemWithTitle:@"Preferences…"
[appleMenu addItemWithTitle:@"Preferences..."
action:nil
keyEquivalent:@""];
@ -164,7 +164,7 @@
// The File menu is as follow:
//
// File >
// Close ⌘W
// Close Command+W
// FILE MENU
NSMenu* fileMenu = [[NSMenu alloc] initWithTitle:@"File"];
@ -186,7 +186,7 @@
// The Window menu is as follow:
//
// Window >
// Minimize ⌘M
// Minimize Command+M
// Zoom
// --------------------
// Bring All to Front

2
src/SFML/Window/OSX/SFWindow.h
View File

@ -70,7 +70,7 @@
///
/// Override NSWindow implementation, see implementation for details
///
/// \param sender The message’s sender
/// \param sender The message's sender
///
////////////////////////////////////////////////////////////
-(void)performClose:(id)sender;

8
src/SFML/Window/OSX/SFWindow.m
View File

@ -64,14 +64,14 @@
{
// From Apple documentation:
//
// > If the window’s delegate or the window itself implements windowShouldClose:,
// > If the window's delegate or the window itself implements windowShouldClose:,
// > that message is sent with the window as the argument. (Only one such message is sent;
// > if both the delegate and the NSWindow object implement the method, only the delegate
// > receives the message.) If the windowShouldClose: method returns NO, the window isn’t
// > closed. If it returns YES, or if it isn’t implemented, performClose: invokes the
// > receives the message.) If the windowShouldClose: method returns NO, the window isn't
// > closed. If it returns YES, or if it isn't implemented, performClose: invokes the
// > close method to close the window.
// >
// > If the window doesn’t have a close button or can’t be closed (for example, if the
// > If the window doesn't have a close button or can't be closed (for example, if the
// > delegate replies NO to a windowShouldClose: message), the system emits the alert sound.
//
// The last paragraph is problematic for SFML fullscreen window since they don't have

26
src/SFML/Window/OSX/WindowImplCocoa.hpp
View File

@ -90,7 +90,7 @@ public:
~WindowImplCocoa();
////////////////////////////////////////////////////////////
/// \brief Window Closed Event – called by the cocoa window object
/// \brief Window Closed Event - called by the cocoa window object
///
/// Send the event to SFML WindowImpl class.
///
@ -98,7 +98,7 @@ public:
void windowClosed(void);
////////////////////////////////////////////////////////////
/// \brief Window Resized Event – called by the cocoa window object
/// \brief Window Resized Event - called by the cocoa window object
///
/// Send the event to SFML WindowImpl class.
///
@ -109,7 +109,7 @@ public:
void windowResized(unsigned int width, unsigned int height);
////////////////////////////////////////////////////////////
/// \brief Window Lost Focus Event – called by the cocoa window object
/// \brief Window Lost Focus Event - called by the cocoa window object
///
/// Send the event to SFML WindowImpl class.
///
@ -117,7 +117,7 @@ public:
void windowLostFocus(void);
////////////////////////////////////////////////////////////
/// \brief Window Get Focus Event – called by the cocoa window object
/// \brief Window Get Focus Event - called by the cocoa window object
///
/// Send the event to SFML WindowImpl class.
///
@ -125,7 +125,7 @@ public:
void windowGainedFocus(void);
////////////////////////////////////////////////////////////
/// \brief Mouse Down Event – called by the cocoa view object
/// \brief Mouse Down Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
@ -137,7 +137,7 @@ public:
void mouseDownAt(Mouse::Button button, int x, int y);
////////////////////////////////////////////////////////////
/// \brief Mouse Up Event – called by the cocoa view object
/// \brief Mouse Up Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
@ -149,7 +149,7 @@ public:
void mouseUpAt(Mouse::Button button, int x, int y);
////////////////////////////////////////////////////////////
/// \brief Mouse Moved Event – called by the cocoa view object
/// \brief Mouse Moved Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
@ -160,7 +160,7 @@ public:
void mouseMovedAt(int x, int y);
////////////////////////////////////////////////////////////
/// \brief Mouse Wheel Scrolled Event – called by the cocoa view object
/// \brief Mouse Wheel Scrolled Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
@ -172,7 +172,7 @@ public:
void mouseWheelScrolledAt(float delta, int x, int y);
////////////////////////////////////////////////////////////
/// \brief Mouse In Event – called by the cocoa view object
/// \brief Mouse In Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
@ -180,7 +180,7 @@ public:
void mouseMovedIn(void);
////////////////////////////////////////////////////////////
/// \brief Mouse Out Event – called by the cocoa view object
/// \brief Mouse Out Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
@ -188,7 +188,7 @@ public:
void mouseMovedOut(void);
////////////////////////////////////////////////////////////
/// \brief Key Down Event – called by the cocoa view object
/// \brief Key Down Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
@ -198,7 +198,7 @@ public:
void keyDown(Event::KeyEvent key);
////////////////////////////////////////////////////////////
/// \brief Key Up Event – called by the cocoa view object
/// \brief Key Up Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///
@ -208,7 +208,7 @@ public:
void keyUp(Event::KeyEvent key);
////////////////////////////////////////////////////////////
/// \brief Text Entred Event – called by the cocoa view object
/// \brief Text Entred Event - called by the cocoa view object
///
/// Send the event to SFML WindowImpl class.
///

4
src/SFML/Window/iOS/SensorImpl.mm
View File

@ -138,7 +138,7 @@ Vector3f SensorImpl::update()
switch (m_sensor)
{
case Sensor::Accelerometer:
// Acceleration is given in G, convert to m/s²
// Acceleration is given in G, convert to m/s^2
value.x = manager.accelerometerData.acceleration.x * 9.81f;
value.y = manager.accelerometerData.acceleration.y * 9.81f;
value.z = manager.accelerometerData.acceleration.z * 9.81f;
@ -159,7 +159,7 @@ Vector3f SensorImpl::update()
break;
case Sensor::UserAcceleration:
// User acceleration is given in G, convert to m/s²
// User acceleration is given in G, convert to m/s^2
value.x = manager.deviceMotion.userAcceleration.x * 9.81f;
value.y = manager.deviceMotion.userAcceleration.y * 9.81f;
value.z = manager.deviceMotion.userAcceleration.z * 9.81f;