Skip to content
Snippets Groups Projects
Commit cdf4667d authored by Tim Repke's avatar Tim Repke
Browse files

made loader animation a bit smoother

parent 94728904
No related branches found
No related tags found
No related merge requests found
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
...@@ -22,7 +22,7 @@ Game.prototype.nextMap = function (map, spawn) { ...@@ -22,7 +22,7 @@ Game.prototype.nextMap = function (map, spawn) {
clearInterval(Game.mainLoop); clearInterval(Game.mainLoop);
Game.mainLoop = null; Game.mainLoop = null;
var self = this; var self = this;
setTimeout(function() { setTimeout(function () {
var gameRoot = document.getElementById("gameRoot"); var gameRoot = document.getElementById("gameRoot");
while (gameRoot.firstChild) { while (gameRoot.firstChild) {
gameRoot.removeChild(gameRoot.firstChild); gameRoot.removeChild(gameRoot.firstChild);
...@@ -30,7 +30,7 @@ Game.prototype.nextMap = function (map, spawn) { ...@@ -30,7 +30,7 @@ Game.prototype.nextMap = function (map, spawn) {
Game.char = null; Game.char = null;
Game.cam = null; Game.cam = null;
self.loadMap(map, spawn); self.loadMap(map, spawn);
}, Game.config.loopSpeed+5); }, Game.config.loopSpeed + 5);
}; };
Game.prototype.loadMap = function (map, spawn) { Game.prototype.loadMap = function (map, spawn) {
...@@ -38,7 +38,7 @@ Game.prototype.loadMap = function (map, spawn) { ...@@ -38,7 +38,7 @@ Game.prototype.loadMap = function (map, spawn) {
var gameRoot = document.getElementById("gameRoot"); var gameRoot = document.getElementById("gameRoot");
var gameOverlay = $('#game-overlay'); var gameOverlay = $('#game-overlay');
gameOverlay.html('<img src="graphics/loader.svg" style="position: absolute; left: 300px; top: 200px;" />').show(); gameOverlay.html('<img src="graphics/loader.svg" style="position: absolute; left: 300px; top: 200px;" />').fadeIn(500);
var svg = null; var svg = null;
...@@ -53,13 +53,13 @@ Game.prototype.loadMap = function (map, spawn) { ...@@ -53,13 +53,13 @@ Game.prototype.loadMap = function (map, spawn) {
if (next) next[0].apply(null, (next.slice(1) || []).concat(init)); if (next) next[0].apply(null, (next.slice(1) || []).concat(init));
} }
init(); setTimeout(init, 1000);
function initMap(mapId, spawn, done) { function initMap(mapId, spawn, done) {
console.log('Init map: ' + mapId + ' spawn: ' + spawn); console.log('Init map: ' + mapId + ' spawn: ' + spawn);
d3.xml(FAPI.resolvePath('maps/' + mapId + '.svg'), 'image/svg+xml', function (xml) { d3.xml(FAPI.resolvePath('maps/' + mapId + '.svg'), 'image/svg+xml', function (xml) {
console.log('dslkjdl')
gameCanvas.style.width = Game.config.size[0] + 'px'; gameCanvas.style.width = Game.config.size[0] + 'px';
gameCanvas.style.height = Game.config.size[1] + 'px'; gameCanvas.style.height = Game.config.size[1] + 'px';
gameRoot.appendChild(xml.documentElement); gameRoot.appendChild(xml.documentElement);
...@@ -69,12 +69,13 @@ Game.prototype.loadMap = function (map, spawn) { ...@@ -69,12 +69,13 @@ Game.prototype.loadMap = function (map, spawn) {
// ------------------------------------- // -------------------------------------
// init event related stuff // init event related stuff
var displayEvents = Game.config.showEventLayers ? 0.5 : 0; var displayEvents = Game.config.showEventLayers ? 0.5 : 0;
svg.selectAll('g').filter(function () { svg.selectAll('g')
return ( .filter(function () {
this.getAttribute('inkscape:groupmode') == 'layer' return (
&& Game.eventLayers.indexOf(this.getAttribute('inkscape:label')) >= 0 this.getAttribute('inkscape:groupmode') == 'layer'
); && Game.eventLayers.indexOf(this.getAttribute('inkscape:label')) >= 0
}) );
})
.style('display', 'block') .style('display', 'block')
.style('opacity', displayEvents); .style('opacity', displayEvents);
...@@ -195,7 +196,7 @@ Game.log = function (message) { ...@@ -195,7 +196,7 @@ Game.log = function (message) {
newElem.appendChild(newElemText); newElem.appendChild(newElemText);
newElem.style.backgroundColor = '#474c46'; newElem.style.backgroundColor = '#474c46';
setTimeout(function(){ setTimeout(function () {
newElem.style.background = 'transparent'; newElem.style.background = 'transparent';
}, 1000); }, 1000);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment