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

JS Date cleanup.

Browse Source 
Use Date.now() to get the current timestamp instead of doing arithmetic
with Date objects and avoid needless object instantiation.

Differential Revision: https://code.wildfiregames.com/D554
Eyeballed By: causative
This was SVN commit r19802.
This commit is contained in:
elexis 2017-06-18 19:11:24 +00:00
parent 6141c5c4fa
commit fe4ffa3558
8 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/gui/common/functions_utility.js
View File

@ -222,7 +222,7 @@ function notifyUser(userName, msgText)
msgText.toLowerCase().indexOf(userName.toLowerCase()) == -1)
return;
let timeNow = new Date().getTime();
let timeNow = Date.now();
if (!g_LastNickNotification || timeNow > g_LastNickNotification + 3000)
Engine.PlayUISound("audio/interface/ui/chat_alert.ogg", false);

2
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View File

@ -2151,7 +2151,7 @@ function addChatMessage(msg)
if (Engine.ConfigDB_GetValue("user", "chat.timestamp") == "true")
text = sprintf(translate("%(time)s %(message)s"), {
"time": sprintf(translate("\\[%(time)s]"), {
"time": Engine.FormatMillisecondsIntoDateStringLocal(new Date().getTime(), translate("HH:mm"))
"time": Engine.FormatMillisecondsIntoDateStringLocal(Date.now(), translate("HH:mm"))
}),
"message": text
});

10
binaries/data/mods/public/gui/pregame/mainmenu.js
View File

@ -14,8 +14,8 @@ var g_BackgroundLayerData = [];
*/
var g_BackgroundLayerset;
var g_T0 = +(new Date());
var g_LastTickTime = new Date();
var g_T0 = Date.now();
var g_LastTickTime = Date.now();
function init(initData, hotloadData)
{
@ -60,7 +60,7 @@ function scrollBackgrounds()
var w = h * 16/9;
var iw = h * 2;
var time = (new Date() - g_T0) / 1000;
var time = (Date.now() - g_T0) / 1000;
var offset = g_BackgroundLayerset[i].offset(time, w);
if (g_BackgroundLayerset[i].tiling)
{
@ -113,8 +113,8 @@ function formatUserReportStatus(status)
function onTick()
{
var now = new Date();
var tickLength = new Date() - g_LastTickTime;
let now = Date.now();
let tickLength = Date.now() - g_LastTickTime;
g_LastTickTime = now;
scrollBackgrounds();

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

@ -878,8 +878,8 @@ function handleInputAfterGui(ev)
case "hotkeydown":
if (ev.hotkey.indexOf("selection.group.") == 0)
{
var now = new Date();
if ((now.getTime() - doublePressTimer < doublePressTime) && (ev.hotkey == prevHotkey))
let now = Date.now();
if (now - doublePressTimer < doublePressTime && ev.hotkey == prevHotkey)
{
if (ev.hotkey.indexOf("selection.group.select.") == 0)
{
@ -892,7 +892,7 @@ function handleInputAfterGui(ev)
var sptr = ev.hotkey.split(".");
performGroup(sptr[2], sptr[3]);
doublePressTimer = now.getTime();
doublePressTimer = now;
prevHotkey = ev.hotkey;
}
}

2
binaries/data/mods/public/gui/session/messages.js
View File

@ -908,7 +908,7 @@ function addChatMessage(msg)
let historical = {
"txt": formatted,
"timePrefix": sprintf(translate("\\[%(time)s]"), {
"time": Engine.FormatMillisecondsIntoDateStringLocal(new Date().getTime(), translate("HH:mm"))
"time": Engine.FormatMillisecondsIntoDateStringLocal(Date.now(), translate("HH:mm"))
}),
"filter": {}
};

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

@ -96,7 +96,7 @@ var g_Players = [];
* Last time when onTick was called().
* Used for animating the main menu.
*/
var lastTickTime = new Date();
var g_LastTickTime = Date.now();
/**
* Recalculate which units have their status bars shown with this frequency in milliseconds.
@ -737,9 +737,9 @@ function onTick()
if (!g_Settings)
return;
let now = new Date();
let tickLength = now - lastTickTime;
lastTickTime = now;
let now = Date.now();
let tickLength = now - g_LastTickTime;
g_LastTickTime = now;
handleNetMessages();

10
binaries/data/mods/public/maps/random/belgian_uplands.js
View File

@ -1,6 +1,6 @@
// Prepare progress calculation
var timeArray = [];
timeArray.push(new Date().getTime());
timeArray.push(Date.now());
// Importing rmgen libraries
RMS.LoadLibrary("rmgen");
@ -98,7 +98,7 @@ textueByHeight.push({"upperHeightLimit": waterHeightAdjusted + 6/6 * (heightRang
var minTerrainDistToBorder = 3;
// Time check 1
timeArray.push(new Date().getTime());
timeArray.push(Date.now());
RMS.SetProgress(5);
@ -274,7 +274,7 @@ while (!goodStartPositionsFound)
} // END THE GIANT WHILE LOOP
// Time check 2
timeArray.push(new Date().getTime());
timeArray.push(Date.now());
RMS.SetProgress(60);
@ -403,7 +403,7 @@ for(var x = minTerrainDistToBorder; x < mapSize - minTerrainDistToBorder; x++)
}
// Time check 3
timeArray.push(new Date().getTime());
timeArray.push(Date.now());
RMS.SetProgress(90);
@ -442,7 +442,7 @@ for (var p = 0; p < numPlayers; p++)
ExportMap();
// Time check 7
timeArray.push(new Date().getTime());
timeArray.push(Date.now());
// Calculate progress percentage with the time checks
var generationTime = timeArray[timeArray.length - 1] - timeArray[0];

45
binaries/data/mods/public/maps/random/caledonian_meadows.js
View File

@ -3,10 +3,7 @@ RMS.LoadLibrary("heightmap");
InitMap();
/**
* Start Timer
*/
let genStartTime = new Date().getTime();
let genStartTime = Date.now();
/**
* Returns an approximation of the heights of the tiles between the vertices, a tile centered heightmap
@ -181,7 +178,7 @@ function getGrad(wrapped = true, scalarField = g_Map.height)
max_x -= 1;
max_y -= 1;
}
for (let x = 0; x < max_x; ++x)
{
vectorField.push([]);
@ -254,10 +251,10 @@ function getPointsByHeight(heightRange, avoidPoints = [], avoidClass = undefined
let validVertices = [];
let r = 0.5 * (heightmap.length - 1); // Map center x/y as well as radius
let avoidMap;
if (avoidClass !== undefined)
avoidMap = g_Map.tileClasses[avoidClass].inclusionCount;
for (let x = minDistance; x < heightmap.length - minDistance; ++x)
{
for (let y = minDistance; y < heightmap[0].length - minDistance; ++y)
@ -284,7 +281,7 @@ function getPointsByHeight(heightRange, avoidPoints = [], avoidClass = undefined
placements.push(point);
}
if (tries != 0 && tries % 100 == 0) // Time Check
log(points.length + " points found after " + tries + " tries after " + ((new Date().getTime() - genStartTime) / 1000) + "s");
log(points.length + " points found after " + tries + " tries after " + ((Date.now() - genStartTime) / 1000) + "s");
}
return points;
@ -441,7 +438,7 @@ function placeStartLocationResources(point, foodEntities = ["gaia/flora_bush_ber
}
}
log("Functions loaded after " + ((new Date().getTime() - genStartTime) / 1000) + "s"); // Time Check
log("Functions loaded after " + ((Date.now() - genStartTime) / 1000) + "s");
/**
* Environment settings
@ -553,7 +550,7 @@ myBiome.push({ // 10 Hilltop
"textureHS": ["alpine_cliff_c"], "actorHS": [["actor|geology/highland1.xml"], 0.0]
});
log("Terrain shape generation and texture presets after " + ((new Date().getTime() - genStartTime) / 1000) + "s"); // Time Check
log("Terrain shape generation and texture presets after " + ((Date.now() - genStartTime) / 1000) + "s");
/**
* Get start locations
@ -591,17 +588,17 @@ if (teams.length)
{
let p1 = playerIDs[(pi + s) % playerIDs.length] - 1;
let t1 = getPlayerTeam(p1);
if (teams.indexOf(t1) === -1)
continue;
for (let pj = pi + 1; pj < playerIDs.length; ++pj)
{
let p2 = playerIDs[(pj + s) % playerIDs.length] - 1;
let t2 = getPlayerTeam(p2);
if (t2 != t1)
continue;
let l1 = startLocations[pi];
let l2 = startLocations[pj];
let dist = getDistance(l1.x, l1.y, l2.x, l2.y);
@ -609,7 +606,7 @@ if (teams.length)
maxTeamDist = dist;
}
}
if (maxTeamDist < minDistance)
{
minDistance = maxTeamDist;
@ -625,7 +622,7 @@ if (teams.length)
}
}
log("Start location chosen after " + ((new Date().getTime() - genStartTime) / 1000) + "s"); // Time Check
log("Start location chosen after " + ((Date.now() - genStartTime) / 1000) + "s");
RMS.SetProgress(30);
/**
@ -641,7 +638,7 @@ for (let i = 0; i < startLocations.length; ++i)
pathPoints = pathPoints.concat(placeRandomPathToHeight(start, target, playerHeight, clPath));
}
log("Paths placed after " + ((new Date().getTime() - genStartTime) / 1000) + "s"); // Time Check
log("Paths placed after " + ((Date.now() - genStartTime) / 1000) + "s");
RMS.SetProgress(45);
/**
@ -652,7 +649,7 @@ for (let i = 0; i < avoidPoints.length; ++i)
avoidPoints[i].dist = 30;
let resourceSpots = getPointsByHeight({ "min": (heighLimits[3] + heighLimits[4]) / 2, "max": (heighLimits[5] + heighLimits[6]) / 2 }, avoidPoints, clPath);
log("Resource spots chosen after " + ((new Date().getTime() - genStartTime) / 1000) + "s"); // Time Check
log("Resource spots chosen after " + ((Date.now() - genStartTime) / 1000) + "s");
RMS.SetProgress(55);
/**
@ -698,10 +695,10 @@ for (let h = 0; h < heighLimits.length; ++h)
let x = areas[h][t].x;
let y = areas[h][t].y;
let slope = slopeMap[x][y];
if (slope > maxSlope[h])
maxSlope[h] = slope;
if (slope < minSlope[h])
minSlope[h] = slope;
}
@ -718,7 +715,7 @@ for (let h = 0; h < heighLimits.length; ++h)
let y = areas[h][t].y;
let actor = undefined;
let texture = pickRandom(myBiome[h].texture);
if (slopeMap[x][y] < 0.4 * (minSlope[h] + maxSlope[h]))
{
if (randBool(myBiome[h].actor[1]))
@ -730,15 +727,15 @@ for (let h = 0; h < heighLimits.length; ++h)
if (randBool(myBiome[h].actorHS[1]))
actor = pickRandom(myBiome[h].actorHS[0]);
}
g_Map.texture[x][y] = g_Map.getTextureID(texture);
if (actor)
placeObject(randFloat(x, x + 1), randFloat(y, y + 1), actor, 0, randFloat(0, 2 * PI));
}
}
log("Terrain texture placement finished after " + ((new Date().getTime() - genStartTime) / 1000) + "s"); // Time Check
log("Terrain texture placement finished after " + ((Date.now() - genStartTime) / 1000) + "s");
RMS.SetProgress(80);
/**
@ -770,7 +767,7 @@ for (let i = 0; i < resourceSpots.length; ++i)
/**
* Stop Timer
*/
log("Map generation finished after " + ((new Date().getTime() - genStartTime) / 1000) + "s");
log("Map generation finished after " + ((Date.now() - genStartTime) / 1000) + "s");
/**
* Export map data