Made fantasy intro possible on full screen

Pyrdacor · Mar 6, 2023 · 7d27079 · 7d27079
1 parent 2335c15
commit 7d27079
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,9 @@ obj
 /Ambermoon.net/Saves
 /Ambermoon.net/Screenshots
 /Ambermoon.net/music
+*.cache
+/Ambermoon.net/error.txt
+/Ambermoon.net/diffs.dat
+/Ambermoon.net/ambermoon.cfg
+/publish-win64
+/ambermoon.cfg
diff --git a/Ambermoon.net/FantasyIntro.cs b/Ambermoon.net/FantasyIntro.cs
@@ -3,6 +3,7 @@
 using Ambermoon.Render;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 
 namespace Ambermoon
@@ -15,6 +16,8 @@ internal class FantasyIntro
         readonly IRenderLayer renderLayer;
         readonly IRenderLayer colorLayer;
         readonly Queue<FantasyIntroAction> actions = null;
+        readonly ILayerSprite backgroundLeftBorder;
+        readonly ILayerSprite backgroundRightBorder;
         readonly ILayerSprite background;
         readonly ILayerSprite fairy;
         readonly ILayerSprite writing;
@@ -30,13 +33,32 @@ internal class FantasyIntro
         long lastFrame = -1;
         bool playFairyAnimation = false;
         uint fairyAnimationIndex = 0;
+        static uint borderTextureIndexOffset = 0;
 
         static void EnsureTextures(IRenderView renderView, IFantasyIntroData fantasyIntroData)
         {
             if (textureAtlas == null)
             {
                 TextureAtlasManager.Instance.AddFromGraphics(Layer.FantasyIntroGraphics,
                     fantasyIntroData.Graphics.ToDictionary(g => (uint)g.Key, g => g.Value));
+                var borders256 = new DataReader(Resources.Borders256);
+                borderTextureIndexOffset = (uint)fantasyIntroData.Graphics.Keys.Max() + 1;
+                var borderGraphicInfo = new GraphicInfo
+                {
+                    Width = 45,
+                    Height = 256,
+                    GraphicFormat = GraphicFormat.Palette5Bit,
+                    Alpha = false
+                };
+                var graphicReader = new GraphicReader();
+                Graphic LoadBorder()
+                {
+                    var border = new Graphic();
+                    graphicReader.ReadGraphic(border, borders256, borderGraphicInfo);
+                    return border;
+                }
+                TextureAtlasManager.Instance.AddFromGraphics(Layer.FantasyIntroGraphics,
+                    Enumerable.Range(0, 2).ToDictionary(i => (uint)(borderTextureIndexOffset + i), _ => LoadBorder()));
                 textureAtlas = TextureAtlasManager.Instance.GetOrCreate(Layer.FantasyIntroGraphics);
                 renderView.GetLayer(Layer.FantasyIntroGraphics).Texture = textureAtlas.Texture;
             }
@@ -52,6 +74,24 @@ public FantasyIntro(IRenderView renderView, IFantasyIntroData fantasyIntroData,
 
             EnsureTextures(renderView, fantasyIntroData);
 
+            backgroundLeftBorder = renderView.SpriteFactory.Create(45, 256, true, 1) as ILayerSprite;
+            backgroundLeftBorder.Layer = renderLayer;
+            backgroundLeftBorder.PaletteIndex = GetPaletteIndex(FantasyIntroGraphic.Background);
+            backgroundLeftBorder.TextureAtlasOffset = textureAtlas.GetOffset(borderTextureIndexOffset);
+            backgroundLeftBorder.X = -45;
+            backgroundLeftBorder.Y = 0;
+            backgroundLeftBorder.ClipArea = new Rect(-45, 0, 366, 256);
+            backgroundLeftBorder.Visible = false;
+
+            backgroundRightBorder = renderView.SpriteFactory.Create(45, 256, true, 1) as ILayerSprite;
+            backgroundRightBorder.Layer = renderLayer;
+            backgroundRightBorder.PaletteIndex = GetPaletteIndex(FantasyIntroGraphic.Background);
+            backgroundRightBorder.TextureAtlasOffset = textureAtlas.GetOffset(borderTextureIndexOffset + 1);
+            backgroundRightBorder.X = 320;
+            backgroundRightBorder.Y = 0;
+            backgroundRightBorder.ClipArea = new Rect(-45, 0, 366, 256);
+            backgroundRightBorder.Visible = false;
+
             background = renderView.SpriteFactory.Create(320, 256, true, 1) as ILayerSprite;
             background.Layer = renderLayer;
             background.PaletteIndex = GetPaletteIndex(FantasyIntroGraphic.Background);
@@ -213,7 +253,8 @@ public void Update(double deltaTime)
             if (time == 0)
             {
                 Active = true;
-
+                backgroundLeftBorder.Visible = true;
+                backgroundRightBorder.Visible = true;
                 background.Visible = true;
             }
 
@@ -328,6 +369,8 @@ public void Abort()
         private void Destroy()
         {
             Active = false;
+            backgroundLeftBorder?.Delete();
+            backgroundRightBorder?.Delete();
             background?.Delete();
             fairy?.Delete();
             writing?.Delete();

diff --git a/Ambermoon.net/Resources.Designer.cs b/Ambermoon.net/Resources.Designer.cs
diff --git a/Ambermoon.net/Resources.resx b/Ambermoon.net/Resources.resx
@@ -121,6 +121,9 @@
   <data name="advanced" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\advanced.pyr;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="borders256" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>Resources\borders256.pyr;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="IntroFont" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\IntroFont.dat;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>

diff --git a/Ambermoon.net/Resources/AppIcon.png b/Ambermoon.net/Resources/AppIcon.png
diff --git a/Ambermoon.net/Resources/borders256.pyr b/Ambermoon.net/Resources/borders256.pyr
diff --git a/NewVersion.bat b/NewVersion.bat
@@ -0,0 +1,3 @@
+git add -u
+git commit -m "This is v%1"
+git tag -a v%1 -m "Version %1"