Skip to content
Snippets Groups Projects
Commit 0cdb74ba authored by Adam Procter's avatar Adam Procter
Browse files

trying to work out translation issue

parent 8cd16037
Branches
No related tags found
No related merge requests found
...@@ -126,9 +126,4 @@ button { ...@@ -126,9 +126,4 @@ button {
button.active { button.active {
background: rgb(30, 30, 30); background: rgb(30, 30, 30);
} }
@media only screen and (max-width: 600px) {
nav {
}
}
</style> </style>
...@@ -30,6 +30,16 @@ ...@@ -30,6 +30,16 @@
</div> </div>
<div v-else ref="container" class="outer"> <div v-else ref="container" class="outer">
<!-- <div
ref="innerContainer"
v-bind:class="{ inner: true, active: true }"
v-bind:style="{
width: `${width}px`,
height: `${height}px`,
transform: `translate(${translation.x}px, ${translation.y}px) scale(${scale})`,
}"
> -->
<div <div
ref="innerContainer" ref="innerContainer"
v-bind:class="{ inner: true, active: true }" v-bind:class="{ inner: true, active: true }"
...@@ -98,7 +108,7 @@ export default { ...@@ -98,7 +108,7 @@ export default {
this.translation, this.translation,
this.scale this.scale
) )
// console.log(relativePoint, boardPoint) console.log(relativePoint, boardPoint)
}, },
reset() {}, reset() {},
onMouseDown(e) { onMouseDown(e) {
......
...@@ -2,7 +2,7 @@ import { ...@@ -2,7 +2,7 @@ import {
clamp, clamp,
lerpPoint, lerpPoint,
scalePoint, scalePoint,
distanceBetween distanceBetween,
} from '@/experimental/utils/numbers' } from '@/experimental/utils/numbers'
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
...@@ -27,14 +27,14 @@ export const getNormalisedInteraction = (target, event, translation, scale) => { ...@@ -27,14 +27,14 @@ export const getNormalisedInteraction = (target, event, translation, scale) => {
return { return {
relativePoint: { x, y }, relativePoint: { x, y },
boardPoint: containerToBoardPoint({ x, y }, translation, scale) boardPoint: containerToBoardPoint({ x, y }, translation, scale),
} }
} }
export const containerToBoardPoint = (containerPoint, translation, scale) => { export const containerToBoardPoint = (containerPoint, translation, scale) => {
return { return {
x: parseInt((containerPoint.x + -translation.x) / scale, 10), x: parseInt((containerPoint.x + -translation.x) / scale, 10),
y: parseInt((containerPoint.y + -translation.y) / scale, 10) y: parseInt((containerPoint.y + -translation.y) / scale, 10),
} }
} }
...@@ -58,7 +58,7 @@ export const getTranslatedPositionFromContainer = ( ...@@ -58,7 +58,7 @@ export const getTranslatedPositionFromContainer = (
return { return {
x: point.x - (rect.left + translation.x), x: point.x - (rect.left + translation.x),
y: point.y - (rect.top + translation.y) y: point.y - (rect.top + translation.y),
} }
} }
...@@ -79,7 +79,7 @@ export const changeViewFromWheelEvent = ( ...@@ -79,7 +79,7 @@ export const changeViewFromWheelEvent = (
const focalPtDelta = scalePoint(mousePosition, scaleRatio) const focalPtDelta = scalePoint(mousePosition, scaleRatio)
const newTranslation = { const newTranslation = {
x: translation.x - focalPtDelta.x, x: translation.x - focalPtDelta.x,
y: translation.y - focalPtDelta.y y: translation.y - focalPtDelta.y,
} }
return [newScale, newTranslation] return [newScale, newTranslation]
...@@ -111,7 +111,7 @@ export const changeViewFromMultiTouch = ( ...@@ -111,7 +111,7 @@ export const changeViewFromMultiTouch = (
) )
const dragDelta = { const dragDelta = {
x: newMidPoint.x - startMidpoint.x, x: newMidPoint.x - startMidpoint.x,
y: newMidPoint.y - startMidpoint.y y: newMidPoint.y - startMidpoint.y,
} }
const scaleRatio = newScale / startScale const scaleRatio = newScale / startScale
const focalPoint = getTranslatedPositionFromContainer( const focalPoint = getTranslatedPositionFromContainer(
...@@ -127,7 +127,9 @@ export const changeViewFromMultiTouch = ( ...@@ -127,7 +127,9 @@ export const changeViewFromMultiTouch = (
focalPointDelta.x + focalPointDelta.x +
dragDelta.x, dragDelta.x,
y: y:
interaction.origin.pointer.translation.y - focalPointDelta.y + dragDelta.y interaction.origin.pointer.translation.y -
focalPointDelta.y +
dragDelta.y,
} }
return [newTranslation, newScale] return [newTranslation, newScale]
} }
...@@ -139,9 +141,9 @@ export const changeViewFromMultiTouch = ( ...@@ -139,9 +141,9 @@ export const changeViewFromMultiTouch = (
* @returns {Point} * @returns {Point}
* *
* */ * */
export const touchPoint = touch => { export const touchPoint = (touch) => {
return { return {
x: touch.clientX, x: touch.clientX,
y: touch.clientY y: touch.clientY,
} }
} }
...@@ -55,10 +55,6 @@ ...@@ -55,10 +55,6 @@
/> />
</div> </div>
<div v-else> <div v-else>
<OnBoard
@clientAdded="clientAdded()"
@editTrue="(e) => editTrue(e)"
/>
<OtherNodeslayer <OtherNodeslayer
v-for="value in otherNodes" v-for="value in otherNodes"
v-bind:key="value.node_id" v-bind:key="value.node_id"
...@@ -72,6 +68,10 @@ ...@@ -72,6 +68,10 @@
v-bind:nodeid="value.node_id" v-bind:nodeid="value.node_id"
v-bind:nodetext="value.node_text" v-bind:nodetext="value.node_text"
/> />
<OnBoard
@clientAdded="clientAdded()"
@editTrue="(e) => editTrue(e)"
/>
</div> </div>
</PanZoomContainer> </PanZoomContainer>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment