mirror of
https://github.com/SFML/SFML.git
synced 2024-11-25 04:41:05 +08:00
Fix typos
This commit is contained in:
parent
5eb57ae5f1
commit
7083b6562e
@ -98,7 +98,7 @@ int main()
|
|||||||
// Without the stencil buffer, 1 of the rectangles would have to be precisely split along the edge of another
|
// Without the stencil buffer, 1 of the rectangles would have to be precisely split along the edge of another
|
||||||
// rectangle and both pieces would have to be drawn at different stages in the draw pass. This would not only be
|
// rectangle and both pieces would have to be drawn at different stages in the draw pass. This would not only be
|
||||||
// almost impossible to compute to the required accuracy to mimic the GPU's vertex computations but splitting a
|
// almost impossible to compute to the required accuracy to mimic the GPU's vertex computations but splitting a
|
||||||
// primitive up and drawing the pieces in seperate draw calls would introduce noticeable artifacts which would
|
// primitive up and drawing the pieces in separate draw calls would introduce noticeable artifacts which would
|
||||||
// reduce the overall quality of the output image.
|
// reduce the overall quality of the output image.
|
||||||
|
|
||||||
// To start with, we initialize the stencil buffer values for every pixel to 0 at the start of each frame. In
|
// To start with, we initialize the stencil buffer values for every pixel to 0 at the start of each frame. In
|
||||||
@ -126,7 +126,7 @@ int main()
|
|||||||
// Now comes the magic. We want to draw the third rectangle so it is behind i.e. does not overwrite pixels of the
|
// Now comes the magic. We want to draw the third rectangle so it is behind i.e. does not overwrite pixels of the
|
||||||
// first rectangle but in front of i.e. overwrites pixels of the second rectangle. We already set the reference
|
// first rectangle but in front of i.e. overwrites pixels of the second rectangle. We already set the reference
|
||||||
// value of the first rectangle to 3 and the second rectangle to 1, so in order to be "between" them, this rectangle
|
// value of the first rectangle to 3 and the second rectangle to 1, so in order to be "between" them, this rectangle
|
||||||
// has to have a reference value of 2. 2 is not greather than 3 so pixels of this rectangle will not overwrite pixels
|
// has to have a reference value of 2. 2 is not greater than 3 so pixels of this rectangle will not overwrite pixels
|
||||||
// of the first rectangle, however 2 is greater than 1 and thus pixels of this rectangle will overwrite pixels of the
|
// of the first rectangle, however 2 is greater than 1 and thus pixels of this rectangle will overwrite pixels of the
|
||||||
// second rectangle. The stencil update operation for this draw operation is not significant in any way since this is
|
// second rectangle. The stencil update operation for this draw operation is not significant in any way since this is
|
||||||
// the last draw call in the frame.
|
// the last draw call in the frame.
|
||||||
|
@ -407,7 +407,7 @@ private:
|
|||||||
/// The way to access the current active event subtype is via
|
/// The way to access the current active event subtype is via
|
||||||
/// `sf::Event::getIf`. This member function returns the address
|
/// `sf::Event::getIf`. This member function returns the address
|
||||||
/// of the event subtype struct if the event subtype matches the
|
/// of the event subtype struct if the event subtype matches the
|
||||||
/// active event, otherise it returns `nullptr`.
|
/// active event, otherwise it returns `nullptr`.
|
||||||
///
|
///
|
||||||
/// `sf::Event::is` is used to check the active event subtype
|
/// `sf::Event::is` is used to check the active event subtype
|
||||||
/// without actually reading any of the corresponding event data.
|
/// without actually reading any of the corresponding event data.
|
||||||
|
@ -249,7 +249,7 @@ public:
|
|||||||
/// operator() defined for a specific event type. Additionally a
|
/// operator() defined for a specific event type. Additionally a
|
||||||
/// generic callable can also be provided that will be invoked for
|
/// generic callable can also be provided that will be invoked for
|
||||||
/// every event type. If both types of callables are provided, the
|
/// every event type. If both types of callables are provided, the
|
||||||
/// callables taking concrete event types will be prefered over the
|
/// callables taking concrete event types will be preferred over the
|
||||||
/// generic callable by overload resolution. Generic callables can
|
/// generic callable by overload resolution. Generic callables can
|
||||||
/// be used to customize handler dispatching based on the deduced
|
/// be used to customize handler dispatching based on the deduced
|
||||||
/// type of the event and other information available at compile
|
/// type of the event and other information available at compile
|
||||||
|
@ -64,7 +64,7 @@ std::optional<std::string> getDefaultDevice()
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
bool setDevice(const std::string& name)
|
bool setDevice(const std::string& name)
|
||||||
{
|
{
|
||||||
// Perform a sanity check to make sure the user isn't passing us a non-existant device name
|
// Perform a sanity check to make sure the user isn't passing us a non-existent device name
|
||||||
const auto devices = priv::AudioDevice::getAvailableDevices();
|
const auto devices = priv::AudioDevice::getAvailableDevices();
|
||||||
if (auto iter = std::find_if(devices.begin(), devices.end(), [&](const auto& device) { return device.name == name; });
|
if (auto iter = std::find_if(devices.begin(), devices.end(), [&](const auto& device) { return device.name == name; });
|
||||||
iter == devices.end())
|
iter == devices.end())
|
||||||
|
@ -7,13 +7,13 @@ if(SFML_OS_WINDOWS)
|
|||||||
if(SFML_COMPILER_GCC OR (SFML_COMPILER_CLANG AND MINGW))
|
if(SFML_COMPILER_GCC OR (SFML_COMPILER_CLANG AND MINGW))
|
||||||
if(ARCH_X86)
|
if(ARCH_X86)
|
||||||
if(SFML_RUNTIME_UCRT)
|
if(SFML_RUNTIME_UCRT)
|
||||||
# taking precendence for provided libraries linking UCRT
|
# taking precedence for provided libraries linking UCRT
|
||||||
list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw-ucrt/x86")
|
list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw-ucrt/x86")
|
||||||
endif()
|
endif()
|
||||||
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw/x86")
|
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw/x86")
|
||||||
elseif(ARCH_X64)
|
elseif(ARCH_X64)
|
||||||
if(SFML_RUNTIME_UCRT)
|
if(SFML_RUNTIME_UCRT)
|
||||||
# taking precendence for provided libraries linking UCRT
|
# taking precedence for provided libraries linking UCRT
|
||||||
list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw-ucrt/x64")
|
list(APPEND CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw-ucrt/x64")
|
||||||
endif()
|
endif()
|
||||||
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw/x64")
|
set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw/x64")
|
||||||
|
@ -83,7 +83,7 @@ std::shared_ptr<_XIM> openXim()
|
|||||||
const std::lock_guard lock(UnixDisplayImpl::mutex);
|
const std::lock_guard lock(UnixDisplayImpl::mutex);
|
||||||
|
|
||||||
assert(!UnixDisplayImpl::weakSharedDisplay.expired() &&
|
assert(!UnixDisplayImpl::weakSharedDisplay.expired() &&
|
||||||
"Display is not initalized. Call priv::openDisplay() to initialize it.");
|
"Display is not initialized. Call priv::openDisplay() to initialize it.");
|
||||||
|
|
||||||
static std::weak_ptr<_XIM> xim;
|
static std::weak_ptr<_XIM> xim;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user