Peter M. Groen / dali-demo

Commit 50c46006658a2ce15af301840b041320aa3585ce

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents bca10dc5 f13b921d

Merge "Fixing bug in pbr demo ktx loader" into devel/graphics

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
examples/rendering-basic-pbr/ktx-loader.cpp
  View file @50c4600
@@ -69,7 +69,7 @@ bool ConvertPixelFormat(const uint32_t ktxPixelFormat, Dali::Pixel::Format& form @@ -69,7 +69,7 @@ bool ConvertPixelFormat(const uint32_t ktxPixelFormat, Dali::Pixel::Format& form
69 } 69 }
70 case 0x8C3A: // GL_R11F_G11F_B10F 70 case 0x8C3A: // GL_R11F_G11F_B10F
71 { 71 {
72 - format = Dali::Pixel::RGB32F; 72 + format = Dali::Pixel::R11G11B10F;
73 break; 73 break;
74 } 74 }
75 case 0x8D7C: // GL_RGBA8UI 75 case 0x8D7C: // GL_RGBA8UI
examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp
  View file @50c4600
1 /* 1 /*
2 - * Copyright (c) 2020 Samsung Electronics Co., Ltd. 2 + * Copyright (c) 2021 Samsung Electronics Co., Ltd.
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
@@ -109,7 +109,7 @@ public: @@ -109,7 +109,7 @@ public:
109 mLabel = TextLabel::New("R:1 M:0"); 109 mLabel = TextLabel::New("R:1 M:0");
110 mLabel.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER); 110 mLabel.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_CENTER);
111 mLabel.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER); 111 mLabel.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_CENTER);
112 - mLabel.SetProperty(Actor::Property::SIZE, Vector2(window.GetSize().GetWidth() * 0.5f, window.GetSize().GetHeight() * 0.083f)); 112 + mLabel.SetProperty(Actor::Property::SIZE, Vector2(window.GetSize().GetWidth() * 0.75f, window.GetSize().GetHeight() * 0.083f));
113 mLabel.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER"); 113 mLabel.SetProperty(TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER");
114 mLabel.SetProperty(TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER"); 114 mLabel.SetProperty(TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER");
115 mLabel.SetProperty(TextLabel::Property::TEXT_COLOR, Color::WHITE); 115 mLabel.SetProperty(TextLabel::Property::TEXT_COLOR, Color::WHITE);