X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-scene3d%2Finternal%2Fcontrols%2Fscene-view%2Fscene-view-impl.cpp;h=f0afd0d65d57963a50f90a7bfd64f39214d20ccd;hb=refs%2Fchanges%2F01%2F281201%2F8;hp=b230f86d4390f737312664d948cdf9fa44949f4b;hpb=cdf5a545f4fd5e06ca9b511cacd0079e0fd98dd4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp b/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp index b230f86..f0afd0d 100644 --- a/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp +++ b/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp @@ -118,17 +118,17 @@ void SceneView::RemoveCamera(CameraActor camera) } } -uint32_t SceneView::GetCameraCount() +uint32_t SceneView::GetCameraCount() const { return mCameras.size(); } -CameraActor SceneView::GetSelectedCamera() +CameraActor SceneView::GetSelectedCamera() const { return mSelectedCamera; } -CameraActor SceneView::GetCamera(uint32_t index) +CameraActor SceneView::GetCamera(uint32_t index) const { if(index < mCameras.size()) { @@ -138,7 +138,7 @@ CameraActor SceneView::GetCamera(uint32_t index) return CameraActor(); } -CameraActor SceneView::GetCamera(const std::string& name) +CameraActor SceneView::GetCamera(const std::string& name) const { CameraActor returnCamera; for(auto&& camera : mCameras) @@ -188,6 +188,7 @@ void SceneView::UnregisterModelView(Scene3D::ModelView modelView) void SceneView::SetImageBasedLightSource(const std::string& diffuse, const std::string& specular, float scaleFactor) { + mIBLResourceReady = false; Texture diffuseTexture = Dali::Scene3D::Loader::LoadCubeMap(diffuse); if(diffuseTexture) { @@ -207,6 +208,25 @@ void SceneView::SetImageBasedLightSource(const std::string& diffuse, const std:: } } } + mIBLResourceReady = true; + Control::SetResourceReady(false); +} + +void SceneView::SetImageBasedLightScaleFactor(float scaleFactor) +{ + mIblScaleFactor = scaleFactor; + for(auto&& model : mModels) + { + if(model) + { + model.SetImageBasedLightScaleFactor(scaleFactor); + } + } +} + +float SceneView::GetImageBasedLightScaleFactor() const +{ + return mIblScaleFactor; } void SceneView::UseFramebuffer(bool useFramebuffer) @@ -218,7 +238,7 @@ void SceneView::UseFramebuffer(bool useFramebuffer) } } -bool SceneView::IsUsingFramebuffer() +bool SceneView::IsUsingFramebuffer() const { return mUseFrameBuffer; } @@ -305,6 +325,11 @@ void SceneView::OnRelayout(const Vector2& size, RelayoutContainer& container) UpdateRenderTask(); } +bool SceneView::IsResourceReady() const +{ + return mIBLResourceReady; +} + void SceneView::UpdateCamera(CameraActor camera) { if(camera)