Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced renderer to lottie-web #6

Merged
merged 1 commit into from
Nov 23, 2023
+51 −151
Merged

Replaced renderer to lottie-web #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 3 additions & 74 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
"main": "public/Main.js",
"homepage": "./",
"dependencies": {
"@lottiefiles/lottie-player": "^2.0.2",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
@@ -18,6 +17,7 @@
"electron-builder": "^24.6.4",
"html2canvas": "^1.4.1",
"jspdf": "^2.5.1",
"lottie-web": "latest",
"opencv-react": "^0.0.6",
"puppeteer": "^21.5.1",
"react": "^18.2.0",
120 changes: 45 additions & 75 deletions src/App.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import "@lottiefiles/lottie-player";
import { useEffect, useRef, useState } from 'react';
import './App.css';
import lottieWeb from 'lottie-web';
import { useEffect, useRef, useState } from 'react';
import logo from './logo.svg';
import Player from './utils/player';
// @ts-ignore
import { OpenCvProvider } from 'opencv-react';
import { BlobReader, TextWriter, ZipReader } from "@zip.js/zip.js";
import html2canvas from "html2canvas";
import jsPDF from "jspdf";
import { FileUploader } from "react-drag-drop-files";
import { size, successPercentage, testingSize } from "./utils/constant";
import { diffWithResembleJS } from './utils/diff';
import { testingSize, size, successPercentage } from "./utils/constant";
import { drawSvgIntoCanvas } from "./utils/drawer";
import jsPDF from "jspdf";
import html2canvas from "html2canvas";
import { BlobReader, ZipReader, TextWriter } from "@zip.js/zip.js";

declare global {
interface Window {
@@ -21,7 +18,6 @@ declare global {
}

let player: any;
let cv: any;
let isDebug = false;

function App() {
@@ -166,13 +162,13 @@ function App() {
const run = async (file: File): Promise<number> => {
return new Promise((resolve, reject) => { // !
try {
const thorvgCanvas: any = document.querySelector("#thorvg-canvas");
const lottieCanvas: any = document.querySelector("#lottie-canvas");
const thorvgCanvas: any = document.querySelector(".thorvg-canvas > canvas");
const lottieCanvasWrapper: any = document.querySelector(".lottie-canvas");
const diffImg: any = document.querySelector("#diff-img");

diffImg.setAttribute('src', '');
thorvgCanvas.getContext('2d').clearRect(0, 0, testingSize, testingSize);
lottieCanvas.getContext('2d').clearRect(0, 0, testingSize, testingSize);
lottieCanvasWrapper.innerHTML = '';
diffImg.setAttribute('src', '');

setTimeout(async () => {
const isLoaded = await load(file);
@@ -206,19 +202,23 @@ function App() {
resultText.style.width = '200px';
resultRow?.appendChild(resultText);

const thorvgCanvas = document.querySelector('#thorvg-canvas');
const lottieCanvas = document.querySelector('#lottie-canvas');
const thorvgCanvas = document.querySelector('.thorvg-canvas > canvas');
const lottieCanvas = document.querySelector('.lottie-canvas > canvas');
const diffImg = document.querySelector('#diff-img');

const thorvgCloneCanvas = thorvgCanvas?.cloneNode(true) as any;
const lottieCloneCanvas = lottieCanvas?.cloneNode(true) as any;
const diffCloneImg = diffImg?.cloneNode(true) as any;

thorvgCloneCanvas.width = size;
thorvgCloneCanvas.style.width = `${size}px`;
thorvgCloneCanvas.height = size;
thorvgCloneCanvas.style.height = `${size}px`;

lottieCloneCanvas.width = size;
lottieCloneCanvas.style.width = `${size}px`;
lottieCloneCanvas.height = size;
lottieCloneCanvas.style.height = `${size}px`;

diffCloneImg.width = size;
diffCloneImg.height = size;
@@ -247,19 +247,23 @@ function App() {
resultText.innerText = logText;
resultRow?.appendChild(resultText);

const thorvgCanvas = document.querySelector('#thorvg-canvas');
const lottieCanvas = document.querySelector('#lottie-canvas');
const thorvgCanvas = document.querySelector('.thorvg-canvas > canvas');
const lottieCanvas = document.querySelector('.lottie-canvas > canvas');
const diffImg = document.querySelector('#diff-img');

const thorvgCloneCanvas = thorvgCanvas?.cloneNode(true) as any;
const lottieCloneCanvas = lottieCanvas?.cloneNode(true) as any;
const diffCloneImg = diffImg?.cloneNode(true) as any;

thorvgCloneCanvas.width = size;
thorvgCloneCanvas.style.width = `${size}px`;
thorvgCloneCanvas.height = size;
thorvgCloneCanvas.style.height = `${size}px`;

lottieCloneCanvas.width = size;
lottieCloneCanvas.style.width = `${size}px`;
lottieCloneCanvas.height = size;
lottieCloneCanvas.style.height = `${size}px`;

diffCloneImg.width = size;
diffCloneImg.height = size;
@@ -278,50 +282,36 @@ function App() {
}

const test = async () => {
const thorvgCanvas: any = document.querySelector("#thorvg-canvas");
const lottieCanvas: any = document.querySelector("#lottie-canvas");

// copy lottie-svg to canvas
try {
// @ts-ignore
const svg: any = document.querySelector('.lottie-player').shadowRoot.querySelector('svg');
const canvas: any = document.querySelector("#lottie-canvas");

await drawSvgIntoCanvas(svg, canvas);
} catch (err) {
console.log(err);
return 0;
}
const thorvgCanvas: any = document.querySelector(".thorvg-canvas > canvas");
const lottieCanvas: any = document.querySelector(".lottie-canvas > canvas");

// resembleJS diff
const compabilityWithResembleJS = await diffWithResembleJS(thorvgCanvas, lottieCanvas);
return compabilityWithResembleJS;

// // OpenCV diff
// const compabilityOpenCV = diffWithOpenCV(cv, thorvgCanvas, lottieCanvas);
// return compabilityOpenCV;
}

const load = async (file: File) => {
return new Promise<boolean>(async (resolve, reject) => {
const lottiePlayer: any = document.querySelector("lottie-player");
let anim: any = null;
const lottieCanvas: any = document.querySelector(".lottie-canvas");
const reader = new FileReader();
reader.readAsText(file);
reader.onload = async () => {
const json = reader.result as any;

try {
// lottie-player
lottiePlayer.load(json);
} catch (err) {
console.log('Mark as an error : maybe lottie issue');
resolve(false);
}

// check JSON
try {
JSON.parse(json);
anim = lottieWeb.loadAnimation({
container: lottieCanvas,
renderer: "canvas",
loop: false,
autoplay: false,
animationData: JSON.parse(json),
rendererSettings: {
clearCanvas: true,
},
});
} catch (err) {
console.error('LottieWeb load error');
resolve(false);
}

@@ -330,20 +320,14 @@ function App() {

fr.onloadend = () => {
const bytes = fr.result as any;
console.log(bytes);


try {
player.loadBytes(bytes);

const playerTotalFrames = Math.floor(player.totalFrame);
const lottieTotalFrames = Math.floor(lottiePlayer.getLottie().totalFrames);
const targetFrame = Math.floor(playerTotalFrames / 2); // Run with middle frame

player.seek(targetFrame);
lottiePlayer.seek(targetFrame);

console.log(`totalFrames ${playerTotalFrames} ${lottieTotalFrames}`);
anim.goToAndStop(targetFrame, true);
} catch (err) {
console.log(err);
return resolve(false);
@@ -358,7 +342,7 @@ function App() {
}

return (
<OpenCvProvider onLoad={(_cv: any) => cv = _cv}>
<>
<div className="App">
<header className="App-header">
{
@@ -436,30 +420,16 @@ function App() {
</div>
}
</header>


<div style={{ display: 'none', overflowX: 'scroll', width: '100%' }}>
<canvas id="thorvg-canvas" width={testingSize} height={testingSize} />
<canvas id="lottie-canvas" width={testingSize} height={testingSize} />
<div style={{ display: 'block', overflowX: 'scroll', width: '100%', position: 'absolute', opacity: 0 }}>
<div className="thorvg-canvas" style={{ width: testingSize, height: testingSize }}>
<canvas id="thorvg-canvas" width={testingSize * 2} height={testingSize * 2} style={{ width: '100%', height: '100%' }} />
</div>
<div className="lottie-canvas" style={{ width: testingSize, height: testingSize }}></div>
<img id="diff-img" width={testingSize} height={testingSize} />

<lottie-player
class="lottie-player"
// autoplay
// loop={}
// controls
width={testingSize + 'px'}
style={{ width: testingSize, height: testingSize }}
mode="normal"
/>
</div>
</div>

{/* <div style={{ display: 'none' }}>
<canvas id="thorvg-output-canvas" width={512} height={512} />
<canvas id="lottie-output-canvas" width={512} height={512} />
</div> */}

<div className="result-board" style={{ width: '100%', display: 'flex', flexDirection: 'row', justifyContent: 'center', backgroundColor: '#f6f6f6' }}>
<div className='result-error' style={{ padding: 24 }}>
<div className='result-error-row-first' style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', justifyContent: 'start', marginBottom: 20, fontWeight: 'bold' }}>
@@ -487,7 +457,7 @@ function App() {

</div>
</div>
</OpenCvProvider>
</>
);
}

3 changes: 2 additions & 1 deletion src/utils/diff.ts
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,8 @@ export const diffWithResembleJS = async (canvas: any, targetCanvas: any): Promis
const lottieURL = targetCanvas.toDataURL("image/png");

return new Promise((resolve, reject) => {
resemble.compare(thorvgURL, lottieURL, {}, (err: any, data: any) => {
resemble.compare(thorvgURL, lottieURL, { scaleToSameSize: true }, (err: any, data: any) => {
console.log(err);
const { misMatchPercentage, getImageDataUrl } = data;
const diffImg = document.querySelector('#diff-img') as any;
diffImg.src = getImageDataUrl();