Simplify check for identical shaders

Previously when checking if two SPIR-V shaders are identical the hashs of their file content would be compared and afterwards their (unhashed) file contents as well. Comparing the file contents isn't necessary, as the hash function used is a cryptographic one, which guarantees the hash can be used as a representative of the hashed data.
Increase height of middle panel to prevent icon overflow
2024-09-21 20:39:59 +02:00 · 2024-09-18 13:38:05 +02:00 · 2024-09-18 06:46:51 +02:00 · 2024-09-18 06:46:51 +02:00
10 changed files with 63 additions and 55 deletions
--- a/binaries/data/mods/public/gui/common/tooltips.js
+++ b/binaries/data/mods/public/gui/common/tooltips.js
@ -1219,16 +1219,28 @@ function getResourceDropsiteTooltip(template)
 	});
 }

-function showTemplateViewerOnRightClickTooltip()
+function getFocusOnLeftClickTooltip()
 {
-	// Translation: Appears in a tooltip to indicate that right-clicking the corresponding GUI element will open the Template Details GUI page.
-	return translate("Right-click to view more information.");
+	// Translation: Appears in a tooltip to indicate that left-clicking the corresponding GUI element will center the view on the selected entity.
+	return translate("Left-click to focus.");
 }

-function showTemplateViewerOnClickTooltip()
+function getFollowOnLeftClickTooltip()
+{
+	// Translation: Appears in a tooltip to indicate that left-clicking the corresponding GUI element will make the camera follow the selected unit.
+	return translate("Left-click to follow.");
+}
+
+function getTemplateViewerOnRightClickTooltip()
+{
+	// Translation: Appears in a tooltip to indicate that right-clicking the corresponding GUI element will open the Template Details GUI page.
+	return translate("Right-click for more information.");
+}
+
+function getTemplateViewerOnClickTooltip()
 {
 	// Translation: Appears in a tooltip to indicate that clicking the corresponding GUI element will open the Template Details GUI page.
-	return translate("Click to view more information.");
+	return translate("Click for more information.");
 }

 /**
--- a/binaries/data/mods/public/gui/reference/structree/Boxes/EntityBox.js
+++ b/binaries/data/mods/public/gui/reference/structree/Boxes/EntityBox.js
@ -45,7 +45,7 @@ class EntityBox

 	static compileTooltip(template)
 	{
-		return ReferencePage.buildText(template, this.prototype.TooltipFunctions) + "\n" + showTemplateViewerOnClickTooltip();
+		return ReferencePage.buildText(template, this.prototype.TooltipFunctions) + "\n" + getTemplateViewerOnClickTooltip();
 	}

 	/**
--- a/binaries/data/mods/public/gui/session/minimap/MiniMap.xml
+++ b/binaries/data/mods/public/gui/session/minimap/MiniMap.xml
@ -16,7 +16,7 @@
 	<!-- Background circle -->
 	<object
 		type="image"
-		size="4 4 100%-4 100%-4"
+		size="4 6 100%-4 100%-6"
 		sprite="stretched:session/minimap_circle_modern.png"
 		ghost="true"
 	/>
@ -24,7 +24,7 @@
 	<!-- Idle Worker Button -->
 	<object name="idleWorkerButton"
 		type="button"
-		size="100%-119 100%-120 100%-4 100%-5"
+		size="100%-119 100%-121 100%-4 100%-6"
 		tooltip_style="sessionToolTip"
 		hotkey="selection.idleworker"
 		sprite="stretched:session/minimap-idle.png"
@ -45,7 +45,7 @@
 	<!-- Diplomacy Colors Button -->
 	<object name="diplomacyColorsButton"
 		type="button"
-		size="4 100%-120 119 100%-5"
+		size="3 100%-121 118 100%-6"
 		tooltip_style="sessionToolTip"
 		hotkey="session.diplomacycolors"
 	/>
@ -54,7 +54,7 @@
 	<object
 		name="flareButton"
 		type="button"
-		size="3 3 118 118"
+		size="2 4 117 119"
 		tooltip_style="sessionToolTip"
 		hotkey="session.flareactivate"
 		sprite="stretched:session/minimap-flare.png"
@ -66,7 +66,7 @@
 	<!-- MiniMap -->
 	<object
 		name="minimap"
-		size="8 8 100%-8 100%-8"
+		size="8 10 100%-8 100%-10"
 		type="minimap"
 		mask="true"
 		flare_texture_count="16"
--- a/binaries/data/mods/public/gui/session/selection.js
+++ b/binaries/data/mods/public/gui/session/selection.js
@ -479,8 +479,8 @@ EntitySelection.prototype.selectAndMoveTo = function(entityID)
 	this.reset();
 	this.addList([entityID]);

-	Engine.CameraMoveTo(entState.position.x, entState.position.z);
-}
+	setCameraFollow(entityID);
+};

 /**
 * Adds the formation members of a selected entities to the selection.
--- a/binaries/data/mods/public/gui/session/selection_details.js
+++ b/binaries/data/mods/public/gui/session/selection_details.js
@ -324,9 +324,17 @@ function displaySingle(entState)
 	// TODO: we should require all entities to have icons
 	Engine.GetGUIObjectByName("icon").sprite = template.icon ? ("stretched:session/portraits/" + template.icon) : "BackgroundBlack";
 	if (template.icon)
-		Engine.GetGUIObjectByName("iconBorder").onPressRight = () => {
+	{
+		const iconBorder = Engine.GetGUIObjectByName("iconBorder");
+
+		iconBorder.onPress = () => {
+			setCameraFollow(entState.id);
+		};
+
+		iconBorder.onPressRight = () => {
 			showTemplateDetails(entState.template, playerState.civ);
 		};
+	}

 	let detailedTooltip = [
 		getAttackTooltip,
@ -357,10 +365,12 @@ function displaySingle(entState)
 		getVisibleEntityClassesFormatted,
 		getAurasTooltip,
 		getEntityTooltip,
-		getTreasureTooltip,
-		showTemplateViewerOnRightClickTooltip
+		getTreasureTooltip
 	].map(func => func(template)));

+	const leftClickTooltip = hasClass(entState, "Unit") ? getFollowOnLeftClickTooltip() : getFocusOnLeftClickTooltip();
+	iconTooltips.push(leftClickTooltip + " " + getTemplateViewerOnRightClickTooltip());
+
 	Engine.GetGUIObjectByName("iconBorder").tooltip = iconTooltips.filter(tip => tip).join("\n");

 	Engine.GetGUIObjectByName("detailsAreaSingle").hidden = false;
--- a/binaries/data/mods/public/gui/session/selection_panels.js
+++ b/binaries/data/mods/public/gui/session/selection_panels.js
@ -207,7 +207,7 @@ g_SelectionPanels.Construction = {
 			getGarrisonTooltip(template),
 			getTurretsTooltip(template),
 			getPopulationBonusTooltip(template),
-			showTemplateViewerOnRightClickTooltip(template)
+			getTemplateViewerOnRightClickTooltip(template)
 		);


@ -578,7 +578,7 @@ g_SelectionPanels.Queue = {
 				"neededSlots": queuedItem.neededSlots
 			}));
 		}
-		tooltips.push(showTemplateViewerOnRightClickTooltip(template));
+		tooltips.push(getTemplateViewerOnRightClickTooltip(template));
 		data.button.tooltip = tooltips.join("\n");

 		data.countDisplay.caption = queuedItem.count > 1 ? queuedItem.count : "";
@ -763,7 +763,7 @@ g_SelectionPanels.Research = {
 				getEntityNamesFormatted,
 				getEntityTooltip,
 				getEntityCostTooltip,
-				showTemplateViewerOnRightClickTooltip
+				getTemplateViewerOnRightClickTooltip
 			].map(func => func(template));

 			if (!requirementsPassed)
@ -1058,7 +1058,7 @@ g_SelectionPanels.Training = {
 				getResourceDropsiteTooltip
 			].map(func => func(template)));

-		tooltips.push(showTemplateViewerOnRightClickTooltip());
+		tooltips.push(getTemplateViewerOnRightClickTooltip());
 		tooltips.push(
 			formatBatchTrainingString(buildingsCountToTrainFullBatch, fullBatchSize, remainderBatch),
 			getRequirementsTooltip(requirementsMet, template.requirements, GetSimState().players[data.player].civ),
@ -1180,7 +1180,8 @@ g_SelectionPanels.Upgrade = {
 				formatMatchLimitString(limits.matchLimit, limits.matchCount, limits.type),
 				getRequirementsTooltip(requirementsMet, data.item.requirements, GetSimState().players[data.player].civ),
 				getNeededResourcesTooltip(neededResources),
-				showTemplateViewerOnRightClickTooltip());
+				getTemplateViewerOnRightClickTooltip()
+			);

 			tooltip = tooltips.filter(tip => tip).join("\n");

--- a/binaries/data/mods/public/gui/session/selection_panels_helpers.js
+++ b/binaries/data/mods/public/gui/session/selection_panels_helpers.js
@ -386,14 +386,16 @@ function cancelUpgradeEntity()
 }

 /**
- * Set the camera to follow the given entity if it's a unit.
- * Otherwise stop following.
+ * Focus the camera on the entity and follow if it's a unit.
+ * If that's not possible, stop any current follow.
 */
 function setCameraFollow(entity)
 {
-	let entState = entity && GetEntityState(entity);
+	const entState = entity && GetEntityState(entity);
 	if (entState && hasClass(entState, "Unit"))
 		Engine.CameraFollow(entity);
+	else if (entState?.position)
+		Engine.CameraMoveTo(entState.position.x, entState.position.z);
 	else
 		Engine.CameraFollow(0);
 }
--- a/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
+++ b/binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
@ -5,7 +5,7 @@
 >

 	<!-- Names and civilization emblem etc. (This must come before the attack and resistance icon to avoid clipping issues.) -->
-	<object size="0 92 100% 100%" name="statsArea" type="image" sprite="edgedPanelShader">
+	<object size="0 96 100% 100%" name="statsArea" type="image" sprite="edgedPanelShader">
 		<!-- Civilization tooltip. -->
 		<object size="0 38 100% 62" tooltip_style="sessionToolTip">
 			<!-- Civilization emblem. -->
@ -26,14 +26,14 @@
 	</object>

 	<!-- Stats Bars -->
-	<object size= "0 0 100% 96" type="image" tooltip_style="sessionToolTip">
+	<object size= "0 0 100% 100" type="image" tooltip_style="sessionToolTip">

-		<object size="0 0 100% 60" type="image" sprite="topEdgedPanelShader">
+		<object size="0 0 100% 65" type="image" sprite="topEdgedPanelShader">

 			<!-- Placeholders storing the position for the bars. -->
-			<object size="96 1 100% 24" name="sectionPosTop" hidden="true"/>
-			<object size="96 11 100% 34" name="sectionPosMiddle" hidden="true"/>
-			<object size="96 32 100% 55" name="sectionPosBottom" hidden="true"/>
+			<object size="96 2 100% 24" name="sectionPosTop" hidden="true"/>
+			<object size="96 12 100% 34" name="sectionPosMiddle" hidden="true"/>
+			<object size="96 35 100% 55" name="sectionPosBottom" hidden="true"/>

 			<!-- Capture bar -->
 			<object name="captureSection">
@ -78,15 +78,15 @@
 			</object>
 		</object>

-		<object size="0 59 100% 95" type="image" sprite="edgedPanelShader">
+		<object size="0 63 100% 98" type="image" sprite="edgedPanelShader">
 			<!-- Attack and Resistance -->
-			<object size="96 0 128 32" name="attackAndResistanceStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
+			<object size="97 0 129 32" name="attackAndResistanceStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
 				<translatableAttribute id="tooltip">Attack and Resistance</translatableAttribute>
 			</object>

 			<!-- Resource carrying icon/counter -->
 			<!-- Used also for number of gatherers/builders -->
-			<object size="100%-96 0 100%-36 32" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
+			<object size="100%-96 0 100%-33 32" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
 			<object size="100%-32 0 100% 32" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
 		</object>

--- a/binaries/data/mods/public/gui/session/session.xml
+++ b/binaries/data/mods/public/gui/session/session.xml
@ -79,7 +79,7 @@
 	<!-- Limit to the minimal supported width of 1024 pixels. -->
 	<object size="50%-512 0 50%+512 100%">

-		<object size="50%-512 100%-200 50%-312 100%">
+		<object size="50%-512 100%-204 50%-312 100%">
 			<include file="gui/session/minimap/MiniMap.xml"/>
 		</object>

@ -95,7 +95,7 @@

 		<!-- Selection Details Panel (middle). -->
 		<object name="selectionDetails"
-			size="50%-114 100%-200 50%+114 100%"
+			size="50%-114 100%-204 50%+114 100%"
 			sprite="selectionDetailsPanel"
 			type="image"
 		>
--- a/source/tools/spirv/compile.py
+++ b/source/tools/spirv/compile.py
@ -49,14 +49,6 @@ def calculate_hash(path):
        return hashlib.sha1(handle.read()).hexdigest()


-def compare_spirv(path1, path2):
-    with open(path1, "rb") as handle:
-        spirv1 = handle.read()
-    with open(path2, "rb") as handle:
-        spirv2 = handle.read()
-    return spirv1 == spirv2
-
-
 def resolve_if(defines, expression):
    for item in expression.strip().split("||"):
        item = item.strip()
@ -456,19 +448,10 @@ def build(rules, input_mod_path, output_mod_path, dependencies, program_name):

            spirv_hash = calculate_hash(output_spirv_path)
            if spirv_hash not in hashed_cache:
-                hashed_cache[spirv_hash] = [file_name]
+                hashed_cache[spirv_hash] = file_name
            else:
-                found_candidate = False
-                for candidate_name in hashed_cache[spirv_hash]:
-                    candidate_path = os.path.join(output_spirv_mod_path, candidate_name)
-                    if compare_spirv(output_spirv_path, candidate_path):
-                        found_candidate = True
-                        file_name = candidate_name
-                        break
-                if found_candidate:
-                    os.remove(output_spirv_path)
-                else:
-                    hashed_cache[spirv_hash].append(file_name)
+                file_name = hashed_cache[spirv_hash]
+                os.remove(output_spirv_path)

            shader_element = ET.SubElement(program_root, shader["type"])
            shader_element.set("file", "spirv/" + file_name)
Author	SHA1	Message	Date
Dunedan	265ed76131	Simplify check for identical shaders Previously when checking if two SPIR-V shaders are identical the hashs of their file content would be compared and afterwards their (unhashed) file contents as well. Comparing the file contents isn't necessary, as the hash function used is a cryptographic one, which guarantees the hash can be used as a representative of the hashed data.	2024-09-21 20:39:59 +02:00
abian	668ae8a20e	Increase height of middle panel to prevent icon overflow The icon/portrait of the middle panel when a single entity was selected was very subtly (4 px) overflowing its lane and invading that of the entity's name. This change fixes that by: - Raising the top of the middle panel by 4 px to leave room for the portrait/icon. This avoids having to shrink it and lose quality. - Distributing the 4 px of difference in height in the statistics area by lowering 1 px the top bar, 1 px the middle bar (if any), and 3 px the bottom bar (if any). The rest of the elements are lowered 4 px, and therefore remain in the same place. - Increasing the height of the minimap panel by 4 px so that it remains aligned with the middle panel, vertically centering the minimap, and making the necessary adjustments to the position of its buttons. Additionally, a couple of minor changes are applied: - The separators between the statistics area and the attack/resistance and resources area, and between the attack/resistance and resources area and the entity name area, which had different heights, are set to the same height/thickness. - The attack/resistance icon, which was very close to the entity icon/portrait, is moved 1 px to the right, and the resourceCarryingText (in the same area), which was very far from the resourceCarryingIcon, is also moved 3 px to the right. Fixes #7029	2024-09-18 13:38:05 +02:00
abian	b15eb6909e	Remove unnecessary comments in selection_details.js Related: #7012	2024-09-18 06:46:51 +02:00
abian	798cff1f6f	Left-click the portrait to follow the entity - Left-clicking the portrait of a unit will make the camera follow that unit (before: no action). A tooltip informs the player of this possibility. - Left-clicking the portrait of a structure will make the camera focus on that structure (before: no action). A tooltip informs the player of this possibility. - Double-clicking a hero/treasure icon will make the camera follow that hero/treasure (before: just focus on that hero/treasure). - Some minor related changes. Fixes #6879	2024-09-18 06:46:51 +02:00