remoteMap place rotated items, fix selection box offset

This commit is contained in:
Danielv123 committed 2018-02-28 18:01:34 +01:00
1 parent f5eef7c1bb
commit e6d734d4eb
3 files changed
+27 -6

No files matched your search

+2 -2
View File
@@ -69,8 +69,8 @@ class remoteMap {
// add entity to the chunkStore database because create_entity does not trigger any events // add entity to the chunkStore database because create_entity does not trigger any events
let name = req.name; let name = req.name;
let entity = {name}; let entity = {name};
if(req.direction){ if(typeof req.direction == "string"){
entity.direction = req.direction; entity.rot = req.direction;
} }
this.addEntity(req.position.x, req.position.y, entity); this.addEntity(req.position.x, req.position.y, entity);
} }
+8 -3
View File
@@ -26,7 +26,8 @@ var itemSelectorGUI = new itemSelector("#remoteMapItemSelector", [
{name:"stone-furnace"}, {name:"stone-furnace"},
{name:"accumulator"}, {name:"accumulator"},
{name:"electric-furnace"}, {name:"electric-furnace"},
{name:"inserter"} {name:"inserter"},
{name:"express-transport-belt"},
]); ]);
if(!localStorage.remoteMapConfig || localStorage.remoteMapConfig == "[object Object]"){ if(!localStorage.remoteMapConfig || localStorage.remoteMapConfig == "[object Object]"){
@@ -289,6 +290,7 @@ selectionCanvas.addEventListener('mousemove', function(evt) {
}, false); }, false);
selectionCanvas.addEventListener("mousedown", function(evt) { selectionCanvas.addEventListener("mousedown", function(evt) {
if(evt.which === 1) window.mousePos.clicked = true; if(evt.which === 1) window.mousePos.clicked = true;
if(evt.which === 3) window.mousePos.rightClicked = true;
// place item in world by sending it with websockets and shit // place item in world by sending it with websockets and shit
let tileSize = remoteMapConfig.tileSize; let tileSize = remoteMapConfig.tileSize;
@@ -298,6 +300,7 @@ selectionCanvas.addEventListener("mousedown", function(evt) {
x: Math.floor((playerPosition.x + window.mousePos.x) / tileSize), x: Math.floor((playerPosition.x + window.mousePos.x) / tileSize),
y: Math.floor((playerPosition.y + window.mousePos.y) / tileSize), y: Math.floor((playerPosition.y + window.mousePos.y) / tileSize),
}, },
direction: itemSelectorGUI.getItem().direction.toString(),
}; };
if(evt.which === 1){ // left click to place if(evt.which === 1){ // left click to place
console.log(JSON.stringify(entity)); console.log(JSON.stringify(entity));
@@ -310,6 +313,7 @@ selectionCanvas.addEventListener("mousedown", function(evt) {
}); });
selectionCanvas.addEventListener("mouseup", function(evt) { selectionCanvas.addEventListener("mouseup", function(evt) {
if(evt.which === 1) window.mousePos.clicked = false; if(evt.which === 1) window.mousePos.clicked = false;
if(evt.which === 3) window.mousePos.rightClicked = false;
}); });
function renderLoop(){ function renderLoop(){
// render game canvas // render game canvas
@@ -371,14 +375,15 @@ function renderLoop(){
selectionCtx.lineWidth = remoteMapConfig.tileSize / 8; selectionCtx.lineWidth = remoteMapConfig.tileSize / 8;
selectionCtx.strokeStyle="yellow"; selectionCtx.strokeStyle="yellow";
if(mousePosition.clicked) selectionCtx.strokeStyle = "red"; if(mousePosition.clicked) selectionCtx.strokeStyle = "red";
if(mousePosition.rightClicked) selectionCtx.strokeStyle = "blue";
let tileSize = remoteMapConfig.tileSize let tileSize = remoteMapConfig.tileSize
let halfTile = tileSize / 2; let halfTile = tileSize / 2;
let tilePosition = { let tilePosition = { // position in world coordinates (same as used by factorio)
x: Math.floor((playerPosition.x + mousePosition.x) / tileSize), x: Math.floor((playerPosition.x + mousePosition.x) / tileSize),
y: Math.floor((playerPosition.y + mousePosition.y) / tileSize), y: Math.floor((playerPosition.y + mousePosition.y) / tileSize),
} }
// Long thing to correct for offset between playerPosition, cachePosition (tile grid) and mouse position and draw the box so it aligns with tiles. // Long thing to correct for offset between playerPosition, cachePosition (tile grid) and mouse position and draw the box so it aligns with tiles.
selectionCtx.rect(mousePosition.x - mousePosition.x % tileSize - playerPosition.x % tileSize, mousePosition.y - mousePosition.y % tileSize - playerPosition.y % tileSize, tileSize, tileSize); selectionCtx.rect(tilePosition.x * tileSize - playerPosition.x, tilePosition.y * tileSize - playerPosition.y, tileSize, tileSize);
selectionCtx.stroke(); selectionCtx.stroke();
} }
} }
+17 -1
View File
@@ -4,6 +4,7 @@ export class itemSelector {
this.container = document.querySelector(containerSelector); this.container = document.querySelector(containerSelector);
if(!this.container) throw new Error("Could not find container "+container); if(!this.container) throw new Error("Could not find container "+container);
this.entities = entities; this.entities = entities;
this.direction = 0;
// populate container // populate container
let cont = this.container; let cont = this.container;
@@ -17,6 +18,12 @@ export class itemSelector {
this.entities.forEach(entity => HTML += "<option value='"+entity.name+"'>"+entity.name+"</option>"); this.entities.forEach(entity => HTML += "<option value='"+entity.name+"'>"+entity.name+"</option>");
HTML += "</select>"; HTML += "</select>";
HTML += "</div>"; HTML += "</div>";
// direction selector
HTML += "<div id='directionSelector'>";
HTML += "<h2>Direction: </h2>";
HTML += "<p>Press R to rotate</p>";
HTML += "<p id='directionDisplay'>0</p>"
HTML += "</div>";
// write styles // write styles
let styles = { let styles = {
@@ -42,9 +49,18 @@ export class itemSelector {
HTML += "}"; HTML += "}";
} }
cont.innerHTML += HTML + "</style>"; cont.innerHTML += HTML + "</style>";
// handle direction keyboard event
Mousetrap.bind('r', ()=>this.rotate());
}
rotate(){
this.direction = (this.direction + 2) % 8;
// update display
document.querySelector("#directionDisplay").innerHTML = this.direction;
} }
getItem(){ getItem(){
let name = document.querySelector(this.containerSelector+" > .itemSelector > select").value; let name = document.querySelector(this.containerSelector+" > .itemSelector > select").value;
return {name}; let direction = this.direction;
return {name, direction};
} }
} }