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

Add method to debug changed areas

Browse Source
This commit is contained in:
tobspr
2020-06-25 12:42:48 +02:00
parent 77ddef0170
commit 182b62d604
4 changed files with 130 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
import { Math_sqrt } from "../../core/builtins";
import { Math_sqrt, Math_max } from "../../core/builtins";
import { globalConfig } from "../../core/config";
import { DrawParameters } from "../../core/draw_parameters";
import { gMetaBuildingRegistry } from "../../core/global_registries";
@@ -117,7 +117,9 @@ export class BeltSystem extends GameSystemWithFilter {
} else {
this.areaToRecompute = affectedArea.clone();
}
logger.log("Queuing recompute:", this.areaToRecompute);
if (G_IS_DEV) {
logger.log("Queuing recompute:", this.areaToRecompute);
}
}
}
@@ -169,6 +171,15 @@ export class BeltSystem extends GameSystemWithFilter {
computeBeltCache() {
if (this.areaToRecompute) {
logger.log("Updating belt cache by updating area:", this.areaToRecompute);
if (G_IS_DEV && globalConfig.debug.renderChanges) {
this.root.hud.parts.changesDebugger.renderChange(
"belt-area",
this.areaToRecompute,
"#00fff6"
);
}
for (let x = this.areaToRecompute.x; x < this.areaToRecompute.right(); ++x) {
for (let y = this.areaToRecompute.y; y < this.areaToRecompute.bottom(); ++y) {
const tile = this.root.map.getTileContentXY(x, y);
@@ -182,6 +193,15 @@ export class BeltSystem extends GameSystemWithFilter {
this.areaToRecompute = null;
} else {
logger.log("Doing full belt recompute");
if (G_IS_DEV && globalConfig.debug.renderChanges) {
this.root.hud.parts.changesDebugger.renderChange(
"",
new Rectangle(-1000, -1000, 2000, 2000),
"#00fff6"
);
}
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];
entity.components.Belt.followUpCache = this.findFollowUpEntity(entity);
@@ -246,6 +266,11 @@ export class BeltSystem extends GameSystemWithFilter {
speedMultiplier = SQRT_2;
}
// How much offset we add when transferring to a new belt
// This substracts one tick because the belt will be updated directly
// afterwards anyways
const takeoverOffset = 1.0 + beltSpeed * speedMultiplier;
// Not really nice. haven't found the reason for this yet.
if (items.length > 2 / globalConfig.itemSpacingOnBelts) {
beltComp.sortedItems = [];
@@ -260,7 +285,7 @@ export class BeltSystem extends GameSystemWithFilter {
if (beltComp.followUpCache) {
const followUpBelt = beltComp.followUpCache.components.Belt;
if (followUpBelt.canAcceptItem()) {
followUpBelt.takeItem(progressAndItem[1], progressAndItem[0] - 1.0);
followUpBelt.takeItem(progressAndItem[1], progressAndItem[0] - takeoverOffset);
items.splice(itemIndex, 1);
} else {
// Well, we couldn't really take it to a follow up belt, keep it at

15
src/js/game/systems/item_ejector.js
View File

@@ -56,10 +56,25 @@ export class ItemEjectorSystem extends GameSystemWithFilter {
recomputeCache() {
if (this.areaToRecompute) {
logger.log("Recomputing cache using rectangle");
if (G_IS_DEV && globalConfig.debug.renderChanges) {
this.root.hud.parts.changesDebugger.renderChange(
"ejector-area",
this.areaToRecompute,
"#fe50a6"
);
}
this.recomputeAreaCache(this.areaToRecompute);
this.areaToRecompute = null;
} else {
logger.log("Full cache recompute");
if (G_IS_DEV && globalConfig.debug.renderChanges) {
this.root.hud.parts.changesDebugger.renderChange(
"ejector-full",
new Rectangle(-1000, -1000, 2000, 2000),
"#fe50a6"
);
}
// Try to find acceptors for every ejector
for (let i = 0; i < this.allEntities.length; ++i) {
const entity = this.allEntities[i];