|
@@ -288,7 +288,6 @@ define([ |
|
|
const { zoneId, collisionMap, map, hiddenRooms, clientObjects, rendererConfig } = msg; |
|
|
const { zoneId, collisionMap, map, hiddenRooms, clientObjects, rendererConfig } = msg; |
|
|
const { staticCamera = false, cameraPosition } = rendererConfig; |
|
|
const { staticCamera = false, cameraPosition } = rendererConfig; |
|
|
|
|
|
|
|
|
this.staticCamera = staticCamera; |
|
|
|
|
|
this.map = map; |
|
|
this.map = map; |
|
|
|
|
|
|
|
|
this.titleScreen = false; |
|
|
this.titleScreen = false; |
|
@@ -339,12 +338,19 @@ define([ |
|
|
events.emit('onGetObject', c); |
|
|
events.emit('onGetObject', c); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
if (cameraPosition) { |
|
|
|
|
|
|
|
|
if (staticCamera) { |
|
|
|
|
|
this.staticCamera = true; |
|
|
|
|
|
|
|
|
this.setPosition({ |
|
|
this.setPosition({ |
|
|
x: (cameraPosition.x - (this.width / (scale * 2))) * scale, |
|
|
|
|
|
y: (cameraPosition.y - (this.height / (scale * 2))) * scale |
|
|
|
|
|
}, true, true); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
pos: { |
|
|
|
|
|
x: cameraPosition.x, |
|
|
|
|
|
y: cameraPosition.y |
|
|
|
|
|
}, |
|
|
|
|
|
instant: true, |
|
|
|
|
|
staticPosition: true |
|
|
|
|
|
}); |
|
|
|
|
|
} else |
|
|
|
|
|
this.staticCamera = false; |
|
|
|
|
|
|
|
|
//Normally, the mounts mod queues this event when unmounting. |
|
|
//Normally, the mounts mod queues this event when unmounting. |
|
|
// If we rezone, our effects are destroyed, so the event is queued, |
|
|
// If we rezone, our effects are destroyed, so the event is queued, |
|
@@ -359,7 +365,7 @@ define([ |
|
|
instant: boolean |
|
|
instant: boolean |
|
|
should the camera pan to the location or not |
|
|
should the camera pan to the location or not |
|
|
*/ |
|
|
*/ |
|
|
setPosition: function ({ pos = { x: 0, y: 0 }, instant }) { |
|
|
|
|
|
|
|
|
setPosition: function ({ pos = { x: 0, y: 0 }, instant, staticPosition }) { |
|
|
let { x, y } = pos; |
|
|
let { x, y } = pos; |
|
|
|
|
|
|
|
|
x = (x - (this.width / (scale * 2))) * scale; |
|
|
x = (x - (this.width / (scale * 2))) * scale; |
|
@@ -389,8 +395,8 @@ define([ |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const staticCamera = window.staticCamera || this.staticCamera; |
|
|
|
|
|
if (staticCamera && !instant) { |
|
|
|
|
|
|
|
|
const staticCamera = window.staticCamera ?? this.staticCamera; |
|
|
|
|
|
if (staticCamera && staticPosition === undefined) { |
|
|
this.updateSprites(); |
|
|
this.updateSprites(); |
|
|
|
|
|
|
|
|
return; |
|
|
return; |
|
@@ -609,7 +615,7 @@ define([ |
|
|
return filter; |
|
|
return filter; |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
removeFilter: function (sprite, filter) { |
|
|
|
|
|
|
|
|
removeFilter: function (sprite) { |
|
|
if (sprite.filters) |
|
|
if (sprite.filters) |
|
|
sprite.filters = null; |
|
|
sprite.filters = null; |
|
|
}, |
|
|
}, |
|
|