mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 18:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'replace_boost' into 'master'

Browse Source 
replace boost where not needed

See merge request OpenMW/openmw!2962
This commit is contained in:
psi29a 2023-04-23 19:46:29 +00:00
commit 406eb1f9cc
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/openmw_test_suite/nifosg/testnifloader.cpp
View File

@ -10,9 +10,6 @@
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <boost/algorithm/string.hpp>
#include <boost/format.hpp>
#include <osgDB/Registry> #include <osgDB/Registry>
#include <array> #include <array>
@ -55,7 +52,7 @@ namespace
{ {
if (line.starts_with('#')) if (line.starts_with('#'))
continue; continue;
boost::trim_right(line); line.erase(line.find_last_not_of(" \t\n\r\f\v") + 1);
result += line; result += line;
result += '\n'; result += '\n';
} }
@ -113,7 +110,8 @@ osg::Group {
std::string formatOsgNodeForShaderProperty(std::string_view shaderPrefix) std::string formatOsgNodeForShaderProperty(std::string_view shaderPrefix)
{ {
static constexpr const char format[] = R"( std::ostringstream oss;
oss << R"(
osg::Group { osg::Group {
UniqueID 1 UniqueID 1
DataVariance STATIC DataVariance STATIC
@ -144,7 +142,8 @@ osg::Group {
osg::StringValueObject { osg::StringValueObject {
UniqueID 7 UniqueID 7
Name "shaderPrefix" Name "shaderPrefix"
Value "%s" Value ")"
<< shaderPrefix << R"("
} }
osg::BoolValueObject { osg::BoolValueObject {
UniqueID 8 UniqueID 8
@ -163,7 +162,7 @@ osg::Group {
} }
} }
)"; )";
return (boost::format(format) % shaderPrefix).str(); return oss.str();
} }
struct ShaderPrefixParams struct ShaderPrefixParams