diff --git a/examples/stencil/Stencil.cpp b/examples/stencil/Stencil.cpp index 643bfcd2a..91917034e 100644 --- a/examples/stencil/Stencil.cpp +++ b/examples/stencil/Stencil.cpp @@ -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 // 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 - // 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. // 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 // 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 - // 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 // 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. diff --git a/include/SFML/Window/Event.hpp b/include/SFML/Window/Event.hpp index 04f1eafbd..4f2fa9c0a 100644 --- a/include/SFML/Window/Event.hpp +++ b/include/SFML/Window/Event.hpp @@ -407,7 +407,7 @@ private: /// The way to access the current active event subtype is via /// `sf::Event::getIf`. This member function returns the address /// 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 /// without actually reading any of the corresponding event data. diff --git a/include/SFML/Window/WindowBase.hpp b/include/SFML/Window/WindowBase.hpp index 729a2924d..7587d1ce9 100644 --- a/include/SFML/Window/WindowBase.hpp +++ b/include/SFML/Window/WindowBase.hpp @@ -249,7 +249,7 @@ public: /// operator() defined for a specific event type. Additionally a /// generic callable can also be provided that will be invoked for /// 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 /// be used to customize handler dispatching based on the deduced /// type of the event and other information available at compile diff --git a/src/SFML/Audio/PlaybackDevice.cpp b/src/SFML/Audio/PlaybackDevice.cpp index 38c7d36c4..7b5248fc5 100644 --- a/src/SFML/Audio/PlaybackDevice.cpp +++ b/src/SFML/Audio/PlaybackDevice.cpp @@ -64,7 +64,7 @@ std::optional getDefaultDevice() //////////////////////////////////////////////////////////// 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(); if (auto iter = std::find_if(devices.begin(), devices.end(), [&](const auto& device) { return device.name == name; }); iter == devices.end()) diff --git a/src/SFML/CMakeLists.txt b/src/SFML/CMakeLists.txt index 3118b9c86..c94e7d99a 100644 --- a/src/SFML/CMakeLists.txt +++ b/src/SFML/CMakeLists.txt @@ -7,13 +7,13 @@ if(SFML_OS_WINDOWS) if(SFML_COMPILER_GCC OR (SFML_COMPILER_CLANG AND MINGW)) if(ARCH_X86) 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") endif() set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw/x86") elseif(ARCH_X64) 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") endif() set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} "${PROJECT_SOURCE_DIR}/extlibs/libs-mingw/x64") diff --git a/src/SFML/Window/Unix/Display.cpp b/src/SFML/Window/Unix/Display.cpp index f4a0a61a5..5539b0ce3 100644 --- a/src/SFML/Window/Unix/Display.cpp +++ b/src/SFML/Window/Unix/Display.cpp @@ -83,7 +83,7 @@ std::shared_ptr<_XIM> openXim() const std::lock_guard lock(UnixDisplayImpl::mutex); 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;