#include <dali-toolkit/internal/controls/control/control-data-impl.h>
#include <dali-toolkit/internal/graphics/builtin-shader-extern-gen.h>
#include <dali/devel-api/actors/actor-devel.h>
-#include <dali/integration-api/adaptor-framework/adaptor.h>
#include <dali/integration-api/debug.h>
#include <dali/public-api/object/type-registry-helper.h>
#include <dali/public-api/object/type-registry.h>
mModelUrl(modelUrl),
mResourceDirectoryUrl(resourceDirectoryUrl),
mModelRoot(),
- mModelLoadedCallback(nullptr),
- mIblLoadedCallback(nullptr),
mNaturalSize(Vector3::ZERO),
mModelPivot(AnchorPoint::CENTER),
mIblScaleFactor(1.0f),
Model::~Model()
{
- if(mModelLoadedCallback && Adaptor::IsAvailable())
- {
- // Removes the callback from the callback manager in case the control is destroyed before the callback is executed.
- Adaptor::Get().RemoveIdle(mModelLoadedCallback);
- }
-
- if(mIblLoadedCallback && Adaptor::IsAvailable())
- {
- // Removes the callback from the callback manager in case the control is destroyed before the callback is executed.
- Adaptor::Get().RemoveIdle(mIblLoadedCallback);
- }
}
Dali::Scene3D::Model Model::New(const std::string& modelUrl, const std::string& resourceDirectoryUrl)
void Model::SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor)
{
- // Request asynchronous model loading
- if(!mIblLoadedCallback)
+ mIBLResourceReady = false;
+ Texture diffuseTexture = Dali::Scene3D::Loader::LoadCubeMap(diffuseUrl);
+ Texture specularTexture = Dali::Scene3D::Loader::LoadCubeMap(specularUrl);
+ SetImageBasedLightTexture(diffuseTexture, specularTexture, scaleFactor);
+ mIBLResourceReady = true;
+
+ // If Model resource is already ready, then set resource ready.
+ // If Model resource is still not ready, wait for model resource ready.
+ if(IsResourceReady())
{
- mIBLResourceReady = false;
- mDiffuseIblUrl = diffuseUrl;
- mSpecularIblUrl = specularUrl;
- mIblScaleFactor = scaleFactor;
- // The callback manager takes the ownership of the callback object.
- mIblLoadedCallback = MakeCallback(this, &Model::OnLoadComplete);
- Adaptor::Get().AddIdle(mIblLoadedCallback, false);
+ SetResourceReady(false);
}
}
{
if(!mModelRoot)
{
- // Request asynchronous model loading
- if(!mModelLoadedCallback)
- {
- mModelResourceReady = false;
- // The callback manager takes the ownership of the callback object.
- mModelLoadedCallback = MakeCallback(this, &Model::OnLoadComplete);
- Adaptor::Get().AddIdle(mModelLoadedCallback, false);
- }
+ LoadModel();
}
Actor parent = Self().GetParent();
{
if(!mModelRoot)
{
- DALI_LOG_ERROR("Model is still not loaded.\n");
- return Vector3::ZERO;
+ LoadModel();
}
return mNaturalSize;
Self().SetProperty(Dali::Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
Self().SetProperty(Dali::Actor::Property::ANCHOR_POINT, Vector3(mModelPivot.x, 1.0f - mModelPivot.y, mModelPivot.z));
-}
-void Model::LoadImageBasedLight()
-{
- Texture diffuseTexture = Dali::Scene3D::Loader::LoadCubeMap(mDiffuseIblUrl);
- Texture specularTexture = Dali::Scene3D::Loader::LoadCubeMap(mSpecularIblUrl);
- SetImageBasedLightTexture(diffuseTexture, specularTexture, mIblScaleFactor);
+ mModelResourceReady = true;
+
+ Control::SetResourceReady(false);
}
void Model::ScaleModel()
}
}
-void Model::OnLoadComplete()
-{
- // TODO: In this implementation, we cannot know which request occurs this OnLoadComplete Callback.
- // Currently it is no problem because the all loading is processed in this method.
-
- // Prevent to emit unnecessary resource ready signal.
- if(IsResourceReady())
- {
- return;
- }
-
- if(!mIBLResourceReady)
- {
- LoadImageBasedLight();
- mIBLResourceReady = true;
- mIblLoadedCallback = nullptr;
- }
-
- if(!mModelResourceReady)
- {
- LoadModel();
- mModelResourceReady = true;
- mModelLoadedCallback = nullptr;
- }
-
- if(IsResourceReady())
- {
- Control::SetResourceReady(false);
- }
-}
-
} // namespace Internal
} // namespace Scene3D
} // namespace Dali
void LoadModel();
/**
- * @brief Loads image based light from file.
- */
- void LoadImageBasedLight();
-
- /**
* @brief Scales the model to fit the control or to return to original size.
*/
void ScaleModel();
*/
void UpdateImageBasedLightScaleFactor();
- /**
- * @brief Asynchronously loading finished.
- */
- void OnLoadComplete();
-
private:
std::string mModelUrl;
std::string mResourceDirectoryUrl;
std::vector<WeakHandle<Actor>> mRenderableActors;
WeakHandle<Scene3D::SceneView> mParentSceneView;
- CallbackBase* mModelLoadedCallback;
- CallbackBase* mIblLoadedCallback;
- std::string mDiffuseIblUrl;
- std::string mSpecularIblUrl;
-
Dali::Texture mSpecularTexture;
Dali::Texture mDiffuseTexture;
Vector3 mNaturalSize;
#include <dali-toolkit/public-api/image-loader/image-url.h>
#include <dali-toolkit/public-api/image-loader/image.h>
#include <dali/devel-api/common/stage.h>
-#include <dali/integration-api/adaptor-framework/adaptor.h>
#include <dali/integration-api/debug.h>
#include <dali/public-api/object/type-registry-helper.h>
#include <dali/public-api/object/type-registry.h>
} // anonymous namespace
SceneView::SceneView()
-: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)),
- mIblLoadedCallback(nullptr)
+: Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT))
{
}
-SceneView::~SceneView()
-{
- if(mIblLoadedCallback && Adaptor::IsAvailable())
- {
- // Removes the callback from the callback manager in case the control is destroyed before the callback is executed.
- Adaptor::Get().RemoveIdle(mIblLoadedCallback);
- }
-}
+SceneView::~SceneView() = default;
Dali::Scene3D::SceneView SceneView::New()
{
void SceneView::SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor)
{
- // Request asynchronous model loading
- if(!mIblLoadedCallback)
+ mIBLResourceReady = false;
+ Texture diffuseTexture = Dali::Scene3D::Loader::LoadCubeMap(diffuseUrl);
+ if(diffuseTexture)
{
- mIBLResourceReady = false;
- mDiffuseIblUrl = diffuseUrl;
- mSpecularIblUrl = specularUrl;
- mIblScaleFactor = scaleFactor;
- // The callback manager takes the ownership of the callback object.
- mIblLoadedCallback = MakeCallback(this, &SceneView::OnLoadComplete);
- Adaptor::Get().AddIdle(mIblLoadedCallback, false);
+ Texture specularTexture = Dali::Scene3D::Loader::LoadCubeMap(specularUrl);
+ if(specularTexture)
+ {
+ mDiffuseTexture = diffuseTexture;
+ mSpecularTexture = specularTexture;
+ mIblScaleFactor = scaleFactor;
+
+ for(auto&& model : mModels)
+ {
+ if(model)
+ {
+ model.SetImageBasedLightTexture(mDiffuseTexture, mSpecularTexture, mIblScaleFactor);
+ }
+ }
+ }
}
+ mIBLResourceReady = true;
+ Control::SetResourceReady(false);
}
void SceneView::SetImageBasedLightScaleFactor(float scaleFactor)
mRenderTask.SetCameraActor(mSelectedCamera);
}
- Vector3 size = Self().GetProperty<Vector3>(Dali::Actor::Property::SIZE);
+ Vector3 size = Self().GetProperty<Vector3>(Dali::Actor::Property::SIZE);
const float aspectRatio = size.width / size.height;
mSelectedCamera.SetAspectRatio(aspectRatio);
- const float halfHeight = mSelectedCamera[Dali::CameraActor::Property::TOP_PLANE_DISTANCE];
- const float halfWidth = aspectRatio * halfHeight;
+ const float halfHeight = mSelectedCamera[Dali::CameraActor::Property::TOP_PLANE_DISTANCE];
+ const float halfWidth = aspectRatio * halfHeight;
mSelectedCamera[Dali::CameraActor::Property::LEFT_PLANE_DISTANCE] = -halfWidth;
mSelectedCamera[Dali::CameraActor::Property::RIGHT_PLANE_DISTANCE] = halfWidth;
- mSelectedCamera[Dali::CameraActor::Property::TOP_PLANE_DISTANCE] = halfHeight; // Top is +ve to keep consistency with orthographic values
+ mSelectedCamera[Dali::CameraActor::Property::TOP_PLANE_DISTANCE] = halfHeight; // Top is +ve to keep consistency with orthographic values
mSelectedCamera[Dali::CameraActor::Property::BOTTOM_PLANE_DISTANCE] = -halfHeight; // Bottom is -ve to keep consistency with orthographic values
if(mUseFrameBuffer)
{
}
}
-void SceneView::LoadImageBasedLight()
-{
- Texture diffuseTexture = Dali::Scene3D::Loader::LoadCubeMap(mDiffuseIblUrl);
- Texture specularTexture = Dali::Scene3D::Loader::LoadCubeMap(mSpecularIblUrl);
-
- if(diffuseTexture)
- {
- if(specularTexture)
- {
- mDiffuseTexture = diffuseTexture;
- mSpecularTexture = specularTexture;
-
- for(auto&& model : mModels)
- {
- if(model)
- {
- model.SetImageBasedLightTexture(mDiffuseTexture, mSpecularTexture, mIblScaleFactor);
- }
- }
- }
- }
-}
-
-void SceneView::OnLoadComplete()
-{
- // TODO: In this implementation, we cannot know which request occurs this OnLoadComplete Callback.
- // Currently it is no problem because the all loading is processed in this method.
-
- // Prevent to emit unnecessary resource ready signal.
- if(IsResourceReady())
- {
- return;
- }
-
- if(!mIBLResourceReady)
- {
- LoadImageBasedLight();
- mIBLResourceReady = true;
- mIblLoadedCallback = nullptr;
- }
-
- if(IsResourceReady())
- {
- Control::SetResourceReady(false);
- }
-}
-
} // namespace Internal
} // namespace Scene3D
} // namespace Dali
#include <dali/public-api/rendering/texture.h>
// INTERNAL INCLUDES
-#include <dali-scene3d/public-api/controls/model/model.h>
#include <dali-scene3d/public-api/controls/scene-view/scene-view.h>
+#include <dali-scene3d/public-api/controls/model/model.h>
namespace Dali
{
*/
void UpdateRenderTask();
- /**
- * @brief Loads image based light from file.
- */
- void LoadImageBasedLight();
-
- /**
- * @brief Asynchronously loading finished.
- */
- void OnLoadComplete();
-
private:
Toolkit::Visual::Base mVisual;
Dali::Texture mTexture;
Dali::RenderTask mRenderTask;
- CallbackBase* mIblLoadedCallback;
- std::string mDiffuseIblUrl;
- std::string mSpecularIblUrl;
+ Layer mRootLayer;
- Layer mRootLayer;
Dali::Texture mSpecularTexture;
Dali::Texture mDiffuseTexture;
float mIblScaleFactor{1.0f};
{
namespace Scene3D
{
-Model::Model() = default;
+Model::Model()
+{
+}
Model::Model(const Model& model) = default;
Model& Model::operator=(Model&& rhs) = default;
-Model::~Model() = default;
+Model::~Model()
+{
+}
Model Model::New(const std::string& modelUrl, const std::string& resourceDirectoryUrl)
{
/**
* @brief Sets Image Based Light Texture.
- * @note This method doesn't load texture from file, so this work is performed synchronously.
*
* @SINCE_2_1.41
* @param[in] diffuseTexture cube map texture that can be used as a diffuse IBL source.
projects / platform / core / uifw / dali-toolkit.git / commitdiff