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

remove unnecessary _context property from FilamentViewer

Browse Source
This commit is contained in:
Nick Fisher
2024-11-04 08:30:28 +08:00
parent 5ae028f1e9
commit 14b815e009
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
thermion_dart/native/include/FilamentViewer.hpp
View File

@@ -153,7 +153,6 @@ namespace thermion
private: private:
const ResourceLoaderWrapperImpl *const _resourceLoaderWrapper; const ResourceLoaderWrapperImpl *const _resourceLoaderWrapper;
void* _context = nullptr;
Scene *_scene = nullptr; Scene *_scene = nullptr;
Engine *_engine = nullptr; Engine *_engine = nullptr;
thermion::ThreadPool *_tp = nullptr; thermion::ThreadPool *_tp = nullptr;

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

@@ -127,8 +127,7 @@ namespace thermion
FilamentViewer::FilamentViewer(const void *sharedContext, const ResourceLoaderWrapperImpl *const resourceLoader, void *const platform, const char *uberArchivePath) FilamentViewer::FilamentViewer(const void *sharedContext, const ResourceLoaderWrapperImpl *const resourceLoader, void *const platform, const char *uberArchivePath)
: _resourceLoaderWrapper(resourceLoader) : _resourceLoaderWrapper(resourceLoader)
{ {
Log("Creating engine wiht sharedContext %d", sharedContext);
_context = (void *)sharedContext;
ASSERT_POSTCONDITION(_resourceLoaderWrapper != nullptr, "Resource loader must be non-null"); ASSERT_POSTCONDITION(_resourceLoaderWrapper != nullptr, "Resource loader must be non-null");
@@ -147,7 +146,7 @@ namespace thermion
#else #else
_engine = Engine::create(Engine::Backend::OPENGL, (backend::Platform *)platform, (void *)sharedContext, nullptr); _engine = Engine::create(Engine::Backend::OPENGL, (backend::Platform *)platform, (void *)sharedContext, nullptr);
#endif #endif
Log("Engine created");
_engine->setAutomaticInstancingEnabled(true); _engine->setAutomaticInstancingEnabled(true);
_renderer = _engine->createRenderer(); _renderer = _engine->createRenderer();

2
thermion_flutter/thermion_flutter/windows/CMakeLists.txt
View File

@@ -15,7 +15,7 @@ list(APPEND PLUGIN_SOURCES
) )
set(USE_ANGLE FALSE) set(USE_ANGLE FALSE)
set(WGL_USE_BACKING_WINDOW TRUE) set(WGL_USE_BACKING_WINDOW FALSE)
if(USE_ANGLE) if(USE_ANGLE)
add_compile_definitions(USE_ANGLE) add_compile_definitions(USE_ANGLE)