mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 08:13:12 +09:00
Using spritesheets for more entities
This commit is contained in:
1 parent
d5d02aa80d
commit
6f2262de52
2 files changed
+107
-23
No files matched your search
@@ -13,15 +13,38 @@ export var entityDrawRules = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"accumulator": {
|
"accumulator": {
|
||||||
|
spritesheet: spritesheetJson.frames["images/factorio/entity/accumulator/accumulator.png"],
|
||||||
sizeInTiles: {
|
sizeInTiles: {
|
||||||
x:2,
|
x:4,
|
||||||
y:2,
|
y:4,
|
||||||
},
|
},
|
||||||
positionOffset: {
|
positionOffset: {
|
||||||
x:-1,
|
x:-1,
|
||||||
y:-1,
|
y:-2,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"radar": {
|
||||||
|
spritesheet: spritesheetJson.frames["images/factorio/entity/radar/radar.png.22"],
|
||||||
|
sizeInTiles: {
|
||||||
|
x:4,
|
||||||
|
y:4,
|
||||||
|
},
|
||||||
|
positionOffset: {
|
||||||
|
x:-0.8,
|
||||||
|
y:-1.5,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"centrifuge": {
|
||||||
|
spritesheet: spritesheetJson.frames["images/factorio/entity/centrifuge/centrifuge-A.png.0"],
|
||||||
|
sizeInTiles: {
|
||||||
|
x:4,
|
||||||
|
y:4,
|
||||||
|
},
|
||||||
|
positionOffset: {
|
||||||
|
x:-1.5,
|
||||||
|
y:-1,
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
let template3x3entity = {
|
let template3x3entity = {
|
||||||
sizeInTiles: {
|
sizeInTiles: {
|
||||||
@@ -35,12 +58,40 @@ let template3x3entity = {
|
|||||||
};
|
};
|
||||||
for(let i = 1; i <= 3; i++){
|
for(let i = 1; i <= 3; i++){
|
||||||
let name = "assembling-machine-"+i;
|
let name = "assembling-machine-"+i;
|
||||||
entityDrawRules[name] = template3x3entity;
|
// entityDrawRules[name] =
|
||||||
};
|
|
||||||
["chemical-plant", "radar", "solar-panel", "lab", "electric-mining-drill", "beacon", "electric-furnace"].forEach(name => {
|
|
||||||
entityDrawRules[name] = {
|
entityDrawRules[name] = {
|
||||||
spritesheet: spritesheetJson.frames["images/factorio/entity/"+name+"/"+name+".png.0"],
|
spritesheet: spritesheetJson.frames["images/factorio/entity/"+name+"/"+name+".png.0"],
|
||||||
sizeInTiles: {
|
sizeInTiles: {
|
||||||
|
x:3.9,
|
||||||
|
y:3.9,
|
||||||
|
},
|
||||||
|
positionOffset: {
|
||||||
|
x:-1.4,
|
||||||
|
y:-0.9,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
// template3x3entity;
|
||||||
|
};
|
||||||
|
["electric-mining-drill", "beacon", "electric-furnace"].forEach(name => {
|
||||||
|
entityDrawRules[name] = template3x3entity;
|
||||||
|
});
|
||||||
|
["chemical-plant", "lab"].forEach(name => {
|
||||||
|
entityDrawRules[name] = {
|
||||||
|
spritesheet: spritesheetJson.frames["images/factorio/entity/"+name+"/"+name+".png.0"],
|
||||||
|
sizeInTiles: {
|
||||||
|
x:3.5,
|
||||||
|
y:3,
|
||||||
|
},
|
||||||
|
positionOffset: {
|
||||||
|
x:-1,
|
||||||
|
y:-0.9,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
});
|
||||||
|
[{name: "solar-panel", ref:"images/factorio/entity/solar-panel/solar-panel.png"}].forEach(ent => {
|
||||||
|
entityDrawRules[ent.name] = {
|
||||||
|
spritesheet: spritesheetJson.frames[ent.ref],
|
||||||
|
sizeInTiles: {
|
||||||
x:3,
|
x:3,
|
||||||
y:3,
|
y:3,
|
||||||
},
|
},
|
||||||
@@ -49,7 +100,22 @@ for(let i = 1; i <= 3; i++){
|
|||||||
y:-1,
|
y:-1,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
// entityDrawRules[name] = template3x3entity;
|
});
|
||||||
|
// 2 tile entities
|
||||||
|
[{name: "stone-furnace", ref:"images/factorio/entity/stone-furnace/stone-furnace.png"},
|
||||||
|
{name: "steel-furnace", ref:"images/factorio/entity/steel-furnace/steel-furnace.png"}
|
||||||
|
].forEach(ent => {
|
||||||
|
entityDrawRules[ent.name] = {
|
||||||
|
spritesheet: spritesheetJson.frames[ent.ref],
|
||||||
|
sizeInTiles: {
|
||||||
|
x:2.5,
|
||||||
|
y:2.5,
|
||||||
|
},
|
||||||
|
positionOffset: {
|
||||||
|
x:-1,
|
||||||
|
y:-1,
|
||||||
|
},
|
||||||
|
}
|
||||||
});
|
});
|
||||||
["transport-belt", "fast-transport-belt", "express-transport-belt"].forEach(name => {
|
["transport-belt", "fast-transport-belt", "express-transport-belt"].forEach(name => {
|
||||||
entityDrawRules[name] = {
|
entityDrawRules[name] = {
|
||||||
@@ -63,4 +129,14 @@ for(let i = 1; i <= 3; i++){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
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,
|
||||||
|
},
|
||||||
|
}
|
||||||
+22
-14
@@ -187,20 +187,11 @@ function drawEntity(entity, dontCache){
|
|||||||
queue: [],
|
queue: [],
|
||||||
loaded: false,
|
loaded: false,
|
||||||
};
|
};
|
||||||
entityImages[name].queue.push(entity);
|
|
||||||
entityImages[name].img.onload = function(){
|
|
||||||
// process queue and display
|
|
||||||
console.log("Image loaded!");
|
|
||||||
entityImages[name].loaded = true;
|
|
||||||
entityImages[name].queue.forEach(entity => {
|
|
||||||
entityImages[name].draw(entity);
|
|
||||||
});
|
|
||||||
entityImages[name].queue = [];
|
|
||||||
}
|
|
||||||
entityImages[name].draw = function(entity){
|
entityImages[name].draw = function(entity){
|
||||||
if(this.loaded){
|
if(this.loaded){
|
||||||
let name = entity.entity.name;
|
let name = entity.entity.name;
|
||||||
let image, sprWidth, sprHeight, offLeft, offTop
|
let image, sprWidth, sprHeight, offLeft, offTop
|
||||||
|
let rotation = 0;
|
||||||
// check hardcoded entity draw rules for specifics (otherwise draw icon as 1x1 entity with rotation if specified)
|
// check hardcoded entity draw rules for specifics (otherwise draw icon as 1x1 entity with rotation if specified)
|
||||||
if(entityDrawRules[name]){
|
if(entityDrawRules[name]){
|
||||||
let rules = entityDrawRules[name]
|
let rules = entityDrawRules[name]
|
||||||
@@ -216,7 +207,7 @@ function drawEntity(entity, dontCache){
|
|||||||
sprHeight = rules.spritesheet.frame.h;
|
sprHeight = rules.spritesheet.frame.h;
|
||||||
offLeft = rules.spritesheet.frame.x;
|
offLeft = rules.spritesheet.frame.x;
|
||||||
offTop = rules.spritesheet.frame.y;
|
offTop = rules.spritesheet.frame.y;
|
||||||
image = global.spritesheet
|
image = global.spritesheet;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
var offsetX = 0, offsetY = 0;
|
var offsetX = 0, offsetY = 0;
|
||||||
@@ -226,9 +217,12 @@ function drawEntity(entity, dontCache){
|
|||||||
}
|
}
|
||||||
let xPos = ((entity.x + offsetX) * 16) - playerPosition.x;
|
let xPos = ((entity.x + offsetX) * 16) - playerPosition.x;
|
||||||
let yPos = ((entity.y + offsetY) * 16) - playerPosition.y;
|
let yPos = ((entity.y + offsetY) * 16) - playerPosition.y;
|
||||||
let rotation = 0;
|
|
||||||
if(entity.entity.rot && !isNaN(Number(entity.entity.rot))){
|
if(entity.entity.rot && !isNaN(Number(entity.entity.rot))){
|
||||||
if(entityDrawRules[name] && entityDrawRules[name].rotOffset){
|
let rules = entityDrawRules[name];
|
||||||
|
if(rules && rules.directions){
|
||||||
|
// draw different sprites for different rotations
|
||||||
|
|
||||||
|
} else if(rules && rules.rotOffset){
|
||||||
rotation = ((entity.entity.rot * 45) + entityDrawRules[name].rotOffset);
|
rotation = ((entity.entity.rot * 45) + entityDrawRules[name].rotOffset);
|
||||||
} else {
|
} else {
|
||||||
rotation = entity.entity.rot * 45;
|
rotation = entity.entity.rot * 45;
|
||||||
@@ -242,7 +236,21 @@ function drawEntity(entity, dontCache){
|
|||||||
this.queue.push(entity);
|
this.queue.push(entity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
entityImages[name].img.src = getImageFromName(name);
|
let imageLoaded = function(){
|
||||||
|
// process queue and display
|
||||||
|
console.log("Image loaded!");
|
||||||
|
entityImages[name].loaded = true;
|
||||||
|
entityImages[name].queue.forEach(entity => {
|
||||||
|
entityImages[name].draw(entity);
|
||||||
|
});
|
||||||
|
entityImages[name].queue = [];
|
||||||
|
}
|
||||||
|
entityImages[name].queue.push(entity);
|
||||||
|
entityImages[name].img.onload = imageLoaded()
|
||||||
|
|
||||||
|
if(entityDrawRules[name]){
|
||||||
|
imageLoaded();
|
||||||
|
} else entityImages[name].img.src = getImageFromName(name);
|
||||||
} else {
|
} else {
|
||||||
entityImages[name].draw(entity);
|
entityImages[name].draw(entity);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user