Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2026-03-02 03:39:21 +00:00
Code Issues Projects Releases Wiki Activity

Update artwork and minor fixes

Browse Source
This commit is contained in:
tobspr
2020-06-30 09:27:30 +02:00
parent ea868fd750
commit 755f4bd2ea
23 changed files with 623 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/game/belt_path.js
View File

@@ -124,7 +124,7 @@ export class BeltPath extends BasicSerializableObject {
* Returns the layer of the this path
* @returns {enumLayer}
*/
get layer() {
getLayer() {
return this.entityPath[0].layer;
}

2
src/js/game/hud/parts/wires_overlay.js
View File

@@ -51,7 +51,7 @@ export class HUDWiresOverlay extends BaseHUDPart {
update() {
const desiredAlpha = this.root.currentLayer === enumLayer.wires ? 1.0 : 0.0;
this.currentAlpha = lerp(this.currentAlpha, desiredAlpha, 0.08);
this.currentAlpha = lerp(this.currentAlpha, desiredAlpha, 0.12);
}
/**

35
src/js/game/items/negative_energy_item.js
View File

@@ -1,6 +1,5 @@
import { globalConfig } from "../../core/config";
import { smoothenDpi } from "../../core/dpi_manager";
import { DrawParameters } from "../../core/draw_parameters";
import { Loader } from "../../core/loader";
import { types } from "../../savegame/serialization";
import { BaseItem, enumItemType } from "../base_item";
@@ -23,11 +22,6 @@ export class NegativeEnergyItem extends BaseItem {
return enumItemType.negativeEnergy;
}
constructor() {
super();
this.bufferGenerator = null;
}
/**
* @param {number} x
* @param {number} y
@@ -35,31 +29,8 @@ export class NegativeEnergyItem extends BaseItem {
* @param {DrawParameters} parameters
*/
draw(x, y, parameters, size = 12) {
if (!this.bufferGenerator) {
this.bufferGenerator = this.internalGenerateBuffer.bind(this);
}
const dpi = smoothenDpi(globalConfig.shapesSharpness * parameters.zoomLevel);
const key = "pos:" + size + "/" + dpi;
const canvas = parameters.root.buffers.getForKey(key, "", size, size, dpi, this.bufferGenerator);
parameters.context.drawImage(canvas, x - size / 2, y - size / 2, size, size);
}
/**
* @param {HTMLCanvasElement} canvas
* @param {CanvasRenderingContext2D} context
* @param {number} w
* @param {number} h
* @param {number} dpi
*/
internalGenerateBuffer(canvas, context, w, h, dpi) {
context.translate((w * dpi) / 2, (h * dpi) / 2);
context.scale((dpi * w) / 12, (dpi * h) / 12);
context.strokeStyle = "#eee";
context.lineWidth = 2;
context.beginCircle(0, 0, 4);
context.stroke();
const sprite = Loader.getSprite("sprites/wires/negative_energy.png");
sprite.drawCachedCentered(parameters, x, y, size * 1.5);
}
}

35
src/js/game/items/positive_energy_item.js
View File

@@ -1,6 +1,5 @@
import { globalConfig } from "../../core/config";
import { smoothenDpi } from "../../core/dpi_manager";
import { DrawParameters } from "../../core/draw_parameters";
import { Loader } from "../../core/loader";
import { types } from "../../savegame/serialization";
import { BaseItem, enumItemType } from "../base_item";
@@ -23,11 +22,6 @@ export class PositiveEnergyItem extends BaseItem {
return enumItemType.positiveEnergy;
}
constructor() {
super();
this.bufferGenerator = null;
}
/**
* @param {number} x
* @param {number} y
@@ -35,31 +29,8 @@ export class PositiveEnergyItem extends BaseItem {
* @param {DrawParameters} parameters
*/
draw(x, y, parameters, size = 12) {
if (!this.bufferGenerator) {
this.bufferGenerator = this.internalGenerateBuffer.bind(this);
}
const dpi = smoothenDpi(globalConfig.shapesSharpness * parameters.zoomLevel);
const key = "neg:" + size + "/" + dpi;
const canvas = parameters.root.buffers.getForKey(key, "", size, size, dpi, this.bufferGenerator);
parameters.context.drawImage(canvas, x - size / 2, y - size / 2, size, size);
}
/**
* @param {HTMLCanvasElement} canvas
* @param {CanvasRenderingContext2D} context
* @param {number} w
* @param {number} h
* @param {number} dpi
*/
internalGenerateBuffer(canvas, context, w, h, dpi) {
context.translate((w * dpi) / 2, (h * dpi) / 2);
context.scale((dpi * w) / 12, (dpi * h) / 12);
context.fillStyle = "#eee";
context.lineWidth = 1;
context.beginCircle(0, 0, 4);
context.fill();
const sprite = Loader.getSprite("sprites/wires/positive_energy.png");
sprite.drawCachedCentered(parameters, x, y, size * 1.5);
}
}

4
src/js/game/systems/belt.js
View File

@@ -144,7 +144,7 @@ export class BeltSystem extends GameSystemWithFilter {
continue;
}
const targetEntities = this.root.map.getLayersContentsMultipleXY(x, y, entity.layer);
const targetEntities = this.root.map.getLayersContentsMultipleXY(x, y);
for (let i = 0; i < targetEntities.length; ++i) {
const targetEntity = targetEntities[i];
@@ -312,7 +312,7 @@ export class BeltSystem extends GameSystemWithFilter {
drawLayer(parameters, layer) {
for (let i = 0; i < this.beltPaths.length; ++i) {
const path = this.beltPaths[i];
if (path.layer === layer) {
if (path.getLayer() === layer) {
path.draw(parameters);
}
}