diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-08-22 02:40:01 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-08-22 02:40:01 +0900 |
| commit | c741e27057aa1e4490b96b5336baa25194323f36 (patch) | |
| tree | 2725776ba2f48e2998a505b7099ddcd87080724b /src/client | |
| parent | Update yarn.lock (#5327) (diff) | |
| download | misskey-c741e27057aa1e4490b96b5336baa25194323f36.tar.gz misskey-c741e27057aa1e4490b96b5336baa25194323f36.tar.bz2 misskey-c741e27057aa1e4490b96b5336baa25194323f36.zip | |
[Room] Add holo-display
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/scripts/room/furnitures.json5 | 27 | ||||
| -rw-r--r-- | src/client/assets/room/furnitures/holo-display/holo-display.blend | bin | 0 -> 788876 bytes | |||
| -rw-r--r-- | src/client/assets/room/furnitures/holo-display/holo-display.glb | bin | 0 -> 149912 bytes | |||
| -rw-r--r-- | src/client/assets/room/furnitures/holo-display/ray-uv.png | bin | 0 -> 20901 bytes | |||
| -rw-r--r-- | src/client/assets/room/furnitures/holo-display/ray.png | bin | 0 -> 104293 bytes |
5 files changed, 27 insertions, 0 deletions
diff --git a/src/client/app/common/scripts/room/furnitures.json5 b/src/client/app/common/scripts/room/furnitures.json5 index 5893147dcc..b6ddd5c2b8 100644 --- a/src/client/app/common/scripts/room/furnitures.json5 +++ b/src/client/app/common/scripts/room/furnitures.json5 @@ -354,5 +354,32 @@ { id: "cup-noodle", place: "floor" + }, + { + id: "holo-display", + place: "floor", + props: { + image: 'image' + }, + texture: { + Image_Front: { + prop: 'image', + uv: { + x: 0, + y: 0, + width: 1024, + height: 1024, + }, + }, + Image_Back: { + prop: 'image', + uv: { + x: 0, + y: 0, + width: 1024, + height: 1024, + }, + }, + }, } ] diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.blend b/src/client/assets/room/furnitures/holo-display/holo-display.blend Binary files differnew file mode 100644 index 0000000000..87c748ffef --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/holo-display.blend diff --git a/src/client/assets/room/furnitures/holo-display/holo-display.glb b/src/client/assets/room/furnitures/holo-display/holo-display.glb Binary files differnew file mode 100644 index 0000000000..541b184fad --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/holo-display.glb diff --git a/src/client/assets/room/furnitures/holo-display/ray-uv.png b/src/client/assets/room/furnitures/holo-display/ray-uv.png Binary files differnew file mode 100644 index 0000000000..aa7e817e0f --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/ray-uv.png diff --git a/src/client/assets/room/furnitures/holo-display/ray.png b/src/client/assets/room/furnitures/holo-display/ray.png Binary files differnew file mode 100644 index 0000000000..6a5d24e143 --- /dev/null +++ b/src/client/assets/room/furnitures/holo-display/ray.png |
