Fixing bug in pbr demo ktx loader 27/258227/1
authorDavid Steele <david.steele@samsung.com>
Wed, 12 May 2021 10:38:15 +0000 (11:38 +0100)
committerDavid Steele <david.steele@samsung.com>
Wed, 12 May 2021 10:38:15 +0000 (11:38 +0100)
Change-Id: I6b7f482d45e9f45ad525fa524fd9f83d4bcc9b80

examples/rendering-basic-pbr/ktx-loader.cpp
examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp

index 9fc15c1..89734be 100644 (file)
@@ -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
index 6b00413..85f63f8 100644 (file)
@@ -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);