Spaces:
Runtime error
Runtime error
remove spring
Browse files- frontend/src/lib/App.svelte +0 -1
- frontend/src/lib/Canvas.svelte +0 -7
- frontend/src/lib/Cursor.svelte +3 -11
- frontend/src/lib/Frame.svelte +3 -18
- frontend/src/lib/store.ts +12 -9
- frontend/src/routes/+page.svelte +3 -0
frontend/src/lib/App.svelte
CHANGED
@@ -132,7 +132,6 @@
|
|
132 |
position={$imagesList.get(i).position}
|
133 |
images={$imagesList.get(i).images}
|
134 |
transform={$currZoomTransform}
|
135 |
-
dumped={false}
|
136 |
/>
|
137 |
{/each}
|
138 |
{/if}
|
|
|
132 |
position={$imagesList.get(i).position}
|
133 |
images={$imagesList.get(i).images}
|
134 |
transform={$currZoomTransform}
|
|
|
135 |
/>
|
136 |
{/each}
|
137 |
{/if}
|
frontend/src/lib/Canvas.svelte
CHANGED
@@ -40,13 +40,9 @@
|
|
40 |
.on('click', () => {
|
41 |
$isPrompting = true;
|
42 |
$clickedPosition = $myPresence.cursor;
|
43 |
-
console.log($clickedPosition);
|
44 |
});
|
45 |
|
46 |
canvasCtx = canvasEl.getContext('2d') as CanvasRenderingContext2D;
|
47 |
-
canvasCtx.fillStyle = 'red';
|
48 |
-
canvasCtx.rect(10, 10, 160, 90);
|
49 |
-
canvasCtx.fill();
|
50 |
canvasCtx.strokeStyle = 'blue';
|
51 |
canvasCtx.lineWidth = 10;
|
52 |
canvasCtx.strokeRect(0, 0, width, height);
|
@@ -72,9 +68,6 @@
|
|
72 |
// const y = Math.round(event.layerY / grid) * grid; //round(Math.max(r, Math.min(512 * 5 - r, event.clientY)), 100);
|
73 |
// const x = round(Math.max(r, Math.min(512 * 5 - r, event.clientX)), grid);
|
74 |
// const y = round(Math.max(r, Math.min(512 * 5 - r, event.clientY)), grid);
|
75 |
-
|
76 |
-
console.log(x, y);
|
77 |
-
|
78 |
$myPresence = {
|
79 |
cursor: {
|
80 |
x,
|
|
|
40 |
.on('click', () => {
|
41 |
$isPrompting = true;
|
42 |
$clickedPosition = $myPresence.cursor;
|
|
|
43 |
});
|
44 |
|
45 |
canvasCtx = canvasEl.getContext('2d') as CanvasRenderingContext2D;
|
|
|
|
|
|
|
46 |
canvasCtx.strokeStyle = 'blue';
|
47 |
canvasCtx.lineWidth = 10;
|
48 |
canvasCtx.strokeRect(0, 0, width, height);
|
|
|
68 |
// const y = Math.round(event.layerY / grid) * grid; //round(Math.max(r, Math.min(512 * 5 - r, event.clientY)), 100);
|
69 |
// const x = round(Math.max(r, Math.min(512 * 5 - r, event.clientX)), grid);
|
70 |
// const y = round(Math.max(r, Math.min(512 * 5 - r, event.clientY)), grid);
|
|
|
|
|
|
|
71 |
$myPresence = {
|
72 |
cursor: {
|
73 |
x,
|
frontend/src/lib/Cursor.svelte
CHANGED
@@ -1,6 +1,4 @@
|
|
1 |
<script lang="ts">
|
2 |
-
import { spring } from 'svelte/motion';
|
3 |
-
|
4 |
import type { ZoomTransform } from 'd3-zoom';
|
5 |
|
6 |
export let transform: ZoomTransform;
|
@@ -8,21 +6,15 @@
|
|
8 |
export let emoji = '';
|
9 |
export let position = { x: 0, y: 0 };
|
10 |
|
11 |
-
|
12 |
-
const coords = spring(position, {
|
13 |
-
stiffness: 0.07,
|
14 |
-
damping: 0.35
|
15 |
-
});
|
16 |
-
// Update spring when x and y change
|
17 |
-
$: coords.set({
|
18 |
x: transform.applyX(position.x),
|
19 |
y: transform.applyY(position.y)
|
20 |
-
}
|
21 |
</script>
|
22 |
|
23 |
<div
|
24 |
class="cursor"
|
25 |
-
style={`transform: translateX(${
|
26 |
>
|
27 |
<svg
|
28 |
class="block z-0 col-span-2 row-span-2"
|
|
|
1 |
<script lang="ts">
|
|
|
|
|
2 |
import type { ZoomTransform } from 'd3-zoom';
|
3 |
|
4 |
export let transform: ZoomTransform;
|
|
|
6 |
export let emoji = '';
|
7 |
export let position = { x: 0, y: 0 };
|
8 |
|
9 |
+
$: coord = {
|
|
|
|
|
|
|
|
|
|
|
|
|
10 |
x: transform.applyX(position.x),
|
11 |
y: transform.applyY(position.y)
|
12 |
+
};
|
13 |
</script>
|
14 |
|
15 |
<div
|
16 |
class="cursor"
|
17 |
+
style={`transform: translateX(${coord.x}px) translateY(${coord.y}px) scale(${transform.k});`}
|
18 |
>
|
19 |
<svg
|
20 |
class="block z-0 col-span-2 row-span-2"
|
frontend/src/lib/Frame.svelte
CHANGED
@@ -1,5 +1,4 @@
|
|
1 |
<script lang="ts">
|
2 |
-
import { spring } from 'svelte/motion';
|
3 |
import LoadingIcon from '$lib/LoadingIcon.svelte';
|
4 |
|
5 |
import type { ZoomTransform } from 'd3-zoom';
|
@@ -8,30 +7,16 @@
|
|
8 |
export let color = '';
|
9 |
export let position = { x: 0, y: 0 };
|
10 |
export let images: string[];
|
11 |
-
export let dumped: boolean = true;
|
12 |
|
13 |
-
|
14 |
-
const coords = spring(position, {
|
15 |
-
stiffness: 0.07,
|
16 |
-
damping: 0.35
|
17 |
-
});
|
18 |
-
// Update spring when x and y change
|
19 |
-
$: coords.set({
|
20 |
x: transform.applyX(position.x),
|
21 |
y: transform.applyY(position.y)
|
22 |
-
}
|
23 |
-
|
24 |
-
$: ncoord = dumped
|
25 |
-
? $coords
|
26 |
-
: {
|
27 |
-
x: transform.applyX(position.x),
|
28 |
-
y: transform.applyY(position.y)
|
29 |
-
};
|
30 |
</script>
|
31 |
|
32 |
<div
|
33 |
class="frame z-0 flex relative"
|
34 |
-
style={`transform: translateX(${
|
35 |
background-image: linear-gradient(${color}, rgba(255,255,255,0));
|
36 |
color: ${color};
|
37 |
`}
|
|
|
1 |
<script lang="ts">
|
|
|
2 |
import LoadingIcon from '$lib/LoadingIcon.svelte';
|
3 |
|
4 |
import type { ZoomTransform } from 'd3-zoom';
|
|
|
7 |
export let color = '';
|
8 |
export let position = { x: 0, y: 0 };
|
9 |
export let images: string[];
|
|
|
10 |
|
11 |
+
$: coord = {
|
|
|
|
|
|
|
|
|
|
|
|
|
12 |
x: transform.applyX(position.x),
|
13 |
y: transform.applyY(position.y)
|
14 |
+
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
15 |
</script>
|
16 |
|
17 |
<div
|
18 |
class="frame z-0 flex relative"
|
19 |
+
style={`transform: translateX(${coord.x}px) translateY(${coord.y}px) scale(${transform.k});
|
20 |
background-image: linear-gradient(${color}, rgba(255,255,255,0));
|
21 |
color: ${color};
|
22 |
`}
|
frontend/src/lib/store.ts
CHANGED
@@ -39,13 +39,16 @@ export function createPresenceStore(room: Room) {
|
|
39 |
}
|
40 |
|
41 |
export async function createStorageStore(room: Room) {
|
42 |
-
|
43 |
-
|
44 |
-
|
45 |
-
|
46 |
-
|
47 |
-
|
48 |
-
|
49 |
-
|
50 |
-
|
|
|
|
|
|
|
51 |
}
|
|
|
39 |
}
|
40 |
|
41 |
export async function createStorageStore(room: Room) {
|
42 |
+
try {
|
43 |
+
const { root } = await room.getStorage();
|
44 |
+
|
45 |
+
const _imagesList = root.get('imagesList');
|
46 |
+
|
47 |
+
imagesList.set(_imagesList);
|
48 |
+
room.subscribe(_imagesList, () => {
|
49 |
+
imagesList.update((_) => _imagesList);
|
50 |
+
});
|
51 |
+
} catch (e) {
|
52 |
+
console.log(e);
|
53 |
+
}
|
54 |
}
|
frontend/src/routes/+page.svelte
CHANGED
@@ -30,6 +30,9 @@
|
|
30 |
},
|
31 |
initialStorage: { imagesList: new LiveList() }
|
32 |
});
|
|
|
|
|
|
|
33 |
|
34 |
const unsubscribePresence = createPresenceStore(room);
|
35 |
createStorageStore(room);
|
|
|
30 |
},
|
31 |
initialStorage: { imagesList: new LiveList() }
|
32 |
});
|
33 |
+
const unsubscribe = room.subscribe('error', (error) => {
|
34 |
+
console.error('error', error);
|
35 |
+
});
|
36 |
|
37 |
const unsubscribePresence = createPresenceStore(room);
|
38 |
createStorageStore(room);
|