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

add missing implementation methods for web/JS interop viewer

Browse Source
This commit is contained in:
Nick Fisher
2024-06-01 12:42:31 +08:00
parent 3083730c2b
commit 5337269f83
1 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
dart_filament/lib/dart_filament/compatibility/web/interop/js_interop_filament_viewer.dart
View File

@@ -113,18 +113,31 @@ class JsInteropFilamentViewer implements AbstractFilamentViewer {
double dirX, double dirX,
double dirY, double dirY,
double dirZ, double dirZ,
{ {double falloffRadius = 1.0,
double falloffRadius=1.0, double spotLightConeInner = pi / 8,
double spotLightConeInner=pi/8, double spotLightConeOuter = pi / 4,
double spotLightConeOuter=pi/4, double sunAngularRadius = 0.545,
double sunAngularRadius=0.545, double sunHaloSize = 10.0,
double sunHaloSize=10.0, double sunHaloFallof = 80.0,
double sunHaloFallof=80.0, bool castShadows = true}) async {
bool castShadows=true
}) async {
return (await _jsObject return (await _jsObject
.addLight(type.index, colour, intensity, posX, posY, posZ, dirX, dirY, .addLight(
dirZ, falloffRadius, spotLightConeInner, spotLightConeOuter, sunAngularRadius, sunHaloSize, sunHaloFallof, castShadows) type.index,
colour,
intensity,
posX,
posY,
posZ,
dirX,
dirY,
dirZ,
falloffRadius,
spotLightConeInner,
spotLightConeOuter,
sunAngularRadius,
sunHaloSize,
sunHaloFallof,
castShadows)
.toDart) .toDart)
.toDartInt; .toDartInt;
} }
@@ -210,11 +223,9 @@ class JsInteropFilamentViewer implements AbstractFilamentViewer {
@override @override
Future<void> setMorphTargetWeights( Future<void> setMorphTargetWeights(
FilamentEntity entity, List<double> weights) async { FilamentEntity entity, List<double> weights) async {
var jsWeights = weights.map((x) => x.toJS).cast<JSNumber>().toList().toJS; var jsWeights = weights.map((x) => x.toJS).cast<JSNumber>().toList().toJS;
var promise = _jsObject.setMorphTargetWeights( var promise = _jsObject.setMorphTargetWeights(entity, jsWeights);
entity, jsWeights await promise.toDart;
);
await promise.toDart;
} }
@override @override
@@ -250,9 +261,13 @@ class JsInteropFilamentViewer implements AbstractFilamentViewer {
.map((x) => x.map((y) => y.toJS).toList().toJS) .map((x) => x.map((y) => y.toJS).toList().toJS)
.toList() .toList()
.toJS; .toJS;
var morphTargetsJs = var morphTargetsJs = animation.morphTargets
animation.morphTargets.map((x) => x.toJS).cast<JSString>().toList().toJS; .map((x) => x.toJS)
var targetMeshNamesJS = targetMeshNames?.map((x) => x.toJS).cast<JSString>().toList().toJS; .cast<JSString>()
.toList()
.toJS;
var targetMeshNamesJS =
targetMeshNames?.map((x) => x.toJS).cast<JSString>().toList().toJS;
await _jsObject await _jsObject
.setMorphAnimationData(entity, animationDataJs, morphTargetsJs, .setMorphAnimationData(entity, animationDataJs, morphTargetsJs,
targetMeshNamesJS, animation.frameLengthInMs) targetMeshNamesJS, animation.frameLengthInMs)
@@ -272,8 +287,17 @@ class JsInteropFilamentViewer implements AbstractFilamentViewer {
@override @override
Future<void> addBoneAnimation( Future<void> addBoneAnimation(
FilamentEntity entity, BoneAnimationData animation) async { FilamentEntity entity, BoneAnimationData animation) async {
throw UnimplementedError(); var boneNames = animation.bones.map((n) => n.toJS).toList().toJS;
// await _jsObject.addBoneAnimation(entity, animation).toDart; var meshNames = animation.meshNames.map((n) => n.toJS).toList().toJS;
var frameData = animation.frameData
.map((frame) => frame
.map((q) => [q.translation[0].toJS, q.translation[1].toJS, q.translation[2].toJS, q.rotation.w.toJS, q.rotation.x.toJS, q.rotation.y.toJS, q.rotation.z.toJS].toJS)
.toList()
.toJS)
.toList()
.toJS;
await _jsObject.addBoneAnimation(entity, boneNames, meshNames, frameData, animation.frameLengthInMs.toJS, animation.isModelSpace.toJS).toDart;
} }
@override @override
@@ -694,4 +718,11 @@ class JsInteropFilamentViewer implements AbstractFilamentViewer {
} }
AbstractGizmo? get gizmo => null; AbstractGizmo? get gizmo => null;
@override
Future<List<String>> getBoneNames(FilamentEntity entity,
{int skinIndex = 0}) async {
var result = await _jsObject.getBoneNames(entity, skinIndex).toDart;
return result.toDart.map((n) => n.toDart).toList();
}
} }