Fix misspellings
I used the Python tool codespell to find these
This commit is contained in:
parent
fe2ca0b82e
commit
d131beb0fd
@ -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 {
|
#MSearchBox {
|
||||||
position: relative;
|
position: relative;
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -18,7 +18,7 @@ out vec2 tex_coord;
|
|||||||
// Main entry point
|
// Main entry point
|
||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
// Caculate the half width/height of the billboards
|
// Calculate the half width/height of the billboards
|
||||||
vec2 half_size = size / 2.f;
|
vec2 half_size = size / 2.f;
|
||||||
|
|
||||||
// Scale the size based on resolution (1 would be full width/height)
|
// Scale the size based on resolution (1 would be full width/height)
|
||||||
|
@ -19,7 +19,7 @@ void playSound()
|
|||||||
if (!buffer.loadFromFile("resources/killdeer.wav"))
|
if (!buffer.loadFromFile("resources/killdeer.wav"))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Display sound informations
|
// Display sound information
|
||||||
std::cout << "killdeer.wav:" << '\n'
|
std::cout << "killdeer.wav:" << '\n'
|
||||||
<< " " << buffer.getDuration().asSeconds() << " seconds" << '\n'
|
<< " " << buffer.getDuration().asSeconds() << " seconds" << '\n'
|
||||||
<< " " << buffer.getSampleRate() << " samples / sec" << '\n'
|
<< " " << buffer.getSampleRate() << " samples / sec" << '\n'
|
||||||
@ -54,7 +54,7 @@ void playMusic(const std::filesystem::path& filename)
|
|||||||
if (!music.openFromFile("resources" / filename))
|
if (!music.openFromFile("resources" / filename))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// Display music informations
|
// Display music information
|
||||||
std::cout << filename << ":" << '\n'
|
std::cout << filename << ":" << '\n'
|
||||||
<< " " << music.getDuration().asSeconds() << " seconds" << '\n'
|
<< " " << music.getDuration().asSeconds() << " seconds" << '\n'
|
||||||
<< " " << music.getSampleRate() << " samples / sec" << '\n'
|
<< " " << music.getSampleRate() << " samples / sec" << '\n'
|
||||||
|
@ -51,7 +51,7 @@ int main()
|
|||||||
// Get the buffer containing the captured data
|
// Get the buffer containing the captured data
|
||||||
const sf::SoundBuffer& buffer = recorder.getBuffer();
|
const sf::SoundBuffer& buffer = recorder.getBuffer();
|
||||||
|
|
||||||
// Display captured sound informations
|
// Display captured sound information
|
||||||
std::cout << "Sound information:" << '\n'
|
std::cout << "Sound information:" << '\n'
|
||||||
<< " " << buffer.getDuration().asSeconds() << " seconds" << '\n'
|
<< " " << buffer.getDuration().asSeconds() << " seconds" << '\n'
|
||||||
<< " " << buffer.getSampleRate() << " samples / seconds" << '\n'
|
<< " " << buffer.getSampleRate() << " samples / seconds" << '\n'
|
||||||
|
@ -483,8 +483,8 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Retrieve the extensions we need to enable in order to use Vulkan with SFML
|
// Retrieve the extensions we need to enable in order to use Vulkan with SFML
|
||||||
std::vector<const char*> requiredExtentions = sf::Vulkan::getGraphicsRequiredInstanceExtensions();
|
std::vector<const char*> requiredExtensions = sf::Vulkan::getGraphicsRequiredInstanceExtensions();
|
||||||
requiredExtentions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
|
requiredExtensions.push_back(VK_EXT_DEBUG_REPORT_EXTENSION_NAME);
|
||||||
|
|
||||||
// Register our application information
|
// Register our application information
|
||||||
VkApplicationInfo applicationInfo = VkApplicationInfo();
|
VkApplicationInfo applicationInfo = VkApplicationInfo();
|
||||||
@ -500,8 +500,8 @@ public:
|
|||||||
instanceCreateInfo.pApplicationInfo = &applicationInfo;
|
instanceCreateInfo.pApplicationInfo = &applicationInfo;
|
||||||
instanceCreateInfo.enabledLayerCount = static_cast<std::uint32_t>(validationLayers.size());
|
instanceCreateInfo.enabledLayerCount = static_cast<std::uint32_t>(validationLayers.size());
|
||||||
instanceCreateInfo.ppEnabledLayerNames = validationLayers.data();
|
instanceCreateInfo.ppEnabledLayerNames = validationLayers.data();
|
||||||
instanceCreateInfo.enabledExtensionCount = static_cast<std::uint32_t>(requiredExtentions.size());
|
instanceCreateInfo.enabledExtensionCount = static_cast<std::uint32_t>(requiredExtensions.size());
|
||||||
instanceCreateInfo.ppEnabledExtensionNames = requiredExtentions.data();
|
instanceCreateInfo.ppEnabledExtensionNames = requiredExtensions.data();
|
||||||
|
|
||||||
// Try to create a Vulkan instance with debug report enabled
|
// Try to create a Vulkan instance with debug report enabled
|
||||||
VkResult result = vkCreateInstance(&instanceCreateInfo, nullptr, &instance);
|
VkResult result = vkCreateInstance(&instanceCreateInfo, nullptr, &instance);
|
||||||
@ -509,10 +509,10 @@ public:
|
|||||||
// If an extension is missing, try disabling debug report
|
// If an extension is missing, try disabling debug report
|
||||||
if (result == VK_ERROR_EXTENSION_NOT_PRESENT)
|
if (result == VK_ERROR_EXTENSION_NOT_PRESENT)
|
||||||
{
|
{
|
||||||
requiredExtentions.pop_back();
|
requiredExtensions.pop_back();
|
||||||
|
|
||||||
instanceCreateInfo.enabledExtensionCount = static_cast<std::uint32_t>(requiredExtentions.size());
|
instanceCreateInfo.enabledExtensionCount = static_cast<std::uint32_t>(requiredExtensions.size());
|
||||||
instanceCreateInfo.ppEnabledExtensionNames = requiredExtentions.data();
|
instanceCreateInfo.ppEnabledExtensionNames = requiredExtensions.data();
|
||||||
|
|
||||||
result = vkCreateInstance(&instanceCreateInfo, nullptr, &instance);
|
result = vkCreateInstance(&instanceCreateInfo, nullptr, &instance);
|
||||||
}
|
}
|
||||||
@ -720,7 +720,7 @@ public:
|
|||||||
deviceQueueCreateInfo.pQueuePriorities = &queuePriority;
|
deviceQueueCreateInfo.pQueuePriorities = &queuePriority;
|
||||||
|
|
||||||
// Enable the swapchain extension
|
// 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
|
// Enable anisotropic filtering
|
||||||
VkPhysicalDeviceFeatures physicalDeviceFeatures = VkPhysicalDeviceFeatures();
|
VkPhysicalDeviceFeatures physicalDeviceFeatures = VkPhysicalDeviceFeatures();
|
||||||
@ -729,7 +729,7 @@ public:
|
|||||||
VkDeviceCreateInfo deviceCreateInfo = VkDeviceCreateInfo();
|
VkDeviceCreateInfo deviceCreateInfo = VkDeviceCreateInfo();
|
||||||
deviceCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
|
deviceCreateInfo.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO;
|
||||||
deviceCreateInfo.enabledExtensionCount = 1;
|
deviceCreateInfo.enabledExtensionCount = 1;
|
||||||
deviceCreateInfo.ppEnabledExtensionNames = extentions;
|
deviceCreateInfo.ppEnabledExtensionNames = extensions;
|
||||||
deviceCreateInfo.queueCreateInfoCount = 1;
|
deviceCreateInfo.queueCreateInfoCount = 1;
|
||||||
deviceCreateInfo.pQueueCreateInfos = &deviceQueueCreateInfo;
|
deviceCreateInfo.pQueueCreateInfos = &deviceQueueCreateInfo;
|
||||||
deviceCreateInfo.pEnabledFeatures = &physicalDeviceFeatures;
|
deviceCreateInfo.pEnabledFeatures = &physicalDeviceFeatures;
|
||||||
@ -1893,7 +1893,7 @@ public:
|
|||||||
return;
|
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();
|
VkImageMemoryBarrier barrier = VkImageMemoryBarrier();
|
||||||
barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
|
barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER;
|
||||||
barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED;
|
barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED;
|
||||||
@ -2031,7 +2031,7 @@ public:
|
|||||||
return;
|
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.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
|
||||||
barrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
|
barrier.newLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
|
||||||
barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
|
barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
|
||||||
@ -2227,7 +2227,7 @@ public:
|
|||||||
writeDescriptorSets[1].descriptorCount = 1;
|
writeDescriptorSets[1].descriptorCount = 1;
|
||||||
writeDescriptorSets[1].pImageInfo = &descriptorImageInfo;
|
writeDescriptorSets[1].pImageInfo = &descriptorImageInfo;
|
||||||
|
|
||||||
// Update the desciptor set
|
// Update the descriptor set
|
||||||
vkUpdateDescriptorSets(device, 2, writeDescriptorSets, 0, nullptr);
|
vkUpdateDescriptorSets(device, 2, writeDescriptorSets, 0, nullptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -265,7 +265,7 @@ protected:
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
/// \brief Recompute the internal geometry of the shape
|
/// \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
|
/// the shape's points change (i.e. the result of either
|
||||||
/// getPointCount or getPoint is different).
|
/// getPointCount or getPoint is different).
|
||||||
///
|
///
|
||||||
|
@ -334,7 +334,7 @@ private:
|
|||||||
// Member data
|
// Member data
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
unsigned int m_buffer{}; //!< Internal buffer identifier
|
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
|
PrimitiveType m_primitiveType{PrimitiveType::Points}; //!< Type of primitives to draw
|
||||||
Usage m_usage{Stream}; //!< How this vertex buffer is to be used
|
Usage m_usage{Stream}; //!< How this vertex buffer is to be used
|
||||||
};
|
};
|
||||||
|
@ -55,7 +55,7 @@ public:
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
enum class TransferMode
|
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
|
Ascii, //!< Text mode using ASCII encoding
|
||||||
Ebcdic //!< Text mode using EBCDIC encoding
|
Ebcdic //!< Text mode using EBCDIC encoding
|
||||||
};
|
};
|
||||||
@ -538,7 +538,7 @@ private:
|
|||||||
Response getResponse();
|
Response getResponse();
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
/// \brief Utility class for exchanging datas with the server
|
/// \brief Utility class for exchanging data with the server
|
||||||
/// on the data channel
|
/// on the data channel
|
||||||
///
|
///
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
|
@ -249,7 +249,7 @@ private:
|
|||||||
/// and without errors (no data corrupted, lost or duplicated).
|
/// and without errors (no data corrupted, lost or duplicated).
|
||||||
///
|
///
|
||||||
/// When a socket is connected to a remote host, you can
|
/// 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
|
/// getRemoteAddress and getRemotePort functions. You can
|
||||||
/// also get the local port to which the socket is bound
|
/// also get the local port to which the socket is bound
|
||||||
/// (which is automatically chosen when the socket is connected),
|
/// (which is automatically chosen when the socket is connected),
|
||||||
|
@ -213,7 +213,7 @@ private:
|
|||||||
/// it can send to and receive from any host at any time.
|
/// it can send to and receive from any host at any time.
|
||||||
///
|
///
|
||||||
/// It is a datagram protocol: bounded blocks of data (datagrams)
|
/// 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
|
/// stream of data (TCP). Therefore, one call to send will always
|
||||||
/// match one call to receive (if the datagram is not lost),
|
/// match one call to receive (if the datagram is not lost),
|
||||||
/// with the same data that was sent.
|
/// with the same data that was sent.
|
||||||
|
@ -226,7 +226,7 @@ public:
|
|||||||
/// \class sf::Event
|
/// \class sf::Event
|
||||||
/// \ingroup window
|
/// \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
|
/// that just happened. Events are retrieved using the
|
||||||
/// sf::Window::pollEvent and sf::Window::waitEvent functions.
|
/// sf::Window::pollEvent and sf::Window::waitEvent functions.
|
||||||
///
|
///
|
||||||
|
@ -221,7 +221,7 @@ public:
|
|||||||
/// SFML will try to match the given limit as much as it can,
|
/// SFML will try to match the given limit as much as it can,
|
||||||
/// but since it internally uses sf::sleep, whose precision
|
/// but since it internally uses sf::sleep, whose precision
|
||||||
/// depends on the underlying OS, the results may be a little
|
/// 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).
|
/// requesting 60).
|
||||||
///
|
///
|
||||||
/// \param limit Framerate limit, in frames per seconds (use 0 to disable limit)
|
/// \param limit Framerate limit, in frames per seconds (use 0 to disable limit)
|
||||||
|
@ -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 <typename T, typename U>
|
template <typename T, typename U>
|
||||||
inline T reinterpret(const U& input)
|
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
|
// Find the glyph's rectangle on the selected row
|
||||||
IntRect rect(Rect<unsigned int>({row->width, row->top}, size));
|
IntRect rect(Rect<unsigned int>({row->width, row->top}, size));
|
||||||
|
|
||||||
// Update the row informations
|
// Update the row information
|
||||||
row->width += size.x;
|
row->width += size.x;
|
||||||
|
|
||||||
return rect;
|
return rect;
|
||||||
|
@ -33,7 +33,7 @@ set_target_properties(sfml-main PROPERTIES
|
|||||||
RELWITHDEBINFO_POSTFIX "")
|
RELWITHDEBINFO_POSTFIX "")
|
||||||
|
|
||||||
# because of a current limitation on Android (which prevents one library
|
# 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
|
# will load our shared libraries manually
|
||||||
if(SFML_OS_ANDROID)
|
if(SFML_OS_ANDROID)
|
||||||
sfml_add_library(Activity SOURCES ${SRCROOT}/SFMLActivity.cpp)
|
sfml_add_library(Activity SOURCES ${SRCROOT}/SFMLActivity.cpp)
|
||||||
|
@ -47,7 +47,7 @@ unsigned short TcpListener::getLocalPort() const
|
|||||||
{
|
{
|
||||||
if (getHandle() != priv::SocketImpl::invalidSocket())
|
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;
|
sockaddr_in address;
|
||||||
priv::SocketImpl::AddrLength size = sizeof(address);
|
priv::SocketImpl::AddrLength size = sizeof(address);
|
||||||
if (getsockname(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
|
if (getsockname(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
|
||||||
|
@ -65,7 +65,7 @@ unsigned short TcpSocket::getLocalPort() const
|
|||||||
{
|
{
|
||||||
if (getHandle() != priv::SocketImpl::invalidSocket())
|
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;
|
sockaddr_in address;
|
||||||
priv::SocketImpl::AddrLength size = sizeof(address);
|
priv::SocketImpl::AddrLength size = sizeof(address);
|
||||||
if (getsockname(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
|
if (getsockname(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
|
||||||
@ -84,7 +84,7 @@ std::optional<IpAddress> TcpSocket::getRemoteAddress() const
|
|||||||
{
|
{
|
||||||
if (getHandle() != priv::SocketImpl::invalidSocket())
|
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;
|
sockaddr_in address;
|
||||||
priv::SocketImpl::AddrLength size = sizeof(address);
|
priv::SocketImpl::AddrLength size = sizeof(address);
|
||||||
if (getpeername(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
|
if (getpeername(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
|
||||||
@ -103,7 +103,7 @@ unsigned short TcpSocket::getRemotePort() const
|
|||||||
{
|
{
|
||||||
if (getHandle() != priv::SocketImpl::invalidSocket())
|
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;
|
sockaddr_in address;
|
||||||
priv::SocketImpl::AddrLength size = sizeof(address);
|
priv::SocketImpl::AddrLength size = sizeof(address);
|
||||||
if (getpeername(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
|
if (getpeername(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
|
||||||
|
@ -50,7 +50,7 @@ unsigned short UdpSocket::getLocalPort() const
|
|||||||
{
|
{
|
||||||
if (getHandle() != priv::SocketImpl::invalidSocket())
|
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;
|
sockaddr_in address;
|
||||||
priv::SocketImpl::AddrLength size = sizeof(address);
|
priv::SocketImpl::AddrLength size = sizeof(address);
|
||||||
if (getsockname(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
|
if (getsockname(getHandle(), reinterpret_cast<sockaddr*>(&address), &size) != -1)
|
||||||
@ -173,7 +173,7 @@ Socket::Status UdpSocket::receive(void* data,
|
|||||||
if (sizeReceived < 0)
|
if (sizeReceived < 0)
|
||||||
return priv::SocketImpl::getErrorStatus();
|
return priv::SocketImpl::getErrorStatus();
|
||||||
|
|
||||||
// Fill the sender informations
|
// Fill the sender information
|
||||||
received = static_cast<std::size_t>(sizeReceived);
|
received = static_cast<std::size_t>(sizeReceived);
|
||||||
remoteAddress = IpAddress(ntohl(address.sin_addr.s_addr));
|
remoteAddress = IpAddress(ntohl(address.sin_addr.s_addr));
|
||||||
remotePort = ntohs(address.sin_port);
|
remotePort = ntohs(address.sin_port);
|
||||||
|
@ -88,7 +88,7 @@ void SocketImpl::setBlocking(SocketHandle sock, bool block)
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
Socket::Status SocketImpl::getErrorStatus()
|
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
|
// so we have to make a special case for them in order
|
||||||
// to avoid having double values in the switch case
|
// to avoid having double values in the switch case
|
||||||
if ((errno == EAGAIN) || (errno == EINPROGRESS))
|
if ((errno == EAGAIN) || (errno == EINPROGRESS))
|
||||||
|
@ -360,7 +360,7 @@ int WindowImplAndroid::processScrollEvent(AInputEvent* _event, ActivityStates& s
|
|||||||
std::int32_t deviceId = AInputEvent_getDeviceId(_event);
|
std::int32_t deviceId = AInputEvent_getDeviceId(_event);
|
||||||
std::int32_t edgeFlags = AMotionEvent_getEdgeFlags(_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");
|
jclass ClassMotionEvent = lJNIEnv->FindClass("android/view/MotionEvent");
|
||||||
jmethodID StaticMethodObtain = lJNIEnv->GetStaticMethodID(ClassMotionEvent,
|
jmethodID StaticMethodObtain = lJNIEnv->GetStaticMethodID(ClassMotionEvent,
|
||||||
"obtain",
|
"obtain",
|
||||||
|
@ -300,7 +300,7 @@ endif()
|
|||||||
# Vulkan headers
|
# Vulkan headers
|
||||||
target_include_directories(sfml-window SYSTEM PRIVATE "${PROJECT_SOURCE_DIR}/extlibs/headers/vulkan")
|
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)
|
# (unless the OpenGL_GL_PREFERENCE was explicitly set)
|
||||||
# See CMP0072 for more details (cmake --help-policy CMP0072)
|
# See CMP0072 for more details (cmake --help-policy CMP0072)
|
||||||
if(NOT OpenGL_GL_PREFERENCE)
|
if(NOT OpenGL_GL_PREFERENCE)
|
||||||
|
@ -650,7 +650,7 @@ void DRMContext::display()
|
|||||||
|
|
||||||
m_currentBO = m_nextBO;
|
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);
|
m_nextBO = gbm_surface_lock_front_buffer(m_gbmSurface);
|
||||||
|
|
||||||
if (!m_nextBO)
|
if (!m_nextBO)
|
||||||
|
@ -277,7 +277,7 @@ private:
|
|||||||
static std::uint8_t scanToVirtualCode(Keyboard::Scancode code);
|
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.
|
/// by the layout. Can return Unknown.
|
||||||
///
|
///
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
|
@ -387,8 +387,8 @@
|
|||||||
rawPos.x = std::clamp(rawPos.x, origin.x, origin.x + size.width - 1);
|
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);
|
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
|
// 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
|
// on the left or below the window, respectively, and therefore prevent the
|
||||||
// application to lose focus by accident. The sign of this offset is determinded
|
// application to lose focus by accident. The sign of this offset is determined
|
||||||
// by the direction of the x and y axis.
|
// by the direction of the x and y axis.
|
||||||
|
|
||||||
// Increase X and Y buffer with the distance of the projection
|
// Increase X and Y buffer with the distance of the projection
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(GLX_DEBUGGING) && defined(SFML_DEBUG)
|
#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
|
//#define GLX_DEBUGGING
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1288,7 +1288,7 @@ void WindowImplX11::setVideoMode(const VideoMode& mode)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Retreive current RRMode, screen position and rotation
|
// Retrieve current RRMode, screen position and rotation
|
||||||
XRRCrtcInfo* crtcInfo = XRRGetCrtcInfo(m_display, res, outputInfo->crtc);
|
XRRCrtcInfo* crtcInfo = XRRGetCrtcInfo(m_display, res, outputInfo->crtc);
|
||||||
if (!crtcInfo)
|
if (!crtcInfo)
|
||||||
{
|
{
|
||||||
@ -1359,7 +1359,7 @@ void WindowImplX11::resetVideoMode()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Retreive current screen position and rotation
|
// Retrieve current screen position and rotation
|
||||||
XRRCrtcInfo* crtcInfo = XRRGetCrtcInfo(m_display, res, m_oldRRCrtc);
|
XRRCrtcInfo* crtcInfo = XRRGetCrtcInfo(m_display, res, m_oldRRCrtc);
|
||||||
if (!crtcInfo)
|
if (!crtcInfo)
|
||||||
{
|
{
|
||||||
@ -2146,7 +2146,7 @@ Vector2i WindowImplX11::getPrimaryMonitorPosition()
|
|||||||
return monitorPosition;
|
return monitorPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Retreive current RRMode, screen position and rotation
|
// Retrieve current RRMode, screen position and rotation
|
||||||
XRRCrtcInfo* crtcInfo = XRRGetCrtcInfo(m_display, res, outputInfo->crtc);
|
XRRCrtcInfo* crtcInfo = XRRGetCrtcInfo(m_display, res, outputInfo->crtc);
|
||||||
if (!crtcInfo)
|
if (!crtcInfo)
|
||||||
{
|
{
|
||||||
|
@ -49,7 +49,7 @@ out vec2 tex_coord;
|
|||||||
// Main entry point
|
// Main entry point
|
||||||
void main()
|
void main()
|
||||||
{
|
{
|
||||||
// Caculate the half width/height of the billboards
|
// Calculate the half width/height of the billboards
|
||||||
vec2 half_size = size / 2.f;
|
vec2 half_size = size / 2.f;
|
||||||
|
|
||||||
// Scale the size based on resolution (1 would be full width/height)
|
// Scale the size based on resolution (1 would be full width/height)
|
||||||
|
@ -10,7 +10,7 @@ Feel free to improve them or send patches.
|
|||||||
|
|
||||||
HOW-TO-USE:
|
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)
|
as the Android CMake toolchain you'll find in cmake/toolchains (android.toolchain.cmake)
|
||||||
export NDK=/path/to/your/ndk
|
export NDK=/path/to/your/ndk
|
||||||
export ANDROID_CMAKE_TOOLCHAIN=/path/to/android.toolchain.cmake
|
export ANDROID_CMAKE_TOOLCHAIN=/path/to/android.toolchain.cmake
|
||||||
|
@ -73,7 +73,7 @@ subject to the following restrictions:
|
|||||||
<key>MACOSX_DEPLOYMENT_TARGET</key>
|
<key>MACOSX_DEPLOYMENT_TARGET</key>
|
||||||
<string>@CMAKE_OSX_DEPLOYMENT_TARGET@</string>
|
<string>@CMAKE_OSX_DEPLOYMENT_TARGET@</string>
|
||||||
|
|
||||||
<!-- SERACH PATHS -->
|
<!-- SEARCH PATHS -->
|
||||||
<key>FRAMEWORK_SEARCH_PATHS</key>
|
<key>FRAMEWORK_SEARCH_PATHS</key>
|
||||||
<string> /Library/Frameworks/ $(inherited) </string>
|
<string> /Library/Frameworks/ $(inherited) </string>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user