From 06b20ec6fc7322df48396850a1371cc2e054e51e Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Fri, 25 Oct 2024 10:37:34 +0800 Subject: [PATCH 1/6] fix: properly pass through loadResourcesAsync flag for loadGlbFromBuffer --- thermion_dart/native/src/ThermionDartApi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thermion_dart/native/src/ThermionDartApi.cpp b/thermion_dart/native/src/ThermionDartApi.cpp index c863d5ad..645e6529 100644 --- a/thermion_dart/native/src/ThermionDartApi.cpp +++ b/thermion_dart/native/src/ThermionDartApi.cpp @@ -170,7 +170,7 @@ extern "C" EMSCRIPTEN_KEEPALIVE EntityId SceneManager_loadGlbFromBuffer(TSceneManager *sceneManager, const uint8_t *const data, size_t length, bool keepData, int priority, int layer, bool loadResourcesAsync) { - return ((SceneManager *)sceneManager)->loadGlbFromBuffer((const uint8_t *)data, length, 1, keepData, priority, layer); + return ((SceneManager *)sceneManager)->loadGlbFromBuffer((const uint8_t *)data, length, 1, keepData, priority, layer, loadResourcesAsync); } EMSCRIPTEN_KEEPALIVE EntityId create_instance(TSceneManager *sceneManager, EntityId entityId) From 2b4a73f3555fd4a0c2b3cf9bea9633edd13afa8b Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Fri, 25 Oct 2024 10:37:57 +0800 Subject: [PATCH 2/6] feat: add SCALE2_MOVE InputType --- thermion_dart/lib/src/input/src/input_handler.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/thermion_dart/lib/src/input/src/input_handler.dart b/thermion_dart/lib/src/input/src/input_handler.dart index 588e587b..0e4f5968 100644 --- a/thermion_dart/lib/src/input/src/input_handler.dart +++ b/thermion_dart/lib/src/input/src/input_handler.dart @@ -13,8 +13,9 @@ enum InputType { MMB_UP, MMB_HOVER, SCALE1, - SCALE2, - SCALE2_ROTATE, + SCALE2, // two fingers pinchin in/out + SCALE2_ROTATE, // two fingers rotating in a circle + SCALE2_MOVE, // two fingers sliding along a line SCROLLWHEEL, POINTER_MOVE, KEYDOWN_W, From ee5c08f79586317c49e950c8d06b1f45bdc38efe Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Fri, 25 Oct 2024 14:16:22 +1100 Subject: [PATCH 3/6] fix: (flutter) (windows) remove deleted source file from Windows CMakeLists --- thermion_flutter/thermion_flutter/windows/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/thermion_flutter/thermion_flutter/windows/CMakeLists.txt b/thermion_flutter/thermion_flutter/windows/CMakeLists.txt index b4ed1cbb..43f2e9c1 100644 --- a/thermion_flutter/thermion_flutter/windows/CMakeLists.txt +++ b/thermion_flutter/thermion_flutter/windows/CMakeLists.txt @@ -33,7 +33,6 @@ add_library(${PLUGIN_NAME} SHARED "include/thermion_flutter/thermion_flutter_plugin_c_api.h" "thermion_flutter_plugin_c_api.cpp" ${PLUGIN_SOURCES} - "include/material/image.c" ) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) From 02d7a0acfdb9670aad21d9b2d20e31edb1150e3c Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Fri, 25 Oct 2024 14:16:29 +1100 Subject: [PATCH 4/6] Update dart.yml --- .github/workflows/dart.yml | 42 ++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 0c1079aa..342cb2af 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -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,16 +11,41 @@ on: branches: [ "develop" ] jobs: - build: + thermion_dart: + name: thermion_dart runs-on: macos-13 + 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 + + - 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 + + 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 @@ -31,12 +55,8 @@ jobs: # - 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 - # 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 From b2a4955d54e2d141f38cfa867f864d944cf8cd9a Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Fri, 25 Oct 2024 11:19:50 +0800 Subject: [PATCH 5/6] Update dart.yml --- .github/workflows/dart.yml | 39 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 342cb2af..23e0d060 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -22,7 +22,8 @@ jobs: - uses: actions/checkout@v4 - uses: dart-lang/setup-dart@9a04e6d73cca37bd455e0608d7e5092f881fd603 - + with: + sdk: '3.6.0' - name: Install dependencies run: dart pub get @@ -36,27 +37,27 @@ jobs: - name: Run tests run: dart --enable-experiment=native-assets test - thermion_flutter: - name: thermion_flutter - runs-on: macos-13 - defaults: - run: - working-directory: thermion_flutter/thermion_flutter # Adjust this path + # 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 + # steps: + # - uses: actions/checkout@v4 - - uses: dart-lang/setup-dart@9a04e6d73cca37bd455e0608d7e5092f881fd603 + # - uses: dart-lang/setup-dart@9a04e6d73cca37bd455e0608d7e5092f881fd603 - - name: Install dependencies - run: dart pub get + # - 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 . + # # 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: Analyze project source + # run: dart analyze - - name: Run tests - run: dart --enable-experiment=native-assets test + # - name: Run tests + # run: dart --enable-experiment=native-assets test From d784efa44a2db4862bba87dba71e9849269d934a Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Fri, 25 Oct 2024 11:22:49 +0800 Subject: [PATCH 6/6] Update dart.yml --- .github/workflows/dart.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 23e0d060..fb591449 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -23,7 +23,8 @@ jobs: - uses: dart-lang/setup-dart@9a04e6d73cca37bd455e0608d7e5092f881fd603 with: - sdk: '3.6.0' + sdk: '3.6.0-326.0.dev' + channel: 'dev' - name: Install dependencies run: dart pub get