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
ModelView using scene-loader
[platform/core/uifw/dali-toolkit.git]
/
dali-scene-loader
/
public-api
/
environment-definition.h
diff --git
a/dali-scene-loader/public-api/environment-definition.h
b/dali-scene-loader/public-api/environment-definition.h
index
1b1906f
..
0fcdee1
100644
(file)
--- a/
dali-scene-loader/public-api/environment-definition.h
+++ b/
dali-scene-loader/public-api/environment-definition.h
@@
-1,7
+1,7
@@
#ifndef DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H
#define DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H
/*
#ifndef DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H
#define DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H
/*
- * Copyright (c) 202
0
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.
@@
-17,19
+17,18
@@
*
*/
*
*/
-
// INTERNAL INCLUDES
+// INTERNAL INCLUDES
#include "dali-scene-loader/public-api/api.h"
#include "dali-scene-loader/public-api/ktx-loader.h"
// EXTERNAL INCLUDES
#include "dali-scene-loader/public-api/api.h"
#include "dali-scene-loader/public-api/ktx-loader.h"
// EXTERNAL INCLUDES
-#include "dali/public-api/rendering/texture.h"
#include "dali/public-api/math/quaternion.h"
#include "dali/public-api/math/quaternion.h"
+#include "dali/public-api/rendering/texture.h"
namespace Dali
{
namespace SceneLoader
{
namespace Dali
{
namespace SceneLoader
{
-
/**
* @brief Defines an environment map with either or both of radiance
* and irradiance maps.
/**
* @brief Defines an environment map with either or both of radiance
* and irradiance maps.
@@
-39,7
+38,8
@@
struct DALI_SCENE_LOADER_API EnvironmentDefinition
struct Textures
{
Texture mDiffuse; // irradiance
struct Textures
{
Texture mDiffuse; // irradiance
- Texture mSpecular; // radiance
+ Texture mSpecular; // radiance
+ Texture mBrdf; // pre-computed brdf
bool IsLoaded() const
{
bool IsLoaded() const
{
@@
-49,12
+49,13
@@
struct DALI_SCENE_LOADER_API EnvironmentDefinition
struct RawData
{
struct RawData
{
- CubeData mDiffuse;
- CubeData mSpecular;
+ CubeData mDiffuse;
+ CubeData mSpecular;
+ PixelData mBrdf;
};
using EnvironmentData = std::pair<EnvironmentDefinition, Textures>;
};
using EnvironmentData = std::pair<EnvironmentDefinition, Textures>;
- using Vector = std::vector<EnvironmentData>;
+ using Vector
= std::vector<EnvironmentData>;
EnvironmentDefinition() = default;
EnvironmentDefinition() = default;
@@
-80,11
+81,13
@@
struct DALI_SCENE_LOADER_API EnvironmentDefinition
public: // DATA
std::string mDiffuseMapPath;
std::string mSpecularMapPath;
public: // DATA
std::string mDiffuseMapPath;
std::string mSpecularMapPath;
- Quaternion mCubeOrientation = Quaternion::IDENTITY;
- float mIblIntensity = 1.0f;
+ Quaternion mCubeOrientation = Quaternion::IDENTITY;
+ Vector3 mYDirection = Vector3::ONE;
+ float mIblIntensity = 1.0f;
+ bool mUseBrdfTexture = false;
};
};
-}
-}
+}
// namespace SceneLoader
+}
// namespace Dali
#endif //DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H
#endif //DALI_SCENE_LOADER_ENVIRONMENT_DEFINITION_H