www.spaceplanner.app

commit 61b787d7fd9857d814ff16c6c7b33d0f9e8f4a74
parent 41406cefc566d89a9d0343fa085b37fbe7efcd69
Author: Jacob R. Edwards <jacob@jacobedwards.org>
Date:   Mon, 14 Oct 2024 13:49:34 -0700

Fix use of old editor.furniture_types field

Diffstat:
M
files/floorplans/floorplan/editor.js
 | 
2
+-
M
files/floorplans/floorplan/main.js
 | 
14
+++++++-------

2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/files/floorplans/floorplan/editor.js b/files/floorplans/floorplan/editor.js
@@ -828,7 +828,7 @@ export class FloorplanEditor {
 		if (this.backend.params.furniture[params.type] == null) {
 			throw new Error(params.type + ": Invalid furniture type")
 		}
-		let vars = this.backend.furniture[params.type].varieties
+		let vars = this.backend.params.furniture[params.type].varieties
 		for (let v in vars) {
 			if (params.width == vars[v].width && params.depth == vars[v].depth) {
 				return v
diff --git a/files/floorplans/floorplan/main.js b/files/floorplans/floorplan/main.js
@@ -937,10 +937,10 @@ function furnitureMenuX(editor, pointOrID) {
 	}
 	const styles = function(type) {
 		let styles = ['default']
-		if (editor.furniture_types[type].styles == null) {
+		if (editor.backend.params.furniture[type].styles == null) {
 			return styles
 		}
-		return styles.concat(editor.furniture_types[type].styles)
+		return styles.concat(editor.backend.params.furniture[type].styles)
 	}
 
 	editor.finishAction()
@@ -955,7 +955,7 @@ function furnitureMenuX(editor, pointOrID) {
 			p = pointOrID
 		}
 		let type = "any"
-		let vars = editor.furniture_types[type].varieties
+		let vars = editor.backend.params.furniture[type].varieties
 		let v
 		if (def(vars)) {
 			v = def(vars)
@@ -988,7 +988,7 @@ function furnitureMenuX(editor, pointOrID) {
 
 	let items = [
 		menuItem("name", "Name", { attributes: { value: params.name ?? "" } }),
-		menuItem("type", "Type", { break: false, enum: editor.furniture_types, attributes: { value: params.type, required: true } }),
+		menuItem("type", "Type", { break: false, enum: editor.backend.params.furniture, attributes: { value: params.type, required: true } }),
 		menuItem("style", "Style"),
 		menuItem("variety", "Variety"),
 		menuItem("width", "Width", { attributes: { value: userLength(editor, params.width), required: true } }),
@@ -1006,7 +1006,7 @@ function furnitureMenuX(editor, pointOrID) {
 			return
 		}
 
-		let v = editor.furniture_types[type].varieties[variety]
+		let v = editor.backend.params.furniture[type].varieties[variety]
 		params.width = v.width
 		items[keys.width].input.value = userLength(editor, v.width)
 		params.depth = v.depth
@@ -1014,7 +1014,7 @@ function furnitureMenuX(editor, pointOrID) {
 		tryUpdate()
 	}
 	const newVariety = function(init) {
-		let vars = editor.furniture_types[items[keys.type].input.value].varieties
+		let vars = editor.backend.params.furniture[items[keys.type].input.value].varieties
 		if (vars == undefined) {
 			items[keys.variety].container.classList.add("hidden")
 			fromVariety()
@@ -1064,7 +1064,7 @@ function furnitureMenuX(editor, pointOrID) {
 		}
 	}
 	const updateVariety = function() {
-		let vars = editor.furniture_types[params.type].varieties
+		let vars = editor.backend.params.furniture[params.type].varieties
 		let cnt = 0
 		for (let k in vars) {
 			if (++cnt > 1) {