alysbrooks-public/games/isometric-park-fna Commit - r256:9215a6f099ee

alysbrooks-public » games » isometric-park-fna

Commit `r256:9215a6f099ee` public

parent | child

Description:

Add description and italic font.

Commit status:

[Not Reviewed]

References:

m3-contracts

Diff options:

| |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r256:9215a6f099ee - Thu, 13 May 2021 03:30:42

isometric-park-fna/Content/iosevka-term-extendedmediumitalic.ttf ¶ created 755 binary 0 0

NO CONTENT: new file 100755, binary diff hidden

isometric-park-fna/Components/NameAndDescriptionCompontent.cs ⬅ ~~isometric-park-fna/Components/NameComponent.cs~~ ¶ renamed +4 -1

              using Encompass;
+             #nullable enable
              namespace isometricparkfna.Components
              {
-                 public struct NameComponent : IComponent
+                 public struct NameAndDescriptionComponent : IComponent
                  {
                      public string DisplayName;
+                     public string? Description;
                  }
              }
  No newline at end of file

isometric-park-fna/Engines/Spawners/ContractSpawner.cs ¶ +1 -1

                              // AddComponent
                              AddComponent(contract, new AreaComponent { squares = squares });
-                             AddComponent(contract, new NameComponent { DisplayName = this.grammar.Flatten(message.name) });
+                             AddComponent(contract, new NameAndDescriptionComponent { DisplayName = this.grammar.Flatten(message.name) });
                              AddComponent(contract, new SelectedComponent { selected = false });
                              AddComponent(contract, new ContractStatusComponent { status = ContractStatus.Proposed, date = this.simulation.DateTime });
                              AddComponent(contract, new TreeDeltaComponent { deltaTrees = deltaTrees });

isometric-park-fna/FNAGame.cs ¶ +3 -2

                      WorldBuilder.AddEngine(new OrganizationSpawner(this.simulation, this.grammar));
                      WorldBuilder.AddGeneralRenderer(new AreaRenderer(this.batch, this.monoFont), 1);
-                     WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(debugWindow.monoFont, this.imGuiWindowBridgeEngine), 2);
+                     WorldBuilder.AddGeneralRenderer(new ImGuiWindowRenderer(debugWindow.monoFont, debugWindow.italicFont, this.imGuiWindowBridgeEngine), 2);
                      var contractWindow = WorldBuilder.CreateEntity();
                      WorldBuilder.SetComponent(contractWindow, new VisibilityComponent { visible = false });
                      WorldBuilder.SetComponent(contractWindow, new WindowTypeComponent { type = isometricparkfna.Messages.Window.Contracts });
                      for (int i = 0; i < 10; i++)
                      {
-                         WorldBuilder.SendMessage(new SpawnOrganizationtMessage { offersContracts = true });
+                         WorldBuilder.SendMessage(new SpawnOrganizationtMessage { offersContracts = true,
+                         description = "Expert loggers since 1893." });
                      }
                      WorldBuilder.SendMessage(new SpawnContractMessage
                      {

isometric-park-fna/Renderers/ImGuiWindowRenderer.cs ¶ +12 -7

              	public class ImGuiWindowRenderer : GeneralRenderer
                  {
                      private ImFontPtr font;
+                     private ImFontPtr italicFont;
                      private ImGuiWindowBridgeEngine BridgeEngine;
-             		public ImGuiWindowRenderer(ImFontPtr font, ImGuiWindowBridgeEngine engine)
+             		public ImGuiWindowRenderer(ImFontPtr font, ImFontPtr italicFont, ImGuiWindowBridgeEngine engine)
              		{
              			this.font = font;
+                         this.italicFont = italicFont;
                          this.BridgeEngine = engine;
              		}
-                     private (Entity entity, string name, ContractStatus status, decimal amount, string delta_trees, int image_index)
+                     private (Entity entity, string name, string description, ContractStatus status, decimal amount, string delta_trees, int image_index)
                      getContractDetails(Entity entity) {
-                         var name = GetComponent<NameComponent>(entity).DisplayName;
+                         var name = GetComponent<NameAndDescriptionComponent>(entity).DisplayName;
                          var status = GetComponent<ContractStatusComponent>(entity).status;
                          var amount = GetComponent<BudgetLineComponent>(entity).amount;
                          var tree_delta = GetComponent<TreeDeltaComponent>(entity).deltaTreesName;
                          var image_index = GetComponent<ImageComponent>(entity).ImageIndex;
+                         var description = "";
                          if (HasComponent<RelatedOrganizationComponent>(entity))
                          {
                          var related_organization = GetComponent<RelatedOrganizationComponent>(entity).Entity;
-                             name = GetComponent<NameComponent>(related_organization).DisplayName;
+                             var name_component = GetComponent<NameAndDescriptionComponent>(related_organization);
+                             name = name_component.DisplayName;
+                             description = name_component.Description;
                              image_index = GetComponent<ImageComponent>(related_organization).ImageIndex;
                          }
-                         return (entity, name, status, amount, tree_delta, image_index);
+                         return (entity, name, description, status, amount, tree_delta, image_index);
                      }
                                      case Window.Contracts:
                                          var contracts = ReadEntities<AreaComponent>();
-                                         var contract_data = new List<(Entity, string, ContractStatus, decimal, string, int)>();
+                                         var contract_data = new List<(Entity, string, string, ContractStatus, decimal, string, int)>();
                                          foreach(var e in contracts)
                                          {
                                          var data = getContractDetails(entity);
-                                         ContractWindow.Render(this.font, this.BridgeEngine, entity, data.name, data.status, data.amount, data.delta_trees, data.image_index);
+                                         ContractWindow.Render(this.font, this.italicFont, this.BridgeEngine, entity, data.name, data.description, data.status, data.amount, data.delta_trees, data.image_index);
                                          //Logging.Trace(string.Format("Rendering Contract Window for {0}", data.name));

isometric-park-fna/UI/ContractWindow.cs ¶ +5 -1

                      }
-                     public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine engine, Entity entity, string name, ContractStatus status, decimal amount, string delta_trees, int imageIndex)
+                     public static void Render(ImFontPtr font, ImFontPtr italicFont, ImGuiWindowBridgeEngine engine, Entity entity, string name, string description, ContractStatus status, decimal amount, string delta_trees, int imageIndex)
                      {
                          bool newShow = true;
                              ImGui.Image(_imGuiTexture, new Num.Vector2(250, 200), map.GetSourceUVStart(imageIndex), map.GetSourceUVEnd(imageIndex), Num.Vector4.One, Num.Vector4.Zero); // Here, the previously loaded texture is used
+                             ImGui.PushFont(italicFont);
+                             ImGui.Text(description);
+                             ImGui.PopFont();
                              ImGui.Separator();
                              switch (status)
                              {

isometric-park-fna/UI/ContractsWindow.cs ¶ +2 -2

                  {
                      public static bool show_all;
-                     private static (Entity entity, string name, ContractStatus status, decimal amount, string delta_trees, int image_index) selected;
+                     private static (Entity entity, string name, string description, ContractStatus status, decimal amount, string delta_trees, int image_index) selected;
                      public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine engine,
-             List<(Entity entity, string name, ContractStatus status, decimal amount, string delta_trees, int image_index)> contracts)
+             List<(Entity entity, string name, string description, ContractStatus status, decimal amount, string delta_trees, int image_index)> contracts)
                      {
                          bool newShow = true;

isometric-park-fna/UI/DebugWindow.cs ¶ +2 0

                      private bool show_test_window;
                      public ImFontPtr monoFont;
+                     public ImFontPtr italicFont;
              	public ImageMap map;
              #endif
                          this.monoFont = io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmedium.ttf", 15);
+                         this.italicFont = io.Fonts.AddFontFromFileTTF(@"Content/iosevka-term-extendedmediumitalic.ttf", 15);
                          unsafe //god this sucks
                          {
                              ImFontConfigPtr config = ImGuiNative.ImFontConfig_ImFontConfig();

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

                  <None Include="Content\iosevka-term-extendedmedium.ttf">
                    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
                  </None>
+                 <None Include="Content\iosevka-term-extendedmediumitalic.ttf">
+                   <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+                 </None>
                  <None Include="Content\iosevka-term-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

r256:9215a6f099ee - Thu, 13 May 2021 03:30:42

Sign in to your account

Commit r256:9215a6f099ee public

Author

r256:9215a6f099ee - Thu, 13 May 2021 03:30:42

Commit `r256:9215a6f099ee` public