X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-scene3d%2Finternal%2Fcontrols%2Fmodel%2Fmodel-impl.h;h=d7924bfbbeb846b43a7e49e9312400e2dee52957;hb=c1236a21a2ddc2da56cb8d54b4ab7e7b1b6c2b50;hp=e4f1f088bd0b327f2710b1d3e2254e3fb9b6194f;hpb=ddddc41f630dc695f84b23c3c5d7e79687e9082b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-scene3d/internal/controls/model/model-impl.h b/dali-scene3d/internal/controls/model/model-impl.h index e4f1f08..d7924bf 100644 --- a/dali-scene3d/internal/controls/model/model-impl.h +++ b/dali-scene3d/internal/controls/model/model-impl.h @@ -2,7 +2,7 @@ #define DALI_SCENE3D_INTERNAL_MODEL_H /* - * Copyright (c) 2022 Samsung Electronics Co., Ltd. + * Copyright (c) 2023 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. @@ -20,8 +20,10 @@ // EXTERNAL INCLUDES #include +#include #include #include +#include #include #include @@ -31,6 +33,8 @@ #include #include #include +#include +#include namespace Dali { @@ -47,18 +51,27 @@ class Model : public Dali::Toolkit::Internal::Control, public ImageBasedLightObs { public: using AnimationData = std::pair; + using CameraData = Loader::CameraParameters; /** - * @brief Creates a new Model. - * - * @return A public handle to the newly allocated Model. + * @copydoc Model::New() */ static Dali::Scene3D::Model New(const std::string& modelUrl, const std::string& resourceDirectoryUrl); /** * @copydoc Model::GetModelRoot() */ - const Actor GetModelRoot() const; + const Scene3D::ModelNode GetModelRoot() const; + + /** + * @copydoc Model::AddModelNode() + */ + void AddModelNode(Scene3D::ModelNode modelNode); + + /** + * @copydoc Model::RemoveModelNode() + */ + void RemoveModelNode(Scene3D::ModelNode modelNode); /** * @copydoc Model::SetChildrenSensitive() @@ -86,11 +99,6 @@ public: void SetImageBasedLightSource(const std::string& diffuseUrl, const std::string& specularUrl, float scaleFactor); /** - * @copydoc Model::SetImageBasedLightTexture() - */ - void SetImageBasedLightTexture(Dali::Texture diffuseTexture, Dali::Texture specularTexture, float scaleFactor); - - /** * @copydoc Model::SetImageBasedLightScaleFactor() */ void SetImageBasedLightScaleFactor(float scaleFactor); @@ -115,9 +123,31 @@ public: */ Dali::Animation GetAnimation(const std::string& name) const; + /** + * @copydoc Model::GetCameraCount() + */ + uint32_t GetCameraCount() const; + + /** + * @copydoc Model::GenerateCamera() + */ + Dali::CameraActor GenerateCamera(uint32_t index) const; + + /** + * @copydoc Model::ApplyCamera() + */ + bool ApplyCamera(uint32_t index, Dali::CameraActor camera) const; + + /** + * @copydoc Model::FindChildModelNodeByName() + */ + Scene3D::ModelNode FindChildModelNodeByName(std::string_view nodeName); + protected: /** * @brief Constructs a new Model. + * @param[in] modelUrl model file path.(e.g., glTF, and DLI). + * @param[in] resourceDirectoryUrl resource file path that includes binary, image etc. */ Model(const std::string& modelUrl, const std::string& resourceDirectoryUrl); @@ -143,6 +173,11 @@ private: void OnSceneDisconnection() override; /** + * @copydoc CustomActorImpl::OnSizeSet( const Vector3& size ) + */ + void OnSizeSet(const Vector3& size) override; + + /** * @copydoc Toolkit::Control::GetNaturalSize */ Vector3 GetNaturalSize() override; @@ -167,10 +202,16 @@ private: */ bool IsResourceReady() const override; +private: + /** + * @brief Create Model Root of this Model class. + */ + void CreateModelRoot(); + /** * @brief Scales the model to fit the control or to return to original size. */ - void ScaleModel(); + void ScaleModel(bool useCurrentSize); /** * @brief Changes model anchor point to set the model at center or returns to the original model pivot. @@ -180,7 +221,12 @@ private: /** * @brief Changes IBL information of the input node. */ - void CollectRenderableActor(Actor actor); + void UpdateImageBasedLightTextureRecursively(Scene3D::ModelNode node, Dali::Texture diffuseTexture, Dali::Texture specularTexture, float iblScaleFactor, uint32_t specularMipmapLevels); + + /** + * @brief Changes IBL factor of the input node. + */ + void UpdateImageBasedLightScaleFactorRecursively(Scene3D::ModelNode node, float iblScaleFactor); /** * @brief Changes IBL textures of the input node. @@ -192,11 +238,20 @@ private: */ void UpdateImageBasedLightScaleFactor(); + /** + * @brief Apply self transform into inputed camera. + * Inputed camera must be configured by CameraParameter. Mean, inputed camera coordinate depend on Model. + * After this API finished, CameraActor coordinate system converted as DALi coordinate system. + * + * @param[in,out] camera CameraActor who need to apply model itself's transform + */ + void ApplyCameraTransform(Dali::CameraActor camera) const; + public: // Overrides ImageBasedLightObserver Methods. /** * @copydoc Dali::Scene3D::Internal::ImageBasedLightObserver::NotifyImageBasedLightTexture() */ - void NotifyImageBasedLightTexture(Dali::Texture diffuseTexture, Dali::Texture specularTexture, float scaleFactor) override; + void NotifyImageBasedLightTexture(Dali::Texture diffuseTexture, Dali::Texture specularTexture, float scaleFactor, uint32_t specularMipmapLevels) override; /** * @copydoc Dali::Scene3D::Internal::ImageBasedLightObserver::NotifyImageBasedLightScaleFactor() @@ -225,17 +280,48 @@ private: void OnIblLoadComplete(); /** + * @brief Update model root scale when Model size property is updated. + */ + void OnSizeNotification(Dali::PropertyNotification& source); + + /** * @brief Reset Resource loading tasks. */ void ResetResourceTasks(); + /** + * @brief Reset a Resource loading task. + */ + void ResetResourceTask(IntrusivePtr asyncTask); + + /** + * @brief Notify Resource Ready signal. + */ + void NotifyResourceReady(); + + /** + * @brief Create Model from loaded SceneDefinition. + */ + void CreateModel(); + + /** + * @brief Create Dali::Animation from loaded AnimationDefinitions. + */ + void CreateAnimations(Dali::Scene3D::Loader::SceneDefinition& scene); + + /** + * @brief Reset CameraData from loaded CameraParameters. + */ + void ResetCameraParameters(); + private: std::string mModelUrl; std::string mResourceDirectoryUrl; - Dali::Actor mModelRoot; + Scene3D::ModelNode mModelRoot; std::vector mAnimations; - std::vector> mRenderableActors; + std::vector mCameraParameters; WeakHandle mParentSceneView; + Dali::PropertyNotification mSizeNotification; // Asynchronous loading variable ModelLoadTaskPtr mModelLoadTask; @@ -245,7 +331,6 @@ private: std::string mDiffuseIblUrl; std::string mSpecularIblUrl; - // TODO: This default texture can be removed after 3D Resource Cache is added. Dali::Texture mDefaultSpecularTexture; Dali::Texture mDefaultDiffuseTexture; Dali::Texture mSceneSpecularTexture; @@ -256,6 +341,8 @@ private: Vector3 mModelPivot; float mSceneIblScaleFactor; float mIblScaleFactor; + uint32_t mSceneSpecularMipmapLevels; + uint32_t mSpecularMipmapLevels; bool mModelChildrenSensitive; bool mModelChildrenFocusable; bool mModelResourceReady;