BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-15 08:15:38 +07:00
Code Issues Packages Projects Releases Wiki Activity

changed str to str_view, stoi to try_parse

Browse Source
This commit is contained in:
Pinchuk Aleksei
2019-08-02 18:31:47 +03:00
parent 31a77e4c0d
commit ba989c6034
1 changed files with 113 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
sources/enduro2d/utils/font.cpp
View File

@@ -5,10 +5,12 @@
******************************************************************************/
#include <enduro2d/utils/font.hpp>
#include <enduro2d/utils/strings.hpp>
namespace
{
using namespace e2d;
using namespace e2d::strings;
class bmfont_loading_exception : public exception {
const char* what() const noexcept override {
@@ -20,10 +22,10 @@ namespace
return (static_cast<u64>(first) << 32) | static_cast<u64>(second);
}
str read_tag(const str& buf, u32& pos) {
str res;
str_view read_tag(str_view buf, u32& pos) {
str_view res;
auto end = buf.find(' ', pos);
if ( end != str::npos ) {
if ( end != str_view::npos ) {
res = buf.substr(pos, end - pos);
pos = end;
}
@@ -31,11 +33,11 @@ namespace
return res;
}
bool read_key(const str& buf, u32& pos, str& key) {
bool read_key(str_view buf, u32& pos, str& key) {
auto end = buf.find('=', pos);
if ( end != str::npos ) {
if ( end != str_view::npos ) {
auto start = buf.rfind(' ', end);
if ( start != str::npos ) {
if ( start != str_view::npos ) {
start++;
key = buf.substr(start, end - start);
pos = end + 1;
@@ -46,32 +48,34 @@ namespace
return false;
}
i32 read_int(const str& buf, u32& pos) {
i32 read_int(str_view buf, u32& pos) {
i32 res{0};
auto end = buf.find(' ', pos);
if ( end == str::npos ) {
if ( end == str_view::npos ) {
end = buf.find('\n', pos);
}
if ( end == str::npos ) {
if ( end == str_view::npos ) {
throw bmfont_loading_exception();
} else {
res = std::stoi(buf.substr(pos, end - pos));
if ( !try_parse(buf.substr(pos, end - pos), res) ) {
throw bmfont_loading_exception();
}
pos = end;
}
return res;
}
str read_string(const str& buf, u32& pos) {
str res;
str_view read_string(const str_view& buf, u32& pos) {
str_view res;
auto start = buf.find('"', pos);
if ( start == str::npos ) {
if ( start == str_view::npos ) {
throw bmfont_loading_exception();
} else {
start++;
auto end = buf.find('"', start);
if ( end == str::npos ) {
if ( end == str_view::npos ) {
throw bmfont_loading_exception();
} else {
res = buf.substr(start, end - start);
@@ -83,26 +87,22 @@ namespace
}
font::data load_font_data(str_view content) {
str s(content);
u32 pos{0};
str line;
str tag;
str_view line;
str_view tag;
str key;
font::data data;
vector<font::char_data> chars;
vector<font::kerning_data> kernings;
if (s.back() != '\n') {
s.push_back('\n');
}
chars.reserve(120);
kernings.reserve(120);
size_t start_line{0};
size_t end_line = s.find('\n', start_line);
while ( end_line != str::npos ) {
size_t end_line = content.find('\n', start_line);
while ( end_line != str_view::npos ) {
pos = 0;
line = s.substr(start_line, end_line - start_line + 1);
line = content.substr(start_line, end_line - start_line + 1);
if ( !line.empty() ) {
tag = read_tag(line, pos);
if ( tag == "info" ) {
// info face="Arial-Black" size=32 bold=0 italic=0 charset=""
@@ -198,8 +198,9 @@ namespace
}
kernings.push_back(std::move(k));
}
start_line = s.find_first_not_of(' ', end_line + 1);
end_line = s.find('\n', start_line);
}
start_line = content.find_first_not_of(' ', end_line + 1);
end_line = content.find('\n', start_line);
}
if (chars.empty()) {