maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/nmfisher/thermion into develop

Browse Source
This commit is contained in:
Nick Fisher
2024-10-25 16:45:58 +11:00
parent 85013743fe dd8bf920a5
commit f0feb8aeb1
23 changed files with 199 additions and 975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
.github/workflows/dart.yml vendored
View File

@@ -2,7 +2,6 @@
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
name: Dart
on:
@@ -12,31 +11,65 @@ on:
branches: [ "develop" ]
jobs:
build:
runs-on: macos-13
thermion_dart:
name: thermion_dart
runs-on: windows-latest
defaults:
run:
working-directory: thermion_dart # Adjust this path
steps:
- uses: actions/checkout@v4
# Note: This workflow uses the latest stable version of the Dart SDK.
# You can specify other versions if desired, see documentation here:
# https://github.com/dart-lang/setup-dart/blob/main/README.md
# - uses: dart-lang/setup-dart@v1
- uses: dart-lang/setup-dart@9a04e6d73cca37bd455e0608d7e5092f881fd603
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.26.0-0.1.pre' # Specify Flutter version
channel: 'master' # or 'beta', 'dev', 'master'
cache: true # Caches dependencies between runs
- name: Install dependencies
run: dart pub get
run: flutter pub get # even though this is a Dart package, it has as dev_dependency on objective_c for testing which for some reason has a Flutter dependency
# Uncomment this step to verify the use of 'dart format' on each commit.
# - name: Verify formatting
# run: dart format --output=none --set-exit-if-changed .
# Consider passing '--fatal-infos' for slightly stricter analysis.
- name: Analyze project source
run: dart analyze
#- name: Analyze project source
# run: dart analyze
# Your project will need to have tests in test/ and a dependency on
# package:test for this step to succeed. Note that Flutter projects will
# want to change this to 'flutter test'.
- name: Run tests
run: dart --enable-experiment=native-assets test
run: dart --enable-experiment=native-assets test test/*tests.dart
# Upload logs on failure
- name: Upload logs
if: failure() || steps.build.outcome == 'failure'
uses: actions/upload-artifact@v4
with:
name: build-logs
path: |
D:\a\thermion\thermion\thermion_dart\.dart_tool\thermion_dart\log\build.log
# /Users/runner/work/thermion/thermion/thermion_dart//.dart_tool/thermion_dart/log/build.log
retention-days: 5
# thermion_flutter:
# name: thermion_flutter
# runs-on: macos-13
# defaults:
# run:
# working-directory: thermion_flutter/thermion_flutter # Adjust this path
# steps:
# - uses: actions/checkout@v4
# - uses: dart-lang/setup-dart@9a04e6d73cca37bd455e0608d7e5092f881fd603
# - name: Install dependencies
# run: dart pub get
# # Uncomment this step to verify the use of 'dart format' on each commit.
# # - name: Verify formatting
# # run: dart format --output=none --set-exit-if-changed .
# - name: Analyze project source
# run: dart analyze
# - name: Run tests
# run: dart --enable-experiment=native-assets test

75
CHANGELOG.md
View File

@@ -3,6 +3,81 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## 2024-10-25
### Changes
---
Packages with breaking changes:
- There are no breaking changes in this release.
Packages with other changes:
- [`thermion_dart` - `v0.2.1-dev.0.0.12`](#thermion_dart---v021-dev0012)
- [`thermion_flutter` - `v0.2.1-dev.12`](#thermion_flutter---v021-dev12)
- [`thermion_flutter_web` - `v0.2.0+3`](#thermion_flutter_web---v0203)
- [`thermion_flutter_platform_interface` - `v0.2.1-dev.12`](#thermion_flutter_platform_interface---v021-dev12)
- [`thermion_flutter_ffi` - `v0.2.1-dev.12`](#thermion_flutter_ffi---v021-dev12)
Packages with dependency updates only:
> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
- `thermion_flutter_web` - `v0.2.0+3`
- `thermion_flutter_platform_interface` - `v0.2.1-dev.12`
- `thermion_flutter_ffi` - `v0.2.1-dev.12`
---
#### `thermion_dart` - `v0.2.1-dev.0.0.12`
- **FIX**: properly pass through loadResourcesAsync flag for loadGlbFromBuffer.
- **FIX**: properly pass through loadResourcesAsync flag for loadGlbFromBuffer.
- **FEAT**: add SCALE2_MOVE InputType.
- **FEAT**: add SCALE2_MOVE InputType.
#### `thermion_flutter` - `v0.2.1-dev.12`
- **FIX**: (flutter) (windows) remove deleted source file from Windows CMakeLists.
## 2024-10-25
### Changes
---
Packages with breaking changes:
- There are no breaking changes in this release.
Packages with other changes:
- [`thermion_dart` - `v0.2.1-dev.0.0.12`](#thermion_dart---v021-dev0012)
- [`thermion_flutter_web` - `v0.2.0+2`](#thermion_flutter_web---v0202)
- [`thermion_flutter_platform_interface` - `v0.2.1-dev.11`](#thermion_flutter_platform_interface---v021-dev11)
- [`thermion_flutter_ffi` - `v0.2.1-dev.11`](#thermion_flutter_ffi---v021-dev11)
- [`thermion_flutter` - `v0.2.1-dev.11`](#thermion_flutter---v021-dev11)
Packages with dependency updates only:
> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
- `thermion_flutter_web` - `v0.2.0+2`
- `thermion_flutter_platform_interface` - `v0.2.1-dev.11`
- `thermion_flutter_ffi` - `v0.2.1-dev.11`
- `thermion_flutter` - `v0.2.1-dev.11`
---
#### `thermion_dart` - `v0.2.1-dev.0.0.12`
- **FIX**: properly pass through loadResourcesAsync flag for loadGlbFromBuffer.
- **FEAT**: add SCALE2_MOVE InputType.
## 2024-10-24
### Changes

12
thermion_dart/CHANGELOG.md
View File

@@ -1,3 +1,15 @@
## 0.2.1-dev.0.0.12
- **FIX**: properly pass through loadResourcesAsync flag for loadGlbFromBuffer.
- **FIX**: properly pass through loadResourcesAsync flag for loadGlbFromBuffer.
- **FEAT**: add SCALE2_MOVE InputType.
- **FEAT**: add SCALE2_MOVE InputType.
## 0.2.1-dev.0.0.12
- **FIX**: properly pass through loadResourcesAsync flag for loadGlbFromBuffer.
- **FEAT**: add SCALE2_MOVE InputType.
## 0.2.1-dev.0.0.11
> Note: This release has breaking changes.

2
thermion_dart/pubspec.yaml
View File

@@ -1,6 +1,6 @@
name: thermion_dart
description: 3D rendering toolkit for Dart.
version: 0.2.1-dev.0.0.11
version: 0.2.1-dev.0.0.12
homepage: https://thermion.dev
repository: https://github.com/nmfisher/thermion

4
thermion_dart/test/animation_tests.dart
View File

@@ -1,10 +1,6 @@
import 'dart:async';
import 'dart:io';
import 'dart:math';
import 'dart:typed_data';
import 'package:animation_tools_dart/animation_tools_dart.dart';
import 'package:thermion_dart/src/viewer/src/events.dart';
import 'package:thermion_dart/thermion_dart.dart';
import 'package:test/test.dart';
import 'package:vector_math/vector_math_64.dart';
import 'helpers.dart';

3
thermion_dart/test/camera_tests.dart
View File

@@ -1,3 +1,5 @@
// ignore_for_file: unused_local_variable
import 'package:thermion_dart/thermion_dart.dart';
import 'package:test/test.dart';
import 'package:vector_math/vector_math_64.dart';
@@ -62,6 +64,7 @@ void main() async {
test('getCameraCullingProjectionMatrix', () async {
throw Exception("TODO");
// ignore: dead_code
var viewer = await testHelper.createViewer();
var matrix = await viewer.getCameraCullingProjectionMatrix();
print(matrix);

2
thermion_dart/test/geometry_tests.dart
View File

@@ -1,3 +1,5 @@
// ignore_for_file: unused_local_variable
import 'dart:io';
import 'dart:math';
import 'package:thermion_dart/src/viewer/src/ffi/src/thermion_viewer_ffi.dart';

2
thermion_dart/test/gizmo_tests.dart
View File

@@ -1,3 +1,5 @@
// ignore_for_file: unused_local_variable
import 'package:test/test.dart';
import 'helpers.dart';

2
thermion_dart/test/gltf_tests.dart
View File

@@ -1,3 +1,5 @@
// ignore_for_file: unused_local_variable
import 'dart:io';
import 'package:thermion_dart/thermion_dart.dart';
import 'package:test/test.dart';

10
thermion_dart/test/helpers.dart
View File

@@ -1,3 +1,5 @@
// ignore_for_file: unused_local_variable
import 'dart:ffi';
import 'dart:io';
import 'dart:math';
@@ -10,7 +12,6 @@ import 'package:thermion_dart/src/utils/src/dart_resources.dart';
import 'package:thermion_dart/src/viewer/src/ffi/src/thermion_dart.g.dart';
import 'package:thermion_dart/src/viewer/src/ffi/src/thermion_viewer_ffi.dart';
import 'package:thermion_dart/src/viewer/src/ffi/thermion_viewer_ffi.dart';
import 'package:thermion_dart/src/viewer/src/shared_types/view.dart';
import 'package:thermion_dart/thermion_dart.dart';
import 'package:vector_math/vector_math_64.dart';
import 'package:path/path.dart' as p;
@@ -101,9 +102,7 @@ class TestHelper {
}
Future<ThermionTextureSwift> createTexture(int width, int height) async {
final packageUri = findPackageRoot('thermion_dart');
var testDir = Directory("${packageUri.toFilePath()}/test").path;
final object = ThermionTextureSwift.new1();
object.initWithWidth_height_(width, height);
return object;
@@ -191,7 +190,7 @@ Future<Uint8List> pixelBufferToBmp(
}
Future<Uint8List> pixelsToPng(Uint8List pixelBuffer, int width, int height,
{bool linearToSrgb = false}) async {
{bool linearToSrgb = false, bool invertAces=false}) async {
final image = img.Image(width: width, height: height);
for (int y = 0; y < height; y++) {
@@ -203,7 +202,6 @@ Future<Uint8List> pixelsToPng(Uint8List pixelBuffer, int width, int height,
int a = pixelBuffer[pixelIndex + 3];
// Apply inverse ACES tone mapping
bool invertAces = false;
if (invertAces) {
r = _inverseACESToneMapping(r);
g = _inverseACESToneMapping(g);

782
thermion_dart/test/integration_test.dart
View File

@@ -1,782 +0,0 @@
import 'dart:async';
import 'dart:io';
import 'dart:math';
import 'package:thermion_dart/src/viewer/src/events.dart';
import 'package:thermion_dart/src/viewer/src/ffi/src/thermion_viewer_ffi.dart';
import 'package:thermion_dart/thermion_dart.dart';
import 'package:test/test.dart';
import 'package:vector_math/vector_math_64.dart';
import 'helpers.dart';
void main() async {
final testHelper = TestHelper("integration");
group('background', () {
test('set background color to solid green', () async {
var viewer = await testHelper.createViewer();
await viewer.setBackgroundColor(0.0, 1.0, 0.0, 1.0);
await testHelper.capture(viewer, "set_background_color_to_solid_green");
await viewer.dispose();
});
test('set background color to full transparency', () async {
var viewer = await testHelper.createViewer();
await viewer.setBackgroundColor(0.0, 1.0, 0.0, 0.0);
await testHelper.capture(
viewer, "set_background_color_to_transparent_green");
await viewer.dispose();
});
test('set background image', () async {
var viewer = await testHelper.createViewer();
await viewer.setBackgroundImage(
"file:///${testHelper.testDir}/assets/cube_texture_512x512.png");
await viewer.setPostProcessing(true);
await viewer.setToneMapping(ToneMapper.LINEAR);
await testHelper.capture(viewer, "set_background_image");
await viewer.dispose();
});
});
group("scene update events", () {
test('add light fires SceneUpdateEvent', () async {
var viewer = await testHelper.createViewer();
final success = Completer<bool>();
var light = DirectLight(
type: LightType.POINT,
color: 6500,
intensity: 1000000,
position: Vector3(0, 0.6, 0.6),
direction: Vector3(0, 0, 0),
falloffRadius: 2.0);
late StreamSubscription listener;
listener = viewer.sceneUpdated.listen((updateEvent) {
var wasSuccess = updateEvent.eventType == EventType.EntityAdded &&
updateEvent.addedEntityType == EntityType.DirectLight &&
updateEvent.getDirectLight() == light;
success.complete(wasSuccess);
listener.cancel();
});
await viewer.addDirectLight(light);
expect(await success.future, true);
});
test('remove light fires SceneUpdateEvent', () async {
var viewer = await testHelper.createViewer();
final success = Completer<bool>();
var light = await viewer.addDirectLight(DirectLight.point());
late StreamSubscription listener;
listener = viewer.sceneUpdated.listen((updateEvent) {
var wasSuccess = updateEvent.eventType == EventType.EntityRemoved &&
updateEvent.entity == light;
success.complete(wasSuccess);
listener.cancel();
});
await viewer.removeLight(light);
expect(await success.future, true);
});
test('add geometry fires SceneUpdateEvent', () async {
var viewer = await testHelper.createViewer();
final success = Completer<bool>();
var geometry = GeometryHelper.cube();
late StreamSubscription listener;
listener = viewer.sceneUpdated.listen((updateEvent) {
var wasSuccess = updateEvent.eventType == EventType.EntityAdded &&
updateEvent.addedEntityType == EntityType.Geometry &&
updateEvent.getAsGeometry() == geometry;
success.complete(wasSuccess);
listener.cancel();
});
await viewer.createGeometry(geometry);
expect(await success.future, true);
});
test('remove geometry fires SceneUpdateEvent', () async {
var viewer = await testHelper.createViewer();
var geometry = await viewer.createGeometry(GeometryHelper.cube());
final success = Completer<bool>();
late StreamSubscription listener;
listener = viewer.sceneUpdated.listen((updateEvent) {
var wasSuccess = updateEvent.eventType == EventType.EntityRemoved &&
updateEvent.entity == geometry;
success.complete(wasSuccess);
listener.cancel();
});
await viewer.removeEntity(geometry);
expect(await success.future, true);
});
test('loadGlb fires SceneUpdateEvent', () async {
var viewer = await testHelper.createViewer();
final success = Completer<bool>();
late StreamSubscription listener;
final uri = "${testHelper.testDir}/cube.glb";
listener = viewer.sceneUpdated.listen((updateEvent) {
var wasSuccess = updateEvent.eventType == EventType.EntityAdded &&
updateEvent.addedEntityType == EntityType.Gltf &&
updateEvent.getAsGLTF().uri == uri;
success.complete(wasSuccess);
listener.cancel();
});
await viewer.loadGlb(uri, keepData: false);
expect(await success.future, true);
});
test('remove glb fires SceneUpdateEvent', () async {
var viewer = await testHelper.createViewer();
final uri = "${testHelper.testDir}/cube.glb";
var entity = await viewer.loadGlb(uri, keepData: false);
final success = Completer<bool>();
late StreamSubscription listener;
listener = viewer.sceneUpdated.listen((updateEvent) {
var wasSuccess = updateEvent.eventType == EventType.EntityRemoved &&
updateEvent.entity == entity;
success.complete(wasSuccess);
listener.cancel();
});
await viewer.removeEntity(entity);
expect(await success.future, true);
});
});
group("MaterialInstance", () {
test('disable depth write', () async {
var viewer = await testHelper.createViewer();
await viewer.setBackgroundColor(1.0, 0.0, 0.0, 1.0);
await viewer.setCameraPosition(0, 0, 6);
await viewer.addDirectLight(
DirectLight.sun(direction: Vector3(0, 0, -1)..normalize()));
final cube1 = await viewer.createGeometry(GeometryHelper.cube());
var materialInstance = await viewer.getMaterialInstanceAt(cube1, 0);
final cube2 = await viewer.createGeometry(GeometryHelper.cube());
await viewer.setMaterialPropertyFloat4(
cube2, "baseColorFactor", 0, 0, 1, 0, 1);
await viewer.setPosition(cube2, 1.0, 0.0, -1.0);
expect(materialInstance, isNotNull);
// with depth write enabled on both materials, cube2 renders behind the white cube
await testHelper.capture(viewer, "material_instance_depth_write_enabled");
// if we disable depth write on cube1, then cube2 will always appear in front
// (relying on insertion order)
materialInstance!.setDepthWriteEnabled(false);
await testHelper.capture(
viewer, "material_instance_depth_write_disabled");
// set priority for the cube1 cube to 7 (render) last, cube1 renders in front
await viewer.setPriority(cube1, 7);
await testHelper.capture(
viewer, "material_instance_depth_write_disabled_with_priority");
});
});
// test('create instance from glb when keepData is true', () async {
// var model = await viewer.loadGlb("${testHelper.testDir}/cube.glb", keepData: true);
// await viewer.transformToUnitCube(model);
// var instance = await viewer.createInstance(model);
// await viewer.setPosition(instance, 0.5, 0.5, -0.5);
// await viewer.setBackgroundColor(0.0, 0.0, 1.0, 1.0);
// await viewer.setCameraPosition(0, 1, 5);
// await viewer
// .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
// await viewer.setRendering(true);
// await testHelper.capture(viewer, "glb_create_instance");
// await viewer.setRendering(false);
// });
// test('create instance from glb fails when keepData is false', () async {
// var model = await viewer.loadGlb("${testHelper.testDir}/cube.glb", keepData: false);
// bool thrown = false;
// try {
// await viewer.createInstance(model);
// } catch (err) {
// thrown = true;
// }
// expect(thrown, true);
// });
// });
// group('Skinning & animations', () {
// test('get bone names', () async {
// var model = await viewer.loadGlb("${testHelper.testDir}/assets/shapes.glb");
// var names = await viewer.getBoneNames(model);
// expect(names.first, "Bone");
// });
// test('reset bones', () async {
// var model = await viewer.loadGlb("${testHelper.testDir}/assets/shapes.glb");
// await viewer.resetBones(model);
// });
// test('set from BVH', () async {
// var model = await viewer.loadGlb("${testHelper.testDir}/assets/shapes.glb");
// var animation = BVHParser.parse(
// File("${testHelper.testDir}/assets/animation.bvh").readAsStringSync(),
// boneRegex: RegExp(r"Bone$"));
// await viewer.addBoneAnimation(model, animation);
// });
// test('fade in/out', () async {
// var model = await viewer.loadGlb("${testHelper.testDir}/assets/shapes.glb");
// var animation = BVHParser.parse(
// File("${testHelper.testDir}/assets/animation.bvh").readAsStringSync(),
// boneRegex: RegExp(r"Bone$"));
// await viewer.addBoneAnimation(model, animation,
// fadeInInSecs: 0.5, fadeOutInSecs: 0.5);
// await Future.delayed(Duration(seconds: 1));
// });
group("materials", () {
test('set float4 material property for custom geometry', () async {
var viewer = await testHelper.createViewer();
await viewer.setCameraPosition(0, 0, 6);
await viewer.setBackgroundColor(0.0, 0.0, 1.0, 1.0);
var light = await viewer.addLight(
LightType.SUN, 6500, 1000000, 0, 0, 0, 0, 0, -1);
final cube = await viewer.createGeometry(GeometryHelper.cube());
await testHelper.capture(viewer, "set_material_float4_pre");
await viewer.setMaterialPropertyFloat4(
cube, "baseColorFactor", 0, 0.0, 1.0, 0.0, 1.0);
await testHelper.capture(viewer, "set_material_float4_post");
});
test('set float material property for custom geometry', () async {
var viewer = await testHelper.createViewer();
await viewer.setCameraPosition(0, 0, 6);
await viewer.setBackgroundColor(0.0, 0.0, 1.0, 1.0);
var light = await viewer.addLight(
LightType.SUN, 6500, 1000000, 0, 0, 0, 0, 0, -1);
final cube = await viewer.createGeometry(GeometryHelper.cube());
// this won't actually do anything because the default ubershader doesn't use specular/glossiness
// but we can at least check that the call succeeds
await testHelper.capture(viewer, "set_material_specular_pre");
await viewer.setMaterialPropertyFloat(cube, "specularFactor", 0, 0.0);
await testHelper.capture(viewer, "set_material_specular_post");
});
test('set float material property (roughness) for custom geometry',
() async {
var viewer = await testHelper.createViewer();
await viewer.setCameraPosition(0, 0, 6);
await viewer.setBackgroundColor(0.0, 0.0, 1.0, 1.0);
var light = await viewer.addLight(
LightType.SUN, 6500, 1000000, 0, 0, 0, 0, 0, -1);
final cube = await viewer.createGeometry(GeometryHelper.cube());
// this won't actually do anything because the default ubershader doesn't use specular/glossiness
// but we can at least check that the call succeeds
await testHelper.capture(viewer, "set_material_roughness_pre");
await viewer.setMaterialPropertyFloat(cube, "metallicFactor", 0, 0.0);
await viewer.setMaterialPropertyFloat(cube, "roughnessFactor", 0, 0.0);
await testHelper.capture(viewer, "set_material_roughness_post");
});
});
group("transforms & parenting", () {
test('set multiple transforms simultaneously with setTransforms', () async {
var viewer =
await testHelper.createViewer(bg: kRed, cameraPosition: Vector3(0, 0, 5));
final cube1 = await viewer.createGeometry(GeometryHelper.cube());
final cube2 = await viewer.createGeometry(GeometryHelper.cube());
await viewer.queueTransformUpdates([
cube1,
cube2
], [
Matrix4.translation(Vector3(-1, 0, 0)),
Matrix4.translation(Vector3(1, 0, 0))
]);
await viewer.render(testHelper.swapChain);
await testHelper.capture(viewer, "set_multiple_transforms");
});
test('getParent and getAncestor both return null when entity has no parent',
() async {
var viewer = await testHelper.createViewer();
final cube = await viewer.createGeometry(GeometryHelper.cube());
expect(await viewer.getParent(cube), isNull);
expect(await viewer.getAncestor(cube), isNull);
});
test(
'getParent returns the parent entity after one has been set via setParent',
() async {
var viewer = await testHelper.createViewer();
final cube1 = await viewer.createGeometry(GeometryHelper.cube());
final cube2 = await viewer.createGeometry(GeometryHelper.cube());
await viewer.setParent(cube1, cube2);
final parent = await viewer.getParent(cube1);
expect(parent, cube2);
});
test('getAncestor returns the ultimate parent entity', () async {
var viewer = await testHelper.createViewer();
final grandparent = await viewer.createGeometry(GeometryHelper.cube());
final parent = await viewer.createGeometry(GeometryHelper.cube());
final child = await viewer.createGeometry(GeometryHelper.cube());
await viewer.setParent(child, parent);
await viewer.setParent(parent, grandparent);
expect(await viewer.getAncestor(child), grandparent);
});
test('set position based on screenspace coord', () async {
var viewer = await testHelper.createViewer();
print(await viewer.getCameraFov(true));
await viewer.createIbl(1.0, 1.0, 1.0, 1000);
await viewer.setCameraPosition(0, 0, 6);
await viewer.setBackgroundColor(0.0, 0.0, 1.0, 1.0);
// Create the cube geometry
final cube = await viewer.createGeometry(GeometryHelper.cube());
// await viewer.setPosition(cube, -0.05, 0.04, 5.9);
// await viewer.setPosition(cube, -2.54, 2.54, 0);
await viewer.queuePositionUpdateFromViewportCoords(cube, 0, 0);
// we need an explicit render call here to process the transform queue
await viewer.render(testHelper.swapChain);
await testHelper.capture(viewer, "set_position_from_viewport_coords");
});
});
group("layers & overlays", () {
test('enable grid overlay', () async {
var viewer = await testHelper.createViewer();
await viewer.setBackgroundColor(0, 0, 0, 1);
await viewer
.setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -pi / 8));
await viewer.setCameraPosition(0, 2, 0);
await testHelper.capture(viewer, "grid_overlay_default");
await viewer.setLayerVisibility(7, true);
await testHelper.capture(viewer, "grid_overlay_enabled");
await viewer.setLayerVisibility(7, false);
await testHelper.capture(viewer, "grid_overlay_disabled");
});
test('load glb from buffer with layer', () async {
var viewer = await testHelper.createViewer();
await viewer.setBackgroundColor(1, 0, 1, 1);
await viewer.setCameraPosition(0, 2, 5);
await viewer
.setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
var buffer = File("${testHelper.testDir}/cube.glb").readAsBytesSync();
var model = await viewer.loadGlbFromBuffer(buffer, layer: 1);
await testHelper.capture(
viewer, "load_glb_from_buffer_with_layer_disabled");
await viewer.setLayerVisibility(1, true);
await testHelper.capture(
viewer, "load_glb_from_buffer_with_layer_enabled");
});
test('change layer visibility at runtime', () async {
var viewer = await testHelper.createViewer();
await viewer.setBackgroundColor(1, 0, 1, 1);
await viewer.setCameraPosition(0, 2, 5);
await viewer
.setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
var cube = await viewer.createGeometry(GeometryHelper.cube());
await testHelper.capture(
viewer, "change_layer_visibility_at_runtime_default");
// all entities set to layer 0 by default, so this should now be invisible
await viewer.setLayerVisibility(0, false);
await testHelper.capture(
viewer, "change_layer_visibility_at_runtime_layer0_invisible");
// now change the visibility layer to 5, should be invisible
await viewer.setVisibilityLayer(cube, 5);
await testHelper.capture(
viewer, "change_layer_visibility_at_runtime_layer5_invisible");
// now toggle layer 5 visibility, cube should now be visible
await viewer.setLayerVisibility(5, true);
await testHelper.capture(
viewer, "change_layer_visibility_at_runtime_layer5_visible");
});
});
// test('point light', () async {
// var model = await viewer.loadGlb("${testHelper.testDir}/cube.glb");
// await viewer.transformToUnitCube(model);
// var light = await viewer.addLight(
// LightType.POINT, 6500, 1000000, 0, 2, 0, 0, -1, 0,
// falloffRadius: 10.0);
// await viewer.setBackgroundColor(0.0, 0.0, 0.0, 1.0);
// await viewer.setCameraPosition(0, 1, 5);
// await viewer
// .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
// await viewer.setRendering(true);
// await testHelper.capture(viewer, "point_light");
// await viewer.setRendering(false);
// });
// test('set point light position', () async {
// var model = await viewer.loadGlb("${testHelper.testDir}/cube.glb");
// await viewer.transformToUnitCube(model);
// var light = await viewer.addLight(
// LightType.POINT, 6500, 1000000, 0, 2, 0, 0, -1, 0,
// falloffRadius: 10.0);
// await viewer.setLightPosition(light, 0.5, 2, 0);
// await viewer.setBackgroundColor(0.0, 0.0, 0.0, 1.0);
// await viewer.setCameraPosition(0, 1, 5);
// await viewer
// .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
// await viewer.setRendering(true);
// await testHelper.capture(viewer, "move_point_light");
// await viewer.setRendering(false);
// });
// test('directional light', () async {
// var model = await viewer.loadGlb("${testHelper.testDir}/cube.glb");
// await viewer.transformToUnitCube(model);
// var light = await viewer.addLight(
// LightType.SUN, 6500, 1000000, 0, 0, 0, 0, -1, 0);
// await viewer.setBackgroundColor(0.0, 0.0, 0.0, 1.0);
// await viewer.setCameraPosition(0, 1, 5);
// await viewer
// .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
// await viewer.setRendering(true);
// await testHelper.capture(viewer, "directional_light");
// await viewer.setRendering(false);
// });
// test('set directional light direction', () async {
// var model = await viewer.loadGlb("${testHelper.testDir}/cube.glb");
// await viewer.transformToUnitCube(model);
// var light = await viewer.addLight(
// LightType.SUN, 6500, 1000000, 0, 0, 0, 0, -1, 0);
// await viewer.setLightDirection(light, Vector3(-1, -1, -1));
// await viewer.setBackgroundColor(0.0, 0.0, 0.0, 1.0);
// await viewer.setCameraPosition(0, 1, 5);
// await viewer
// .setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
// await viewer.setRendering(true);
// await testHelper.capture(viewer, "set_directional_light_direction");
// await viewer.setRendering(false);
// });
group("stencil", () {
test('set stencil highlight for glb', () async {
final viewer = await testHelper.createViewer();
var model = await viewer.loadGlb("${testHelper.testDir}/cube.glb", keepData: true);
await viewer.setPostProcessing(true);
var light = await viewer.addLight(
LightType.SUN, 6500, 1000000, 0, 0, 0, 0, -1, 0);
await viewer.setLightDirection(light, Vector3(0, 1, -1));
await viewer.setBackgroundColor(0.0, 1.0, 0.0, 1.0);
await viewer.setCameraPosition(0, -1, 5);
await viewer
.setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), pi / 8));
await viewer.setStencilHighlight(model);
await testHelper.capture(viewer, "stencil_highlight_glb");
});
test('set stencil highlight for geometry', () async {
var viewer = await testHelper.createViewer();
await viewer.setPostProcessing(true);
await viewer.setBackgroundColor(0.0, 1.0, 0.0, 1.0);
await viewer.setCameraPosition(0, 2, 5);
await viewer
.setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
var cube = await viewer.createGeometry(GeometryHelper.cube());
await viewer.setStencilHighlight(cube);
await testHelper.capture(viewer, "stencil_highlight_geometry");
await viewer.removeStencilHighlight(cube);
await testHelper.capture(viewer, "stencil_highlight_geometry_remove");
});
test('set stencil highlight for gltf asset', () async {
var viewer = await testHelper.createViewer();
await viewer.setPostProcessing(true);
await viewer.setBackgroundColor(0.0, 1.0, 0.0, 1.0);
await viewer.setCameraPosition(0, 1, 5);
await viewer
.setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
var cube1 = await viewer.loadGlb("${testHelper.testDir}/cube.glb", keepData: true);
await viewer.transformToUnitCube(cube1);
await viewer.setStencilHighlight(cube1);
await testHelper.capture(viewer, "stencil_highlight_gltf");
await viewer.removeStencilHighlight(cube1);
await testHelper.capture(viewer, "stencil_highlight_gltf_removed");
});
test('set stencil highlight for multiple geometry ', () async {
var viewer = await testHelper.createViewer();
await viewer.setPostProcessing(true);
await viewer.setBackgroundColor(0.0, 1.0, 0.0, 1.0);
await viewer.setCameraPosition(0, 1, 5);
await viewer
.setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
var cube1 = await viewer.createGeometry(GeometryHelper.cube());
var cube2 = await viewer.createGeometry(GeometryHelper.cube());
await viewer.setPosition(cube2, 0.5, 0.5, 0);
await viewer.setStencilHighlight(cube1);
await viewer.setStencilHighlight(cube2, r: 0.0, g: 0.0, b: 1.0);
await testHelper.capture(viewer, "stencil_highlight_multiple_geometry");
await viewer.removeStencilHighlight(cube1);
await viewer.removeStencilHighlight(cube2);
await testHelper.capture(
viewer, "stencil_highlight_multiple_geometry_removed");
});
test('set stencil highlight for multiple gltf assets ', () async {
var viewer = await testHelper.createViewer();
await viewer.setPostProcessing(true);
await viewer.setBackgroundColor(0.0, 1.0, 0.0, 1.0);
await viewer.setCameraPosition(0, 1, 5);
await viewer
.setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -0.5));
var cube1 = await viewer.loadGlb("${testHelper.testDir}/cube.glb", keepData: true);
await viewer.transformToUnitCube(cube1);
var cube2 = await viewer.loadGlb("${testHelper.testDir}/cube.glb", keepData: true);
await viewer.transformToUnitCube(cube2);
await viewer.setPosition(cube2, 0.5, 0.5, 0);
await viewer.setStencilHighlight(cube1);
await viewer.setStencilHighlight(cube2, r: 0.0, g: 0.0, b: 1.0);
await testHelper.capture(viewer, "stencil_highlight_multiple_geometry");
await viewer.removeStencilHighlight(cube1);
await viewer.removeStencilHighlight(cube2);
await testHelper.capture(
viewer, "stencil_highlight_multiple_geometry_removed");
});
});
group("texture", () {
test("create/apply/dispose texture", () async {
var viewer = await testHelper.createViewer();
var textureData =
File("${testHelper.testDir}/assets/cube_texture_512x512.png").readAsBytesSync();
var texture = await viewer.createTexture(textureData);
await viewer.setBackgroundColor(0.0, 0.0, 0.0, 1.0);
await viewer.addDirectLight(
DirectLight.sun(direction: Vector3(0, -10, -1)..normalize()));
await viewer.addDirectLight(DirectLight.spot(
intensity: 1000000,
position: Vector3(0, 0, 1.5),
direction: Vector3(0, 0, -1)..normalize(),
falloffRadius: 10,
spotLightConeInner: 1,
spotLightConeOuter: 1));
await viewer.setCameraPosition(0, 2, 6);
await viewer
.setCameraRotation(Quaternion.axisAngle(Vector3(1, 0, 0), -pi / 8));
var materialInstance =
await viewer.createUbershaderMaterialInstance(unlit: true);
var cube = await viewer.createGeometry(GeometryHelper.cube(),
materialInstance: materialInstance);
await viewer.setPostProcessing(true);
await viewer.setToneMapping(ToneMapper.LINEAR);
await viewer.applyTexture(texture, cube,
materialIndex: 0, parameterName: "baseColorMap");
await testHelper.capture(viewer, "texture_applied_to_geometry");
await viewer.removeEntity(cube);
await viewer.destroyTexture(texture);
});
});
// group("unproject", () {
// test("unproject", () async {
// final dimensions = (width: 1280, height: 768);
// var viewer = await testHelper.createViewer(viewportDimensions: dimensions);
// await viewer.setPostProcessing(false);
// // await viewer.setToneMapping(ToneMapper.LINEAR);
// await viewer.setBackgroundColor(1.0, 1.0, 1.0, 1.0);
// // await viewer.createIbl(1.0, 1.0, 1.0, 100000);
// await viewer.addLight(LightType.SUN, 6500, 100000, -2, 0, 0, 1, -1, 0);
// await viewer.addLight(LightType.SPOT, 6500, 500000, 0, 0, 2, 0, 0, -1,
// falloffRadius: 10, spotLightConeInner: 1.0, spotLightConeOuter: 2.0);
// await viewer.setCameraPosition(-3, 4, 6);
// await viewer.setCameraRotation(
// Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
// Quaternion.axisAngle(Vector3(1, 0, 0), -pi / 6));
// var cube =
// await viewer.createGeometry(GeometryHelper.cube(), keepData: true);
// await viewer.setMaterialPropertyFloat4(
// cube, "baseColorFactor", 0, 1.0, 1.0, 1.0, 1.0);
// var textureData =
// File("${testHelper.testDir}/assets/cube_texture_512x512.png").readAsBytesSync();
// var texture = await viewer.createTexture(textureData);
// await viewer.applyTexture(texture, cube,
// materialIndex: 0, parameterName: "baseColorMap");
// var numFrames = 60;
// // first do the render
// for (int i = 0; i < numFrames; i++) {
// await viewer.setCameraPosition(-3 + (i / numFrames * 2), 4, 6);
// await viewer.setCameraRotation(
// Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
// Quaternion.axisAngle(
// Vector3(1, 0, 0), -pi / 6 - (i / numFrames * pi / 6)));
// var rendered = await testHelper.capture(viewer, "unproject_render$i");
// var renderPng =
// await pixelsToPng(rendered, dimensions.width, dimensions.height);
// File("${outDir.path}/unproject_render${i}.png")
// .writeAsBytesSync(renderPng);
// }
// // then go off and convert the video
// // now unproject the render back onto the geometry
// final textureSize = (width: 1280, height: 768);
// var pixels = <Uint8List>[];
// // note we skip the first frame
// for (int i = 0; i < numFrames; i++) {
// await viewer.setCameraPosition(-3 + (i / numFrames * 2), 4, 6);
// await viewer.setCameraRotation(
// Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
// Quaternion.axisAngle(
// Vector3(1, 0, 0), -pi / 6 - (i / numFrames * pi / 6)));
// var input = pngToPixelBuffer(File(
// "${outDir.path}/a8c317af-6081-4848-8a06-f6b69bc57664_${i + 1}.png")
// .readAsBytesSync());
// var pixelBuffer = await (await viewer as ThermionViewerFFI).unproject(
// cube,
// input,
// dimensions.width,
// dimensions.height,
// textureSize.width,
// textureSize.height);
// // var png = await pixelsToPng(Uint8List.fromList(pixelBuffer),
// // dimensions.width, dimensions.height);
// await savePixelBufferToBmp(
// pixelBuffer,
// textureSize.width,
// textureSize.height,
// p.join(outDir.path, "unprojected_texture${i}.bmp"));
// pixels.add(pixelBuffer);
// if (i > 10) {
// break;
// }
// }
// // }
// final aggregatePixelBuffer = medianImages(pixels);
// await savePixelBufferToBmp(aggregatePixelBuffer, textureSize.width,
// textureSize.height, "unproject_texture.bmp");
// var pixelBufferPng = await pixelsToPng(
// Uint8List.fromList(aggregatePixelBuffer),
// dimensions.width,
// dimensions.height);
// File("${outDir.path}/unproject_texture.png")
// .writeAsBytesSync(pixelBufferPng);
// await viewer.setPostProcessing(true);
// await viewer.setToneMapping(ToneMapper.LINEAR);
// final unlit = await viewer.createUnlitMaterialInstance();
// await viewer.removeEntity(cube);
// cube = await viewer.createGeometry(GeometryHelper.cube(),
// materialInstance: unlit);
// var reconstructedTexture = await viewer.createTexture(pixelBufferPng);
// await viewer.applyTexture(reconstructedTexture, cube);
// await viewer.setCameraRotation(
// Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
// Quaternion.axisAngle(Vector3(1, 0, 0), -pi / 6));
// await testHelper.capture(viewer, "unproject_reconstruct");
// // now re-render
// for (int i = 0; i < numFrames; i++) {
// await viewer.setCameraPosition(-3 + (i / numFrames * 2), 4, 6);
// await viewer.setCameraRotation(
// Quaternion.axisAngle(Vector3(0, 1, 0), -pi / 8) *
// Quaternion.axisAngle(
// Vector3(1, 0, 0), -pi / 6 - (i / numFrames * pi / 6)));
// var rendered = await testHelper.capture(viewer, "unproject_rerender$i");
// var renderPng =
// await pixelsToPng(rendered, dimensions.width, dimensions.height);
// File("${outDir.path}/unproject_rerender${i}.png")
// .writeAsBytesSync(renderPng);
// }
// }, timeout: Timeout(Duration(minutes: 2)));
// });
}

1
thermion_dart/test/skybox_tests.dart
View File

@@ -1,4 +1,3 @@
import 'dart:async';
import 'package:test/test.dart';
import 'helpers.dart';

2
thermion_dart/test/view_tests.dart
View File

@@ -1,3 +1,5 @@
// ignore_for_file: unused_local_variable
import 'dart:async';
import 'package:test/test.dart';

81
thermion_dart/test/viewport_gizmo.dart
View File

@@ -1,81 +0,0 @@
import 'dart:ffi';
import 'dart:io';
import 'dart:math';
import 'package:ffi/ffi.dart';
import 'package:test/test.dart';
import 'swift/swift_bindings.g.dart';
import 'package:thermion_dart/src/utils/src/dart_resources.dart';
import 'package:thermion_dart/src/viewer/src/ffi/src/thermion_dart.g.dart';
import 'package:thermion_dart/src/viewer/src/ffi/thermion_viewer_ffi.dart';
import 'package:thermion_dart/thermion_dart.dart';
import 'package:vector_math/vector_math_64.dart';
/// Test files are run in a variety of ways, find this package root in all.
///
/// Test files can be run from source from any working directory. The Dart SDK
/// `tools/test.py` runs them from the root of the SDK for example.
///
/// Test files can be run from dill from the root of package. `package:test`
/// does this.
Uri findPackageRoot(String packageName) {
final script = Platform.script;
final fileName = script.name;
// We're likely running from source.
var directory = script.resolve('.');
while (true) {
final dirName = directory.name;
if (dirName == packageName) {
return directory;
}
final parent = directory.resolve('..');
if (parent == directory) break;
directory = parent;
}
throw StateError("Could not find package root for package '$packageName'. "
'Tried finding the package root via Platform.script '
"'${Platform.script.toFilePath()}' and Directory.current "
"'${Directory.current.uri.toFilePath()}'.");
}
extension on Uri {
String get name => pathSegments.where((e) => e != '').last;
}
late String testDir;
void main() async {
final packageUri = findPackageRoot('thermion_dart');
testDir = Directory("${packageUri.toFilePath()}/test").path;
final lib = ThermionTexture1(DynamicLibrary.open(
'${packageUri.toFilePath()}/native/lib/macos/swift/libthermion_swift.dylib'));
final object = ThermionTexture.new1(lib);
object.initWithWidth_height_(500, 500);
final resourceLoader = calloc<ResourceLoaderWrapper>(1);
var loadToOut = NativeCallable<
Void Function(Pointer<Char>,
Pointer<ResourceBuffer>)>.listener(DartResourceLoader.loadResource);
resourceLoader.ref.loadToOut = loadToOut.nativeFunction;
var freeResource = NativeCallable<Void Function(ResourceBuffer)>.listener(
DartResourceLoader.freeResource);
resourceLoader.ref.freeResource = freeResource.nativeFunction;
var viewer = ThermionViewerFFI(resourceLoader: resourceLoader.cast<Void>());
await viewer.initialized;
await viewer.createSwapChain(500, 500);
await viewer.createRenderTarget(500, 500, object.metalTextureAddress);
await viewer.updateViewportAndCameraProjection(500, 500);
group('viewport', () {
test('viewport', () async {
var entity = await viewer.createGeometry(GeometryHelper.cube());
await viewer.setCameraPosition(0.0, 0.0, 4.0);
await viewer.setCameraRotation(Quaternion.axisAngle(Vector3(0,0,1), pi/2));
await viewer.queueRelativePositionUpdateWorldAxis(
entity, 250.0, 250.0, 1, 0, 0);
});
});
}

69
thermion_dart/test/viewport_grid.dart
View File

@@ -1,69 +0,0 @@
import 'dart:ffi';
import 'dart:io';
import 'package:ffi/ffi.dart';
import 'swift/swift_bindings.g.dart';
import 'package:thermion_dart/src/utils/src/dart_resources.dart';
import 'package:thermion_dart/src/viewer/src/ffi/src/thermion_dart.g.dart';
import 'package:thermion_dart/src/viewer/src/ffi/thermion_viewer_ffi.dart';
/// Test files are run in a variety of ways, find this package root in all.
///
/// Test files can be run from source from any working directory. The Dart SDK
/// `tools/test.py` runs them from the root of the SDK for example.
///
/// Test files can be run from dill from the root of package. `package:test`
/// does this.
Uri findPackageRoot(String packageName) {
final script = Platform.script;
final fileName = script.name;
// We're likely running from source.
var directory = script.resolve('.');
while (true) {
final dirName = directory.name;
if (dirName == packageName) {
return directory;
}
final parent = directory.resolve('..');
if (parent == directory) break;
directory = parent;
}
throw StateError("Could not find package root for package '$packageName'. "
'Tried finding the package root via Platform.script '
"'${Platform.script.toFilePath()}' and Directory.current "
"'${Directory.current.uri.toFilePath()}'.");
}
extension on Uri {
String get name => pathSegments.where((e) => e != '').last;
}
late String testDir;
void main() async {
final packageUri = findPackageRoot('thermion_dart');
testDir = Directory("${packageUri.toFilePath()}/test").path;
final lib = ThermionTexture1(DynamicLibrary.open(
'${packageUri.toFilePath()}/native/lib/macos/swift/libthermion_swift.dylib'));
final object = ThermionTexture.new1(lib);
object.initWithWidth_height_(500, 500);
final resourceLoader = calloc<ResourceLoaderWrapper>(1);
var loadToOut = NativeCallable<
Void Function(Pointer<Char>,
Pointer<ResourceBuffer>)>.listener(DartResourceLoader.loadResource);
resourceLoader.ref.loadToOut = loadToOut.nativeFunction;
var freeResource = NativeCallable<Void Function(ResourceBuffer)>.listener(
DartResourceLoader.freeResource);
resourceLoader.ref.freeResource = freeResource.nativeFunction;
var viewer = ThermionViewerFFI(resourceLoader: resourceLoader.cast<Void>());
await viewer.initialized;
await viewer.createSwapChain(500, 500);
await viewer.createRenderTarget(500, 500, object.metalTextureAddress);
await viewer.updateViewportAndCameraProjection(500, 500);
}

8
thermion_flutter/thermion_flutter/CHANGELOG.md
View File

@@ -1,3 +1,11 @@
## 0.2.1-dev.12
- **FIX**: (flutter) (windows) remove deleted source file from Windows CMakeLists.
## 0.2.1-dev.11
- Update a dependency to the latest release.
## 0.2.1-dev.10
> Note: This release has breaking changes.

10
thermion_flutter/thermion_flutter/pubspec.yaml
View File

@@ -1,6 +1,6 @@
name: thermion_flutter
description: Flutter plugin for 3D rendering with the Thermion toolkit.
version: 0.2.1-dev.10
version: 0.2.1-dev.12
homepage: https://thermion.dev
repository: https://github.com/nmfisher/thermion
@@ -17,10 +17,10 @@ dependencies:
plugin_platform_interface: ^2.0.0
ffi: ^2.1.2
animation_tools_dart: ^0.1.0
thermion_dart: ^0.2.1-dev.0.0.11
thermion_flutter_platform_interface: ^0.2.1-dev.10
thermion_flutter_ffi: ^0.2.1-dev.10
thermion_flutter_web: ^0.2.0+1
thermion_dart: ^0.2.1-dev.0.0.12
thermion_flutter_platform_interface: ^0.2.1-dev.12
thermion_flutter_ffi: ^0.2.1-dev.12
thermion_flutter_web: ^0.2.0+3
logging: ^1.2.0
web: ^1.0.0

8
thermion_flutter/thermion_flutter_ffi/CHANGELOG.md
View File

@@ -1,3 +1,11 @@
## 0.2.1-dev.12
- Update a dependency to the latest release.
## 0.2.1-dev.11
- Update a dependency to the latest release.
## 0.2.1-dev.10
- Update a dependency to the latest release.

6
thermion_flutter/thermion_flutter_ffi/pubspec.yaml
View File

@@ -1,7 +1,7 @@
name: thermion_flutter_ffi
description: An FFI implementation for thermion_flutter (i.e. all platforms except web).
repository: https://github.com/nmfisher/thermion_flutter/thermion_flutter
version: 0.2.1-dev.10
version: 0.2.1-dev.12
environment:
sdk: ">=3.3.0 <4.0.0"
@@ -23,8 +23,8 @@ dependencies:
flutter:
sdk: flutter
plugin_platform_interface: ^2.1.0
thermion_flutter_platform_interface: ^0.2.1-dev.10
thermion_dart: ^0.2.1-dev.0.0.11
thermion_flutter_platform_interface: ^0.2.1-dev.12
thermion_dart: ^0.2.1-dev.0.0.12
logging: ^1.2.0
dev_dependencies:

8
thermion_flutter/thermion_flutter_platform_interface/CHANGELOG.md
View File

@@ -1,3 +1,11 @@
## 0.2.1-dev.12
- Update a dependency to the latest release.
## 0.2.1-dev.11
- Update a dependency to the latest release.
## 0.2.1-dev.10
- Update a dependency to the latest release.

4
thermion_flutter/thermion_flutter_platform_interface/pubspec.yaml
View File

@@ -1,7 +1,7 @@
name: thermion_flutter_platform_interface
description: A common platform interface for the thermion_flutter plugin.
repository: https://github.com/nmfisher/thermion_flutter/thermion_flutter
version: 0.2.1-dev.10
version: 0.2.1-dev.12
environment:
sdk: ">=3.3.0 <4.0.0"
@@ -11,7 +11,7 @@ dependencies:
flutter:
sdk: flutter
plugin_platform_interface: ^2.1.0
thermion_dart: ^0.2.1-dev.0.0.11
thermion_dart: ^0.2.1-dev.0.0.12
dev_dependencies:
flutter_test:

8
thermion_flutter/thermion_flutter_web/CHANGELOG.md
View File

@@ -1,3 +1,11 @@
## 0.2.0+3
- Update a dependency to the latest release.
## 0.2.0+2
- Update a dependency to the latest release.
## 0.2.0+1
- Update a dependency to the latest release.

6
thermion_flutter/thermion_flutter_web/pubspec.yaml
View File

@@ -1,7 +1,7 @@
name: thermion_flutter_web
description: A web platform interface for the thermion_flutter plugin.
repository: https://github.com/nmfisher/thermion_flutter/thermion_flutter
version: 0.2.0+1
version: 0.2.0+3
environment:
sdk: ">=3.3.0 <4.0.0"
@@ -20,8 +20,8 @@ dependencies:
sdk: flutter
plugin_platform_interface: ^2.1.0
web: ^1.0.0
thermion_dart: ^0.2.1-dev.0.0.11
thermion_flutter_platform_interface: ^0.2.1-dev.10
thermion_dart: ^0.2.1-dev.0.0.12
thermion_flutter_platform_interface: ^0.2.1-dev.12
flutter_web_plugins:
sdk: flutter