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

chore: cleanup

Browse Source
This commit is contained in:
Nick Fisher
2024-09-30 18:20:30 +08:00
parent 50ed0bdfda
commit 8ddaf24a94
5 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
thermion_dart/native/src/FilamentViewer.cpp
View File

@@ -130,13 +130,6 @@ namespace thermion
_context = (void *)sharedContext; _context = (void *)sharedContext;
if(!_context) {
Log("Creating, no shared context");
} else {
Log("Creating with shared context");
}
ASSERT_POSTCONDITION(_resourceLoaderWrapper != nullptr, "Resource loader must be non-null"); ASSERT_POSTCONDITION(_resourceLoaderWrapper != nullptr, "Resource loader must be non-null");
#if TARGET_OS_IPHONE #if TARGET_OS_IPHONE

1
thermion_dart/native/src/ThermionDartApi.cpp
View File

@@ -46,7 +46,6 @@ extern "C"
EMSCRIPTEN_KEEPALIVE TViewer *Viewer_create(const void *context, const void *const loader, void *const platform, const char *uberArchivePath) EMSCRIPTEN_KEEPALIVE TViewer *Viewer_create(const void *context, const void *const loader, void *const platform, const char *uberArchivePath)
{ {
Log("CREATE");
const auto *loaderImpl = new ResourceLoaderWrapperImpl((ResourceLoaderWrapper *)loader); const auto *loaderImpl = new ResourceLoaderWrapperImpl((ResourceLoaderWrapper *)loader);
auto viewer = new FilamentViewer(context, loaderImpl, platform, uberArchivePath); auto viewer = new FilamentViewer(context, loaderImpl, platform, uberArchivePath);
return reinterpret_cast<TViewer *>(viewer); return reinterpret_cast<TViewer *>(viewer);

3
thermion_dart/native/src/ThermionDartRenderThreadApi.cpp
View File

@@ -160,10 +160,7 @@ public:
_viewer = (FilamentViewer *)Viewer_create((void *const)_context, loader, platform, uberArchivePath); _viewer = (FilamentViewer *)Viewer_create((void *const)_context, loader, platform, uberArchivePath);
MAIN_THREAD_EM_ASM({ moduleArg.dartFilamentResolveCallback($0, $1); }, callback, _viewer); MAIN_THREAD_EM_ASM({ moduleArg.dartFilamentResolveCallback($0, $1); }, callback, _viewer);
#else #else
Log("CREATING1");
auto viewer = (FilamentViewer *)Viewer_create(context, loader, platform, uberArchivePath); auto viewer = (FilamentViewer *)Viewer_create(context, loader, platform, uberArchivePath);
Log("CREATING2");
_viewer = reinterpret_cast<TViewer*>(viewer); _viewer = reinterpret_cast<TViewer*>(viewer);
callback(_viewer); callback(_viewer);
#endif #endif

7
thermion_flutter/thermion_flutter/android/src/main/cpp/ThermionFlutterAndroid.cpp
View File

@@ -15,13 +15,6 @@ extern "C" {
return window; return window;
} }
// int ThermionAndroid_createGLTexture(jobject )
// int ASurfaceTexture_attachToGLContext(
// ASurfaceTexture *st,
// uint32_t texName
// )
ResourceLoaderWrapper* make_resource_loader_wrapper_android(LoadFilamentResourceFromOwner loadFn, FreeFilamentResourceFromOwner freeFn, void* owner) { ResourceLoaderWrapper* make_resource_loader_wrapper_android(LoadFilamentResourceFromOwner loadFn, FreeFilamentResourceFromOwner freeFn, void* owner) {
ResourceLoaderWrapper *rlw = (ResourceLoaderWrapper *)malloc(sizeof(ResourceLoaderWrapper)); ResourceLoaderWrapper *rlw = (ResourceLoaderWrapper *)malloc(sizeof(ResourceLoaderWrapper));
rlw->loadToOut = nullptr; rlw->loadToOut = nullptr;

2
thermion_flutter/thermion_flutter/android/src/main/kotlin/dev/thermion/android/ThermionFlutterPlugin.kt
View File

@@ -25,7 +25,6 @@ import io.flutter.plugin.common.MethodChannel.MethodCallHandler
import io.flutter.view.TextureRegistry.SurfaceTextureEntry import io.flutter.view.TextureRegistry.SurfaceTextureEntry
import java.io.File import java.io.File
import java.util.* import java.util.*
import android.opengl.GLES20;
class LoadFilamentResourceFromOwnerImpl(plugin:ThermionFlutterPlugin) : LoadFilamentResourceFromOwner { class LoadFilamentResourceFromOwnerImpl(plugin:ThermionFlutterPlugin) : LoadFilamentResourceFromOwner {
@@ -206,7 +205,6 @@ class ThermionFlutterPlugin: FlutterPlugin, MethodCallHandler, ActivityAware, Lo
val textureId = (call.arguments as Int).toLong() val textureId = (call.arguments as Int).toLong()
val textureEntry = textures[textureId] val textureEntry = textures[textureId]
if (textureEntry != null) { if (textureEntry != null) {
//textureEntry.surfaceTexture.updateTexImage()
result.success(null) result.success(null)
} else { } else {
result.error("TEXTURE_NOT_FOUND", "Texture with id $textureId not found", null) result.error("TEXTURE_NOT_FOUND", "Texture with id $textureId not found", null)