diff --git a/thermion_dart/test/helpers.dart b/thermion_dart/test/helpers.dart index 981e53be..bde9b984 100644 --- a/thermion_dart/test/helpers.dart +++ b/thermion_dart/test/helpers.dart @@ -115,29 +115,28 @@ class TestHelper { Vector3? cameraPosition, viewportDimensions = (width: 500, height: 500)}) async { final resourceLoader = calloc(1); - print("resourceLoader"); + var loadToOut = NativeCallable< Void Function(Pointer, Pointer)>.listener(DartResourceLoader.loadResource); - print("loadToOut"); + resourceLoader.ref.loadToOut = loadToOut.nativeFunction; - print("set ref"); + var freeResource = NativeCallable.listener( DartResourceLoader.freeResource); - print("freeResource"); + resourceLoader.ref.freeResource = freeResource.nativeFunction; - print("set freeResource ref"); + var viewer = ThermionViewerFFI(resourceLoader: resourceLoader.cast()); - print("created viewer"); + await viewer.initialized; swapChain = await viewer.createHeadlessSwapChain( viewportDimensions.width, viewportDimensions.height); - print("created headless swapchain"); - + await viewer.updateViewportAndCameraProjection( viewportDimensions.width.toDouble(), viewportDimensions.height.toDouble()); - print("updated camera"); + if (bg != null) { await viewer.setBackgroundColor( bg.r.toDouble(), bg.g.toDouble(), bg.b.toDouble(), bg.a.toDouble()); diff --git a/thermion_dart/test/material_tests.dart b/thermion_dart/test/material_tests.dart index 4324a9fc..a0255131 100644 --- a/thermion_dart/test/material_tests.dart +++ b/thermion_dart/test/material_tests.dart @@ -235,7 +235,7 @@ void main() async { group("stencil", () { test('set stencil highlight for glb', () async { final viewer = await testHelper.createViewer(); - var model = await viewer.loadGlb("${testHelper.testDir}/cube.glb", + var model = await viewer.loadGlb("${testHelper.testDir}/assets/cube.glb", keepData: true); await viewer.setPostProcessing(true); @@ -281,7 +281,7 @@ void main() async { await viewer .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5)); - var cube1 = await viewer.loadGlb("${testHelper.testDir}/cube.glb", + var cube1 = await viewer.loadGlb("${testHelper.testDir}/assets/cube.glb", keepData: true); await viewer.transformToUnitCube(cube1); @@ -329,10 +329,10 @@ void main() async { await viewer .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5)); - var cube1 = await viewer.loadGlb("${testHelper.testDir}/cube.glb", + var cube1 = await viewer.loadGlb("${testHelper.testDir}/assets/cube.glb", keepData: true); await viewer.transformToUnitCube(cube1); - var cube2 = await viewer.loadGlb("${testHelper.testDir}/cube.glb", + var cube2 = await viewer.loadGlb("${testHelper.testDir}/assets/cube.glb", keepData: true); await viewer.transformToUnitCube(cube2); await viewer.setPosition(cube2, 0.5, 0.5, 0);