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

move MaterialInstance methods to own class

Browse Source
This commit is contained in:
Nick Fisher
2024-09-20 18:18:08 +08:00
parent 820ad7cb28
commit 3e1b151488
11 changed files with 128 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
thermion_dart/lib/thermion_dart/viewer/ffi/thermion_dart.g.dart
View File

@@ -1211,15 +1211,6 @@ external void remove_stencil_highlight(
int entity,
);
@ffi.Native<
ffi.Pointer<TMaterialInstance> Function(
ffi.Pointer<ffi.Void>, EntityId, ffi.Int)>(isLeaf: true)
external ffi.Pointer<TMaterialInstance> get_material_instance_at(
ffi.Pointer<ffi.Void> sceneManager,
int entity,
int materialIndex,
);
@ffi.Native<
ffi.Void Function(ffi.Pointer<ffi.Void>, EntityId, ffi.Int,
ffi.Pointer<ffi.Char>, ffi.Float)>(isLeaf: true)
@@ -1311,6 +1302,29 @@ external void apply_texture_to_material(
int materialIndex,
);
@ffi.Native<
ffi.Pointer<TMaterialInstance> Function(
ffi.Pointer<ffi.Void>, EntityId, ffi.Int)>(isLeaf: true)
external ffi.Pointer<TMaterialInstance> get_material_instance_at(
ffi.Pointer<ffi.Void> sceneManager,
int entity,
int materialIndex,
);
@ffi.Native<ffi.Void Function(ffi.Pointer<TMaterialInstance>, ffi.Bool)>(
isLeaf: true)
external void MaterialInstance_setDepthWrite(
ffi.Pointer<TMaterialInstance> materialInstance,
bool enabled,
);
@ffi.Native<ffi.Void Function(ffi.Pointer<TMaterialInstance>, ffi.Bool)>(
isLeaf: true)
external void MaterialInstance_setDepthCulling(
ffi.Pointer<TMaterialInstance> materialInstance,
bool enabled,
);
@ffi.Native<
ffi.Void Function(
ffi.Pointer<ffi.Void>,

31
thermion_dart/lib/thermion_dart/viewer/ffi/thermion_viewer_ffi.dart
View File

@@ -1982,15 +1982,6 @@ class ThermionViewerFFI extends ThermionViewer {
allocator.free(ptr);
}
///
///
///
Future setMaterialDepthWrite(
ThermionEntity entity, int materialIndex, bool enabled) {
set_material_depth_write(_sceneManager!, entity, materialIndex, enabled);
return Future.value();
}
Future<Uint8List> unproject(ThermionEntity entity, Uint8List input,
int inputWidth, int inputHeight, int outWidth, int outHeight) async {
final outPtr = Uint8List(outWidth * outHeight * 4);
@@ -2132,6 +2123,18 @@ class ThermionViewerFFI extends ThermionViewer {
allocator.free(ptr);
return Future.value();
}
///
///
///
Future<MaterialInstance?> getMaterialInstanceAt(
ThermionEntity entity, int index) async {
final instance = get_material_instance_at(_sceneManager!, entity, index);
if (instance == nullptr) {
return null;
}
return ThermionFFIMaterialInstance(instance);
}
}
class ThermionFFITexture extends ThermionTexture {
@@ -2144,4 +2147,14 @@ class ThermionFFIMaterialInstance extends MaterialInstance {
final Pointer<TMaterialInstance> _pointer;
ThermionFFIMaterialInstance(this._pointer);
@override
Future setDepthCullingEnabled(bool enabled) async {
MaterialInstance_setDepthCulling(this._pointer, enabled);
}
@override
Future setDepthWriteEnabled(bool enabled) async {
MaterialInstance_setDepthWrite(this._pointer, enabled);
}
}

9
thermion_dart/lib/thermion_dart/viewer/shared_types/material.dart
View File

@@ -1,9 +1,6 @@
abstract class MaterialInstance {
Future setDepthWriteEnabled(bool enabled);
Future setDepthCullingEnabled(bool enabled);
}
enum AlphaMode {
OPAQUE,
MASK,
BLEND
}
enum AlphaMode { OPAQUE, MASK, BLEND }

15
thermion_dart/lib/thermion_dart/viewer/thermion_viewer_base.dart
View File

@@ -599,13 +599,6 @@ abstract class ThermionViewer {
Future setMaterialPropertyInt(
ThermionEntity entity, String propertyName, int materialIndex, int value);
///
/// Sets the depthWrite material instance at [materialIndex] for [entity] to [enabled].
/// [entity] must have a Renderable attached.
///
Future setMaterialDepthWrite(
ThermionEntity entity, int materialIndex, bool enabled);
///
/// Scale [entity] to fit within the unit cube.
///
@@ -858,7 +851,7 @@ abstract class ThermionViewer {
///
/// Assigns [entity] to visibility layer [layer].
///
///
Future setVisibilityLayer(ThermionEntity entity, int layer);
///
@@ -944,4 +937,10 @@ abstract class ThermionViewer {
///
///
Future<MaterialInstance> createUnlitMaterialInstance();
///
///
///
Future<MaterialInstance?> getMaterialInstanceAt(
ThermionEntity entity, int index);
}

24
thermion_dart/lib/thermion_dart/viewer/thermion_viewer_stub.dart
View File

@@ -928,6 +928,30 @@ class ThermionViewerStub extends ThermionViewer {
// TODO: implement setMaterialPropertyInt
throw UnimplementedError();
}
@override
Future<MaterialInstance?> getMaterialInstanceAt(ThermionEntity entity, int index) {
// TODO: implement getMaterialInstanceAt
throw UnimplementedError();
}
@override
Future setLayerVisibility(int layer, bool visible) {
// TODO: implement setLayerVisibility
throw UnimplementedError();
}
@override
Future setMaterialDepthWrite(ThermionEntity entity, int materialIndex, bool enabled) {
// TODO: implement setMaterialDepthWrite
throw UnimplementedError();
}
@override
Future setVisibilityLayer(ThermionEntity entity, int layer) {
// TODO: implement setVisibilityLayer
throw UnimplementedError();
}
}

2
thermion_dart/lib/thermion_dart/viewer/web/thermion_viewer_wasm.dart
View File

@@ -2186,7 +2186,7 @@ class ThermionViewerWasm implements ThermionViewer {
@override
Future setLayerEnabled(int layer, bool enabled) async {
_module!.ccall(
"set_layer_enabled",
"set_layer_visibility",
"void",
[
"void*".toJS,