diff --git a/src/components/Tile.vue b/src/components/Tile.vue index 6ded5516587506e004b02e9505de62af68106f01..cbb97bb406c616da79c112adc97c1e962b8dc47a 100644 --- a/src/components/Tile.vue +++ b/src/components/Tile.vue @@ -48,20 +48,20 @@ export default { const isViewRadiusBorder = function() { var borders = []; //leftBorder - if( props.tile.x == (this.store.state.centerX-this.store.state.radiusX) && - ((this.store.state.centerY-this.store.state.radiusY) <= props.tile.y && props.tile.y <= (this.store.state.centerY+this.store.state.radiusY))){ + if( props.tile.x == (this.store.state.centerX-this.store.state.radiusX+1) && + ((this.store.state.centerY-this.store.state.radiusY+1) <= props.tile.y && props.tile.y <= (this.store.state.centerY+this.store.state.radiusY-1))){ borders.push("viewBorderLeft"); } - if( props.tile.x == (this.store.state.centerX+this.store.state.radiusX) && - ((this.store.state.centerY-this.store.state.radiusY) <= props.tile.y && props.tile.y <= (this.store.state.centerY+this.store.state.radiusY))){ + if( props.tile.x == (this.store.state.centerX+this.store.state.radiusX-1) && + ((this.store.state.centerY-this.store.state.radiusY+1) <= props.tile.y && props.tile.y <= (this.store.state.centerY+this.store.state.radiusY-1))){ borders.push("viewBorderRight") } - if( props.tile.y == (this.store.state.centerY+this.store.state.radiusY) && - ((this.store.state.centerX-this.store.state.radiusX) <= props.tile.x && props.tile.x <= (this.store.state.centerX+this.store.state.radiusX))){ + if( props.tile.y == (this.store.state.centerY+this.store.state.radiusY-1) && + ((this.store.state.centerX-this.store.state.radiusX+1) <= props.tile.x && props.tile.x <= (this.store.state.centerX+this.store.state.radiusX-1))){ borders.push("viewBorderTop") } - if( props.tile.y == (this.store.state.centerY-this.store.state.radiusY) && - ((this.store.state.centerX-this.store.state.radiusX) <= props.tile.x && props.tile.x <= (this.store.state.centerX+this.store.state.radiusX))){ + if( props.tile.y == (this.store.state.centerY-this.store.state.radiusY+1) && + ((this.store.state.centerX-this.store.state.radiusX+1) <= props.tile.x && props.tile.x <= (this.store.state.centerX+this.store.state.radiusX-1))){ borders.push("viewBorderBottom") } diff --git a/src/store/index.js b/src/store/index.js index 2c14e51000f2383c2567cee909f98e43e413d269..28758a8b903754449091da2d4f92c64ab5402f6e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -42,13 +42,10 @@ const methods = { }, loadMap(mapData) { + let tileSetData = this.getMultDimArrayFromFlattendArray(mapData.tileSet); + state.mapID = mapData.mapID; state.mapName = mapData.mapName; - state.initialViewRadiusX = mapData.initialViewRadiusX; - state.initialViewRadiusY = mapData.initialViewRadiusY; - state.initialVieCenterX = mapData.initialVieCenterX; - state.initialViewCenterY = mapData.initialViewCenterY; - let tileSetData = this.getMultDimArrayFromFlattendArray(mapData.tileSet); state.mapSizeX = tileSetData.mapSizeX; state.mapSizeY = tileSetData.mapSizeY; state.lttMap = tileSetData.map; @@ -56,6 +53,10 @@ const methods = { state.minX = tileSetData.minX; state.maxY = tileSetData.maxY; state.minY = tileSetData.minY; + state.radiusX = mapData.initialViewRadiusX; + state.radiusY = mapData.initialViewRadiusY; + state.centerX = mapData.initialViewCenterX; + state.centerY = mapData.initialViewCenterY; }, getMultDimArrayFromFlattendArray(arr){