mirror of
https://github.com/tobspr/shapez.io.git
synced 2026-03-02 03:39:21 +00:00
Rename belt_base -> belt, minor refactorings
This commit is contained in:
tobspr
@@ -1,21 +1,21 @@
|
||||
import { MetaBeltBaseBuilding } from "../../buildings/belt_base";
|
||||
import { MetaBeltBuilding } from "../../buildings/belt";
|
||||
import { MetaCutterBuilding } from "../../buildings/cutter";
|
||||
import { MetaDisplayBuilding } from "../../buildings/display";
|
||||
import { MetaFilterBuilding } from "../../buildings/filter";
|
||||
import { MetaLeverBuilding } from "../../buildings/lever";
|
||||
import { MetaMinerBuilding } from "../../buildings/miner";
|
||||
import { MetaMixerBuilding } from "../../buildings/mixer";
|
||||
import { MetaPainterBuilding } from "../../buildings/painter";
|
||||
import { MetaReaderBuilding } from "../../buildings/reader";
|
||||
import { MetaRotaterBuilding } from "../../buildings/rotater";
|
||||
import { MetaSplitterBuilding } from "../../buildings/splitter";
|
||||
import { MetaStackerBuilding } from "../../buildings/stacker";
|
||||
import { MetaTrashBuilding } from "../../buildings/trash";
|
||||
import { MetaUndergroundBeltBuilding } from "../../buildings/underground_belt";
|
||||
import { HUDBaseToolbar } from "./base_toolbar";
|
||||
import { MetaLeverBuilding } from "../../buildings/lever";
|
||||
import { MetaFilterBuilding } from "../../buildings/filter";
|
||||
import { MetaDisplayBuilding } from "../../buildings/display";
|
||||
import { MetaReaderBuilding } from "../../buildings/reader";
|
||||
|
||||
const supportedBuildings = [
|
||||
MetaBeltBaseBuilding,
|
||||
MetaBeltBuilding,
|
||||
MetaSplitterBuilding,
|
||||
MetaUndergroundBeltBuilding,
|
||||
MetaMinerBuilding,
|
||||
|
||||
@@ -67,7 +67,7 @@ export class HUDMinerHighlight extends BaseHUDPart {
|
||||
|
||||
const maxThroughput = this.root.hubGoals.getBeltBaseSpeed();
|
||||
|
||||
const screenPos = this.root.camera.screenToWorld(mousePos);
|
||||
const tooltipLocation = this.root.camera.screenToWorld(mousePos);
|
||||
|
||||
const scale = (1 / this.root.camera.zoomLevel) * this.root.app.getEffectiveUiScale();
|
||||
|
||||
@@ -76,8 +76,8 @@ export class HUDMinerHighlight extends BaseHUDPart {
|
||||
// Background
|
||||
parameters.context.fillStyle = THEME.map.connectedMiners.background;
|
||||
parameters.context.beginRoundedRect(
|
||||
screenPos.x + 5 * scale,
|
||||
screenPos.y - 3 * scale,
|
||||
tooltipLocation.x + 5 * scale,
|
||||
tooltipLocation.y - 3 * scale,
|
||||
(isCapped ? 100 : 65) * scale,
|
||||
(isCapped ? 45 : 30) * scale,
|
||||
2
|
||||
@@ -89,8 +89,8 @@ export class HUDMinerHighlight extends BaseHUDPart {
|
||||
parameters.context.font = "bold " + scale * 10 + "px GameFont";
|
||||
parameters.context.fillText(
|
||||
formatItemsPerSecond(throughput),
|
||||
screenPos.x + 10 * scale,
|
||||
screenPos.y + 10 * scale
|
||||
tooltipLocation.x + 10 * scale,
|
||||
tooltipLocation.y + 10 * scale
|
||||
);
|
||||
|
||||
// Amount of miners
|
||||
@@ -100,8 +100,8 @@ export class HUDMinerHighlight extends BaseHUDPart {
|
||||
connectedEntities.length === 1
|
||||
? T.ingame.connectedMiners.one_miner
|
||||
: T.ingame.connectedMiners.n_miners.replace("<amount>", String(connectedEntities.length)),
|
||||
screenPos.x + 10 * scale,
|
||||
screenPos.y + 22 * scale
|
||||
tooltipLocation.x + 10 * scale,
|
||||
tooltipLocation.y + 22 * scale
|
||||
);
|
||||
|
||||
parameters.context.globalAlpha = 1;
|
||||
@@ -113,8 +113,8 @@ export class HUDMinerHighlight extends BaseHUDPart {
|
||||
"<max_throughput>",
|
||||
formatItemsPerSecond(maxThroughput)
|
||||
),
|
||||
screenPos.x + 10 * scale,
|
||||
screenPos.y + 34 * scale
|
||||
tooltipLocation.x + 10 * scale,
|
||||
tooltipLocation.y + 34 * scale
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,125 +1,122 @@
|
||||
import { GameRoot } from "../root";
|
||||
import { globalConfig } from "../../core/config";
|
||||
import { Vector, mixVector } from "../../core/vector";
|
||||
import { lerp } from "../../core/utils";
|
||||
|
||||
/* dev:start */
|
||||
import trailerPoints from "./trailer_points";
|
||||
import { gMetaBuildingRegistry } from "../../core/global_registries";
|
||||
import { MetaBeltBaseBuilding } from "../buildings/belt_base";
|
||||
import { MinerComponent } from "../components/miner";
|
||||
|
||||
const tickrate = 1 / 165;
|
||||
|
||||
export class TrailerMaker {
|
||||
/**
|
||||
*
|
||||
* @param {GameRoot} root
|
||||
*/
|
||||
constructor(root) {
|
||||
this.root = root;
|
||||
|
||||
this.markers = [];
|
||||
this.playbackMarkers = null;
|
||||
this.currentPlaybackOrigin = new Vector();
|
||||
this.currentPlaybackZoom = 3;
|
||||
|
||||
window.addEventListener("keydown", ev => {
|
||||
if (ev.key === "j") {
|
||||
console.log("Record");
|
||||
this.markers.push({
|
||||
pos: this.root.camera.center.copy(),
|
||||
zoom: this.root.camera.zoomLevel,
|
||||
time: 1,
|
||||
wait: 0,
|
||||
});
|
||||
} else if (ev.key === "k") {
|
||||
console.log("Export");
|
||||
const json = JSON.stringify(this.markers);
|
||||
const handle = window.open("about:blank");
|
||||
handle.document.write(json);
|
||||
} else if (ev.key === "u") {
|
||||
if (this.playbackMarkers && this.playbackMarkers.length > 0) {
|
||||
this.playbackMarkers = [];
|
||||
return;
|
||||
}
|
||||
console.log("Playback");
|
||||
this.playbackMarkers = trailerPoints.map(p => Object.assign({}, p));
|
||||
this.playbackMarkers.unshift(this.playbackMarkers[0]);
|
||||
this.currentPlaybackOrigin = Vector.fromSerializedObject(this.playbackMarkers[0].pos);
|
||||
|
||||
this.currentPlaybackZoom = this.playbackMarkers[0].zoom;
|
||||
this.root.camera.center = this.currentPlaybackOrigin.copy();
|
||||
this.root.camera.zoomLevel = this.currentPlaybackZoom;
|
||||
console.log("STart at", this.currentPlaybackOrigin);
|
||||
|
||||
// this.root.entityMgr.getAllWithComponent(MinerComponent).forEach(miner => {
|
||||
// miner.components.Miner.itemChainBuffer = [];
|
||||
// miner.components.Miner.lastMiningTime = this.root.time.now() + 5;
|
||||
// miner.components.ItemEjector.slots.forEach(slot => (slot.item = null));
|
||||
// });
|
||||
|
||||
// this.root.logic.tryPlaceBuilding({
|
||||
// origin: new Vector(-428, -15),
|
||||
// building: gMetaBuildingRegistry.findByClass(MetaBeltBaseBuilding),
|
||||
// originalRotation: 0,
|
||||
// rotation: 0,
|
||||
// variant: "default",
|
||||
// rotationVariant: 0,
|
||||
// });
|
||||
|
||||
// this.root.logic.tryPlaceBuilding({
|
||||
// origin: new Vector(-427, -15),
|
||||
// building: gMetaBuildingRegistry.findByClass(MetaBeltBaseBuilding),
|
||||
// originalRotation: 0,
|
||||
// rotation: 0,
|
||||
// variant: "default",
|
||||
// rotationVariant: 0,
|
||||
// });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
update() {
|
||||
if (this.playbackMarkers && this.playbackMarkers.length > 0) {
|
||||
const nextMarker = this.playbackMarkers[0];
|
||||
|
||||
if (!nextMarker.startTime) {
|
||||
console.log("Starting to approach", nextMarker.pos);
|
||||
nextMarker.startTime = performance.now() / 1000.0;
|
||||
}
|
||||
|
||||
const speed =
|
||||
globalConfig.tileSize *
|
||||
globalConfig.beltSpeedItemsPerSecond *
|
||||
globalConfig.itemSpacingOnBelts;
|
||||
// let time =
|
||||
// this.currentPlaybackOrigin.distance(Vector.fromSerializedObject(nextMarker.pos)) / speed;
|
||||
const time = nextMarker.time;
|
||||
|
||||
const progress = (performance.now() / 1000.0 - nextMarker.startTime) / time;
|
||||
|
||||
if (progress > 1.0) {
|
||||
if (nextMarker.wait > 0) {
|
||||
nextMarker.wait -= tickrate;
|
||||
} else {
|
||||
console.log("Approached");
|
||||
this.currentPlaybackOrigin = this.root.camera.center.copy();
|
||||
this.currentPlaybackZoom = this.root.camera.zoomLevel;
|
||||
this.playbackMarkers.shift();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const targetPos = Vector.fromSerializedObject(nextMarker.pos);
|
||||
const targetZoom = nextMarker.zoom;
|
||||
|
||||
const pos = mixVector(this.currentPlaybackOrigin, targetPos, progress);
|
||||
const zoom = lerp(this.currentPlaybackZoom, targetZoom, progress);
|
||||
this.root.camera.zoomLevel = zoom;
|
||||
this.root.camera.center = pos;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* dev:end */
|
||||
import { GameRoot } from "../root";
|
||||
import { globalConfig } from "../../core/config";
|
||||
import { Vector, mixVector } from "../../core/vector";
|
||||
import { lerp } from "../../core/utils";
|
||||
|
||||
/* dev:start */
|
||||
import trailerPoints from "./trailer_points";
|
||||
|
||||
const tickrate = 1 / 165;
|
||||
|
||||
export class TrailerMaker {
|
||||
/**
|
||||
*
|
||||
* @param {GameRoot} root
|
||||
*/
|
||||
constructor(root) {
|
||||
this.root = root;
|
||||
|
||||
this.markers = [];
|
||||
this.playbackMarkers = null;
|
||||
this.currentPlaybackOrigin = new Vector();
|
||||
this.currentPlaybackZoom = 3;
|
||||
|
||||
window.addEventListener("keydown", ev => {
|
||||
if (ev.key === "j") {
|
||||
console.log("Record");
|
||||
this.markers.push({
|
||||
pos: this.root.camera.center.copy(),
|
||||
zoom: this.root.camera.zoomLevel,
|
||||
time: 1,
|
||||
wait: 0,
|
||||
});
|
||||
} else if (ev.key === "k") {
|
||||
console.log("Export");
|
||||
const json = JSON.stringify(this.markers);
|
||||
const handle = window.open("about:blank");
|
||||
handle.document.write(json);
|
||||
} else if (ev.key === "u") {
|
||||
if (this.playbackMarkers && this.playbackMarkers.length > 0) {
|
||||
this.playbackMarkers = [];
|
||||
return;
|
||||
}
|
||||
console.log("Playback");
|
||||
this.playbackMarkers = trailerPoints.map(p => Object.assign({}, p));
|
||||
this.playbackMarkers.unshift(this.playbackMarkers[0]);
|
||||
this.currentPlaybackOrigin = Vector.fromSerializedObject(this.playbackMarkers[0].pos);
|
||||
|
||||
this.currentPlaybackZoom = this.playbackMarkers[0].zoom;
|
||||
this.root.camera.center = this.currentPlaybackOrigin.copy();
|
||||
this.root.camera.zoomLevel = this.currentPlaybackZoom;
|
||||
console.log("STart at", this.currentPlaybackOrigin);
|
||||
|
||||
// this.root.entityMgr.getAllWithComponent(MinerComponent).forEach(miner => {
|
||||
// miner.components.Miner.itemChainBuffer = [];
|
||||
// miner.components.Miner.lastMiningTime = this.root.time.now() + 5;
|
||||
// miner.components.ItemEjector.slots.forEach(slot => (slot.item = null));
|
||||
// });
|
||||
|
||||
// this.root.logic.tryPlaceBuilding({
|
||||
// origin: new Vector(-428, -15),
|
||||
// building: gMetaBuildingRegistry.findByClass(MetaBeltBaseBuilding),
|
||||
// originalRotation: 0,
|
||||
// rotation: 0,
|
||||
// variant: "default",
|
||||
// rotationVariant: 0,
|
||||
// });
|
||||
|
||||
// this.root.logic.tryPlaceBuilding({
|
||||
// origin: new Vector(-427, -15),
|
||||
// building: gMetaBuildingRegistry.findByClass(MetaBeltBaseBuilding),
|
||||
// originalRotation: 0,
|
||||
// rotation: 0,
|
||||
// variant: "default",
|
||||
// rotationVariant: 0,
|
||||
// });
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
update() {
|
||||
if (this.playbackMarkers && this.playbackMarkers.length > 0) {
|
||||
const nextMarker = this.playbackMarkers[0];
|
||||
|
||||
if (!nextMarker.startTime) {
|
||||
console.log("Starting to approach", nextMarker.pos);
|
||||
nextMarker.startTime = performance.now() / 1000.0;
|
||||
}
|
||||
|
||||
const speed =
|
||||
globalConfig.tileSize *
|
||||
globalConfig.beltSpeedItemsPerSecond *
|
||||
globalConfig.itemSpacingOnBelts;
|
||||
// let time =
|
||||
// this.currentPlaybackOrigin.distance(Vector.fromSerializedObject(nextMarker.pos)) / speed;
|
||||
const time = nextMarker.time;
|
||||
|
||||
const progress = (performance.now() / 1000.0 - nextMarker.startTime) / time;
|
||||
|
||||
if (progress > 1.0) {
|
||||
if (nextMarker.wait > 0) {
|
||||
nextMarker.wait -= tickrate;
|
||||
} else {
|
||||
console.log("Approached");
|
||||
this.currentPlaybackOrigin = this.root.camera.center.copy();
|
||||
this.currentPlaybackZoom = this.root.camera.zoomLevel;
|
||||
this.playbackMarkers.shift();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const targetPos = Vector.fromSerializedObject(nextMarker.pos);
|
||||
const targetZoom = nextMarker.zoom;
|
||||
|
||||
const pos = mixVector(this.currentPlaybackOrigin, targetPos, progress);
|
||||
const zoom = lerp(this.currentPlaybackZoom, targetZoom, progress);
|
||||
this.root.camera.zoomLevel = zoom;
|
||||
this.root.camera.center = pos;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* dev:end */
|
||||
|
||||
Reference in New Issue
Block a user