alysbrooks-public » games » isometric-park-fna

Commit r255:1dee8fe1e4ad public

parent | child
Description:
Associate images with companies.
Commit status:
[Not Reviewed]
References:
m3-contracts
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r255:1dee8fe1e4ad -

Show file before | Show file after | Show commentsHide comments
@@ -40,6 +40,7
40 var related_organization = GetComponent<RelatedOrganizationComponent>(entity).Entity;
40 var related_organization = GetComponent<RelatedOrganizationComponent>(entity).Entity;
41
41
42 name = GetComponent<NameComponent>(related_organization).DisplayName;
42 name = GetComponent<NameComponent>(related_organization).DisplayName;
43 image_index = GetComponent<ImageComponent>(related_organization).ImageIndex;
43 }
44 }
44
45
45 return (entity, name, status, amount, tree_delta, image_index);
46 return (entity, name, status, amount, tree_delta, image_index);
Show file before | Show file after | Show commentsHide comments
@@ -47,7 +47,7
47 StyleSet.pushStyleVarSet(StyleSet.defaultWindowVars);
47 StyleSet.pushStyleVarSet(StyleSet.defaultWindowVars);
48 StyleSet.pushColorSet(StyleSet.defaultWindowColors);
48 StyleSet.pushColorSet(StyleSet.defaultWindowColors);
49 ImGui.SetNextWindowSize(new Num.Vector2(320, 360));
49 ImGui.SetNextWindowSize(new Num.Vector2(320, 360));
50 ImGui.Begin(string.Format("Contract {0}", name), ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings);
50 ImGui.Begin(string.Format("Contract {0} ## {1}", name, entity.ID), ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings);
51
51
52 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
52 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
53
53
Show file before | Show file after | Show commentsHide comments
@@ -1,3 +1,4
1 using System;
1 using System.Collections.Generic;
2 using System.Collections.Generic;
2 using System.Linq;
3 using System.Linq;
3
4
@@ -40,7 +41,8
40 foreach (var contract in contracts.Where((contract) => ((!(new[] {ContractStatus.Expired, ContractStatus.Broken, ContractStatus.Rejected}.Contains(contract.status))
41 foreach (var contract in contracts.Where((contract) => ((!(new[] {ContractStatus.Expired, ContractStatus.Broken, ContractStatus.Rejected}.Contains(contract.status))
41 || ContractsWindow.show_all ))))
42 || ContractsWindow.show_all ))))
42 {
43 {
43 if (ImGui.Selectable(contract.name, ContractsWindow.selected.entity== contract.entity))
44 if (ImGui.Selectable(String.Format("{0}##{1}",contract.name, contract.entity.ID),
45 ContractsWindow.selected.entity == contract.entity))
44 {
46 {
45 ContractsWindow.selected.entity= contract.entity;
47 ContractsWindow.selected.entity= contract.entity;
46 // newSelected = contract.entity;
48 // newSelected = contract.entity;
You need to be logged in to leave comments. Login now