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
Use default PBR shader to the scene-loader
[platform/core/uifw/dali-toolkit.git]
/
dali-scene-loader
/
public-api
/
alpha-function-helper.h
diff --git
a/dali-scene-loader/public-api/alpha-function-helper.h
b/dali-scene-loader/public-api/alpha-function-helper.h
index
1a6c9ad
..
a524b81
100644
(file)
--- a/
dali-scene-loader/public-api/alpha-function-helper.h
+++ b/
dali-scene-loader/public-api/alpha-function-helper.h
@@
-1,7
+1,7
@@
#ifndef DALI_SCENE_LOADER_ALPHA_FUNCTION_HELPER_H_
#define DALI_SCENE_LOADER_ALPHA_FUNCTION_HELPER_H_
/*
#ifndef DALI_SCENE_LOADER_ALPHA_FUNCTION_HELPER_H_
#define DALI_SCENE_LOADER_ALPHA_FUNCTION_HELPER_H_
/*
- * Copyright (c) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
1
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.
@@
-19,14
+19,13
@@
#include "dali-scene-loader/public-api/api.h"
#include "dali-scene-loader/public-api/api.h"
-#include "dali/public-api/animation/alpha-function.h"
#include <string>
#include <string>
+#include "dali/public-api/animation/alpha-function.h"
namespace Dali
{
namespace SceneLoader
{
namespace Dali
{
namespace SceneLoader
{
-
/**
* @return Given a name, provide a AlphaFunction; if the name was not
* recognised, get the default one.
/**
* @return Given a name, provide a AlphaFunction; if the name was not
* recognised, get the default one.
@@
-39,7
+38,7
@@
AlphaFunction DALI_SCENE_LOADER_API GetAlphaFunction(const std::string& name, bo
*/
void DALI_SCENE_LOADER_API RegisterAlphaFunction(const std::string& name, AlphaFunction alphaFn) noexcept(false);
*/
void DALI_SCENE_LOADER_API RegisterAlphaFunction(const std::string& name, AlphaFunction alphaFn) noexcept(false);
-}
-}
+}
// namespace SceneLoader
+}
// namespace Dali
#endif //DALI_SCENE_LOADER_ALPHA_FUNCTION_HELPER_H_
#endif //DALI_SCENE_LOADER_ALPHA_FUNCTION_HELPER_H_