Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Recompute building placement preview every turn, so its colour responds to changes in the environment

Browse Source 
This was SVN commit r8909.
This commit is contained in:
Ykkrosh 2011-02-11 11:17:32 +00:00
parent 6cd212a68d
commit fb738766ea
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
binaries/data/mods/public/gui/session/input.js
View File

@ -31,7 +31,7 @@ var inputState = INPUT_NORMAL;
var defaultPlacementAngle = Math.PI*3/4;
var placementAngle;
var placementPosition;
var placementEntity;
var placementEntity = undefined;
var mouseX = 0;
var mouseY = 0;
@ -68,6 +68,22 @@ function updateCursor()
Engine.SetCursor("arrow-default");
}
function updateBuildingPlacementPreview()
{
// The preview should be recomputed every turn, so that it responds
// to obstructions/fog/etc moving underneath it
if (placementEntity)
{
Engine.GuiInterfaceCall("SetBuildingPlacementPreview", {
"template": placementEntity,
"x": placementPosition.x,
"z": placementPosition.z,
"angle": placementAngle
});
}
}
function findGatherType(gatherer, supply)
{
if (!gatherer || !supply)
@ -319,6 +335,8 @@ function tryPlaceBuilding(queued)
});
Engine.GuiInterfaceCall("PlaySound", { "name": "order_repair", "entity": selection[0] });
placementEntity = undefined;
return true;
}
@ -494,6 +512,7 @@ function handleInputBeforeGui(ev, hoveredObject)
{
// Cancel building
Engine.GuiInterfaceCall("SetBuildingPlacementPreview", {"template": ""});
placementEntity = undefined;
inputState = INPUT_NORMAL;
return true;
}
@ -554,6 +573,7 @@ function handleInputBeforeGui(ev, hoveredObject)
{
// Cancel building
Engine.GuiInterfaceCall("SetBuildingPlacementPreview", {"template": ""});
placementEntity = undefined;
inputState = INPUT_NORMAL;
return true;
}
@ -760,6 +780,7 @@ function handleInputAfterGui(ev)
{
// Cancel building
Engine.GuiInterfaceCall("SetBuildingPlacementPreview", {"template": ""});
placementEntity = undefined;
inputState = INPUT_NORMAL;
return true;
}

1
binaries/data/mods/public/gui/session/session.js
View File

@ -205,6 +205,7 @@ function onSimulationUpdate()
updateDebug(simState);
updatePlayerDisplay(simState);
updateSelectionDetails();
updateBuildingPlacementPreview();
}
function updateMinimap(simState)