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

update federated flutter_filament

Browse Source
This commit is contained in:
Nick Fisher
2024-05-15 22:28:58 +08:00
parent 293d3c9fd6
commit 7703f33b81
238 changed files with 68680 additions and 2037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
flutter_filament_federated/flutter_filament/example/lib/menus/asset_submenu.dart
View File

@@ -3,10 +3,9 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_filament/flutter_filament.dart';
import 'package:flutter_filament_example/main.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:animation_tools_dart/animation_tools_dart.dart';
import 'package:vector_math/vector_math_64.dart' as v;
import 'package:dart_filament/dart_filament.dart';
import 'package:dart_filament/dart_filament/abstract_filament_viewer.dart';
class AssetSubmenu extends StatefulWidget {
final FlutterFilamentPlugin controller;
@@ -27,8 +26,8 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
MenuItemButton(
closeOnActivate: false,
onPressed: () async {
var entity = await widget.controller.getChildEntity(
widget.controller.scene.listEntities().last, "Cylinder");
var entity = await widget.controller.viewer.getChildEntity(
widget.controller.viewer.scene.listEntities().last, "Cylinder");
await showDialog(
context: context,
builder: (BuildContext context) {
@@ -40,8 +39,8 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
child: const Text('Find Cylinder entity by name')),
MenuItemButton(
onPressed: () async {
await widget.controller.addBoneAnimation(
widget.controller.scene.listEntities().last,
await widget.controller.viewer.addBoneAnimation(
widget.controller.viewer.scene.listEntities().last,
BoneAnimationData([
"Bone"
], [
@@ -56,14 +55,14 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
const Text('Set bone transform for Cylinder (pi/2 rotation X)')),
MenuItemButton(
onPressed: () async {
await widget.controller
.resetBones(widget.controller.scene.listEntities().last);
await widget.controller.viewer
.resetBones(widget.controller.viewer.scene.listEntities().last);
},
child: const Text('Reset bones for Cylinder')),
MenuItemButton(
onPressed: () async {
await widget.controller.addBoneAnimation(
widget.controller.scene.listEntities().last,
await widget.controller.viewer.addBoneAnimation(
widget.controller.viewer.scene.listEntities().last,
BoneAnimationData(
["Bone"],
["Cylinder"],
@@ -81,8 +80,8 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
MenuItemButton(
closeOnActivate: false,
onPressed: () async {
var names = await widget.controller.getMorphTargetNames(
widget.controller.scene.listEntities().last, "Cylinder");
var names = await widget.controller.viewer.getMorphTargetNames(
widget.controller.viewer.scene.listEntities().last, "Cylinder");
print("NAMES : $names");
await showDialog(
context: context,
@@ -97,24 +96,24 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
child: const Text("Show morph target names for Cylinder")),
MenuItemButton(
onPressed: () async {
var cylinder = await widget.controller.getChildEntity(
widget.controller.scene.listEntities().last, "Cylinder");
widget.controller
var cylinder = await widget.controller.viewer.getChildEntity(
widget.controller.viewer.scene.listEntities().last, "Cylinder");
widget.controller.viewer
.setMorphTargetWeights(cylinder, List.filled(4, 1.0));
},
child: const Text("set Cylinder morph weights to 1")),
MenuItemButton(
onPressed: () async {
var cylinder = await widget.controller.getChildEntity(
widget.controller.scene.listEntities().last, "Cylinder");
widget.controller
var cylinder = await widget.controller.viewer.getChildEntity(
widget.controller.viewer.scene.listEntities().last, "Cylinder");
widget.controller.viewer
.setMorphTargetWeights(cylinder, List.filled(4, 0.0));
},
child: const Text("Set Cylinder morph weights to 0")),
MenuItemButton(
onPressed: () async {
var morphTargets = await widget.controller.getMorphTargetNames(
widget.controller.scene.listEntities().last, "Cylinder");
var morphTargets = await widget.controller.viewer.getMorphTargetNames(
widget.controller.viewer.scene.listEntities().last, "Cylinder");
var morphData = MorphAnimationData(
List.generate(
@@ -122,8 +121,8 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
(frameNum) =>
List.generate(4, (morphIndex) => frameNum / 60)),
morphTargets);
await widget.controller.setMorphAnimationData(
widget.controller.scene.listEntities().last, morphData,
await widget.controller.viewer.setMorphAnimationData(
widget.controller.viewer.scene.listEntities().last, morphData,
targetMeshNames: [
"Cylinder",
]);
@@ -131,19 +130,19 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
child: const Text("create manual morph animation for Cylinder")),
MenuItemButton(
onPressed: () async {
widget.controller.setPosition(
widget.controller.scene.listEntities().last, 1.0, 1.0, -1.0);
widget.controller.viewer.setPosition(
widget.controller.viewer.scene.listEntities().last, 1.0, 1.0, -1.0);
},
child: const Text('Set position to 1, 1, -1'),
),
MenuItemButton(
onPressed: () async {
if (ExampleWidgetState.coneHidden) {
widget.controller
.reveal(widget.controller.scene.listEntities().last, "Cone");
widget.controller.viewer
.reveal(widget.controller.viewer.scene.listEntities().last, "Cone");
} else {
widget.controller
.hide(widget.controller.scene.listEntities().last, "Cone");
widget.controller.viewer
.hide(widget.controller.viewer.scene.listEntities().last, "Cone");
}
ExampleWidgetState.coneHidden = !ExampleWidgetState.coneHidden;
@@ -153,8 +152,8 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
MenuItemButton(
onPressed: () async {
final color = Colors.purple;
widget.controller.setMaterialColor(
widget.controller.scene.listEntities().last,
widget.controller.viewer.setMaterialColor(
widget.controller.viewer.scene.listEntities().last,
"Cone",
0,
color.red / 255.0,
@@ -194,13 +193,13 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
-1.0,
];
var indices = [0, 1, 2, 2, 3, 0];
var geom = await widget.controller.createGeometry(verts, indices,
var geom = await widget.controller.viewer.createGeometry(verts, indices,
materialPath: "asset://assets/solidcolor.filamat");
},
child: const Text("Quad")),
MenuItemButton(
onPressed: () async {
await widget.controller.createGeometry([
await widget.controller.viewer.createGeometry([
0,
0,
0,
@@ -226,55 +225,55 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
_geometrySubmenu(),
MenuItemButton(
onPressed: () async {
await widget.controller
await widget.controller.viewer
.addLight(1, 6500, 150000, 0, 1, 0, 0, -1, 0, true);
},
child: const Text("Add directional light"),
),
MenuItemButton(
onPressed: () async {
await widget.controller
await widget.controller.viewer
.addLight(2, 6500, 150000, 0, 1, 0, 0, -1, 0, true);
},
child: const Text("Add point light"),
),
MenuItemButton(
onPressed: () async {
await widget.controller
await widget.controller.viewer
.addLight(3, 6500, 15000000, 0, 1, 0, 0, -1, 0, true);
},
child: const Text("Add spot light"),
),
MenuItemButton(
onPressed: () async {
await widget.controller.clearLights();
await widget.controller.viewer.clearLights();
},
child: const Text("Clear lights"),
),
MenuItemButton(
onPressed: () {
final color = const Color(0xAA73C9FA);
widget.controller.setBackgroundColor(color.red / 255.0,
widget.controller.viewer.setBackgroundColor(color.red / 255.0,
color.green / 255.0, color.blue / 255.0, 1.0);
},
child: const Text("Set background color")),
MenuItemButton(
onPressed: () {
widget.controller.setBackgroundImage('assets/background.ktx');
widget.controller.viewer.setBackgroundImage('assets/background.ktx');
},
child: const Text("Load background image")),
MenuItemButton(
onPressed: () {
widget.controller.setBackgroundImage('assets/background.ktx',
widget.controller.viewer.setBackgroundImage('assets/background.ktx',
fillHeight: true);
},
child: const Text("Load background image (fill height)")),
MenuItemButton(
onPressed: () {
if (ExampleWidgetState.hasSkybox) {
widget.controller.removeSkybox();
widget.controller.viewer.removeSkybox();
} else {
widget.controller
widget.controller.viewer
.loadSkybox('assets/default_env/default_env_skybox.ktx');
}
ExampleWidgetState.hasSkybox = !ExampleWidgetState.hasSkybox;
@@ -284,23 +283,18 @@ class _AssetSubmenuState extends State<AssetSubmenu> {
: 'Load skybox')),
MenuItemButton(
onPressed: () {
widget.controller
widget.controller.viewer
.loadIbl('assets/default_env/default_env_ibl.ktx');
},
child: const Text('Load IBL')),
MenuItemButton(
onPressed: () {
widget.controller.removeIbl();
widget.controller.viewer.removeIbl();
},
child: const Text('Remove IBL')),
MenuItemButton(
MenuItemButton(
onPressed: () async {
await Permission.microphone.request();
},
child: const Text("Request permissions (tests inactive->resume)")),
MenuItemButton(
onPressed: () async {
await widget.controller.clearEntities();
await widget.controller.viewer.clearEntities();
},
child: const Text('Clear assets')),
],

39
flutter_filament_federated/flutter_filament/example/lib/menus/camera_submenu.dart
View File

@@ -4,8 +4,7 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:vector_math/vector_math_64.dart' as v;
import 'package:flutter_filament/flutter_filament.dart';
import 'package:dart_filament/dart_filament.dart';
import 'package:dart_filament/dart_filament/abstract_filament_viewer.dart';
import 'package:flutter_filament_example/main.dart';
class CameraSubmenu extends StatefulWidget {
@@ -23,10 +22,10 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
@override
void initState() {
super.initState();
widget.controller.initialized.then((_) {
widget.controller.getCameraCullingNear().then((v) {
widget.controller.viewer.initialized.then((_) {
widget.controller.viewer.getCameraCullingNear().then((v) {
_near = v;
widget.controller.getCameraCullingFar().then((v) {
widget.controller.viewer.getCameraCullingFar().then((v) {
_far = v;
setState(() {});
});
@@ -57,7 +56,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
menuChildren: [1.0, 7.0, 14.0, 28.0, 56.0]
.map((v) => MenuItemButton(
onPressed: () {
widget.controller.setCameraFocalLength(v);
widget.controller.viewer.setCameraFocalLength(v);
},
child: Text(
v.toStringAsFixed(2),
@@ -72,7 +71,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
_near = v;
print("Setting camera culling to $_near $_far!");
widget.controller.setCameraCulling(_near!, _far!);
widget.controller.viewer.setCameraCulling(_near!, _far!);
},
child: Text(
v.toStringAsFixed(2),
@@ -86,7 +85,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
onPressed: () {
_far = v;
print("Setting camera culling to $_near! $_far");
widget.controller.setCameraCulling(_near!, _far!);
widget.controller.viewer.setCameraCulling(_near!, _far!);
},
child: Text(
v.toStringAsFixed(2),
@@ -96,21 +95,21 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
child: const Text("Set far")),
MenuItemButton(
onPressed: () async {
widget.controller.setCameraPosition(1.0, 1.0, -1.0);
widget.controller.viewer.setCameraPosition(1.0, 1.0, -1.0);
},
child: const Text('Set position to 1, 1, -1 (leave rotation as-is)'),
),
MenuItemButton(
onPressed: () async {
widget.controller.setCameraPosition(0.0, 0.0, 0.0);
widget.controller.setCameraRotation(
widget.controller.viewer.setCameraPosition(0.0, 0.0, 0.0);
widget.controller.viewer.setCameraRotation(
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'),
),
MenuItemButton(
onPressed: () {
widget.controller.setCameraRotation(
widget.controller.viewer.setCameraRotation(
v.Quaternion.axisAngle(v.Vector3(0, 1, 0), pi / 4));
},
child: const Text("Rotate camera 45 degrees around y axis"),
@@ -119,7 +118,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
onPressed: () {
ExampleWidgetState.frustumCulling =
!ExampleWidgetState.frustumCulling;
widget.controller
widget.controller.viewer
.setViewFrustumCulling(ExampleWidgetState.frustumCulling);
},
child: Text(
@@ -129,7 +128,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
closeOnActivate: false,
onPressed: () async {
var projMatrix =
await widget.controller.getCameraProjectionMatrix();
await widget.controller.viewer.getCameraProjectionMatrix();
await showDialog(
context: context,
builder: (ctx) {
@@ -148,7 +147,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
menuChildren: ManipulatorMode.values.map((mm) {
return MenuItemButton(
onPressed: () {
widget.controller.setCameraManipulatorOptions(
widget.controller.viewer.setCameraManipulatorOptions(
mode: mm,
orbitSpeedX: ExampleWidgetState.orbitSpeedX,
orbitSpeedY: ExampleWidgetState.orbitSpeedY,
@@ -170,7 +169,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
return MenuItemButton(
onPressed: () {
ExampleWidgetState.zoomSpeed = speed;
widget.controller.setCameraManipulatorOptions(
widget.controller.viewer.setCameraManipulatorOptions(
orbitSpeedX: ExampleWidgetState.orbitSpeedX,
orbitSpeedY: ExampleWidgetState.orbitSpeedY,
zoomSpeed: ExampleWidgetState.zoomSpeed);
@@ -192,7 +191,7 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
onPressed: () {
ExampleWidgetState.orbitSpeedX = speed;
ExampleWidgetState.orbitSpeedY = speed;
widget.controller.setCameraManipulatorOptions(
widget.controller.viewer.setCameraManipulatorOptions(
orbitSpeedX: ExampleWidgetState.orbitSpeedX,
orbitSpeedY: ExampleWidgetState.orbitSpeedY,
zoomSpeed: ExampleWidgetState.zoomSpeed);
@@ -213,9 +212,9 @@ class _CameraSubmenuState extends State<CameraSubmenu> {
@override
Widget build(BuildContext context) {
if (_near == null || _far == null) {
return Container();
}
// if (_near == null || _far == null) {
// return Container();
// }
return SubmenuButton(
controller: _menuController,
menuChildren: _cameraMenu(),

29
flutter_filament_federated/flutter_filament/example/lib/menus/controller_menu.dart
View File

@@ -6,14 +6,15 @@ import 'package:flutter/widgets.dart';
import 'package:flutter_filament/flutter_filament.dart';
class ControllerMenu extends StatefulWidget {
final FlutterFilamentPlugin? controller;
final FlutterFilamentPlugin controller;
final void Function() onToggleViewport;
final void Function(FlutterFilamentPlugin controller) onControllerCreated;
final void Function() onControllerCreated;
final void Function() onControllerDestroyed;
final FocusNode sharedFocusNode;
ControllerMenu(
{this.controller,
{required this.controller,
required this.onControllerCreated,
required this.onControllerDestroyed,
required this.sharedFocusNode,
@@ -24,37 +25,26 @@ class ControllerMenu extends StatefulWidget {
}
class _ControllerMenuState extends State<ControllerMenu> {
FlutterFilamentPlugin? _flutterFilamentPlugin;
void _createController({String? uberArchivePath}) async {
if (_flutterFilamentPlugin != null) {
throw Exception("Controller already exists");
}
_flutterFilamentPlugin =
await FlutterFilamentPlugin.create(uberArchivePath: uberArchivePath);
widget.onControllerCreated(_flutterFilamentPlugin!);
widget.controller.initialize(uberArchivePath: uberArchivePath);
widget.onControllerCreated();
}
@override
void initState() {
super.initState();
_flutterFilamentPlugin = widget.controller;
}
@override
void didUpdateWidget(ControllerMenu oldWidget) {
super.didUpdateWidget(oldWidget);
if (widget.controller != _flutterFilamentPlugin) {
setState(() {
_flutterFilamentPlugin = widget.controller;
});
}
}
bool _initialized = false;
@override
Widget build(BuildContext context) {
var items = <Widget>[];
if (_flutterFilamentPlugin == null) {
if (!_initialized) {
items.addAll([
MenuItemButton(
child:
@@ -83,8 +73,7 @@ class _ControllerMenuState extends State<ControllerMenu> {
MenuItemButton(
child: const Text("Destroy viewer"),
onPressed: () async {
await _flutterFilamentPlugin!.dispose();
_flutterFilamentPlugin = null;
widget.controller.dispose();
widget.onControllerDestroyed();
setState(() {});
},

20
flutter_filament_federated/flutter_filament/example/lib/menus/rendering_submenu.dart
View File

@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_filament/flutter_filament.dart';
import 'package:flutter_filament_example/main.dart';
import 'package:dart_filament/dart_filament.dart';
import 'package:dart_filament/dart_filament/abstract_filament_viewer.dart';
class RenderingSubmenu extends StatefulWidget {
final FlutterFilamentPlugin controller;
@@ -19,14 +19,14 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
menuChildren: [
MenuItemButton(
onPressed: () {
widget.controller.render();
widget.controller.viewer.render();
},
child: const Text("Render single frame"),
),
MenuItemButton(
onPressed: () {
ExampleWidgetState.rendering = !ExampleWidgetState.rendering;
widget.controller.setRendering(ExampleWidgetState.rendering);
widget.controller.viewer.setRendering(ExampleWidgetState.rendering);
},
child: Text(
"Set continuous rendering to ${!ExampleWidgetState.rendering}"),
@@ -35,14 +35,14 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
onPressed: () {
ExampleWidgetState.framerate =
ExampleWidgetState.framerate == 60 ? 30 : 60;
widget.controller.setFrameRate(ExampleWidgetState.framerate);
widget.controller.viewer.setFrameRate(ExampleWidgetState.framerate);
},
child: Text(
"Toggle framerate (currently ${ExampleWidgetState.framerate}) "),
),
MenuItemButton(
onPressed: () {
widget.controller.setToneMapping(ToneMapper.LINEAR);
widget.controller.viewer.setToneMapping(ToneMapper.LINEAR);
},
child: const Text("Set tone mapping to linear"),
),
@@ -50,7 +50,7 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
onPressed: () {
ExampleWidgetState.postProcessing =
!ExampleWidgetState.postProcessing;
widget.controller
widget.controller.viewer
.setPostProcessing(ExampleWidgetState.postProcessing);
},
child: Text(
@@ -60,7 +60,7 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
onPressed: () {
ExampleWidgetState.antiAliasingMsaa =
!ExampleWidgetState.antiAliasingMsaa;
widget.controller.setAntiAliasing(
widget.controller.viewer.setAntiAliasing(
ExampleWidgetState.antiAliasingMsaa,
ExampleWidgetState.antiAliasingFxaa,
ExampleWidgetState.antiAliasingTaa);
@@ -72,7 +72,7 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
onPressed: () {
ExampleWidgetState.antiAliasingFxaa =
!ExampleWidgetState.antiAliasingFxaa;
widget.controller.setAntiAliasing(
widget.controller.viewer.setAntiAliasing(
ExampleWidgetState.antiAliasingMsaa,
ExampleWidgetState.antiAliasingFxaa,
ExampleWidgetState.antiAliasingTaa);
@@ -83,14 +83,14 @@ class _RenderingSubmenuState extends State<RenderingSubmenu> {
MenuItemButton(
onPressed: () {
ExampleWidgetState.recording = !ExampleWidgetState.recording;
widget.controller.setRecording(ExampleWidgetState.recording);
widget.controller.viewer.setRecording(ExampleWidgetState.recording);
},
child: Text(
"Turn recording ${ExampleWidgetState.recording ? "OFF" : "ON"}) "),
),
MenuItemButton(
onPressed: () async {
await widget.controller
await widget.controller.viewer
.addLight(2, 6000, 100000, 0, 0, 0, 0, 1, 0, false);
},
child: Text("Add light"),