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

fixes for Windows

Browse Source
This commit is contained in:
Nick Fisher
2024-06-08 15:30:24 +10:00
parent 6eea9c1f66
commit 4f830f1f95
133 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flutter_filament_federated/flutter_filament/windows/CMakeLists.txt
View File

@@ -100,6 +100,12 @@ set(flutter_filament_bundled_libraries
${CMAKE_CURRENT_SOURCE_DIR}/lib/Debug/libc++.dll
${CMAKE_CURRENT_SOURCE_DIR}/lib/Debug/third_party_abseil-cpp_absl.dll
${CMAKE_CURRENT_SOURCE_DIR}/lib/Debug/third_party_zlib.dll
${CMAKE_CURRENT_SOURCE_DIR}/dart_filament.dll
PARENT_SCOPE
)
else()
set(flutter_filament_bundled_libraries
${runner_BINARY_DIR}/../../../native_assets/windows/dart_filament.dll
PARENT_SCOPE
)
endif()

22
flutter_filament_federated/flutter_filament/windows/flutter_filament_plugin.cpp
View File

@@ -1,5 +1,6 @@
#pragma comment(lib, "dxgi.lib")
#pragma comment(lib, "d3d11.lib")
#pragma comment(lib, "Shlwapi.lib")
#include "flutter_filament_plugin.h"
@@ -35,8 +36,7 @@
namespace flutter_filament {
using namespace std::chrono_literals;
using namespace std::chrono_literals;
void FlutterFilamentPlugin::RegisterWithRegistrar(
flutter::PluginRegistrarWindows *registrar) {
@@ -123,6 +123,7 @@ void FlutterFilamentPlugin::freeResource(ResourceBuffer rbuf) {
}
static ResourceBuffer _loadResource(const char *path, void *const plugin) {
std::wcout << "Loading resource from path " << path << std::endl;
return ((FlutterFilamentPlugin *)plugin)->loadResource(path);
}
@@ -163,10 +164,10 @@ void FlutterFilamentPlugin::CreateTexture(
const auto *args =
std::get_if<flutter::EncodableList>(methodCall.arguments());
double dWidth = *(std::get_if<double>(&(args->at(0))));
double dHeight = *(std::get_if<double>(&(args->at(1))));
double dLeft = *(std::get_if<double>(&(args->at(2))));
double dTop = *(std::get_if<double>(&(args->at(3))));
int dWidth = *(std::get_if<int>(&(args->at(0))));
int dHeight = *(std::get_if<int>(&(args->at(1))));
int dLeft = *(std::get_if<int>(&(args->at(2))));
int dTop = *(std::get_if<int>(&(args->at(3))));
auto width = (uint32_t)round(dWidth );
auto height = (uint32_t)round(dHeight );
auto left = (uint32_t)round(dLeft );
@@ -233,10 +234,11 @@ void FlutterFilamentPlugin::HandleMethodCall(
#if WGL_USE_BACKING_WINDOW
const auto *args =
std::get_if<flutter::EncodableList>(methodCall.arguments());
double dWidth = *(std::get_if<double>(&(args->at(0))));
double dHeight = *(std::get_if<double>(&(args->at(1))));
double dLeft = *(std::get_if<double>(&(args->at(2))));
double dTop = *(std::get_if<double>(&(args->at(3))));
int dWidth = *(std::get_if<int>(&(args->at(0))));
int dHeight = *(std::get_if<int>(&(args->at(1))));
int dLeft = *(std::get_if<int>(&(args->at(2))));
int dTop = *(std::get_if<int>(&(args->at(3))));
auto width = (uint32_t)round(dWidth );
auto height = (uint32_t)round(dHeight );
auto left = (uint32_t)round(dLeft );

7
flutter_filament_federated/flutter_filament/windows/wgl_context.cpp
View File

@@ -118,11 +118,10 @@ void WGLContext::CreateRenderingSurface(
ResizeRenderingSurface(width, height, left, top);
}
std::vector<flutter::EncodableValue> resultList;
resultList.push_back(flutter::EncodableValue((int64_t) nullptr));
resultList.push_back(flutter::EncodableValue()); // return null for Flutter texture ID
resultList.push_back(flutter::EncodableValue()); // return null for hardware texture ID
resultList.push_back(
flutter::EncodableValue((int64_t)_backingWindow->GetHandle()));
resultList.push_back(flutter::EncodableValue((int64_t) nullptr));
resultList.push_back(flutter::EncodableValue((int64_t)_context));
flutter::EncodableValue((int64_t)_backingWindow->GetHandle())); // return the HWND handle for the native window
result->Success(resultList);
#else
if(left != 0 || top != 0) {