diff options
| author | Adeel Kazmi <adeel.kazmi@samsung.com> | 2021-05-14 16:42:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review> | 2021-05-14 16:42:36 +0000 |
| commit | 50c46006658a2ce15af301840b041320aa3585ce (patch) | |
| tree | 8a7457211d0cab41ae4a5c292b761a555f3173bf | |
| parent | bca10dc5a3559fe77e7432694ea0a55f111c198a (diff) | |
| parent | f13b921d1f759b7f9153c39c86cac091c4626b6e (diff) | |
| download | dali-demo-50c46006658a2ce15af301840b041320aa3585ce.tar.gz dali-demo-50c46006658a2ce15af301840b041320aa3585ce.tar.bz2 dali-demo-50c46006658a2ce15af301840b041320aa3585ce.zip | |
Merge "Fixing bug in pbr demo ktx loader" into devel/graphicsdevel/graphics
| -rw-r--r-- | examples/rendering-basic-pbr/ktx-loader.cpp | 2 | ||||
| -rw-r--r-- | examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/rendering-basic-pbr/ktx-loader.cpp b/examples/rendering-basic-pbr/ktx-loader.cpp index 9fc15c11..89734bee 100644 --- a/examples/rendering-basic-pbr/ktx-loader.cpp +++ b/examples/rendering-basic-pbr/ktx-loader.cpp @@ -69,7 +69,7 @@ bool ConvertPixelFormat(const uint32_t ktxPixelFormat, Dali::Pixel::Format& form } case 0x8C3A: // GL_R11F_G11F_B10F { - format = Dali::Pixel::RGB32F; + format = Dali::Pixel::R11G11B10F; break; } case 0x8D7C: // GL_RGBA8UI diff --git a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp index 6b00413d..85f63f86 100644 --- a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp +++ b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -109,7 +109,7 @@ public: mLabel = TextLabel::New("R:1 M:0"); mLabel.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER); mLabel.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER); - mLabel.SetProperty(Actor::Property::SIZE, Vector2(window.GetSize().GetWidth() * 0.5f, window.GetSize().GetHeight() * 0.083f)); + mLabel.SetProperty(Actor::Property::SIZE, Vector2(window.GetSize().GetWidth() * 0.75f, window.GetSize().GetHeight() * 0.083f)); mLabel.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER"); mLabel.SetProperty(TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER"); mLabel.SetProperty(TextLabel::Property::TEXT_COLOR, Color::WHITE); |