From 0dcc890d0d90126893e8a237c0ff6afdc6d2dd14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20N=C3=A6rvig=20W=C3=B8hlk?= Date: Mon, 5 Aug 2024 16:44:45 +0200 Subject: [PATCH] fix: rotate floors --- public/assets/model_x.room | 12 ++++++------ src/utils/styles.ts | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/public/assets/model_x.room b/public/assets/model_x.room index c662e070..0cbb7b6b 100644 --- a/public/assets/model_x.room +++ b/public/assets/model_x.room @@ -46,12 +46,12 @@ [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 280, #locV: 203, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 248, #locV: 219, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] [#member: "flat_stair_0_a_0_0_0", #media: #bitmap, #locH: 278, #locV: 203, #ink: 41, #blend: 100, #width: 130, #height: 103, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] - [#member: "flat_floor_0_a_0_0_0", #media: #bitmap, #locH: 438, #locV: 219, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] - [#member: "flat_floor_0_a_0_0_0", #media: #bitmap, #locH: 374, #locV: 251, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] - [#member: "flat_floor_0_a_0_0_0", #media: #bitmap, #locH: 310, #locV: 283, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] - [#member: "flat_floor_0_a_0_0_0", #media: #bitmap, #locH: 502, #locV: 251, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] - [#member: "flat_floor_0_a_0_0_0", #media: #bitmap, #locH: 438, #locV: 283, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] - [#member: "flat_floor_0_a_0_0_0", #media: #bitmap, #locH: 374, #locV: 315, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] + [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 568, #locV: 219, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] + [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 504, #locV: 251, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] + [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 440, #locV: 283, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] + [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 632, #locV: 251, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] + [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 568, #locV: 283, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] + [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 504, #locV: 315, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 664, #locV: 267, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 600, #locV: 299, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] [#member: "flat_floor_0_a_0_0_0", #flipH: 1, #media: #bitmap, #locH: 536, #locV: 331, #ink: 41, #blend: 100, #width: 130, #height: 71, #bgColor: "#999966", #palette: "floor_basic", #wrapperID: "floor01", #typeDef: #floor, #catchEvents: 1, #locX: 0, #locY: 0] diff --git a/src/utils/styles.ts b/src/utils/styles.ts index a46b9ea1..4d7df777 100644 --- a/src/utils/styles.ts +++ b/src/utils/styles.ts @@ -46,6 +46,10 @@ export const getBackground = ( document: LayoutDocument, element: LayoutElement ) => { + if (element.member === 'flat_floor_0_a_0_0_0') { + return `url(${assetUrl('flat_floor_2_a_0_0_0', 'png')})`; + } + if ( element.member === 'shadow.pixel' || element.type === 'image' ||