Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-12-15 19:21:49 +00:00
Code Issues Projects Releases Wiki Activity

consolidate belt drawing logic

Browse Source
This commit is contained in:
EmeraldBlock 2021-11-24 23:34:09 -06:00
parent 6ea9f91641
commit e23c3c17e2
4 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,8 +50,6 @@ export class MapChunkView extends MapChunk {
systems.mapResources.drawChunk(parameters, this);
}
systems.acceptorBelt.drawChunk(parameters, this);
systems.ejectorBelt.drawChunk(parameters, this);
systems.belt.drawChunk(parameters, this);
}

14
src/js/game/systems/acceptor_belt.js
View File

@ -74,17 +74,11 @@ export class AcceptorBeltSystem extends GameSystemWithFilter {
* Draws a given chunk
* @param {DrawParameters} parameters
* @param {MapChunkView} chunk
* @param {object} param0
* @param {number} param0.animationIndex
* @param {boolean} param0.simplifiedBelts
*/
drawChunk(parameters, chunk) {
// SYNC with systems/belt.js:drawChunk!
const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10);
const animationIndex = Math.floor(
((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) *
globalConfig.itemSpacingOnBelts
);
const simplifiedBelts = this.root.app.settings.getAllSettings().simplifiedBelts;
internalDrawChunk(parameters, chunk, { animationIndex, simplifiedBelts }) {
const contents = chunk.containedEntitiesByLayer.regular;
for (let i = 0; i < contents.length; ++i) {
const entity = contents[i];

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

@ -496,16 +496,42 @@ export class BeltSystem extends GameSystemWithFilter {
* Draws a given chunk
* @param {DrawParameters} parameters
* @param {MapChunkView} chunk
* @param {object} param0
* @param {number} param0.animationIndex
* @param {boolean} param0.simplifiedBelts
* @param {BeltPath} param0.hoveredBeltPath
*
*/
internalDrawChunk(parameters, chunk, { animationIndex, simplifiedBelts, hoveredBeltPath }) {
const contents = chunk.containedEntitiesByLayer.regular;
for (let i = 0; i < contents.length; ++i) {
const entity = contents[i];
if (entity.components.Belt) {
const { direction, assignedPath } = entity.components.Belt;
const sprite = this.beltAnimations[direction][
!simplifiedBelts || assignedPath === hoveredBeltPath ? animationIndex : 0
];
// Culling happens within the static map entity component
entity.components.StaticMapEntity.drawSpriteOnBoundsClipped(parameters, sprite, 0);
}
}
}
/**
* Draws a given chunk, including acceptor/ejector belts
* @param {DrawParameters} parameters
* @param {MapChunkView} chunk
*/
drawChunk(parameters, chunk) {
// SYNC with systems/acceptor_belt.js:drawChunk and systems/ejector_belt.js:drawChunk!
// Limit speed to avoid belts going backwards
const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10);
// 126 / 42 is the exact animation speed of the png animation
const animationIndex = Math.floor(
((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) *
globalConfig.itemSpacingOnBelts
);
const animationIndex =
Math.floor(
((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) *
globalConfig.itemSpacingOnBelts
) % BELT_ANIM_COUNT;
const simplifiedBelts = this.root.app.settings.getAllSettings().simplifiedBelts;
@ -522,21 +548,15 @@ export class BeltSystem extends GameSystemWithFilter {
}
}
const contents = chunk.containedEntitiesByLayer.regular;
for (let i = 0; i < contents.length; ++i) {
const entity = contents[i];
if (entity.components.Belt) {
const { direction, assignedPath } = entity.components.Belt;
const sprite = this.beltAnimations[direction][
!simplifiedBelts || assignedPath === hoveredBeltPath
? animationIndex % BELT_ANIM_COUNT
: 0
];
// Culling happens within the static map entity component
entity.components.StaticMapEntity.drawSpriteOnBoundsClipped(parameters, sprite, 0);
}
}
this.internalDrawChunk(parameters, chunk, { animationIndex, simplifiedBelts, hoveredBeltPath });
this.root.systemMgr.systems.acceptorBelt.internalDrawChunk(parameters, chunk, {
animationIndex,
simplifiedBelts,
});
this.root.systemMgr.systems.ejectorBelt.internalDrawChunk(parameters, chunk, {
animationIndex,
simplifiedBelts,
});
}
/**

14
src/js/game/systems/ejector_belt.js
View File

@ -24,17 +24,11 @@ export class EjectorBeltSystem extends GameSystemWithFilter {
* Draws a given chunk
* @param {DrawParameters} parameters
* @param {MapChunkView} chunk
* @param {object} param0
* @param {number} param0.animationIndex
* @param {boolean} param0.simplifiedBelts
*/
drawChunk(parameters, chunk) {
// SYNC with systems/belt.js:drawChunk!
const speedMultiplier = Math.min(this.root.hubGoals.getBeltBaseSpeed(), 10);
const animationIndex = Math.floor(
((this.root.time.realtimeNow() * speedMultiplier * BELT_ANIM_COUNT * 126) / 42) *
globalConfig.itemSpacingOnBelts
);
const simplifiedBelts = this.root.app.settings.getAllSettings().simplifiedBelts;
internalDrawChunk(parameters, chunk, { animationIndex, simplifiedBelts }) {
const contents = chunk.containedEntitiesByLayer.regular;
for (let i = 0; i < contents.length; ++i) {
const entity = contents[i];