alysbrooks-public/games/isometric-park-fna Commit - r423:ef53046b3561

alysbrooks-public » games » isometric-park-fna

Commit `r423:ef53046b3561` public

parent | child

Description:

Add image to dialog window (DialogInterface).

Commit status:

[Not Reviewed]

References:

m5-events

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r423:ef53046b3561 - Sun, 03 Oct 2021 18:30:38

isometric-park-fna/Engines/ImGuiWindowBridgeEngine.cs ¶ 0 -5

              			}
              			foreach(var entity in ReadEntities<WindowTypeComponent>())
              			{
              				var type = GetComponent<WindowTypeComponent>(entity).type;
              				}
              			}
              			this.messages.Clear();
              			this.typeMessages.Clear();
              			this.contractStatusMessages.Clear();

isometric-park-fna/Engines/UIEngine.cs ¶ +1 -1

                                  if (EntityExists(windowMessage.Entity) && entity.ID == windowMessage.Entity.ID)
                                  {
                                      var visibilityComponent = GetComponent<VisibilityComponent>(entity);
-                                     AddComponent(entity, new VisibilityComponent { visible = !visibilityComponent.visible });
+                                     SetComponent(entity, new VisibilityComponent { visible = !visibilityComponent.visible });
                                  }
                              }

isometric-park-fna/FNAGame.cs ¶ +5 0

                  private DebugWindow debugWindow;
                  public ImGuiImageMap imageMap;
+                 public ImGuiImageMap portraitsMap;
                  public bool show_another_window;
                      var imageMapTexture = Content.Load<Texture2D>(@"photos_converted3");
                      this.imageMap = new ImGuiImageMap(500, 400, imageMapTexture, _imGuiRenderer);
+                     var portraitMapTexture = Content.Load<Texture2D>(@"portraits");
+                     this.portraitsMap = new ImGuiImageMap(500, 400, portraitMapTexture, _imGuiRenderer);
                      Line.initialize(GraphicsDevice);
                      Quad.Initialize(GraphicsDevice, texture);
                      Logging.Success("Initialized Quad texture.");
                      ContractWindow.LoadContent(this._imGuiRenderer, this.imageMap);
+                     DialogInterface.LoadContent(this._imGuiRenderer, this.portraitsMap);
                      //Must be done before SetFontMessage is sent
                      var bakedMono = TtfFontBaker.Bake(File.OpenRead(@"Content/iosevka-term-extendedmedium.ttf"),

isometric-park-fna/ImGuiImageMap.cs ¶ +4 -1

              using System;
+             using System.Diagnostics;
              using Num = System.Numerics;
              using Microsoft.Xna.Framework;
                      public ImGuiImageMap(int tileWidth, int tileHeight, Texture2D ImageMapTexture, ImGuiRenderer renderer) : base(tileWidth, tileHeight, ImageMapTexture)
                      {
-                         this.ImGuiTexture = renderer.BindTexture(this.ImageMapTexture);
+                         Logging.Info("Constructed ImGuiImageMap.");
+                         this.ImGuiTexture = renderer.BindTexture(ImageMapTexture);
+                         Debug.Assert(this.ImGuiTexture != null);
                      }
                  }
              }

isometric-park-fna/ImageMap.cs ¶ +6 -1

+             using System.Diagnostics;
              using Num = System.Numerics;
              using Microsoft.Xna.Framework;
                      {
              		this.TileHeight = tileHeight;
              		this.TileWidth = tileWidth;
+                     this.ImageMapTexture = ImageMapTexture;
+                     Debug.Assert(ImageMapTexture != null);
+                     Debug.Assert(tileHeight != null);
+                     Debug.Assert(tileWidth != null);
+                     Logging.Info("Constructed ImageMap.");
                      }
                      public Rectangle GetSourceRectangle(int tileIndex)

isometric-park-fna/UI/Dialog.cs ¶ +21 0

              using System.Linq;
              using System.Collections.Generic;
              using ImGuiNET;
+             using ImGuiNET.SampleProgram.XNA;
              using isometricparkfna.Utils;
              using TraceryNet;
              using Num = System.Numerics;
                  {
              	public static bool hadFocus = false;
+                     public static ImGuiImageMap map;
+                     private static IntPtr _imGuiTexture;
+                     public static void LoadContent(ImGuiRenderer _imGuiRenderer,
+                                     ImGuiImageMap map)
+                     {
+                             DialogInterface.map = map;
+                             var _xnaTexture = map.ImageMapTexture;
+                             DialogInterface._imGuiTexture = _imGuiRenderer.BindTexture(_xnaTexture);
+                     }
                      public static void RenderDialog(Entity entity,
                                      ImGuiWindowBridgeEngine bridgeEngine, ref bool show, ref bool paused, ImFontPtr font, DialogComponent dialogComponent)
                      {
                                              }
                                              DialogInterface.hadFocus = ImGui.IsWindowFocused();
+                                             ImGui.Columns(2);
+                                             Widgets.MapImage(DialogInterface.map, new Num.Vector2(150, 100), 1);
+                                             ImGui.NextColumn();
              				if (dialogComponent.CurrentDialog != null)
                              {
              					ImGui.TextWrapped(messageText);
              				}
+                                             ImGui.Columns(1);
              				if ((dialogComponent.Options != null) && dialogComponent.Options.Count > 0)
              				{
                                                      for(int i = 0; i < dialogComponent.Options.Count; i++)

isometric-park-fna/isometric-park-fna.csproj ¶ +3 0

                  <None Include="Content\solid_tileset.png">
                    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
                  </None>
+                 <None Include="Content\portraits.png">
+                   <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+                 </None>
                  <None Include="Content\iosevka-medium.ttf">
                    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
                  </None>

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r423:ef53046b3561 - Sun, 03 Oct 2021 18:30:38

Sign in to your account

Commit r423:ef53046b3561 public

Author

r423:ef53046b3561 - Sun, 03 Oct 2021 18:30:38

Commit `r423:ef53046b3561` public