GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

review fix for string.hpp

Browse Source
This commit is contained in:
Metehan Tuncbilek
2024-10-20 13:40:24 +03:00
parent 3d601d7d66
commit 9fa25d6922
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitea/workflows/build_pc.yml
View File

@@ -16,7 +16,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ windows_x64, ubuntu-latest, mac_arm ] os: [ windows_x64, ubuntu-24.04, mac_arm ]
steps: steps:
- name: Checkout - name: Checkout
@@ -24,13 +24,13 @@ jobs:
with: with:
submodules: true submodules: true
- name: Install Vulkan SDK - name: Install Vulkan SDK
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-24.04'
uses: humbletim/install-vulkan-sdk@v1.1.1 uses: humbletim/install-vulkan-sdk@v1.1.1
with: with:
version: 1.3.250.1 version: 1.3.250.1
cache: true cache: true
- name: Install Dev Packages - name: Install Dev Packages
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-24.04'
run: > run: >
sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip zip libcurl4-openssl-dev libfreetype-dev libjpeg-turbo8-dev nasm sudo apt update && sudo apt install -y extra-cmake-modules libwayland-dev libxkbcommon-dev xorg-dev libarchive-dev libassimp-dev ninja-build glslang-tools glslang-dev unzip zip libcurl4-openssl-dev libfreetype-dev libjpeg-turbo8-dev nasm
&& sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin && sudo wget https://sourceforge.net/projects/bin2c/files/1.1/bin2c-1.1.zip && sudo unzip bin2c-1.1.zip && cd bin2c && sudo gcc -o bin2c bin2c.c && sudo mv bin2c /usr/bin

11
openVulkanoCpp/Data/Containers/String.hpp
View File

@@ -94,10 +94,9 @@ namespace OpenVulkano
size_t FindStartIndexOf(const std::string_view& str) const { return m_string.find(str); } size_t FindStartIndexOf(const std::string_view& str) const { return m_string.find(str); }
size_t FindEndIndexOf(const std::string_view& str) const { return m_string.rfind(str); } size_t FindEndIndexOf(const std::string_view& str) const { return m_string.rfind(str); }
String Trim() noexcept String& Trim() noexcept { return TrimBack().TrimFront(); }
{
return TrimBack().TrimFront(); [[nodiscard]] String Trim() const { return Trim(); }
}
String& TrimFront() noexcept String& TrimFront() noexcept
{ {
@@ -264,11 +263,13 @@ namespace OpenVulkano
constexpr int64_t HexToInt() { return HexToInt(m_string); } constexpr int64_t HexToInt() { return HexToInt(m_string); }
bool IsUrl(const std::string_view& str) static bool IsUrl(const std::string_view& str)
{ {
return str.find("http://") == 0 || str.find("https://") == 0 || str.find("ftp://") == 0; return str.find("http://") == 0 || str.find("https://") == 0 || str.find("ftp://") == 0;
} }
bool IsUrl() const { return IsUrl(m_string); }
void ToUpper() noexcept void ToUpper() noexcept
{ {
std::transform(m_string.begin(), m_string.end(), m_string.begin(), std::transform(m_string.begin(), m_string.end(), m_string.begin(),