Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move SplitSpec into utils

master
Andrew Copland 2016-03-31 22:16:34 +01:00
parent 4d1dd62d0a
commit 4dda7ec18b
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ui/Skin.cpp
View File

@ -6,6 +6,7 @@
#include "graphics/TextureBuilder.h"
#include "graphics/VertexArray.h"
#include "FileSystem.h"
#include "utils.h"
namespace UI {
@ -220,29 +221,6 @@ void Skin::DrawRectColor(const Color &col, const Point &pos, const Point &size)
m_renderer->DrawTriangles(&va, GetAlphaBlendState(), m_colorMaterial.Get(), Graphics::TRIANGLE_STRIP);
}
static size_t SplitSpec(const std::string &spec, std::vector<int> &output)
{
static const std::string delim(",");
size_t i = 0, start = 0, end = 0;
while (end != std::string::npos) {
// get to the first non-delim char
start = spec.find_first_not_of(delim, end);
// read the end, no more to do
if (start == std::string::npos)
break;
// find the end - next delim or end of string
end = spec.find_first_of(delim, start);
// extract the fragment and remember it
output[i++] = atoi(spec.substr(start, (end == std::string::npos) ? std::string::npos : end - start).c_str());
}
return i;
}
Skin::RectElement Skin::LoadRectElement(const std::string &spec)
{
std::vector<int> v(4);

23
src/utils.h
View File

@ -136,6 +136,29 @@ inline bool ends_with_ci(const std::string &s, const std::string &t) {
return ends_with_ci(s.c_str(), s.size(), t.c_str(), t.size());
}
static inline size_t SplitSpec(const std::string &spec, std::vector<int> &output)
{
static const std::string delim(",");
size_t i = 0, start = 0, end = 0;
while (end != std::string::npos) {
// get to the first non-delim char
start = spec.find_first_not_of(delim, end);
// read the end, no more to do
if (start == std::string::npos)
break;
// find the end - next delim or end of string
end = spec.find_first_of(delim, start);
// extract the fragment and remember it
output[i++] = atoi(spec.substr(start, (end == std::string::npos) ? std::string::npos : end - start).c_str());
}
return i;
}
// 'Numeric type' to string conversions.
std::string SInt64ToStr(Sint64 val);
std::string UInt64ToStr(Uint64 val);