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

fix: update Flutter example project to use new API

Browse Source 
fix: don't keep example project Podfile.lock in repo
This commit is contained in:
Nick Fisher
2024-06-21 11:44:56 +08:00
parent 55b5c7068e
commit 81ffbdd824
10 changed files with 197 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/flutter/example/lib/example_viewport.dart
View File

@@ -1,36 +1,34 @@
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:thermion_flutter/filament/widgets/camera/entity_controller_mouse_widget.dart'; import 'package:thermion_flutter/thermion/widgets/camera/entity_controller_mouse_widget.dart';
import 'package:thermion_flutter/filament/widgets/camera/gestures/filament_gesture_detector.dart';
import 'package:thermion_flutter/filament/widgets/filament_widget.dart';
import 'package:thermion_flutter/thermion_flutter.dart'; import 'package:thermion_flutter/thermion_flutter.dart';
import 'package:thermion_dart/thermion_dart/entities/entity_transform_controller.dart'; import 'package:thermion_dart/thermion_dart/entities/entity_transform_controller.dart';
class ExampleViewport extends StatelessWidget { class ExampleViewport extends StatelessWidget {
final ThermionFlutterPlugin? controller; final ThermionViewer? viewer;
final EntityTransformController? entityTransformController; final EntityTransformController? entityTransformController;
final EdgeInsets padding; final EdgeInsets padding;
final FocusNode keyboardFocusNode; final FocusNode keyboardFocusNode;
const ExampleViewport( const ExampleViewport(
{super.key, {super.key,
required this.controller, required this.viewer,
required this.padding, required this.padding,
required this.keyboardFocusNode, required this.keyboardFocusNode,
this.entityTransformController}); this.entityTransformController});
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return controller != null return viewer != null
? Padding( ? Padding(
padding: padding, padding: padding,
child: EntityTransformMouseControllerWidget( child: EntityTransformMouseControllerWidget(
transformController: entityTransformController, transformController: entityTransformController,
child: FilamentGestureDetector( child: ThermionGestureDetector(
showControlOverlay: true, showControlOverlay: true,
controller: controller!.viewer, controller: viewer!,
child: ThermionWidget( child: ThermionWidget(
plugin: controller!, viewer: viewer!,
)))) ))))
: Container(); : Container();
} }

207
examples/flutter/example/lib/main.dart
View File

@@ -1,14 +1,10 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:thermion_flutter/filament/widgets/debug/entity_list_widget.dart'; import 'package:thermion_flutter/thermion/widgets/debug/entity_list_widget.dart';
import 'package:thermion_flutter_example/camera_matrix_overlay.dart';
import 'package:thermion_flutter_example/menus/controller_menu.dart'; import 'package:thermion_flutter_example/menus/controller_menu.dart';
import 'package:thermion_flutter_example/example_viewport.dart'; import 'package:thermion_flutter_example/example_viewport.dart';
import 'package:thermion_dart/thermion_dart/entities/entity_transform_controller.dart';
import 'package:thermion_flutter_example/menus/scene_menu.dart'; import 'package:thermion_flutter_example/menus/scene_menu.dart';
import 'package:thermion_flutter/thermion_flutter.dart'; import 'package:thermion_flutter/thermion_flutter.dart';
import 'package:thermion_flutter_example/picker_result_widget.dart';
const loadDefaultScene = bool.hasEnvironment('--load-default-scene'); const loadDefaultScene = bool.hasEnvironment('--load-default-scene');
@@ -38,8 +34,7 @@ class _MyAppState extends State<MyApp> with SingleTickerProviderStateMixin {
bodyMedium: TextStyle(fontSize: 12))), bodyMedium: TextStyle(fontSize: 12))),
// showPerformanceOverlay: true, // showPerformanceOverlay: true,
home: const Scaffold( home: const Scaffold(
backgroundColor: Color(0x00000000), backgroundColor: Color(0x00000000), body: ExampleWidget()));
body: ExampleWidget()));
} }
} }
@@ -55,7 +50,7 @@ class ExampleWidget extends StatefulWidget {
enum MenuType { controller, assets, camera, misc } enum MenuType { controller, assets, camera, misc }
class ExampleWidgetState extends State<ExampleWidget> { class ExampleWidgetState extends State<ExampleWidget> {
final _plugin = ThermionFlutterPlugin(); ThermionViewer? _viewer;
EdgeInsets _viewportMargin = EdgeInsets.zero; EdgeInsets _viewportMargin = EdgeInsets.zero;
@@ -99,105 +94,103 @@ class ExampleWidgetState extends State<ExampleWidget> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return FutureBuilder( return Stack(fit: StackFit.expand, children: [
future: _plugin.initialized, if (_viewer != null)
builder: (_, AsyncSnapshot<bool> initialized) { Positioned.fill(
var isInitialized = initialized.data == true; child: ExampleViewport(
viewer: _viewer!,
return Stack( entityTransformController: _transformController,
fit: StackFit.expand, padding: _viewportMargin,
children: [ keyboardFocusNode: _sharedFocusNode),
if (isInitialized) ),
Positioned.fill( Positioned(
child: ExampleViewport( bottom: 30,
controller: isInitialized ? _plugin : null, left: 0,
entityTransformController: _transformController, right: 10,
padding: _viewportMargin, height: 30,
keyboardFocusNode: _sharedFocusNode), child: Container(
height: 30,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30),
color: Colors.white.withOpacity(0.25),
), ),
Positioned( padding: const EdgeInsets.symmetric(horizontal: 10),
bottom: 30, child:
left: 0, Row(crossAxisAlignment: CrossAxisAlignment.center, children: [
right: 10, ViewerMenu(
height: 30, sharedFocusNode: _sharedFocusNode,
child: Container( viewer: _viewer,
height: 30, onToggleViewport: () {
decoration: BoxDecoration( setState(() {
borderRadius: BorderRadius.circular(30), _viewportMargin = (_viewportMargin == EdgeInsets.zero)
color: Colors.white.withOpacity(0.25), ? const EdgeInsets.all(30)
), : EdgeInsets.zero;
padding: const EdgeInsets.symmetric(horizontal: 10), });
child: Row( },
crossAxisAlignment: CrossAxisAlignment.center, onViewerDestroyed: () {
children: [ setState(() {
ControllerMenu( _viewer = null;
sharedFocusNode: _sharedFocusNode, });
controller: _plugin, },
onToggleViewport: () { onViewerCreated: (v) {
setState(() { setState(() {
_viewportMargin = _viewer = v;
(_viewportMargin == EdgeInsets.zero) });
? const EdgeInsets.all(30) }),
: EdgeInsets.zero; SceneMenu(
}); sharedFocusNode: _sharedFocusNode,
}, controller: _viewer,
onControllerDestroyed: () {}, ),
onControllerCreated: () {}), GestureDetector(
SceneMenu( onTap: () async {
sharedFocusNode: _sharedFocusNode, await _viewer!
controller: _plugin, .loadGlb('assets/shapes/shapes.glb', numInstances: 1);
), },
GestureDetector( child: Container(
onTap: () async { color: Colors.transparent,
await _plugin.viewer.loadGlb( child: const Text("shapes.glb"))),
'assets/shapes/shapes.glb', const SizedBox(width: 5),
numInstances: 1); GestureDetector(
}, onTap: () async {
child: Container( await _viewer!.loadGlb('assets/1.glb');
color: Colors.transparent, },
child: const Text("shapes.glb"))), child: Container(
const SizedBox(width: 5), color: Colors.transparent, child: const Text("1.glb"))),
GestureDetector( const SizedBox(width: 5),
onTap: () async { GestureDetector(
await _plugin.viewer.loadGlb('assets/1.glb'); onTap: () async {
}, await _viewer!.loadGlb('assets/2.glb');
child: Container( },
color: Colors.transparent, child: Container(
child: const Text("1.glb"))), color: Colors.transparent, child: const Text("2.glb"))),
const SizedBox(width: 5), const SizedBox(width: 5),
GestureDetector( GestureDetector(
onTap: () async { onTap: () async {
await _plugin.viewer.loadGlb('assets/2.glb'); await _viewer!.loadGlb('assets/3.glb');
}, },
child: Container( child: Container(
color: Colors.transparent, color: Colors.transparent, child: const Text("3.glb"))),
child: const Text("2.glb"))), Expanded(child: Container()),
const SizedBox(width: 5), ]))),
GestureDetector( if (_viewer != null) ...[
onTap: () async { Positioned(
await _plugin.viewer.loadGlb('assets/3.glb'); top: 10,
}, left: 10,
child: Container( width: 200,
color: Colors.transparent, height: 200,
child: const Text("3.glb"))), child: Container(child: EntityListWidget(controller: _viewer!))),
Expanded(child: Container()), // Padding(
]))), // padding: const EdgeInsets.only(top: 10, left: 20, right: 20),
if (isInitialized) ...[ // child: ValueListenableBuilder(
Positioned(top:10, left:10, width:200, height:200, child:Container( // valueListenable: showProjectionMatrices,
child:EntityListWidget(controller: _plugin.viewer))), // builder: (ctx, value, child) => CameraMatrixOverlay(
// Padding( // controller: _viewer!, showProjectionMatrices: value)),
// padding: const EdgeInsets.only(top: 10, left: 20, right: 20), // ),
// child: ValueListenableBuilder( // Align(
// valueListenable: showProjectionMatrices, // alignment: Alignment.topRight,
// builder: (ctx, value, child) => CameraMatrixOverlay( // child: PickerResultWidget(controller: _viewer!),
// controller: _plugin.viewer, showProjectionMatrices: value)), // )
// ), ]
// Align( ]);
// alignment: Alignment.topRight,
// child: PickerResultWidget(controller: _plugin.viewer),
// )
]
]);
});
} }
} }

44
examples/flutter/example/lib/menus/asset_submenu.dart
View File

@@ -8,8 +8,8 @@ import 'package:vector_math/vector_math_64.dart' as v;
import 'package:thermion_dart/thermion_dart/thermion_viewer.dart'; import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
class AssetSubmenu extends StatefulWidget { class AssetSubmenu extends StatefulWidget {
final ThermionFlutterPlugin controller; final ThermionViewer viewer;
const AssetSubmenu({super.key, required this.controller}); const AssetSubmenu({super.key, required this.viewer});
@override @override
State<StatefulWidget> createState() => _AssetSubmenuState(); State<StatefulWidget> createState() => _AssetSubmenuState();
@@ -26,8 +26,8 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
MenuItemButton( MenuItemButton(
closeOnActivate: false, closeOnActivate: false,
onPressed: () async { onPressed: () async {
var entity = await widget.controller.viewer.getChildEntity( var entity = await widget.viewer.getChildEntity(
widget.controller.viewer.scene.listEntities().last, "Cylinder"); widget.viewer.scene.listEntities().last, "Cylinder");
await showDialog( await showDialog(
context: context, context: context,
builder: (BuildContext context) { builder: (BuildContext context) {
@@ -39,8 +39,8 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
child: const Text('Find Cylinder entity by name')), child: const Text('Find Cylinder entity by name')),
MenuItemButton( MenuItemButton(
onPressed: () async { onPressed: () async {
widget.controller.viewer.setPosition( widget.viewer.setPosition(
widget.controller.viewer.scene.listEntities().last, widget.viewer.scene.listEntities().last,
1.0, 1.0,
1.0, 1.0,
-1.0); -1.0);
@@ -50,8 +50,8 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
MenuItemButton( MenuItemButton(
onPressed: () async { onPressed: () async {
final color = Colors.purple; final color = Colors.purple;
widget.controller.viewer.setMaterialColor( widget.viewer.setMaterialColor(
widget.controller.viewer.scene.listEntities().last, widget.viewer.scene.listEntities().last,
"Cone", "Cone",
0, 0,
color.red / 255.0, color.red / 255.0,
@@ -85,14 +85,14 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
-1.0, -1.0,
]; ];
var indices = [0, 1, 2, 2, 3, 0]; var indices = [0, 1, 2, 2, 3, 0];
var geom = await widget.controller.viewer.createGeometry( var geom = await widget.viewer.createGeometry(
verts, indices, verts, indices,
materialPath: "asset://assets/solidcolor.filamat"); materialPath: "asset://assets/solidcolor.filamat");
}, },
child: const Text("Quad")), child: const Text("Quad")),
MenuItemButton( MenuItemButton(
onPressed: () async { onPressed: () async {
await widget.controller.viewer.createGeometry([ await widget.viewer.createGeometry([
0, 0,
0, 0,
0, 0,
@@ -118,14 +118,14 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
_geometrySubmenu(), _geometrySubmenu(),
MenuItemButton( MenuItemButton(
onPressed: () async { onPressed: () async {
await widget.controller.viewer.addLight( await widget.viewer.addLight(
LightType.DIRECTIONAL, 6500, 100000, 0, 1, 0, 0, -1, 0); LightType.DIRECTIONAL, 6500, 100000, 0, 1, 0, 0, -1, 0);
}, },
child: const Text("Add directional light"), child: const Text("Add directional light"),
), ),
MenuItemButton( MenuItemButton(
onPressed: () async { onPressed: () async {
await widget.controller.viewer.addLight( await widget.viewer.addLight(
LightType.POINT, 6500, 100000, 0, 1, 0, 0, -1, 0, LightType.POINT, 6500, 100000, 0, 1, 0, 0, -1, 0,
falloffRadius: 1.0); falloffRadius: 1.0);
}, },
@@ -133,7 +133,7 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
), ),
MenuItemButton( MenuItemButton(
onPressed: () async { onPressed: () async {
await widget.controller.viewer.addLight( await widget.viewer.addLight(
LightType.SPOT, 6500, 1000000, 0, 0, 0, 0, 1, 0, LightType.SPOT, 6500, 1000000, 0, 0, 0, 0, 1, 0,
spotLightConeInner: 0.1, spotLightConeInner: 0.1,
spotLightConeOuter: 0.4, spotLightConeOuter: 0.4,
@@ -143,26 +143,26 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
), ),
MenuItemButton( MenuItemButton(
onPressed: () async { onPressed: () async {
await widget.controller.viewer.clearLights(); await widget.viewer.clearLights();
}, },
child: const Text("Clear lights"), child: const Text("Clear lights"),
), ),
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
final color = const Color(0xAA73C9FA); final color = const Color(0xAA73C9FA);
widget.controller.viewer.setBackgroundColor(color.red / 255.0, widget.viewer.setBackgroundColor(color.red / 255.0,
color.green / 255.0, color.blue / 255.0, 1.0); color.green / 255.0, color.blue / 255.0, 1.0);
}, },
child: const Text("Set background color")), child: const Text("Set background color")),
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
widget.controller.viewer widget.viewer
.setBackgroundImage('assets/background.ktx'); .setBackgroundImage('assets/background.ktx');
}, },
child: const Text("Load background image")), child: const Text("Load background image")),
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
widget.controller.viewer.setBackgroundImage( widget.viewer.setBackgroundImage(
'assets/background.ktx', 'assets/background.ktx',
fillHeight: true); fillHeight: true);
}, },
@@ -170,9 +170,9 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
if (ExampleWidgetState.hasSkybox) { if (ExampleWidgetState.hasSkybox) {
widget.controller.viewer.removeSkybox(); widget.viewer.removeSkybox();
} else { } else {
widget.controller.viewer widget.viewer
.loadSkybox('assets/default_env/default_env_skybox.ktx'); .loadSkybox('assets/default_env/default_env_skybox.ktx');
} }
ExampleWidgetState.hasSkybox = !ExampleWidgetState.hasSkybox; ExampleWidgetState.hasSkybox = !ExampleWidgetState.hasSkybox;
@@ -182,18 +182,18 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
: 'Load skybox')), : 'Load skybox')),
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
widget.controller.viewer widget.viewer
.loadIbl('assets/default_env/default_env_ibl.ktx'); .loadIbl('assets/default_env/default_env_ibl.ktx');
}, },
child: const Text('Load IBL')), child: const Text('Load IBL')),
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
widget.controller.viewer.removeIbl(); widget.viewer.removeIbl();
}, },
child: const Text('Remove IBL')), child: const Text('Remove IBL')),
MenuItemButton( MenuItemButton(
onPressed: () async { onPressed: () async {
await widget.controller.viewer.clearEntities(); await widget.viewer.clearEntities();
}, },
child: const Text('Clear assets')), child: const Text('Clear assets')),
], ],

34
examples/flutter/example/lib/menus/camera_submenu.dart
View File

@@ -8,8 +8,8 @@ import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
import 'package:thermion_flutter_example/main.dart'; import 'package:thermion_flutter_example/main.dart';
class CameraSubmenu extends StatefulWidget { class CameraSubmenu extends StatefulWidget {
final ThermionFlutterPlugin controller; final ThermionViewer viewer;
const CameraSubmenu({super.key, required this.controller}); const CameraSubmenu({super.key, required this.viewer});
@override @override
State<StatefulWidget> createState() => _CameraSubmenuState(); State<StatefulWidget> createState() => _CameraSubmenuState();
@@ -22,10 +22,10 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
widget.controller.viewer.initialized.then((_) { widget.viewer.initialized.then((_) {
widget.controller.viewer.getCameraCullingNear().then((v) { widget.viewer.getCameraCullingNear().then((v) {
_near = v; _near = v;
widget.controller.viewer.getCameraCullingFar().then((v) { widget.viewer.getCameraCullingFar().then((v) {
_far = v; _far = v;
setState(() {}); setState(() {});
}); });
@@ -56,7 +56,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
menuChildren: [1.0, 7.0, 14.0, 28.0, 56.0] menuChildren: [1.0, 7.0, 14.0, 28.0, 56.0]
.map((v) => MenuItemButton( .map((v) => MenuItemButton(
onPressed: () { onPressed: () {
widget.controller.viewer.setCameraFocalLength(v); widget.viewer.setCameraFocalLength(v);
}, },
child: Text( child: Text(
v.toStringAsFixed(2), v.toStringAsFixed(2),
@@ -71,7 +71,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
_near = v; _near = v;
print("Setting camera culling to $_near $_far!"); print("Setting camera culling to $_near $_far!");
widget.controller.viewer.setCameraCulling(_near!, _far!); widget.viewer.setCameraCulling(_near!, _far!);
}, },
child: Text( child: Text(
v.toStringAsFixed(2), v.toStringAsFixed(2),
@@ -85,7 +85,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
onPressed: () { onPressed: () {
_far = v; _far = v;
print("Setting camera culling to $_near! $_far"); print("Setting camera culling to $_near! $_far");
widget.controller.viewer.setCameraCulling(_near!, _far!); widget.viewer.setCameraCulling(_near!, _far!);
}, },
child: Text( child: Text(
v.toStringAsFixed(2), v.toStringAsFixed(2),
@@ -95,21 +95,21 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
child: const Text("Set far")), child: const Text("Set far")),
MenuItemButton( MenuItemButton(
onPressed: () async { onPressed: () async {
widget.controller.viewer.setCameraPosition(1.0, 1.0, -1.0); widget.viewer.setCameraPosition(1.0, 1.0, -1.0);
}, },
child: const Text('Set position to 1, 1, -1 (leave rotation as-is)'), child: const Text('Set position to 1, 1, -1 (leave rotation as-is)'),
), ),
MenuItemButton( MenuItemButton(
onPressed: () async { onPressed: () async {
widget.controller.viewer.setCameraPosition(0.0, 0.0, 0.0); widget.viewer.setCameraPosition(0.0, 0.0, 0.0);
widget.controller.viewer.setCameraRotation( widget.viewer.setCameraRotation(
v.Quaternion.axisAngle(v.Vector3(0, 0.0, 1.0), 0.0)); v.Quaternion.axisAngle(v.Vector3(0, 0.0, 1.0), 0.0));
}, },
child: const Text('Move to 0,0,0, facing towards 0,0,-1'), child: const Text('Move to 0,0,0, facing towards 0,0,-1'),
), ),
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
widget.controller.viewer.setCameraRotation( widget.viewer.setCameraRotation(
v.Quaternion.axisAngle(v.Vector3(0, 1, 0), pi / 4)); v.Quaternion.axisAngle(v.Vector3(0, 1, 0), pi / 4));
}, },
child: const Text("Rotate camera 45 degrees around y axis"), child: const Text("Rotate camera 45 degrees around y axis"),
@@ -118,7 +118,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
onPressed: () { onPressed: () {
ExampleWidgetState.frustumCulling = ExampleWidgetState.frustumCulling =
!ExampleWidgetState.frustumCulling; !ExampleWidgetState.frustumCulling;
widget.controller.viewer widget.viewer
.setViewFrustumCulling(ExampleWidgetState.frustumCulling); .setViewFrustumCulling(ExampleWidgetState.frustumCulling);
}, },
child: Text( child: Text(
@@ -128,7 +128,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
closeOnActivate: false, closeOnActivate: false,
onPressed: () async { onPressed: () async {
var projMatrix = var projMatrix =
await widget.controller.viewer.getCameraProjectionMatrix(); await widget.viewer.getCameraProjectionMatrix();
await showDialog( await showDialog(
context: context, context: context,
builder: (ctx) { builder: (ctx) {
@@ -147,7 +147,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
menuChildren: ManipulatorMode.values.map((mm) { menuChildren: ManipulatorMode.values.map((mm) {
return MenuItemButton( return MenuItemButton(
onPressed: () { onPressed: () {
widget.controller.viewer.setCameraManipulatorOptions( widget.viewer.setCameraManipulatorOptions(
mode: mm, mode: mm,
orbitSpeedX: ExampleWidgetState.orbitSpeedX, orbitSpeedX: ExampleWidgetState.orbitSpeedX,
orbitSpeedY: ExampleWidgetState.orbitSpeedY, orbitSpeedY: ExampleWidgetState.orbitSpeedY,
@@ -169,7 +169,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
return MenuItemButton( return MenuItemButton(
onPressed: () { onPressed: () {
ExampleWidgetState.zoomSpeed = speed; ExampleWidgetState.zoomSpeed = speed;
widget.controller.viewer.setCameraManipulatorOptions( widget.viewer.setCameraManipulatorOptions(
orbitSpeedX: ExampleWidgetState.orbitSpeedX, orbitSpeedX: ExampleWidgetState.orbitSpeedX,
orbitSpeedY: ExampleWidgetState.orbitSpeedY, orbitSpeedY: ExampleWidgetState.orbitSpeedY,
zoomSpeed: ExampleWidgetState.zoomSpeed); zoomSpeed: ExampleWidgetState.zoomSpeed);
@@ -191,7 +191,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
onPressed: () { onPressed: () {
ExampleWidgetState.orbitSpeedX = speed; ExampleWidgetState.orbitSpeedX = speed;
ExampleWidgetState.orbitSpeedY = speed; ExampleWidgetState.orbitSpeedY = speed;
widget.controller.viewer.setCameraManipulatorOptions( widget.viewer.setCameraManipulatorOptions(
orbitSpeedX: ExampleWidgetState.orbitSpeedX, orbitSpeedX: ExampleWidgetState.orbitSpeedX,
orbitSpeedY: ExampleWidgetState.orbitSpeedY, orbitSpeedY: ExampleWidgetState.orbitSpeedY,
zoomSpeed: ExampleWidgetState.zoomSpeed); zoomSpeed: ExampleWidgetState.zoomSpeed);

45
examples/flutter/example/lib/menus/controller_menu.dart
View File

@@ -5,29 +5,31 @@ import 'package:flutter/widgets.dart';
import 'package:thermion_flutter/thermion_flutter.dart'; import 'package:thermion_flutter/thermion_flutter.dart';
class ControllerMenu extends StatefulWidget { class ViewerMenu extends StatefulWidget {
final ThermionFlutterPlugin controller; final ThermionViewer? viewer;
final void Function() onToggleViewport; final void Function() onToggleViewport;
final void Function() onControllerCreated; final void Function(ThermionViewer viewer) onViewerCreated;
final void Function() onControllerDestroyed; final void Function() onViewerDestroyed;
final FocusNode sharedFocusNode; final FocusNode sharedFocusNode;
ControllerMenu( ViewerMenu(
{required this.controller, {
required this.onControllerCreated, required this.viewer,
required this.onControllerDestroyed, required this.onViewerCreated,
required this.onViewerDestroyed,
required this.sharedFocusNode, required this.sharedFocusNode,
required this.onToggleViewport}); required this.onToggleViewport});
@override @override
State<StatefulWidget> createState() => _ControllerMenuState(); State<StatefulWidget> createState() => _ViewerMenuState();
} }
class _ControllerMenuState extends State<ControllerMenu> { class _ViewerMenuState extends State<ViewerMenu> {
void _createController({String? uberArchivePath}) async { void _createViewer({String? uberArchivePath}) async {
widget.controller.initialize(uberArchivePath: uberArchivePath); var viewer = await ThermionFlutterPlugin.createViewer(
widget.onControllerCreated(); uberArchivePath: uberArchivePath);
await viewer.initialized;
widget.onViewerCreated(viewer);
} }
@override @override
@@ -36,7 +38,7 @@ class _ControllerMenuState extends State<ControllerMenu> {
} }
@override @override
void didUpdateWidget(ControllerMenu oldWidget) { void didUpdateWidget(ViewerMenu oldWidget) {
super.didUpdateWidget(oldWidget); super.didUpdateWidget(oldWidget);
} }
@@ -50,14 +52,14 @@ class _ControllerMenuState extends State<ControllerMenu> {
child: child:
const Text("Create ThermionFlutterPlugin (default ubershader)"), const Text("Create ThermionFlutterPlugin (default ubershader)"),
onPressed: () { onPressed: () {
_createController(); _createViewer();
}, },
), ),
MenuItemButton( MenuItemButton(
child: const Text( child: const Text(
"Create ThermionFlutterPlugin (custom ubershader - lit opaque only)"), "Create ThermionFlutterPlugin (custom ubershader - lit opaque only)"),
onPressed: () { onPressed: () {
_createController( _createViewer(
uberArchivePath: Platform.isWindows uberArchivePath: Platform.isWindows
? "assets/lit_opaque_32.uberz" ? "assets/lit_opaque_32.uberz"
: Platform.isMacOS : Platform.isMacOS
@@ -73,8 +75,8 @@ class _ControllerMenuState extends State<ControllerMenu> {
MenuItemButton( MenuItemButton(
child: const Text("Destroy viewer"), child: const Text("Destroy viewer"),
onPressed: () async { onPressed: () async {
widget.controller.dispose(); widget.viewer!.dispose();
widget.onControllerDestroyed(); widget.onViewerDestroyed();
setState(() {}); setState(() {});
}, },
) )
@@ -89,8 +91,7 @@ class _ControllerMenuState extends State<ControllerMenu> {
onPressed: widget.onToggleViewport, onPressed: widget.onToggleViewport,
) )
], ],
builder: builder: (BuildContext context, MenuController controller, Widget? child) {
(BuildContext context, MenuController controller, Widget? child) {
return TextButton( return TextButton(
onPressed: () { onPressed: () {
if (controller.isOpen) { if (controller.isOpen) {
@@ -99,7 +100,7 @@ class _ControllerMenuState extends State<ControllerMenu> {
controller.open(); controller.open();
} }
}, },
child: const Text("Controller / Viewer"), child: const Text("Viewer / Viewer"),
); );
}); });
} }

20
examples/flutter/example/lib/menus/rendering_submenu.dart
View File

@@ -4,9 +4,9 @@ import 'package:thermion_flutter_example/main.dart';
import 'package:thermion_dart/thermion_dart/thermion_viewer.dart'; import 'package:thermion_dart/thermion_dart/thermion_viewer.dart';
class RenderingSubmenu extends StatefulWidget { class RenderingSubmenu extends StatefulWidget {
final ThermionFlutterPlugin controller; final ThermionViewer viewer;
const RenderingSubmenu({super.key, required this.controller}); const RenderingSubmenu({super.key, required this.viewer});
@override @override
State<StatefulWidget> createState() => _RenderingSubmenuState(); State<StatefulWidget> createState() => _RenderingSubmenuState();
@@ -19,14 +19,14 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
menuChildren: [ menuChildren: [
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
widget.controller.viewer.render(); widget.viewer.render();
}, },
child: const Text("Render single frame"), child: const Text("Render single frame"),
), ),
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
ExampleWidgetState.rendering = !ExampleWidgetState.rendering; ExampleWidgetState.rendering = !ExampleWidgetState.rendering;
widget.controller.viewer.setRendering(ExampleWidgetState.rendering); widget.viewer.setRendering(ExampleWidgetState.rendering);
}, },
child: Text( child: Text(
"Set continuous rendering to ${!ExampleWidgetState.rendering}"), "Set continuous rendering to ${!ExampleWidgetState.rendering}"),
@@ -35,14 +35,14 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
onPressed: () { onPressed: () {
ExampleWidgetState.framerate = ExampleWidgetState.framerate =
ExampleWidgetState.framerate == 60 ? 30 : 60; ExampleWidgetState.framerate == 60 ? 30 : 60;
widget.controller.viewer.setFrameRate(ExampleWidgetState.framerate); widget.viewer.setFrameRate(ExampleWidgetState.framerate);
}, },
child: Text( child: Text(
"Toggle framerate (currently ${ExampleWidgetState.framerate}) "), "Toggle framerate (currently ${ExampleWidgetState.framerate}) "),
), ),
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
widget.controller.viewer.setToneMapping(ToneMapper.LINEAR); widget.viewer.setToneMapping(ToneMapper.LINEAR);
}, },
child: const Text("Set tone mapping to linear"), child: const Text("Set tone mapping to linear"),
), ),
@@ -50,7 +50,7 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
onPressed: () { onPressed: () {
ExampleWidgetState.postProcessing = ExampleWidgetState.postProcessing =
!ExampleWidgetState.postProcessing; !ExampleWidgetState.postProcessing;
widget.controller.viewer widget.viewer
.setPostProcessing(ExampleWidgetState.postProcessing); .setPostProcessing(ExampleWidgetState.postProcessing);
}, },
child: Text( child: Text(
@@ -60,7 +60,7 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
onPressed: () { onPressed: () {
ExampleWidgetState.antiAliasingMsaa = ExampleWidgetState.antiAliasingMsaa =
!ExampleWidgetState.antiAliasingMsaa; !ExampleWidgetState.antiAliasingMsaa;
widget.controller.viewer.setAntiAliasing( widget.viewer.setAntiAliasing(
ExampleWidgetState.antiAliasingMsaa, ExampleWidgetState.antiAliasingMsaa,
ExampleWidgetState.antiAliasingFxaa, ExampleWidgetState.antiAliasingFxaa,
ExampleWidgetState.antiAliasingTaa); ExampleWidgetState.antiAliasingTaa);
@@ -72,7 +72,7 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
onPressed: () { onPressed: () {
ExampleWidgetState.antiAliasingFxaa = ExampleWidgetState.antiAliasingFxaa =
!ExampleWidgetState.antiAliasingFxaa; !ExampleWidgetState.antiAliasingFxaa;
widget.controller.viewer.setAntiAliasing( widget.viewer.setAntiAliasing(
ExampleWidgetState.antiAliasingMsaa, ExampleWidgetState.antiAliasingMsaa,
ExampleWidgetState.antiAliasingFxaa, ExampleWidgetState.antiAliasingFxaa,
ExampleWidgetState.antiAliasingTaa); ExampleWidgetState.antiAliasingTaa);
@@ -83,7 +83,7 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
MenuItemButton( MenuItemButton(
onPressed: () { onPressed: () {
ExampleWidgetState.recording = !ExampleWidgetState.recording; ExampleWidgetState.recording = !ExampleWidgetState.recording;
widget.controller.viewer.setRecording(ExampleWidgetState.recording); widget.viewer.setRecording(ExampleWidgetState.recording);
}, },
child: Text( child: Text(
"Turn recording ${ExampleWidgetState.recording ? "OFF" : "ON"}) "), "Turn recording ${ExampleWidgetState.recording ? "OFF" : "ON"}) "),

8
examples/flutter/example/lib/menus/scene_menu.dart
View File

@@ -6,7 +6,7 @@ import 'package:thermion_flutter_example/menus/camera_submenu.dart';
import 'package:thermion_flutter_example/menus/rendering_submenu.dart'; import 'package:thermion_flutter_example/menus/rendering_submenu.dart';
class SceneMenu extends StatefulWidget { class SceneMenu extends StatefulWidget {
final ThermionFlutterPlugin? controller; final ThermionViewer? controller;
final FocusNode sharedFocusNode; final FocusNode sharedFocusNode;
const SceneMenu( const SceneMenu(
@@ -37,11 +37,11 @@ class _SceneMenuState extends State<SceneMenu> {
? [] ? []
: <Widget>[ : <Widget>[
RenderingSubmenu( RenderingSubmenu(
controller: widget.controller!, viewer: widget.controller!,
), ),
AssetSubmenu(controller: widget.controller!), AssetSubmenu(viewer: widget.controller!),
CameraSubmenu( CameraSubmenu(
controller: widget.controller!, viewer: widget.controller!,
), ),
], ],
builder: builder:

29
examples/flutter/example/macos/Podfile.lock
View File

@@ -1,29 +0,0 @@
PODS:
- FlutterMacOS (1.0.0)
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- thermion_flutter (0.0.1):
- FlutterMacOS
DEPENDENCIES:
- FlutterMacOS (from `Flutter/ephemeral`)
- path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
- thermion_flutter (from `Flutter/ephemeral/.symlinks/plugins/thermion_flutter/macos`)
EXTERNAL SOURCES:
FlutterMacOS:
:path: Flutter/ephemeral
path_provider_foundation:
:path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
thermion_flutter:
:path: Flutter/ephemeral/.symlinks/plugins/thermion_flutter/macos
SPEC CHECKSUMS:
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
thermion_flutter: e4895ade6b14d9efb6e17ed2436e89dbb87fa998
PODFILE CHECKSUM: 1888651be91a8ad58692c1add9ce24279fd4e950
COCOAPODS: 1.15.2

13
examples/flutter/example/pubspec.yaml
View File

@@ -13,9 +13,22 @@ dependencies:
sdk: flutter sdk: flutter
path_provider: path_provider:
thermion_flutter: thermion_flutter:
path: ../../../thermion_flutter/thermion_flutter
cupertino_icons: ^1.0.2 cupertino_icons: ^1.0.2
web: web:
dependency_overrides:
thermion_flutter:
path: ../../../thermion_flutter/thermion_flutter
thermion_flutter_platform_interface:
path: ../../../thermion_flutter/thermion_flutter_platform_interface
thermion_flutter_ffi:
path: ../../../thermion_flutter/thermion_flutter_ffi
thermion_flutter_web:
path: ../../../thermion_flutter/thermion_flutter_web
thermion_dart:
path: ../../../thermion_dart
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter

1
thermion_flutter/thermion_flutter/lib/thermion_flutter.dart
View File

@@ -3,4 +3,5 @@ library thermion_flutter;
export 'thermion/thermion_flutter_plugin.dart'; export 'thermion/thermion_flutter_plugin.dart';
export 'thermion/widgets/thermion_widget.dart'; export 'thermion/widgets/thermion_widget.dart';
export 'thermion/widgets/camera/gestures/thermion_gesture_detector.dart'; export 'thermion/widgets/camera/gestures/thermion_gesture_detector.dart';
export 'package:thermion_dart/thermion_dart.dart'; export 'package:thermion_dart/thermion_dart.dart';