diff --git a/doc/searchOverrides.css b/doc/searchOverrides.css index 19b17e60..93043c4b 100644 --- a/doc/searchOverrides.css +++ b/doc/searchOverrides.css @@ -1,4 +1,4 @@ -/* Override search/search.css rules to adjust seach box placement */ +/* Override search/search.css rules to adjust search box placement */ #MSearchBox { position: relative; display: block; diff --git a/examples/shader/resources/billboard.geom b/examples/shader/resources/billboard.geom index d3161fc4..dc3037af 100644 --- a/examples/shader/resources/billboard.geom +++ b/examples/shader/resources/billboard.geom @@ -18,7 +18,7 @@ out vec2 tex_coord; // Main entry point void main() { - // Caculate the half width/height of the billboards + // Calculate the half width/height of the billboards vec2 half_size = size / 2.f; // Scale the size based on resolution (1 would be full width/height) diff --git a/examples/sound/Sound.cpp b/examples/sound/Sound.cpp index 4edc2b7d..29b8f31e 100644 --- a/examples/sound/Sound.cpp +++ b/examples/sound/Sound.cpp @@ -19,7 +19,7 @@ void playSound() if (!buffer.loadFromFile("resources/killdeer.wav")) return; - // Display sound informations + // Display sound information std::cout << "killdeer.wav:" << '\n' << " " << buffer.getDuration().asSeconds() << " seconds" << '\n' << " " << buffer.getSampleRate() << " samples / sec" << '\n' @@ -54,7 +54,7 @@ void playMusic(const std::filesystem::path& filename) if (!music.openFromFile("resources" / filename)) return; - // Display music informations + // Display music information std::cout << filename << ":" << '\n' << " " << music.getDuration().asSeconds() << " seconds" << '\n' << " " << music.getSampleRate() << " samples / sec" << '\n' diff --git a/examples/sound_capture/SoundCapture.cpp b/examples/sound_capture/SoundCapture.cpp index 492d54cf..d2a1620e 100644 --- a/examples/sound_capture/SoundCapture.cpp +++ b/examples/sound_capture/SoundCapture.cpp @@ -51,7 +51,7 @@ int main() // Get the buffer containing the captured data const sf::SoundBuffer& buffer = recorder.getBuffer(); - // Display captured sound informations + // Display captured sound information std::cout << "Sound information:" << '\n' << " " << buffer.getDuration().asSeconds() << " seconds" << '\n' << " " << buffer.getSampleRate() << " samples / seconds" << '\n' diff --git a/examples/vulkan/Vulkan.cpp b/examples/vulkan/Vulkan.cpp index 51bd4bc8..e73dcb59 100644 --- a/examples/vulkan/Vulkan.cpp +++ b/examples/vulkan/Vulkan.cpp @@ -483,8 +483,8 @@ public: } // Retrieve the extensions we need to enable in order to use Vulkan with SFML - std::vector requiredExtentions = sf::Vulkan::getGraphicsRequiredInstanceExtensions(); - requiredExtentions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME); + std::vector requiredExtensions = sf::Vulkan::getGraphicsRequiredInstanceExtensions(); + requiredExtensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME); // Register our application information VkApplicationInfo applicationInfo = VkApplicationInfo(); @@ -500,8 +500,8 @@ public: instanceCreateInfo.pApplicationInfo = &applicationInfo; instanceCreateInfo.enabledLayerCount = static_cast(validationLayers.size()); instanceCreateInfo.ppEnabledLayerNames = validationLayers.data(); - instanceCreateInfo.enabledExtensionCount = static_cast(requiredExtentions.size()); - instanceCreateInfo.ppEnabledExtensionNames = requiredExtentions.data(); + instanceCreateInfo.enabledExtensionCount = static_cast(requiredExtensions.size()); + instanceCreateInfo.ppEnabledExtensionNames = requiredExtensions.data(); // Try to create a Vulkan instance with debug report enabled VkResult result = vkCreateInstance(&instanceCreateInfo, nullptr, &instance); @@ -509,10 +509,10 @@ public: // If an extension is missing, try disabling debug report if (result == VK_ERROR_EXTENSION_NOT_PRESENT) { - requiredExtentions.pop_back(); + requiredExtensions.pop_back(); - instanceCreateInfo.enabledExtensionCount = static_cast(requiredExtentions.size()); - instanceCreateInfo.ppEnabledExtensionNames = requiredExtentions.data(); + instanceCreateInfo.enabledExtensionCount = static_cast(requiredExtensions.size()); + instanceCreateInfo.ppEnabledExtensionNames = requiredExtensions.data(); result = vkCreateInstance(&instanceCreateInfo, nullptr, &instance); } @@ -720,7 +720,7 @@ public: deviceQueueCreateInfo.pQueuePriorities = &queuePriority; // Enable the swapchain extension - const char* extentions[1] = {VK_KHR_SWAPCHAIN_EXTENSION_NAME}; + const char* extensions[1] = {VK_KHR_SWAPCHAIN_EXTENSION_NAME}; // Enable anisotropic filtering VkPhysicalDeviceFeatures physicalDeviceFeatures = VkPhysicalDeviceFeatures(); @@ -729,7 +729,7 @@ public: VkDeviceCreateInfo deviceCreateInfo = VkDeviceCreateInfo(); deviceCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; deviceCreateInfo.enabledExtensionCount = 1; - deviceCreateInfo.ppEnabledExtensionNames = extentions; + deviceCreateInfo.ppEnabledExtensionNames = extensions; deviceCreateInfo.queueCreateInfoCount = 1; deviceCreateInfo.pQueueCreateInfos = &deviceQueueCreateInfo; deviceCreateInfo.pEnabledFeatures = &physicalDeviceFeatures; @@ -1893,7 +1893,7 @@ public: return; } - // Submit a barrier to transition the image layout to transfer destionation optimal + // Submit a barrier to transition the image layout to transfer destination optimal VkImageMemoryBarrier barrier = VkImageMemoryBarrier(); barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -2031,7 +2031,7 @@ public: return; } - // Submit a barrier to transition the image layout from transfer destionation optimal to shader read-only optimal + // Submit a barrier to transition the image layout from transfer destination optimal to shader read-only optimal barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; barrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; @@ -2227,7 +2227,7 @@ public: writeDescriptorSets[1].descriptorCount = 1; writeDescriptorSets[1].pImageInfo = &descriptorImageInfo; - // Update the desciptor set + // Update the descriptor set vkUpdateDescriptorSets(device, 2, writeDescriptorSets, 0, nullptr); } } diff --git a/include/SFML/Graphics/Shape.hpp b/include/SFML/Graphics/Shape.hpp index 754f4a1d..9687f1fb 100644 --- a/include/SFML/Graphics/Shape.hpp +++ b/include/SFML/Graphics/Shape.hpp @@ -265,7 +265,7 @@ protected: //////////////////////////////////////////////////////////// /// \brief Recompute the internal geometry of the shape /// - /// This function must be called by the derived class everytime + /// This function must be called by the derived class every time /// the shape's points change (i.e. the result of either /// getPointCount or getPoint is different). /// diff --git a/include/SFML/Graphics/VertexBuffer.hpp b/include/SFML/Graphics/VertexBuffer.hpp index af942863..c27e3c90 100644 --- a/include/SFML/Graphics/VertexBuffer.hpp +++ b/include/SFML/Graphics/VertexBuffer.hpp @@ -334,7 +334,7 @@ private: // Member data //////////////////////////////////////////////////////////// unsigned int m_buffer{}; //!< Internal buffer identifier - std::size_t m_size{}; //!< Size in Vertexes of the currently allocated buffer + std::size_t m_size{}; //!< Size in Vertices of the currently allocated buffer PrimitiveType m_primitiveType{PrimitiveType::Points}; //!< Type of primitives to draw Usage m_usage{Stream}; //!< How this vertex buffer is to be used }; diff --git a/include/SFML/Network/Ftp.hpp b/include/SFML/Network/Ftp.hpp index 75871b8a..9429885e 100644 --- a/include/SFML/Network/Ftp.hpp +++ b/include/SFML/Network/Ftp.hpp @@ -55,7 +55,7 @@ public: //////////////////////////////////////////////////////////// enum class TransferMode { - Binary, //!< Binary mode (file is transfered as a sequence of bytes) + Binary, //!< Binary mode (file is transferred as a sequence of bytes) Ascii, //!< Text mode using ASCII encoding Ebcdic //!< Text mode using EBCDIC encoding }; @@ -538,7 +538,7 @@ private: Response getResponse(); //////////////////////////////////////////////////////////// - /// \brief Utility class for exchanging datas with the server + /// \brief Utility class for exchanging data with the server /// on the data channel /// //////////////////////////////////////////////////////////// diff --git a/include/SFML/Network/TcpSocket.hpp b/include/SFML/Network/TcpSocket.hpp index 8759285a..88b6f6a6 100644 --- a/include/SFML/Network/TcpSocket.hpp +++ b/include/SFML/Network/TcpSocket.hpp @@ -249,7 +249,7 @@ private: /// and without errors (no data corrupted, lost or duplicated). /// /// When a socket is connected to a remote host, you can -/// retrieve informations about this host with the +/// retrieve information about this host with the /// getRemoteAddress and getRemotePort functions. You can /// also get the local port to which the socket is bound /// (which is automatically chosen when the socket is connected), diff --git a/include/SFML/Network/UdpSocket.hpp b/include/SFML/Network/UdpSocket.hpp index c1aa4b84..1904d814 100644 --- a/include/SFML/Network/UdpSocket.hpp +++ b/include/SFML/Network/UdpSocket.hpp @@ -213,7 +213,7 @@ private: /// it can send to and receive from any host at any time. /// /// It is a datagram protocol: bounded blocks of data (datagrams) -/// are transfered over the network rather than a continuous +/// are transferred over the network rather than a continuous /// stream of data (TCP). Therefore, one call to send will always /// match one call to receive (if the datagram is not lost), /// with the same data that was sent. diff --git a/include/SFML/Window/Event.hpp b/include/SFML/Window/Event.hpp index 76eb6f27..587ae22a 100644 --- a/include/SFML/Window/Event.hpp +++ b/include/SFML/Window/Event.hpp @@ -226,7 +226,7 @@ public: /// \class sf::Event /// \ingroup window /// -/// sf::Event holds all the informations about a system event +/// sf::Event holds all the information about a system event /// that just happened. Events are retrieved using the /// sf::Window::pollEvent and sf::Window::waitEvent functions. /// diff --git a/include/SFML/Window/Window.hpp b/include/SFML/Window/Window.hpp index 2dc8bd0f..99a4d943 100644 --- a/include/SFML/Window/Window.hpp +++ b/include/SFML/Window/Window.hpp @@ -221,7 +221,7 @@ public: /// SFML will try to match the given limit as much as it can, /// but since it internally uses sf::sleep, whose precision /// depends on the underlying OS, the results may be a little - /// unprecise as well (for example, you can get 65 FPS when + /// imprecise as well (for example, you can get 65 FPS when /// requesting 60). /// /// \param limit Framerate limit, in frames per seconds (use 0 to disable limit) diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp index 7c8efa9c..194a1dcb 100644 --- a/src/SFML/Graphics/Font.cpp +++ b/src/SFML/Graphics/Font.cpp @@ -71,7 +71,7 @@ void close(FT_Stream) { } -// Helper to intepret memory as a specific type +// Helper to interpret memory as a specific type template inline T reinterpret(const U& input) { @@ -780,7 +780,7 @@ IntRect Font::findGlyphRect(Page& page, const Vector2u& size) const // Find the glyph's rectangle on the selected row IntRect rect(Rect({row->width, row->top}, size)); - // Update the row informations + // Update the row information row->width += size.x; return rect; diff --git a/src/SFML/Main/CMakeLists.txt b/src/SFML/Main/CMakeLists.txt index 5e20e3d0..da5a7d82 100644 --- a/src/SFML/Main/CMakeLists.txt +++ b/src/SFML/Main/CMakeLists.txt @@ -33,7 +33,7 @@ set_target_properties(sfml-main PROPERTIES RELWITHDEBINFO_POSTFIX "") # because of a current limitation on Android (which prevents one library -# from depending on shared libraries), we need a boostrap activity which +# from depending on shared libraries), we need a bootstrap activity which # will load our shared libraries manually if(SFML_OS_ANDROID) sfml_add_library(Activity SOURCES ${SRCROOT}/SFMLActivity.cpp) diff --git a/src/SFML/Network/TcpListener.cpp b/src/SFML/Network/TcpListener.cpp index dbf015f7..55802eb9 100644 --- a/src/SFML/Network/TcpListener.cpp +++ b/src/SFML/Network/TcpListener.cpp @@ -47,7 +47,7 @@ unsigned short TcpListener::getLocalPort() const { if (getHandle() != priv::SocketImpl::invalidSocket()) { - // Retrieve informations about the local end of the socket + // Retrieve information about the local end of the socket sockaddr_in address; priv::SocketImpl::AddrLength size = sizeof(address); if (getsockname(getHandle(), reinterpret_cast(&address), &size) != -1) diff --git a/src/SFML/Network/TcpSocket.cpp b/src/SFML/Network/TcpSocket.cpp index 8e6b15f3..63440dd9 100644 --- a/src/SFML/Network/TcpSocket.cpp +++ b/src/SFML/Network/TcpSocket.cpp @@ -65,7 +65,7 @@ unsigned short TcpSocket::getLocalPort() const { if (getHandle() != priv::SocketImpl::invalidSocket()) { - // Retrieve informations about the local end of the socket + // Retrieve information about the local end of the socket sockaddr_in address; priv::SocketImpl::AddrLength size = sizeof(address); if (getsockname(getHandle(), reinterpret_cast(&address), &size) != -1) @@ -84,7 +84,7 @@ std::optional TcpSocket::getRemoteAddress() const { if (getHandle() != priv::SocketImpl::invalidSocket()) { - // Retrieve informations about the remote end of the socket + // Retrieve information about the remote end of the socket sockaddr_in address; priv::SocketImpl::AddrLength size = sizeof(address); if (getpeername(getHandle(), reinterpret_cast(&address), &size) != -1) @@ -103,7 +103,7 @@ unsigned short TcpSocket::getRemotePort() const { if (getHandle() != priv::SocketImpl::invalidSocket()) { - // Retrieve informations about the remote end of the socket + // Retrieve information about the remote end of the socket sockaddr_in address; priv::SocketImpl::AddrLength size = sizeof(address); if (getpeername(getHandle(), reinterpret_cast(&address), &size) != -1) diff --git a/src/SFML/Network/UdpSocket.cpp b/src/SFML/Network/UdpSocket.cpp index f73d2728..e9c88541 100644 --- a/src/SFML/Network/UdpSocket.cpp +++ b/src/SFML/Network/UdpSocket.cpp @@ -50,7 +50,7 @@ unsigned short UdpSocket::getLocalPort() const { if (getHandle() != priv::SocketImpl::invalidSocket()) { - // Retrieve informations about the local end of the socket + // Retrieve information about the local end of the socket sockaddr_in address; priv::SocketImpl::AddrLength size = sizeof(address); if (getsockname(getHandle(), reinterpret_cast(&address), &size) != -1) @@ -173,7 +173,7 @@ Socket::Status UdpSocket::receive(void* data, if (sizeReceived < 0) return priv::SocketImpl::getErrorStatus(); - // Fill the sender informations + // Fill the sender information received = static_cast(sizeReceived); remoteAddress = IpAddress(ntohl(address.sin_addr.s_addr)); remotePort = ntohs(address.sin_port); diff --git a/src/SFML/Network/Unix/SocketImpl.cpp b/src/SFML/Network/Unix/SocketImpl.cpp index b3514abd..72ed32a9 100644 --- a/src/SFML/Network/Unix/SocketImpl.cpp +++ b/src/SFML/Network/Unix/SocketImpl.cpp @@ -88,7 +88,7 @@ void SocketImpl::setBlocking(SocketHandle sock, bool block) //////////////////////////////////////////////////////////// Socket::Status SocketImpl::getErrorStatus() { - // The followings are sometimes equal to EWOULDBLOCK, + // The following are sometimes equal to EWOULDBLOCK, // so we have to make a special case for them in order // to avoid having double values in the switch case if ((errno == EAGAIN) || (errno == EINPROGRESS)) diff --git a/src/SFML/Window/Android/WindowImplAndroid.cpp b/src/SFML/Window/Android/WindowImplAndroid.cpp index 9c4a270b..abaeedf2 100644 --- a/src/SFML/Window/Android/WindowImplAndroid.cpp +++ b/src/SFML/Window/Android/WindowImplAndroid.cpp @@ -360,7 +360,7 @@ int WindowImplAndroid::processScrollEvent(AInputEvent* _event, ActivityStates& s std::int32_t deviceId = AInputEvent_getDeviceId(_event); std::int32_t edgeFlags = AMotionEvent_getEdgeFlags(_event); - // Create the MotionEvent object in Java trough its static constructor obtain() + // Create the MotionEvent object in Java through its static constructor obtain() jclass ClassMotionEvent = lJNIEnv->FindClass("android/view/MotionEvent"); jmethodID StaticMethodObtain = lJNIEnv->GetStaticMethodID(ClassMotionEvent, "obtain", diff --git a/src/SFML/Window/CMakeLists.txt b/src/SFML/Window/CMakeLists.txt index f4dadfe9..5c2dd2a0 100644 --- a/src/SFML/Window/CMakeLists.txt +++ b/src/SFML/Window/CMakeLists.txt @@ -300,7 +300,7 @@ endif() # Vulkan headers target_include_directories(sfml-window SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/vulkan") -# CMake 3.11 and later prefer to choose GLVND, but we choose legacy OpenGL for backward compability +# CMake 3.11 and later prefer to choose GLVND, but we choose legacy OpenGL for backward compatibility # (unless the OpenGL_GL_PREFERENCE was explicitly set) # See CMP0072 for more details (cmake --help-policy CMP0072) if(NOT OpenGL_GL_PREFERENCE) diff --git a/src/SFML/Window/DRM/DRMContext.cpp b/src/SFML/Window/DRM/DRMContext.cpp index 007306a7..dce56958 100644 --- a/src/SFML/Window/DRM/DRMContext.cpp +++ b/src/SFML/Window/DRM/DRMContext.cpp @@ -650,7 +650,7 @@ void DRMContext::display() m_currentBO = m_nextBO; - // This call must be preceeded by a single call to eglSwapBuffers() + // This call must be preceded by a single call to eglSwapBuffers() m_nextBO = gbm_surface_lock_front_buffer(m_gbmSurface); if (!m_nextBO) diff --git a/src/SFML/Window/OSX/HIDInputManager.hpp b/src/SFML/Window/OSX/HIDInputManager.hpp index 64d5d183..c004ba91 100644 --- a/src/SFML/Window/OSX/HIDInputManager.hpp +++ b/src/SFML/Window/OSX/HIDInputManager.hpp @@ -277,7 +277,7 @@ private: static std::uint8_t scanToVirtualCode(Keyboard::Scancode code); //////////////////////////////////////////////////////////// - /// Fallback convertion for keys which aren't expected to be impacted + /// Fallback conversion for keys which aren't expected to be impacted /// by the layout. Can return Unknown. /// //////////////////////////////////////////////////////////// diff --git a/src/SFML/Window/OSX/SFOpenGLView+mouse.mm b/src/SFML/Window/OSX/SFOpenGLView+mouse.mm index d3c8a976..6d2f9817 100644 --- a/src/SFML/Window/OSX/SFOpenGLView+mouse.mm +++ b/src/SFML/Window/OSX/SFOpenGLView+mouse.mm @@ -387,8 +387,8 @@ rawPos.x = std::clamp(rawPos.x, origin.x, origin.x + size.width - 1); rawPos.y = std::clamp(rawPos.y, origin.y + 1, origin.y + size.height); // Note: the `-1` and `+1` on the two lines above prevent the user to click - // on the left or below the window, repectively, and therefore prevent the - // application to lose focus by accident. The sign of this offset is determinded + // on the left or below the window, respectively, and therefore prevent the + // application to lose focus by accident. The sign of this offset is determined // by the direction of the x and y axis. // Increase X and Y buffer with the distance of the projection diff --git a/src/SFML/Window/Unix/GlxContext.cpp b/src/SFML/Window/Unix/GlxContext.cpp index 937257e8..43127792 100644 --- a/src/SFML/Window/Unix/GlxContext.cpp +++ b/src/SFML/Window/Unix/GlxContext.cpp @@ -45,7 +45,7 @@ #endif #if !defined(GLX_DEBUGGING) && defined(SFML_DEBUG) -// Enable this to print messages to err() everytime GLX produces errors +// Enable this to print messages to err() every time GLX produces errors //#define GLX_DEBUGGING #endif diff --git a/src/SFML/Window/Unix/WindowImplX11.cpp b/src/SFML/Window/Unix/WindowImplX11.cpp index 76115f24..393469b1 100644 --- a/src/SFML/Window/Unix/WindowImplX11.cpp +++ b/src/SFML/Window/Unix/WindowImplX11.cpp @@ -1288,7 +1288,7 @@ void WindowImplX11::setVideoMode(const VideoMode& mode) return; } - // Retreive current RRMode, screen position and rotation + // Retrieve current RRMode, screen position and rotation XRRCrtcInfo* crtcInfo = XRRGetCrtcInfo(m_display, res, outputInfo->crtc); if (!crtcInfo) { @@ -1359,7 +1359,7 @@ void WindowImplX11::resetVideoMode() return; } - // Retreive current screen position and rotation + // Retrieve current screen position and rotation XRRCrtcInfo* crtcInfo = XRRGetCrtcInfo(m_display, res, m_oldRRCrtc); if (!crtcInfo) { @@ -2146,7 +2146,7 @@ Vector2i WindowImplX11::getPrimaryMonitorPosition() return monitorPosition; } - // Retreive current RRMode, screen position and rotation + // Retrieve current RRMode, screen position and rotation XRRCrtcInfo* crtcInfo = XRRGetCrtcInfo(m_display, res, outputInfo->crtc); if (!crtcInfo) { diff --git a/test/Graphics/Shader.test.cpp b/test/Graphics/Shader.test.cpp index 372066c3..2efc2b55 100644 --- a/test/Graphics/Shader.test.cpp +++ b/test/Graphics/Shader.test.cpp @@ -49,7 +49,7 @@ out vec2 tex_coord; // Main entry point void main() { - // Caculate the half width/height of the billboards + // Calculate the half width/height of the billboards vec2 half_size = size / 2.f; // Scale the size based on resolution (1 would be full width/height) diff --git a/tools/android/readme.txt b/tools/android/readme.txt index 23949d1a..f30858f5 100644 --- a/tools/android/readme.txt +++ b/tools/android/readme.txt @@ -10,7 +10,7 @@ Feel free to improve them or send patches. HOW-TO-USE: ----------- -1) Some of these scripts need an environement variable to work ($NDK) as well +1) Some of these scripts need an environment variable to work ($NDK) as well as the Android CMake toolchain you'll find in cmake/toolchains (android.toolchain.cmake) export NDK=/path/to/your/ndk export ANDROID_CMAKE_TOOLCHAIN=/path/to/android.toolchain.cmake diff --git a/tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist.in b/tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist.in index f7855abb..dfb3c3d2 100644 --- a/tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist.in +++ b/tools/xcode/templates/SFML/SFML Compiler.xctemplate/TemplateInfo.plist.in @@ -73,7 +73,7 @@ subject to the following restrictions: MACOSX_DEPLOYMENT_TARGET @CMAKE_OSX_DEPLOYMENT_TARGET@ - + FRAMEWORK_SEARCH_PATHS /Library/Frameworks/ $(inherited)