From 5d53da42f9e094dc8f4da8254426f1a718727063 Mon Sep 17 00:00:00 2001 From: Lino Schmidt Date: Mon, 27 Jun 2022 20:28:59 +0200 Subject: [PATCH] Updated progress design --- src/components/blenderController.ts | 4 ++-- src/components/ui/renderingSide.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/blenderController.ts b/src/components/blenderController.ts index 93480ae..faa891a 100644 --- a/src/components/blenderController.ts +++ b/src/components/blenderController.ts @@ -50,7 +50,7 @@ function setRenderProgress(log:number, init:boolean, frameCount:number, frame:nu timeDiffMinutes++; timeDiffSeconds -= 60; } - setPastTimeNow(timeDiffMinutes + "min " + timeDiffSeconds.toFixed(0) + "sec"); + setPastTimeNow(timeDiffMinutes + "m " + timeDiffSeconds.toFixed(0) + "s"); if(progress > 0) { const timeRemaining = (timeDiff / progress) * (1 - progress); @@ -60,7 +60,7 @@ function setRenderProgress(log:number, init:boolean, frameCount:number, frame:nu timeDiffMinutes++; timeDiffSeconds -= 60; } - setRemainingTimeNow(timeDiffMinutes + "min " + timeDiffSeconds.toFixed(0) + "sec"); + setRemainingTimeNow(timeDiffMinutes + "m " + timeDiffSeconds.toFixed(0) + "s"); } } diff --git a/src/components/ui/renderingSide.tsx b/src/components/ui/renderingSide.tsx index a992235..35a1be3 100644 --- a/src/components/ui/renderingSide.tsx +++ b/src/components/ui/renderingSide.tsx @@ -9,7 +9,7 @@ let setRenderDisplayProgress:React.Dispatch>; let setPastTime:React.Dispatch>; let setRemainingTime:React.Dispatch>; -let pastTimeNow = "0min 0sec"; +let pastTimeNow = "0m 0s"; let remainingTimeNow = "calculating..."; function RenderingSide() { @@ -19,7 +19,7 @@ function RenderingSide() { setStatus = setStatusInner; const [renderDisplayProgress, setRenderDisplayProgressInner] = useState(0); setRenderDisplayProgress = setRenderDisplayProgressInner; - const [pastTime, setPastTimeInner] = useState("0min 0sec"); + const [pastTime, setPastTimeInner] = useState("0m 0s"); setPastTime = setPastTimeInner; const [remainingTime, setRemainingTimeInner] = useState("calculating..."); setRemainingTime = setRemainingTimeInner;