mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-16 07:24:53 +09:00
remoteMap chem plant, oil refinery, splitters, underneathies, inserters
This commit is contained in:
1 parent
3499411290
commit
d1c2816669
2 files changed
+117
-36
No files matched your search
@@ -97,7 +97,7 @@ for(let i = 1; i <= 3; i++){
|
||||
["electric-mining-drill", "beacon", "electric-furnace"].forEach(name => {
|
||||
entityDrawRules[name] = template3x3entity;
|
||||
});
|
||||
["chemical-plant", "lab"].forEach(name => {
|
||||
["lab"].forEach(name => {
|
||||
entityDrawRules[name] = {
|
||||
spritesheet: spritesheetJson.frames["images/factorio/entity/"+name+"/"+name+".png.0"],
|
||||
sizeInTiles: {
|
||||
@@ -110,6 +110,50 @@ for(let i = 1; i <= 3; i++){
|
||||
},
|
||||
}
|
||||
});
|
||||
entityDrawRules["chemical-plant"] = {
|
||||
spritesheet: [{
|
||||
spritesheet: spritesheetJson.frames["images/factorio/entity/chemical-plant/chemical-plant.png.0"],
|
||||
sizeInTiles: {
|
||||
x:3.5,
|
||||
y:3.5,
|
||||
},
|
||||
positionOffset: {
|
||||
x:-1.3,
|
||||
y:-1,
|
||||
},
|
||||
},{
|
||||
spritesheet: spritesheetJson.frames["images/factorio/entity/chemical-plant/chemical-plant.png.1"],
|
||||
sizeInTiles: {
|
||||
x:3.7,
|
||||
y:4,
|
||||
},
|
||||
positionOffset: {
|
||||
x:-1.3,
|
||||
y:-1.5,
|
||||
},
|
||||
},{
|
||||
spritesheet: spritesheetJson.frames["images/factorio/entity/chemical-plant/chemical-plant.png.2"],
|
||||
sizeInTiles: {
|
||||
x:3.5,
|
||||
y:3.2,
|
||||
},
|
||||
positionOffset: {
|
||||
x:-1.3,
|
||||
y:-1,
|
||||
},
|
||||
},{
|
||||
spritesheet: spritesheetJson.frames["images/factorio/entity/chemical-plant/chemical-plant.png.3"],
|
||||
sizeInTiles: {
|
||||
x:3.7,
|
||||
y:3.6,
|
||||
},
|
||||
positionOffset: {
|
||||
x:-1.45,
|
||||
y:-1.3,
|
||||
},
|
||||
},
|
||||
],
|
||||
};
|
||||
[{name: "solar-panel", ref:"images/factorio/entity/solar-panel/solar-panel.png"}].forEach(ent => {
|
||||
entityDrawRules[ent.name] = {
|
||||
spritesheet: spritesheetJson.frames[ent.ref],
|
||||
@@ -136,19 +180,48 @@ for(let i = 1; i <= 3; i++){
|
||||
}
|
||||
}
|
||||
});
|
||||
["inserter", "fast-inserter", "stack-inserter", "filter-inserter"].forEach(inserter => {
|
||||
["splitter", "fast-splitter", "express-splitter"].forEach(splitter => {
|
||||
entityDrawRules[splitter] = {
|
||||
rotOffset:180,
|
||||
}
|
||||
});
|
||||
["underground-belt", "fast-underground-belt", "express-underground-belt"].forEach(underneathie => {
|
||||
entityDrawRules[underneathie] = {
|
||||
rotOffset: 270,
|
||||
}
|
||||
});
|
||||
["inserter", "fast-inserter", "stack-inserter", "filter-inserter", "burner-inserter", 'long-handed-inserter', 'stack-filter-inserter'].forEach(inserter => {
|
||||
entityDrawRules[inserter] = {
|
||||
rotOffset:90,
|
||||
}
|
||||
});
|
||||
entityDrawRules["oil-refinery"] = {
|
||||
spritesheet: spritesheetJson.frames["images/factorio/entity/oil-refinery/oil-refinery.png.0"],
|
||||
sizeInTiles: {
|
||||
x:9,
|
||||
y:6,
|
||||
},
|
||||
positionOffset: {
|
||||
x:-2,
|
||||
y:-2,
|
||||
},
|
||||
entityDrawRules["straight-rail"] = {
|
||||
rotOffset: 0,
|
||||
};
|
||||
entityDrawRules["curved-rail"] = {
|
||||
rotOffset: 0
|
||||
}
|
||||
entityDrawRules["oil-refinery"] = {
|
||||
spritesheet: [
|
||||
{
|
||||
spritesheet: spritesheetJson.frames["images/factorio/entity/oil-refinery/oil-refinery.png.0"],
|
||||
}, {
|
||||
spritesheet: spritesheetJson.frames["images/factorio/entity/oil-refinery/oil-refinery.png.1"],
|
||||
}, {
|
||||
spritesheet: spritesheetJson.frames["images/factorio/entity/oil-refinery/oil-refinery.png.2"],
|
||||
}, {
|
||||
spritesheet: spritesheetJson.frames["images/factorio/entity/oil-refinery/oil-refinery.png.3"],
|
||||
}
|
||||
],
|
||||
}
|
||||
// correct image size for the oil refinery frames (same for all of them on this one)
|
||||
entityDrawRules["oil-refinery"].spritesheet.forEach(object => {
|
||||
object.sizeInTiles = {
|
||||
x:10,
|
||||
y:7.5,
|
||||
}
|
||||
object.positionOffset = {
|
||||
x:-2,
|
||||
y:-2.7,
|
||||
}
|
||||
});
|
||||
+32
-24
@@ -390,7 +390,7 @@ function renderLoop(){
|
||||
var entityImages = {}; // cache to store images and details about entities, populated by drawEntity();
|
||||
window.logEntCache = function(){console.log(entityCache)}
|
||||
function drawEntity(entity, dontCache){
|
||||
if(entity.x && entity.y){
|
||||
if(entity.x !== undefined && entity.y !== undefined){
|
||||
if(!dontCache){
|
||||
// cache entity for later draws (like panning)
|
||||
if(entity.x - cachePosition.x/remoteMapConfig.tileSize >= 0 && entity.x - cachePosition.x/remoteMapConfig.tileSize < remoteMapConfig.mapSize && entity.y - cachePosition.y/remoteMapConfig.tileSize >= 0 && entity.y - cachePosition.y/remoteMapConfig.tileSize < remoteMapConfig.mapSize){
|
||||
@@ -415,31 +415,38 @@ function drawEntity(entity, dontCache){
|
||||
entityImages[name].draw = function(entity){
|
||||
if(this.loaded){
|
||||
let name = entity.entity.name;
|
||||
let image, sprWidth, sprHeight, offLeft, offTop
|
||||
let image, sprWidth, sprHeight, offLeft, offTop, size, offsetX, offsetY
|
||||
let rotation = 0;
|
||||
// check hardcoded entity draw rules for specifics (otherwise draw icon as 1x1 entity with rotation if specified)
|
||||
if(entityDrawRules[name] && entityDrawRules[name].positionOffset){
|
||||
if(entityDrawRules[name] && (entityDrawRules[name].positionOffset || entityDrawRules[name].spritesheet)){
|
||||
let rules = entityDrawRules[name]
|
||||
var offsetX = rules.positionOffset.x;
|
||||
var offsetY = rules.positionOffset.y;
|
||||
var size = {
|
||||
x: remoteMapConfig.tileSize * rules.sizeInTiles.x,
|
||||
y: remoteMapConfig.tileSize * rules.sizeInTiles.y,
|
||||
};
|
||||
if(rules.positionOffset){
|
||||
offsetX = rules.positionOffset.x;
|
||||
offsetY = rules.positionOffset.y;
|
||||
}
|
||||
if(rules.sizeInTiles){
|
||||
size = {
|
||||
x: remoteMapConfig.tileSize * rules.sizeInTiles.x,
|
||||
y: remoteMapConfig.tileSize * rules.sizeInTiles.y,
|
||||
};
|
||||
}
|
||||
if(rules.spritesheet && Array.isArray(rules.spritesheet)){
|
||||
let dir = Number(entity.entity.rot);
|
||||
sprWidth = rules.spritesheet[dir].frame.w;
|
||||
sprHeight = rules.spritesheet[dir].frame.h;
|
||||
offLeft = rules.spritesheet[dir].frame.x;
|
||||
offTop = rules.spritesheet[dir].frame.y;
|
||||
sprWidth = rules.spritesheet[dir/2].spritesheet.frame.w;
|
||||
sprHeight = rules.spritesheet[dir/2].spritesheet.frame.h;
|
||||
offLeft = rules.spritesheet[dir/2].spritesheet.frame.x;
|
||||
offTop = rules.spritesheet[dir/2].spritesheet.frame.y;
|
||||
image = global.spritesheet;
|
||||
|
||||
offsetX = rules.spritesheet[dir].positionOffset.x;
|
||||
offsetY = rules.spritesheet[dir].positionOffset.y;
|
||||
size = {
|
||||
x: remoteMapConfig.tileSize * rules.spritesheet[dir].sizeInTiles.x,
|
||||
y: remoteMapConfig.tileSize * rules.spritesheet[dir].sizeInTiles.y,
|
||||
};
|
||||
if(rules.spritesheet[dir/2].positionOffset){
|
||||
offsetX = rules.spritesheet[dir/2].positionOffset.x;
|
||||
offsetY = rules.spritesheet[dir/2].positionOffset.y;
|
||||
}
|
||||
if(rules.spritesheet[dir/2].sizeInTiles){
|
||||
size = {
|
||||
x: remoteMapConfig.tileSize * rules.spritesheet[dir/2].sizeInTiles.x,
|
||||
y: remoteMapConfig.tileSize * rules.spritesheet[dir/2].sizeInTiles.y,
|
||||
};
|
||||
}
|
||||
} else if(rules.spritesheet){
|
||||
sprWidth = rules.spritesheet.frame.w;
|
||||
sprHeight = rules.spritesheet.frame.h;
|
||||
@@ -448,14 +455,14 @@ function drawEntity(entity, dontCache){
|
||||
image = global.spritesheet;
|
||||
}
|
||||
} else {
|
||||
var offsetX = 0, offsetY = 0;
|
||||
var size = {
|
||||
offsetX = 0, offsetY = 0;
|
||||
size = {
|
||||
x:remoteMapConfig.tileSize, y: remoteMapConfig.tileSize,
|
||||
};
|
||||
}
|
||||
let xPos = ((entity.x + offsetX) * remoteMapConfig.tileSize) - playerPosition.x;
|
||||
let yPos = ((entity.y + offsetY) * remoteMapConfig.tileSize) - playerPosition.y;
|
||||
if(entityDrawRules[name] && entity.entity.rot && !isNaN(Number(entity.entity.rot)) && !Array.isArray(entityDrawRules[name].spritesheet)){
|
||||
if(entity.entity.rot && !isNaN(Number(entity.entity.rot)) && !(entityDrawRules[name] && Array.isArray(entityDrawRules[name].spritesheet))){
|
||||
let rules = entityDrawRules[name];
|
||||
if(rules && rules.rotOffset){
|
||||
rotation = ((entity.entity.rot * 45) + entityDrawRules[name].rotOffset);
|
||||
@@ -464,6 +471,7 @@ function drawEntity(entity, dontCache){
|
||||
}
|
||||
}
|
||||
if(!image) image = entityImages[name].img;
|
||||
// if(name == "oil-refinery") console.log(offsetX)
|
||||
drawImageWithRotation(ctx, image, xPos, yPos, size.x, size.y, rotation%360, sprWidth, sprHeight, offLeft, offTop);
|
||||
//console.log("Drawing "+name+" at X: "+xPos+", Y: "+yPos+" with with rotation "+rotation);
|
||||
} else {
|
||||
@@ -484,7 +492,7 @@ function drawEntity(entity, dontCache){
|
||||
entityImages[name].img.onload = imageLoaded()
|
||||
|
||||
if(entityDrawRules[name] && entityDrawRules[name].spritesheet){
|
||||
imageLoaded();
|
||||
// imageLoaded();
|
||||
} else entityImages[name].img.src = getImageFromName(name);
|
||||
} else {
|
||||
// console.log("Already got image, drawing")
|
||||
|
||||
Reference in new issue
Block a user