From f13b921d1f759b7f9153c39c86cac091c4626b6e Mon Sep 17 00:00:00 2001 From: David Steele Date: Wed, 12 May 2021 11:38:15 +0100 Subject: [PATCH] Fixing bug in pbr demo ktx loader Change-Id: I6b7f482d45e9f45ad525fa524fd9f83d4bcc9b80 --- examples/rendering-basic-pbr/ktx-loader.cpp | 2 +- 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 9fc15c1..89734be 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 6b00413..85f63f8 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); -- 2.7.4