projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace std::string global variables with C-style string.
[platform/core/uifw/dali-toolkit.git]
/
dali-scene3d
/
public-api
/
loader
/
scene-definition.cpp
diff --git
a/dali-scene3d/public-api/loader/scene-definition.cpp
b/dali-scene3d/public-api/loader/scene-definition.cpp
index
3241769
..
f41422e
100644
(file)
--- a/
dali-scene3d/public-api/loader/scene-definition.cpp
+++ b/
dali-scene3d/public-api/loader/scene-definition.cpp
@@
-45,7
+45,7
@@
namespace Loader
{
namespace
{
{
namespace
{
-const
std::string
JOINT_MATRIX{"jointMatrix"};
+const
char*
JOINT_MATRIX{"jointMatrix"};
const std::map<Property::Type, Constraint (*)(Actor&, Property::Index)> sConstraintFactory = {
{Property::Type::BOOLEAN,
const std::map<Property::Type, Constraint (*)(Actor&, Property::Index)> sConstraintFactory = {
{Property::Type::BOOLEAN,
@@
-305,7
+305,7
@@
void ConfigureBoneMatrix(const Matrix& ibm, Actor joint, Shader& shader, Index&
{
// Register bone transform on shader.
char propertyNameBuffer[32];
{
// Register bone transform on shader.
char propertyNameBuffer[32];
- snprintf(propertyNameBuffer, sizeof(propertyNameBuffer), "%s[%d]", Skinning::BONE_UNIFORM_NAME
.c_str()
, boneIdx);
+ snprintf(propertyNameBuffer, sizeof(propertyNameBuffer), "%s[%d]", Skinning::BONE_UNIFORM_NAME, boneIdx);
DALI_ASSERT_DEBUG(shader.GetPropertyIndex(propertyNameBuffer) == Property::INVALID_INDEX);
auto propBoneXform = shader.RegisterProperty(propertyNameBuffer, Matrix{false});
DALI_ASSERT_DEBUG(shader.GetPropertyIndex(propertyNameBuffer) == Property::INVALID_INDEX);
auto propBoneXform = shader.RegisterProperty(propertyNameBuffer, Matrix{false});