From 0230d5e9d0a563f55ba6db52f3dd08b6372ccd17 Mon Sep 17 00:00:00 2001 From: Torin Blankensmith Date: Wed, 19 Feb 2020 22:52:44 -0500 Subject: [PATCH 1/9] rm sp-core --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 95f57df6..783d8882 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "firebase": "^7.8.1", "intersection-observer": "^0.7.0", "register-service-worker": "^1.6.2", - "shader-park-core": "https://github.com/bnanner/shader-park-core.git", "three": "^0.113.2", "v-lazy-image": "^1.3.2", "vue": "^2.6.11", From dd159aca33a395017d26a0f576667f6043e667a6 Mon Sep 17 00:00:00 2001 From: Torin Blankensmith Date: Wed, 19 Feb 2020 22:52:57 -0500 Subject: [PATCH 2/9] add sp core --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 783d8882..95f57df6 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "firebase": "^7.8.1", "intersection-observer": "^0.7.0", "register-service-worker": "^1.6.2", + "shader-park-core": "https://github.com/bnanner/shader-park-core.git", "three": "^0.113.2", "v-lazy-image": "^1.3.2", "vue": "^2.6.11", From f7c1a5dcb0f0972488de252985901786d9afd3b5 Mon Sep 17 00:00:00 2001 From: Torin Blankensmith Date: Wed, 19 Feb 2020 23:18:08 -0500 Subject: [PATCH 3/9] small change for re-deploy --- src/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.js b/src/main.js index ff82f588..efe78bb5 100644 --- a/src/main.js +++ b/src/main.js @@ -15,7 +15,6 @@ import './registerServiceWorker'; import TWEEN from '@tweenjs/tween.js'; import Vue from 'vue'; - import VModal from 'vue-js-modal'; import VueRouter from 'vue-router'; import Vuelidate from 'vuelidate'; From 31f2bb977c23d67378590b88eff2dd8a82958295 Mon Sep 17 00:00:00 2001 From: Torin Blankensmith Date: Thu, 24 Sep 2020 23:57:09 -0400 Subject: [PATCH 4/9] resize handel uses correct cursor pointer + dragging occurs centered to hande --- src/components/MainContainer.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/MainContainer.vue b/src/components/MainContainer.vue index 00667b15..89ff2dbf 100644 --- a/src/components/MainContainer.vue +++ b/src/components/MainContainer.vue @@ -80,8 +80,8 @@ export default { mouseMove(event) { if(this.dragingMouse) { let newWidth = ((event.clientX - this.handelWidth) / window.innerWidth) * 100; - this.editorWidth = `${newWidth}vw`; - this.actionsBarWidth = `calc(${100 - newWidth}vw - ${this.handelWidth}px)`; + this.editorWidth = `calc(${newWidth}vw + ${this.handelWidth/2}px)`; + this.actionsBarWidth = `calc(${100 - newWidth}vw - ${this.handelWidth * 1.5}px)`; this.cachedActionsBarWidth = this.actionsBarWidth; } }, @@ -137,7 +137,7 @@ export default { } .dragging { - cursor: pointer; + cursor: ew-resize !important; transition: width 0ms ease-in-out !important; } @@ -180,6 +180,7 @@ canvas { flex: 0 auto; border-right: 2px solid #f5f5f5; border-left: 2px solid #f5f5f5; + cursor:ew-resize; } .dot-container { @@ -187,13 +188,13 @@ canvas { padding-left: 28px; -webkit-transition: opacity 300ms ease-in-out; transition: opacity 300ms ease-in-out; - cursor: pointer; &:hover { opacity: 1; } .dot { height: 20px; opacity: 0.8; + user-select: none; } } From 534c1b019d26a35b71f9ffd7a645496845a741e0 Mon Sep 17 00:00:00 2001 From: Torin Blankensmith Date: Tue, 29 Sep 2020 00:24:54 -0400 Subject: [PATCH 5/9] docs potential fix --- src/components/New.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/New.vue b/src/components/New.vue index 8f88bbe9..be888b44 100644 --- a/src/components/New.vue +++ b/src/components/New.vue @@ -75,7 +75,7 @@ export default { this.$nextTick(function() { const sculp = this.$refs.sculpture; if(sculp) { - if(!this.hideEditor && window.width > 500) { + if(!this.hideEditor) { this.$store.state.selectedObject = sculp.sculpture.mesh; } From 5738472513b574e564e4d6fed9a1e742a60b2128 Mon Sep 17 00:00:00 2001 From: Torin Blankensmith Date: Sat, 5 Mar 2022 20:04:58 -0500 Subject: [PATCH 6/9] update tag --- public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index f865ac76..5933703c 100644 --- a/public/index.html +++ b/public/index.html @@ -23,13 +23,13 @@ - + From 3f8a4a2ce0782c43d090a5ec65e61e6dea318265 Mon Sep 17 00:00:00 2001 From: Torin Blankensmith Date: Fri, 25 Mar 2022 01:18:58 -0400 Subject: [PATCH 7/9] rm public path --- vue.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index d4a378ba..9aa8c2fc 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,5 +1,4 @@ module.exports = { - publicPath: "./", pwa: { workboxOptions: { exclude: ['_redirects'], From 2da03d884055c4962dba42d3fc5d9c8f3175b53a Mon Sep 17 00:00:00 2001 From: Peter Whidden Date: Sun, 29 May 2022 00:57:08 -0400 Subject: [PATCH 8/9] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94fa9e12..c636f506 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "intersection-observer": "^0.7.0", "lodash.throttle": "^4.1.1", "register-service-worker": "^1.6.2", - "shader-park-core": "^0.1.18", + "shader-park-core": "^0.1.22", "three": "^0.138.3", "v-lazy-image": "^1.3.2", "vue": "^2.6.11", From ad662a12cdef33d816f61c3362c1de89c96e4373 Mon Sep 17 00:00:00 2001 From: Peter Whidden Date: Sun, 5 Jun 2022 12:31:07 -0400 Subject: [PATCH 9/9] update sp-core --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c636f506..f18a795b 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "intersection-observer": "^0.7.0", "lodash.throttle": "^4.1.1", "register-service-worker": "^1.6.2", - "shader-park-core": "^0.1.22", + "shader-park-core": "^0.1.26", "three": "^0.138.3", "v-lazy-image": "^1.3.2", "vue": "^2.6.11",