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
Refactoring model-impl.cpp
[platform/core/uifw/dali-toolkit.git]
/
dali-scene3d
/
internal
/
common
/
environment-map-load-task.cpp
diff --git
a/dali-scene3d/internal/common/environment-map-load-task.cpp
b/dali-scene3d/internal/common/environment-map-load-task.cpp
index
82d8646
..
d847f46
100644
(file)
--- a/
dali-scene3d/internal/common/environment-map-load-task.cpp
+++ b/
dali-scene3d/internal/common/environment-map-load-task.cpp
@@
-1,5
+1,5
@@
/*
/*
- * 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.
@@
-19,7
+19,7
@@
#include <dali-scene3d/internal/common/environment-map-load-task.h>
// INTERNAL INCLUDES
#include <dali-scene3d/internal/common/environment-map-load-task.h>
// INTERNAL INCLUDES
-#include <dali-scene3d/public-api/loader/
cube
-map-loader.h>
+#include <dali-scene3d/public-api/loader/
environment
-map-loader.h>
namespace Dali
namespace Dali
@@
-29,9
+29,10
@@
namespace Scene3D
namespace Internal
{
namespace Internal
{
-EnvironmentMapLoadTask::EnvironmentMapLoadTask(const std::string& environmentMapUrl, CallbackBase* callback)
+EnvironmentMapLoadTask::EnvironmentMapLoadTask(const std::string& environmentMapUrl,
Dali::Scene3D::EnvironmentMapType environmentMapType,
CallbackBase* callback)
: AsyncTask(callback),
mEnvironmentMapUrl(environmentMapUrl),
: AsyncTask(callback),
mEnvironmentMapUrl(environmentMapUrl),
+ mEnvironmentMapType(environmentMapType),
mIsReady(true),
mHasSucceeded(false)
{
mIsReady(true),
mHasSucceeded(false)
{
@@
-43,7
+44,8
@@
EnvironmentMapLoadTask::~EnvironmentMapLoadTask()
void EnvironmentMapLoadTask::Process()
{
void EnvironmentMapLoadTask::Process()
{
- mHasSucceeded = Scene3D::Loader::LoadCubeMapData(mEnvironmentMapUrl, mEnvironmentMapPixelData);
+ mEnvironmentMapData.SetEnvironmentMapType(mEnvironmentMapType);
+ mHasSucceeded = Scene3D::Loader::LoadEnvironmentMap(mEnvironmentMapUrl, mEnvironmentMapData);
}
bool EnvironmentMapLoadTask::IsReady()
}
bool EnvironmentMapLoadTask::IsReady()
@@
-56,14
+58,9
@@
bool EnvironmentMapLoadTask::HasSucceeded() const
return mHasSucceeded;
}
return mHasSucceeded;
}
-Dali::
Scene3D::Loader::CubeData EnvironmentMapLoadTask::GetEnvironmentMap() const
+Dali::
Texture EnvironmentMapLoadTask::GetLoadedTexture()
{
{
- Dali::Scene3D::Loader::CubeData environmentMapPixelData;
- if(mIsReady && mHasSucceeded && !mEnvironmentMapPixelData.data.empty())
- {
- environmentMapPixelData = mEnvironmentMapPixelData;
- }
- return environmentMapPixelData;
+ return (HasSucceeded()) ? mEnvironmentMapData.GetTexture() : Texture();;
}
} // namespace Internal
}
} // namespace Internal