diff --git a/package-lock.json b/package-lock.json index 8e9f9b4..2f7bd38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "pinia": "^2.0.32", "pinia-persistedstate-plugin": "^0.1.0", "pinia-plugin-persistedstate": "^3.1.0", + "three": "^0.148.0", "vue": "^3.2.47", "vue-draggable-plus": "^0.6.1", "vue-i18n": "^11.2.8", @@ -8556,6 +8557,12 @@ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, + "node_modules/three": { + "version": "0.148.0", + "resolved": "https://registry.npmmirror.com/three/-/three-0.148.0.tgz", + "integrity": "sha512-8uzVV+qhTPi0bOFs/3te3RW6hb3urL8jYEl6irjCWo/l6sr8MPNMcClFev/MMYeIxr0gmDcoXTy/8LXh/LXkfw==", + "license": "MIT" + }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmmirror.com/through/-/through-2.3.8.tgz", @@ -16065,6 +16072,11 @@ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, + "three": { + "version": "0.148.0", + "resolved": "https://registry.npmmirror.com/three/-/three-0.148.0.tgz", + "integrity": "sha512-8uzVV+qhTPi0bOFs/3te3RW6hb3urL8jYEl6irjCWo/l6sr8MPNMcClFev/MMYeIxr0gmDcoXTy/8LXh/LXkfw==" + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmmirror.com/through/-/through-2.3.8.tgz", diff --git a/package.json b/package.json index a89a047..c003462 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "pinia": "^2.0.32", "pinia-persistedstate-plugin": "^0.1.0", "pinia-plugin-persistedstate": "^3.1.0", + "three": "^0.148.0", "vue": "^3.2.47", "vue-draggable-plus": "^0.6.1", "vue-i18n": "^11.2.8", diff --git a/src/assets/icons/dc/hide.svg b/src/assets/icons/dc/hide.svg new file mode 100644 index 0000000..e991e7e --- /dev/null +++ b/src/assets/icons/dc/hide.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/Canvas/DepthCanvas/components/layer-panel/layer-item.vue b/src/components/Canvas/DepthCanvas/components/layer-panel/layer-item.vue index fbf8bc2..a54bebb 100644 --- a/src/components/Canvas/DepthCanvas/components/layer-panel/layer-item.vue +++ b/src/components/Canvas/DepthCanvas/components/layer-panel/layer-item.vue @@ -1,28 +1,64 @@ diff --git a/src/components/Canvas/components/fullscreen-dialog.vue b/src/components/Canvas/components/fullscreen-dialog.vue index cca3d74..ae94f3b 100644 --- a/src/components/Canvas/components/fullscreen-dialog.vue +++ b/src/components/Canvas/components/fullscreen-dialog.vue @@ -69,6 +69,7 @@ position: absolute; top: 3rem; right: 3rem; + --my-info-bgColor: #fff; } > .close-btn { cursor: pointer; diff --git a/src/components/MyInfo.vue b/src/components/MyInfo.vue index d763bdb..0d7a345 100644 --- a/src/components/MyInfo.vue +++ b/src/components/MyInfo.vue @@ -72,9 +72,9 @@ min-width: 18rem; height: 4.3rem; margin-right: 1rem; - background-color: rgba(255, 252, 244, 1); border: 1px solid #ffcf90; border-radius: 0.8rem; + background-color: var(--my-info-bgColor, rgba(255, 252, 244, 1)); > .credits { flex: 1; font-size: 1.3rem;