Merge pull request #416 from vizzuhq/scheduling

Time for update() supplied from js api

Author: simzer

src/apps/weblib/cinterface.cpp

@@ -184,12 +184,14 @@ void vizzu_update(APIHandles::Chart chart,
     APIHandles::Canvas canvas,
     double width,
     double height,
+    double timeInMSecs,
     int renderControl)
 {
 	return Interface::getInstance().update(chart,
 	    canvas,
 	    width,
 	    height,
+	    timeInMSecs,
 	    static_cast<Interface::RenderControl>(renderControl));
 }
 

src/apps/weblib/cinterface.h

@@ -66,6 +66,7 @@ extern void vizzu_update(APIHandles::Chart chart,
     APIHandles::Canvas canvas,
     double width,
     double height,
+    double timeInMSecs,
     int renderControl);
 extern const char *vizzu_errorMessage(
     APIHandles::Exception exceptionPtr,

src/apps/weblib/interface.cpp

@@ -353,11 +353,20 @@ void Interface::update(ObjectRegistry::Handle chart,
     ObjectRegistry::Handle canvas,
     double width,
     double height,
+    double timeInMSecs,
     RenderControl renderControl)
 {
 	auto &&widget = objects.get<UI::ChartWidget>(chart);
-	widget->getChart().getAnimControl().update(
-	    std::chrono::steady_clock::now());
+
+	std::chrono::duration<double, std::milli> milliSecs(timeInMSecs);
+
+	auto nanoSecs =
+	    std::chrono::duration_cast<std::chrono::nanoseconds>(
+	        milliSecs);
+
+	::Anim::TimePoint time(nanoSecs);
+
+	widget->getChart().getAnimControl().update(time);
 
 	if (const Geom::Size size{width, height};
 	    renderControl == force

src/apps/weblib/interface.h

@@ -47,6 +47,7 @@ class Interface
 	    ObjectRegistry::Handle canvas,
 	    double width,
 	    double height,
+	    double timeInMSecs,
 	    RenderControl renderControl);
 
 	ObjectRegistry::Handle storeAnim(ObjectRegistry::Handle chart);

src/apps/weblib/ts-api/cvizzu.types.d.ts

@@ -94,6 +94,7 @@ export interface CVizzu {
 		canvas: CCanvasPtr,
 		width: number,
 		height: number,
+		time: number,
 		renderControl: number
 	): void
 	_vizzu_errorMessage(exceptionPtr: CException, typeinfo: CTypeInfo): CString

src/apps/weblib/ts-api/module/cchart.ts

@@ -42,9 +42,15 @@ export class CChart extends CObject {
 		this.animOptions = this._makeAnimOptions()
 	}
 
-	update(cCanvas: CCanvas, width: number, height: number, renderControl: number): void {
+	update(
+		cCanvas: CCanvas,
+		width: number,
+		height: number,
+		time: number,
+		renderControl: number
+	): void {
 		this._cCanvas = cCanvas
-		this._call(this._wasm._vizzu_update)(cCanvas.getId(), width, height, renderControl)
+		this._call(this._wasm._vizzu_update)(cCanvas.getId(), width, height, time, renderControl)
 	}
 
 	animate(callback: (ok: boolean) => void): void {

src/apps/weblib/ts-api/render.ts

@@ -48,8 +48,9 @@ export class Render implements Plugin, Canvas {
 	updateFrame(force: boolean = false): void {
 		const size = this._canvas.calcSize()
 		if (size.x >= 1 && size.y >= 1) {
+			const time = performance.now()
 			const renderControl = !this._enabled ? 2 : force ? 1 : 0
-			this._cchart.update(this._ccanvas, size.x, size.y, renderControl)
+			this._cchart.update(this._ccanvas, size.x, size.y, time, renderControl)
 		}
 	}
 

test/e2e/test_cases/test_cases.json

@@ -3287,7 +3287,7 @@
 			"refs": ["2a18132"]
 		},
 		"web_content/cookbook/rendering/motion_blur": {
-			"refs": ["be67912"]
+			"refs": ["3a48367"]
 		},
 		"web_content/cookbook/style/colorfilter": {
 			"refs": ["05406ff"]

test/e2e/test_cases/web_content/cookbook/rendering/motion_blur.mjs

@@ -37,18 +37,11 @@ const testSteps = [
 
 		chart.on('draw-complete', drawComplete)
 
-		return chart
-			.animate({
-				coordSystem: 'polar',
-				y: 'Joy factors',
-				x: 'Value 2 (+)'
-			})
-			.then((chart) => {
-				const handle = setInterval(() => {
-					const ctx = chart.feature.htmlCanvas.element.getContext('2d')
-					if (!drawImages(ctx)) clearInterval(handle)
-				}, 40)
-			})
+		return chart.animate({
+			coordSystem: 'polar',
+			y: 'Joy factors',
+			x: 'Value 2 (+)'
+		})
 	}
 ]