Browse Source

Squashed commit of the following:

commit 06f4d6afab933e32eaf3428dd080766b11a87f82
Author: Lasse Öörni <[email protected]>
Date:   Sun Dec 18 18:31:39 2016 +0200

    Black variant of logo.

commit 8fa11f888de023fcc76f26908e2ea77ebfd3146b
Author: Lasse Öörni <[email protected]>
Date:   Sun Dec 18 17:12:14 2016 +0200

    New logo in Lua samples.

commit 1283e38db1164a1c1e5db7d1042feabf996031fb
Merge: 4062553 4f5a2ea
Author: Lasse Öörni <[email protected]>
Date:   Sun Dec 18 16:51:04 2016 +0200

    Merge remote-tracking branch 'Modanung/new-logo'

commit 4f5a2ea104feeac12b87d3fb89d116e1866c2513
Author: Modanung <[email protected]>
Date:   Sun Dec 18 05:36:37 2016 +0100

    Also replaced logo in angelscript samples

commit 7c6e5e90c4dc82705883806e46b0957a44fbc787
Author: Modanung <[email protected]>
Date:   Sun Dec 18 03:34:31 2016 +0100

    Changed logo in samples to fishbone logo
Lasse Öörni 9 years ago
parent
commit
fef73ba4c4

+ 4 - 4
Source/Samples/Sample.inl

@@ -157,7 +157,7 @@ void Sample::CreateLogo()
 {
     // Get logo texture
     ResourceCache* cache = GetSubsystem<ResourceCache>();
-    Texture2D* logoTexture = cache->GetResource<Texture2D>("Textures/LogoLarge.png");
+    Texture2D* logoTexture = cache->GetResource<Texture2D>("Textures/FishBoneLogo.png");
     if (!logoTexture)
         return;
 
@@ -178,13 +178,13 @@ void Sample::CreateLogo()
     logoSprite_->SetSize(textureWidth, textureHeight);
 
     // Set logo sprite hot spot
-    logoSprite_->SetHotSpot(0, textureHeight);
+    logoSprite_->SetHotSpot(textureWidth, textureHeight);
 
     // Set logo sprite alignment
-    logoSprite_->SetAlignment(HA_LEFT, VA_BOTTOM);
+    logoSprite_->SetAlignment(HA_RIGHT, VA_BOTTOM);
 
     // Make logo not fully opaque to show the scene underneath
-    logoSprite_->SetOpacity(0.75f);
+    logoSprite_->SetOpacity(0.9f);
 
     // Set a low priority for the logo so that other UI elements can be drawn on top
     logoSprite_->SetPriority(-100);

+ 4 - 4
bin/Data/LuaScripts/Utilities/Sample.lua

@@ -89,7 +89,7 @@ end
 
 function CreateLogo()
     -- Get logo texture
-    local logoTexture = cache:GetResource("Texture2D", "Textures/LogoLarge.png")
+    local logoTexture = cache:GetResource("Texture2D", "Textures/FishBoneLogo.png")
     if logoTexture == nil then
         return
     end
@@ -110,13 +110,13 @@ function CreateLogo()
     logoSprite:SetSize(textureWidth, textureHeight)
 
     -- Set logo sprite hot spot
-    logoSprite.hotSpot = IntVector2(0, textureHeight)
+    logoSprite.hotSpot = IntVector2(textureWidth, textureHeight)
 
     -- Set logo sprite alignment
-    logoSprite:SetAlignment(HA_LEFT, VA_BOTTOM);
+    logoSprite:SetAlignment(HA_RIGHT, VA_BOTTOM);
 
     -- Make logo not fully opaque to show the scene underneath
-    logoSprite.opacity = 0.75
+    logoSprite.opacity = 0.9
 
     -- Set a low priority for the logo so that other UI elements can be drawn on top
     logoSprite.priority = -100

+ 4 - 4
bin/Data/Scripts/Utilities/Sample.as

@@ -97,7 +97,7 @@ void SetLogoVisible(bool enable)
 void CreateLogo()
 {
     // Get logo texture
-    Texture2D@ logoTexture = cache.GetResource("Texture2D", "Textures/LogoLarge.png");
+    Texture2D@ logoTexture = cache.GetResource("Texture2D", "Textures/FishBoneLogo.png");
     if (logoTexture is null)
         return;
 
@@ -117,13 +117,13 @@ void CreateLogo()
     logoSprite.SetSize(textureWidth, textureHeight);
 
     // Set logo sprite hot spot
-    logoSprite.SetHotSpot(0, textureHeight);
+    logoSprite.SetHotSpot(textureWidth, textureHeight);
 
     // Set logo sprite alignment
-    logoSprite.SetAlignment(HA_LEFT, VA_BOTTOM);
+    logoSprite.SetAlignment(HA_RIGHT, VA_BOTTOM);
 
     // Make logo not fully opaque to show the scene underneath
-    logoSprite.opacity = 0.75f;
+    logoSprite.opacity = 0.9f;
 
     // Set a low priority for the logo so that other UI elements can be drawn on top
     logoSprite.priority = -100;

BIN
bin/Data/Textures/FishBoneLogo.png


+ 4 - 0
bin/Data/Textures/FishBoneLogo.xml

@@ -0,0 +1,4 @@
+<texture>
+    <quality low="0" />
+</texture>
+