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
[dali_2.2.18] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-scene3d
/
internal
/
common
/
environment-map-load-task.h
diff --git
a/dali-scene3d/internal/common/environment-map-load-task.h
b/dali-scene3d/internal/common/environment-map-load-task.h
index
8b1ac7c
..
446665c
100644
(file)
--- a/
dali-scene3d/internal/common/environment-map-load-task.h
+++ b/
dali-scene3d/internal/common/environment-map-load-task.h
@@
-2,7
+2,7
@@
#define DALI_SCENE3D_ENVIRONMENT_MAP_LOAD_TASK_H
/*
#define DALI_SCENE3D_ENVIRONMENT_MAP_LOAD_TASK_H
/*
- * Copyright (c) 202
2
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
3
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.
@@
-26,6
+26,8
@@
// INTERNAL INCLUDES
#include <dali-scene3d/public-api/loader/load-result.h>
#include <dali-scene3d/public-api/loader/scene-definition.h>
// INTERNAL INCLUDES
#include <dali-scene3d/public-api/loader/load-result.h>
#include <dali-scene3d/public-api/loader/scene-definition.h>
+#include <dali-scene3d/public-api/common/environment-map.h>
+#include <dali-scene3d/public-api/loader/environment-map-data.h>
namespace Dali
{
namespace Dali
{
@@
-44,7
+46,7
@@
public:
* @param[in] environmentMapUrl The url of the environment map image file.
* @param[in] callback The callback that is called when the operation is completed.
*/
* @param[in] environmentMapUrl The url of the environment map image file.
* @param[in] callback The callback that is called when the operation is completed.
*/
- EnvironmentMapLoadTask(const std::string& environmentMapUrl, CallbackBase* callback);
+ EnvironmentMapLoadTask(const std::string& environmentMapUrl,
Dali::Scene3D::EnvironmentMapType environmentMapType,
CallbackBase* callback);
/**
* Destructor.
/**
* Destructor.
@@
-69,12
+71,11
@@
public:
bool HasSucceeded() const;
/**
bool HasSucceeded() const;
/**
- * Retrieves loaded Environment Map
- * @return CubeData loaded from url.
- *
- * TODO: Supports Equirectangular environment map
+ * Retrieves loaded Ibl Texture
+ * @return Texture that is loaded from url.
+ * @note Do not call this method in worker thread.
*/
*/
- Dali::
Scene3D::Loader::CubeData GetEnvironmentMap() const
;
+ Dali::
Texture GetLoadedTexture()
;
private:
// Undefined
private:
// Undefined
@@
-84,8
+85,9
@@
private:
EnvironmentMapLoadTask& operator=(const EnvironmentMapLoadTask& task) = delete;
private:
EnvironmentMapLoadTask& operator=(const EnvironmentMapLoadTask& task) = delete;
private:
- std::string mEnvironmentMapUrl;
- Dali::Scene3D::Loader::CubeData mEnvironmentMapPixelData;
+ std::string mEnvironmentMapUrl;
+ Dali::Scene3D::Loader::EnvironmentMapData mEnvironmentMapData;
+ Dali::Scene3D::EnvironmentMapType mEnvironmentMapType{Dali::Scene3D::EnvironmentMapType::AUTO};
bool mIsReady;
bool mHasSucceeded;
bool mIsReady;
bool mHasSucceeded;