radames commited on
Commit
ab1e5bd
1 Parent(s): 8dabd94

fix masking claning on update issue

Browse files
frontend/src/lib/App.svelte CHANGED
@@ -29,6 +29,7 @@
29
  }
30
 
31
  const promptImgStorage = useObject('promptImgStorage');
 
32
 
33
  $: isLoading = $myPresence?.status === Status.loading || $isRenderingCanvas || false;
34
  function onShowModal(e: CustomEvent) {
 
29
  }
30
 
31
  const promptImgStorage = useObject('promptImgStorage');
32
+ $: console.log('isRendering', $isRenderingCanvas);
33
 
34
  $: isLoading = $myPresence?.status === Status.loading || $isRenderingCanvas || false;
35
  function onShowModal(e: CustomEvent) {
frontend/src/lib/PaintCanvas.svelte CHANGED
@@ -149,9 +149,9 @@
149
  position: { x: number; y: number };
150
  id: string;
151
  };
152
- function renderImages(promptImgList: PromptImgObject[]) {
153
  $isRenderingCanvas = true;
154
- Promise.allSettled(
155
  promptImgList.map(
156
  ({ imgURL, position, id, room }) =>
157
  new Promise<ImageRendered>((resolve, reject) => {
@@ -178,8 +178,8 @@
178
  imagesOnCanvas.add(id);
179
  canvasCtx.drawImage(img, position.x, position.y, img.width, img.height);
180
  });
181
- $isRenderingCanvas = false;
182
  });
 
183
  }
184
  function zoomed(e: Event) {
185
  const transform = ($currZoomTransform = e.transform);
 
149
  position: { x: number; y: number };
150
  id: string;
151
  };
152
+ async function renderImages(promptImgList: PromptImgObject[]) {
153
  $isRenderingCanvas = true;
154
+ await Promise.allSettled(
155
  promptImgList.map(
156
  ({ imgURL, position, id, room }) =>
157
  new Promise<ImageRendered>((resolve, reject) => {
 
178
  imagesOnCanvas.add(id);
179
  canvasCtx.drawImage(img, position.x, position.y, img.width, img.height);
180
  });
 
181
  });
182
+ $isRenderingCanvas = false;
183
  }
184
  function zoomed(e: Event) {
185
  const transform = ($currZoomTransform = e.transform);
frontend/src/lib/PaintFrame.svelte CHANGED
@@ -30,21 +30,20 @@
30
  let frameElement: HTMLDivElement;
31
  let dragEnabled = true;
32
  let isDragging = false;
 
 
33
  $: prompt = $myPresence?.currentPrompt;
34
  $: isLoading =
35
  $myPresence?.status === Status.loading || $myPresence?.status === Status.prompting || false;
36
 
37
- $: {
38
- if (!dragEnabled && $myPresence.status === Status.loading) {
39
- dragEnabled = true;
40
- }
41
- }
42
  $: coord = {
43
  x: transform.applyX(position.x),
44
  y: transform.applyY(position.y)
45
  };
46
- $: if (!$isRenderingCanvas) {
 
47
  cleanMask();
 
48
  }
49
 
50
  $: if ($loadingState === 'Complete' && !dragEnabled) {
 
30
  let frameElement: HTMLDivElement;
31
  let dragEnabled = true;
32
  let isDragging = false;
33
+ let firstLoading = true;
34
+
35
  $: prompt = $myPresence?.currentPrompt;
36
  $: isLoading =
37
  $myPresence?.status === Status.loading || $myPresence?.status === Status.prompting || false;
38
 
 
 
 
 
 
39
  $: coord = {
40
  x: transform.applyX(position.x),
41
  y: transform.applyY(position.y)
42
  };
43
+
44
+ $: if (!$isRenderingCanvas && firstLoading) {
45
  cleanMask();
46
+ firstLoading = false;
47
  }
48
 
49
  $: if ($loadingState === 'Complete' && !dragEnabled) {