huanld/speckle-server
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #536 from specklesystems/dim/frontend

Browse Source 
fix(frontend): camera setting in units + double encoding (thx @cristi8)
This commit is contained in:
Dimitrie Stefanescu
2022-01-21 13:04:19 +00:00
committed by GitHub
parent 6c7c52a11e 24bc105816
commit d9712b9cff
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/frontend/src/cleanup/pages/stream/CommitObjectViewer.vue
+11 -10
View File
@@ -245,7 +245,7 @@ export default {
this.$router
.replace({
path: this.$route.path,
query: { ...fullQuery, filter: encodeURIComponent(JSON.stringify(val)) }
query: { ...fullQuery, filter: JSON.stringify(val) }
})
.catch(() => {})
}
@@ -294,11 +294,11 @@ export default {
this.filterToSet = null
if (this.$route.query && this.$route.query.c) {
this.camToSet = JSON.parse(decodeURIComponent(this.$route.query.c))
this.camToSet = JSON.parse(this.$route.query.c)
}
if (this.$route.query && this.$route.query.filter) {
this.filterToSet = JSON.parse(decodeURIComponent(this.$route.query.filter))
this.filterToSet = JSON.parse(this.$route.query.filter)
}
setTimeout(() => {
@@ -349,21 +349,22 @@ export default {
let pos = controls.getPosition()
let target = controls.getTarget()
let c = [
Math.round(pos.x, 5),
Math.round(pos.y, 5),
Math.round(pos.z, 5),
Math.round(target.x, 5),
Math.round(target.y, 5),
Math.round(target.z, 5),
parseFloat(pos.x.toFixed(5)),
parseFloat(pos.y.toFixed(5)),
parseFloat(pos.z.toFixed(5)),
parseFloat(target.x.toFixed(5)),
parseFloat(target.y.toFixed(5)),
parseFloat(target.z.toFixed(5)),
window.__viewer.cameraHandler.activeCam.name === 'ortho' ? 1 : 0,
controls._zoom
]
console.log(c)
let fullQuery = { ...this.$route.query }
delete fullQuery.c
this.$router
.replace({
path: this.$route.path,
query: { ...fullQuery, c: encodeURIComponent(JSON.stringify(c)) }
query: { ...fullQuery, c: JSON.stringify(c) }
})
.catch(() => {})
}, 1000)