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
Merge "Ambient occlusion support in DLI model" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-scene-loader
/
public-api
/
material-definition.cpp
diff --git
a/dali-scene-loader/public-api/material-definition.cpp
b/dali-scene-loader/public-api/material-definition.cpp
index
c0e816c
..
3c7a391
100644
(file)
--- a/
dali-scene-loader/public-api/material-definition.cpp
+++ b/
dali-scene-loader/public-api/material-definition.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-217,6
+217,12
@@
MaterialDefinition::LoadRaw(const std::string& imagesPath) const
++iTexture;
}
++iTexture;
}
+ if(checkStage(OCCLUSION))
+ {
+ raw.mTextures.push_back({SyncImageLoader::Load(imagesPath + iTexture->mTexture.mImageUri), iTexture->mTexture.mSamplerFlags});
+ ++iTexture;
+ }
+
return raw;
}
return raw;
}