From 368ce83380e9affc443aae2157d8cbb2463f1141 Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Wed, 26 Jun 2024 01:51:31 +1000 Subject: [PATCH] rename thermion_filament namespace to thermion_flutter for Windows --- .../thermion_flutter/windows/backing_window.cpp | 4 ++-- thermion_flutter/thermion_flutter/windows/backing_window.h | 2 +- thermion_flutter/thermion_flutter/windows/egl_context.cpp | 2 +- thermion_flutter/thermion_flutter/windows/egl_context.h | 2 +- .../thermion_flutter/windows/flutter_angle_texture.cpp | 4 ++-- .../thermion_flutter/windows/flutter_angle_texture.h | 2 +- .../thermion_flutter/windows/flutter_render_context.h | 2 +- .../thermion_flutter/windows/flutter_texture_buffer.h | 2 +- .../thermion_flutter/windows/opengl_texture_buffer.cpp | 4 ++-- .../thermion_flutter/windows/opengl_texture_buffer.h | 2 +- .../windows/test/thermion_flutter_plugin_test.cpp | 4 ++-- .../thermion_flutter/windows/thermion_flutter_plugin.cpp | 5 ++--- .../thermion_flutter/windows/thermion_flutter_plugin.h | 6 +++--- thermion_flutter/thermion_flutter/windows/wgl_context.cpp | 4 ++-- thermion_flutter/thermion_flutter/windows/wgl_context.h | 2 +- 15 files changed, 23 insertions(+), 24 deletions(-) diff --git a/thermion_flutter/thermion_flutter/windows/backing_window.cpp b/thermion_flutter/thermion_flutter/windows/backing_window.cpp index b7b2f989..b98daed9 100644 --- a/thermion_flutter/thermion_flutter/windows/backing_window.cpp +++ b/thermion_flutter/thermion_flutter/windows/backing_window.cpp @@ -12,7 +12,7 @@ #pragma comment(lib, "dwmapi.lib") #pragma comment(lib, "comctl32.lib") -namespace thermion_filament { +namespace thermion_flutter { static constexpr auto kClassName = L"FLUTTER_FILAMENT_WINDOW"; static constexpr auto kWindowName = L"thermion_flutter_window"; @@ -354,4 +354,4 @@ void BackingWindow::Resize(int width, int height, int left, int top) { } HWND BackingWindow::GetHandle() { return _windowHandle; } -} // namespace thermion_filament +} // namespace thermion_flutter diff --git a/thermion_flutter/thermion_flutter/windows/backing_window.h b/thermion_flutter/thermion_flutter/windows/backing_window.h index e58a9d07..bf2cf0e7 100644 --- a/thermion_flutter/thermion_flutter/windows/backing_window.h +++ b/thermion_flutter/thermion_flutter/windows/backing_window.h @@ -5,7 +5,7 @@ #include #include -namespace thermion_filament { +namespace thermion_flutter { class BackingWindow { public: diff --git a/thermion_flutter/thermion_flutter/windows/egl_context.cpp b/thermion_flutter/thermion_flutter/windows/egl_context.cpp index 3933f543..a766fa36 100644 --- a/thermion_flutter/thermion_flutter/windows/egl_context.cpp +++ b/thermion_flutter/thermion_flutter/windows/egl_context.cpp @@ -7,7 +7,7 @@ #pragma comment(lib, "dwmapi.lib") #pragma comment(lib, "comctl32.lib") -namespace thermion_filament { +namespace thermion_flutter { FlutterEGLContext::FlutterEGLContext( flutter::PluginRegistrarWindows* pluginRegistrar, diff --git a/thermion_flutter/thermion_flutter/windows/egl_context.h b/thermion_flutter/thermion_flutter/windows/egl_context.h index 59cf0a24..b6b056bc 100644 --- a/thermion_flutter/thermion_flutter/windows/egl_context.h +++ b/thermion_flutter/thermion_flutter/windows/egl_context.h @@ -12,7 +12,7 @@ #include "backend/platforms/PlatformEGL.h" #include "flutter_render_context.h" -namespace thermion_filament { +namespace thermion_flutter { class FlutterEGLContext : public FlutterRenderContext { public: diff --git a/thermion_flutter/thermion_flutter/windows/flutter_angle_texture.cpp b/thermion_flutter/thermion_flutter/windows/flutter_angle_texture.cpp index e443c1b2..75465f55 100644 --- a/thermion_flutter/thermion_flutter/windows/flutter_angle_texture.cpp +++ b/thermion_flutter/thermion_flutter/windows/flutter_angle_texture.cpp @@ -7,7 +7,7 @@ #include -namespace thermion_filament { +namespace thermion_flutter { static void logEglError(const char *name) noexcept { const char *err; @@ -240,4 +240,4 @@ FlutterAngleTexture::FlutterAngleTexture( result->Success(resultList); } -} // namespace thermion_filament \ No newline at end of file +} // namespace thermion_flutter \ No newline at end of file diff --git a/thermion_flutter/thermion_flutter/windows/flutter_angle_texture.h b/thermion_flutter/thermion_flutter/windows/flutter_angle_texture.h index ea449f69..0612c516 100644 --- a/thermion_flutter/thermion_flutter/windows/flutter_angle_texture.h +++ b/thermion_flutter/thermion_flutter/windows/flutter_angle_texture.h @@ -26,7 +26,7 @@ typedef uint32_t GLuint; -namespace thermion_filament { +namespace thermion_flutter { class FlutterAngleTexture : public FlutterTextureBuffer { public: diff --git a/thermion_flutter/thermion_flutter/windows/flutter_render_context.h b/thermion_flutter/thermion_flutter/windows/flutter_render_context.h index 88157ae1..c582d349 100644 --- a/thermion_flutter/thermion_flutter/windows/flutter_render_context.h +++ b/thermion_flutter/thermion_flutter/windows/flutter_render_context.h @@ -8,7 +8,7 @@ #include "flutter_texture_buffer.h" -namespace thermion_filament { +namespace thermion_flutter { class FlutterRenderContext { public: diff --git a/thermion_flutter/thermion_flutter/windows/flutter_texture_buffer.h b/thermion_flutter/thermion_flutter/windows/flutter_texture_buffer.h index f12c8541..40ee244f 100644 --- a/thermion_flutter/thermion_flutter/windows/flutter_texture_buffer.h +++ b/thermion_flutter/thermion_flutter/windows/flutter_texture_buffer.h @@ -7,7 +7,7 @@ #include -namespace thermion_filament { +namespace thermion_flutter { class FlutterTextureBuffer { public: diff --git a/thermion_flutter/thermion_flutter/windows/opengl_texture_buffer.cpp b/thermion_flutter/thermion_flutter/windows/opengl_texture_buffer.cpp index dbaca0ab..7142846e 100644 --- a/thermion_flutter/thermion_flutter/windows/opengl_texture_buffer.cpp +++ b/thermion_flutter/thermion_flutter/windows/opengl_texture_buffer.cpp @@ -7,7 +7,7 @@ #include -namespace thermion_filament { +namespace thermion_flutter { void _release_callback(void *releaseContext) { // ((OpenGLTextureBuffer*)releaseContext)->unlock(); @@ -141,4 +141,4 @@ OpenGLTextureBuffer::~OpenGLTextureBuffer() { wglMakeCurrent(NULL, NULL); } -} // namespace thermion_filament \ No newline at end of file +} // namespace thermion_flutter \ No newline at end of file diff --git a/thermion_flutter/thermion_flutter/windows/opengl_texture_buffer.h b/thermion_flutter/thermion_flutter/windows/opengl_texture_buffer.h index df17c02c..16f59e4f 100644 --- a/thermion_flutter/thermion_flutter/windows/opengl_texture_buffer.h +++ b/thermion_flutter/thermion_flutter/windows/opengl_texture_buffer.h @@ -20,7 +20,7 @@ typedef uint32_t GLuint; -namespace thermion_filament { +namespace thermion_flutter { class OpenGLTextureBuffer : public FlutterTextureBuffer { public: diff --git a/thermion_flutter/thermion_flutter/windows/test/thermion_flutter_plugin_test.cpp b/thermion_flutter/thermion_flutter/windows/test/thermion_flutter_plugin_test.cpp index 38f05c58..3ebaf4da 100644 --- a/thermion_flutter/thermion_flutter/windows/test/thermion_flutter_plugin_test.cpp +++ b/thermion_flutter/thermion_flutter/windows/test/thermion_flutter_plugin_test.cpp @@ -10,7 +10,7 @@ #include "thermion_flutter_plugin.h" -namespace thermion_filament { +namespace thermion_flutter { namespace test { namespace { @@ -40,4 +40,4 @@ TEST(ThermionFlutterPlugin, GetPlatformVersion) { } } // namespace test -} // namespace thermion_filament +} // namespace thermion_flutter diff --git a/thermion_flutter/thermion_flutter/windows/thermion_flutter_plugin.cpp b/thermion_flutter/thermion_flutter/windows/thermion_flutter_plugin.cpp index b5c0f261..f02c3e9b 100644 --- a/thermion_flutter/thermion_flutter/windows/thermion_flutter_plugin.cpp +++ b/thermion_flutter/thermion_flutter/windows/thermion_flutter_plugin.cpp @@ -35,7 +35,7 @@ #include "wgl_context.h" #endif -namespace thermion_filament { +namespace thermion_flutter { using namespace std::chrono_literals; @@ -61,7 +61,6 @@ ThermionFlutterPlugin::ThermionFlutterPlugin( // attach the method call handler for incoming messages _channel->SetMethodCallHandler([=](const auto &call, auto result) { - std::cout << call.method_name() << std::endl; this->HandleMethodCall(call, std::move(result)); }); } @@ -275,4 +274,4 @@ void ThermionFlutterPlugin::HandleMethodCall( } } -} // namespace thermion_filament +} // namespace thermion_flutter diff --git a/thermion_flutter/thermion_flutter/windows/thermion_flutter_plugin.h b/thermion_flutter/thermion_flutter/windows/thermion_flutter_plugin.h index 712e2182..74bf9839 100644 --- a/thermion_flutter/thermion_flutter/windows/thermion_flutter_plugin.h +++ b/thermion_flutter/thermion_flutter/windows/thermion_flutter_plugin.h @@ -14,7 +14,7 @@ #include "GL/GL.h" #include "GL/GLu.h" -#include "ResourceBuffer.hpp" +#include "ResourceBuffer.h" #if USE_ANGLE #include "egl_context.h" @@ -22,7 +22,7 @@ #include "wgl_context.h" #endif -namespace thermion_filament { +namespace thermion_flutter { class ThermionFlutterPlugin : public flutter::Plugin { public: @@ -66,6 +66,6 @@ public: #endif }; -} // namespace thermion_filament +} // namespace thermion_flutter #endif // FLUTTER_PLUGIN_FLUTTER_FILAMENT_PLUGIN_H_ diff --git a/thermion_flutter/thermion_flutter/windows/wgl_context.cpp b/thermion_flutter/thermion_flutter/windows/wgl_context.cpp index cb5485a3..68bbaebd 100644 --- a/thermion_flutter/thermion_flutter/windows/wgl_context.cpp +++ b/thermion_flutter/thermion_flutter/windows/wgl_context.cpp @@ -6,7 +6,7 @@ #include "flutter_texture_buffer.h" -namespace thermion_filament { +namespace thermion_flutter { WGLContext::WGLContext(flutter::PluginRegistrarWindows *pluginRegistrar, flutter::TextureRegistrar *textureRegistrar) @@ -143,4 +143,4 @@ void WGLContext::CreateRenderingSurface( void *WGLContext::GetSharedContext() { return (void *)_context; } -} // namespace thermion_filament +} // namespace thermion_flutter diff --git a/thermion_flutter/thermion_flutter/windows/wgl_context.h b/thermion_flutter/thermion_flutter/windows/wgl_context.h index 46b8bc77..0968bf41 100644 --- a/thermion_flutter/thermion_flutter/windows/wgl_context.h +++ b/thermion_flutter/thermion_flutter/windows/wgl_context.h @@ -7,7 +7,7 @@ #if WGL_USE_BACKING_WINDOW #include "backing_window.h" #endif -namespace thermion_filament { +namespace thermion_flutter { class WGLContext : public FlutterRenderContext { public: