From e1a8de61477c6a23f32b41c8c9509f58f0c3e925 Mon Sep 17 00:00:00 2001 From: ink-soul Date: Fri, 2 Jun 2023 14:29:20 +0800 Subject: [PATCH] fix wrong MICRO usage --- src/render/render.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/render/render.cpp b/src/render/render.cpp index 9bd1389..3453de1 100644 --- a/src/render/render.cpp +++ b/src/render/render.cpp @@ -1664,7 +1664,7 @@ PlumageRender::PlumageRender(): std::string strModelFilePath; strModelFilePath = guiFunc.openFileFolderDialog(); filePath.glTFModelFilePath = strModelFilePath; - PlumageRender::prepare(); + loadAssets(); } if(overlay->button("select vertexShader")) @@ -1680,12 +1680,4 @@ PlumageRender::PlumageRender(): } - PlumageRender* plumageRender; LRESULT __stdcall WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - if (plumageRender != 0) { - plumageRender->handleMessages(hWnd, uMsg, wParam, lParam); - } return (DefWindowProcA(hWnd, uMsg, wParam, lParam)); - } int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE, LPSTR, int) { - for (int32_t i = 0; i < (*__p___argc()); i++) { - PlumageRender::args.push_back((*__p___argv())[i]); - }; plumageRender = new PlumageRender(); plumageRender->initVulkan(); plumageRender->setupWindow(hInstance, WndProc); plumageRender->prepare(); plumageRender->renderLoop(); delete(plumageRender); return 0; - } + PLUMAGE_RENDER_MAIN()