Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-06-13 13:04:03 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Exund 2020-09-19 15:43:48 +02:00
parent 88d457af0e
commit f1c134994c
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/js/game/building_codes.js
View File

@ -19,7 +19,7 @@ import { Vector } from "../core/vector";
/** /**
* Stores a lookup table for all building variants (for better performance) * Stores a lookup table for all building variants (for better performance)
* @type {Object<number, BuildingVariantIdentifier>} * @type {Object<string, BuildingVariantIdentifier>}
*/ */
export const gBuildingVariants = { export const gBuildingVariants = {
// Set later // Set later
@ -38,12 +38,7 @@ const variantsCache = new Map();
* @param {typeof MetaBuildingVariant} variant * @param {typeof MetaBuildingVariant} variant
* @param {number} rotationVariant * @param {number} rotationVariant
*/ */
export function registerBuildingVariant( export function registerBuildingVariant(code, meta, variant, rotationVariant = 0) {
code,
meta,
variant,
rotationVariant = 0
) {
assert(!gBuildingVariants[code], "Duplicate id: " + code); assert(!gBuildingVariants[code], "Duplicate id: " + code);
gBuildingVariants[code.toString()] = { gBuildingVariants[code.toString()] = {
metaClass: meta, metaClass: meta,
@ -71,7 +66,7 @@ export function buildBuildingCodeCache() {
for (const code in gBuildingVariants) { for (const code in gBuildingVariants) {
const data = gBuildingVariants[code]; const data = gBuildingVariants[code];
const hash = data.metaInstance.getId() + "/" + data.variant + "/" + data.rotationVariant; const hash = data.metaInstance.getId() + "/" + data.variant + "/" + data.rotationVariant;
variantsCache.set(hash, +code); variantsCache.set(hash, code);
} }
} }

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

@ -53,7 +53,7 @@ import {
Tier2UndergroundBeltVariant, Tier2UndergroundBeltVariant,
} from "./buildings/underground_belt"; } from "./buildings/underground_belt";
import { DefaultWireVariant, MetaWireBuilding } from "./buildings/wire"; import { DefaultWireVariant, MetaWireBuilding } from "./buildings/wire";
import { gBuildingVariants, registerBuildingVariant } from "./building_codes"; import { buildBuildingCodeCache, gBuildingVariants, registerBuildingVariant } from "./building_codes";
import { defaultBuildingVariant } from "./meta_building"; import { defaultBuildingVariant } from "./meta_building";
import { DefaultConstantSignalVariant, MetaConstantSignalBuilding } from "./buildings/constant_signal"; import { DefaultConstantSignalVariant, MetaConstantSignalBuilding } from "./buildings/constant_signal";
import { import {