Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

C++11-combat: replace more std::to_string by assimp-specific to_string

Browse Source
This commit is contained in:
Kim Kulling
2016-10-15 21:25:16 +02:00
parent b90669c45e
commit e0dde73018
7 changed files with 99 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/X3DImporter_Light.cpp
View File

@@ -46,9 +46,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "X3DImporter.hpp"
#include "X3DImporter_Macro.hpp"
#include "StringUtils.h"
namespace Assimp
{
namespace Assimp {
// <DirectionalLight
// DEF="" ID
@@ -95,7 +95,7 @@ void X3DImporter::ParseNode_Lighting_DirectionalLight()
if(!def.empty())
ne->ID = def;
else
ne->ID = "DirectionalLight_" + std::to_string((size_t)ne);// make random name
ne->ID = "DirectionalLight_" + to_string((size_t)ne);// make random name
((CX3DImporter_NodeElement_Light*)ne)->AmbientIntensity = ambientIntensity;
((CX3DImporter_NodeElement_Light*)ne)->Color = color;
@@ -178,7 +178,7 @@ void X3DImporter::ParseNode_Lighting_PointLight()
// Assimp want a node with name similar to a light. "Why? I don't no." )
ParseHelper_Group_Begin(false);
// make random name
if(ne->ID.empty()) ne->ID = "PointLight_" + std::to_string((size_t)ne);
if(ne->ID.empty()) ne->ID = "PointLight_" + to_string((size_t)ne);
NodeElement_Cur->ID = ne->ID;// assign name to node and return to light element.
ParseHelper_Node_Exit();
@@ -268,7 +268,7 @@ void X3DImporter::ParseNode_Lighting_SpotLight()
// Assimp want a node with name similar to a light. "Why? I don't no." )
ParseHelper_Group_Begin(false);
// make random name
if(ne->ID.empty()) ne->ID = "SpotLight_" + std::to_string((size_t)ne);
if(ne->ID.empty()) ne->ID = "SpotLight_" + to_string((size_t)ne);
NodeElement_Cur->ID = ne->ID;// assign name to node and return to light element.
ParseHelper_Node_Exit();