Skip to content

Commit 1f26a13

Browse files
alpinebusteralpinebuster
committed
Merge branch 'dev' into meshsdk
2 parents 1b7502d + 92ab691 commit 1f26a13

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+313
-216
lines changed

‎.github/workflows/build-test-linux-vcpkg.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,9 @@ jobs:
155155
-DMRVIEWER_NO_GTK=ON
156156
-DMRVIEWER_WITH_BUNDLED_CURL=ON
157157
158+
- name: MRMesh Exported Symbols
159+
run: objdump -T ./build/${{ matrix.config }}/bin/libMRMesh.so | llvm-cxxfilt
160+
158161
- name: Generate and build Python bindings
159162
if: ${{ inputs.mrbind }}
160163
env:

‎.github/workflows/build-test-macos.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,11 @@ jobs:
151151
-DMR_CXX_STANDARD=23
152152
-DMESHSDK_BUILD_GENERATED_C_BINDINGS=${{ fromJSON('["OFF", "ON"]')[inputs.mrbind_c] }}
153153
154+
- name: MRMesh Exported Symbols
155+
run: |
156+
export PATH="$(brew --prefix llvm@18)/bin:$PATH"
157+
nm -gU ./build/${{ matrix.config }}/bin/libMRMesh.dylib | llvm-cxxfilt
158+
154159
- name: Generate and build Python bindings
155160
if: ${{ inputs.mrbind }}
156161
env:

‎.github/workflows/build-test-ubuntu-arm64.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ jobs:
144144
-DMESHSDK_BUILD_GENERATED_C_BINDINGS=${{ fromJSON('["OFF", "ON"]')[inputs.mrbind_c] }}
145145
-DMRVIEWER_NO_XDG_DESKTOP_PORTAL=ON
146146
147+
- name: MRMesh Exported Symbols
148+
run: objdump -T ./build/${{ matrix.config }}/bin/libMRMesh.so | c++filt
149+
147150
- name: Generate and build Python bindings
148151
if: ${{ inputs.mrbind }}
149152
env:

‎.github/workflows/build-test-ubuntu-x64.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ jobs:
117117
-DMESHSDK_BUILD_GENERATED_C_BINDINGS=${{ fromJSON('["OFF", "ON"]')[inputs.mrbind_c] }}
118118
-DMRVIEWER_NO_XDG_DESKTOP_PORTAL=ON
119119
120+
- name: MRMesh Exported Symbols
121+
run: objdump -T ./build/${{ matrix.config }}/bin/libMRMesh.so | c++filt
122+
120123
- name: Generate and build Python bindings
121124
if: ${{ inputs.mrbind }}
122125
env:

‎source/EditableProject/EditableProject.vcxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
<PrecompiledHeaderFile>$(ProjectDir)..\MRPch\MRPch.h</PrecompiledHeaderFile>
8383
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ProjectDir)..\..\thirdparty;$(ProjectDir)\..\..\thirdparty\imgui\</AdditionalIncludeDirectories>
8484
<ForcedIncludeFiles>$(ProjectDir)..\MRPch\MRPch.h</ForcedIncludeFiles>
85-
<DebugInformationFormat>OldStyle</DebugInformationFormat>
8685
<PrecompiledHeaderOutputFile>$(SolutionDir)TempOutput\MRPch\$(Platform)\$(Configuration)\MRPch.pch</PrecompiledHeaderOutputFile>
8786
</ClCompile>
8887
<Link>
@@ -110,7 +109,6 @@
110109
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
111110
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ProjectDir)..\..\thirdparty;$(ProjectDir)\..\..\thirdparty\imgui\</AdditionalIncludeDirectories>
112111
<ForcedIncludeFiles>$(ProjectDir)..\MRPch\MRPch.h</ForcedIncludeFiles>
113-
<DebugInformationFormat>OldStyle</DebugInformationFormat>
114112
<PrecompiledHeaderOutputFile>$(SolutionDir)TempOutput\MRPch\$(Platform)\$(Configuration)\MRPch.pch</PrecompiledHeaderOutputFile>
115113
</ClCompile>
116114
<Link>

‎source/MRCommonPlugins/MRCommonPlugins.vcxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,6 @@
347347
<PrecompiledHeaderFile>$(ProjectDir)..\MRPch\MRPch.h</PrecompiledHeaderFile>
348348
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ProjectDir)..\..\thirdparty;$(ProjectDir)\..\..\thirdparty\imgui\</AdditionalIncludeDirectories>
349349
<ForcedIncludeFiles>$(ProjectDir)..\MRPch\MRPch.h</ForcedIncludeFiles>
350-
<DebugInformationFormat>OldStyle</DebugInformationFormat>
351350
<PrecompiledHeaderOutputFile>$(SolutionDir)TempOutput\MRPch\$(Platform)\$(Configuration)\MRPch.pch</PrecompiledHeaderOutputFile>
352351
</ClCompile>
353352
<Link>
@@ -375,7 +374,6 @@
375374
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
376375
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ProjectDir)..\..\thirdparty;$(ProjectDir)\..\..\thirdparty\imgui\</AdditionalIncludeDirectories>
377376
<ForcedIncludeFiles>$(ProjectDir)..\MRPch\MRPch.h</ForcedIncludeFiles>
378-
<DebugInformationFormat>OldStyle</DebugInformationFormat>
379377
<PrecompiledHeaderOutputFile>$(SolutionDir)TempOutput\MRPch\$(Platform)\$(Configuration)\MRPch.pch</PrecompiledHeaderOutputFile>
380378
</ClCompile>
381379
<Link>

‎source/MRCommonPlugins/ViewerButtons/MRIOFilesMenuItems.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
#include "MRViewer/MRLambdaRibbonItem.h"
4949
#include "MRIOExtras/MRPng.h"
5050
#include "MRViewer/MRRibbonFontHolder.h"
51+
#include "MRViewer/MRImGuiMultiViewport.h"
5152

5253
#ifndef MESHSDK_NO_VOXELS
5354
#include "MRVoxels/MRObjectVoxels.h"
@@ -333,11 +334,10 @@ void OpenFilesMenuItem::preDraw_()
333334

334335
auto mainColor = ColorTheme::getRibbonColor( ColorTheme::RibbonColorsType::BackgroundSecStyle );
335336
auto secondColor = ColorTheme::getRibbonColor( ColorTheme::RibbonColorsType::Background );
336-
337-
ImVec2 min = ImVec2( 10.0f * UI::scale(), 10.0f * UI::scale() );
338-
ImVec2 max = ImVec2( Vector2f( getViewerInstance().framebufferSize ) );
339-
max.x -= min.x;
340-
max.y -= min.y;
337+
338+
ImVec2 offset = ImVec2( 10.0f, 10.0f ) * UI::scale();
339+
ImVec2 min = ImGuiMV::Window2ScreenSpaceImVec2( offset );
340+
ImVec2 max = ImGuiMV::Window2ScreenSpaceImVec2( ImVec2( Vector2f( getViewerInstance().framebufferSize ) ) - offset );
341341
drawList->AddRectFilled( min, max,
342342
( addAreaHovered ? secondColor : mainColor ).scaledAlpha( 0.8f ).getUInt32(), 10.0f * UI::scale() );
343343
drawList->AddRect( min, max, ColorTheme::getRibbonColor( ColorTheme::RibbonColorsType::Borders ).getUInt32(), 10.0f * UI::scale(), 0, 2.0f * UI::scale() );
@@ -352,7 +352,7 @@ void OpenFilesMenuItem::preDraw_()
352352
{
353353
auto sceneBoxSize = menu->getSceneSize();
354354
min.y += ( getViewerInstance().framebufferSize.y - sceneBoxSize.y );
355-
max.x = sceneBoxSize.x - min.x;
355+
max.x = min.x + sceneBoxSize.x - offset.x * 2.f;
356356
drawList->AddRectFilled( min, max, ( addAreaHovered ? mainColor : secondColor ).scaledAlpha( 0.8f ).getUInt32(), 10.0f * UI::scale() );
357357
drawList->AddRect( min, max, ColorTheme::getRibbonColor( ColorTheme::RibbonColorsType::Borders ).getUInt32(), 10.0f * UI::scale(), 0, 2.0f * UI::scale() );
358358

‎source/MRCommonPlugins/exports.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#pragma once
2+
3+
// see explanation in MRMesh/MRMeshFwd.h
24
#ifdef _WIN32
35
# ifdef MRCommonPlugins_EXPORTS
46
# define MRCOMMONPLUGINS_API __declspec(dllexport)
@@ -8,6 +10,9 @@
810
# define MRCOMMONPLUGINS_CLASS
911
#else
1012
# define MRCOMMONPLUGINS_API __attribute__((visibility("default")))
11-
// to fix undefined reference to `typeinfo/vtable
12-
# define MRCOMMONPLUGINS_CLASS __attribute__((visibility("default")))
13+
# ifdef __clang__
14+
# define MRCOMMONPLUGINS_CLASS __attribute__((type_visibility("default")))
15+
# else
16+
# define MRCOMMONPLUGINS_CLASS __attribute__((visibility("default")))
17+
# endif
1318
#endif

‎source/MRCuda/exports.h‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#pragma once
2+
3+
// see explanation in MRMesh/MRMeshFwd.h
24
#ifdef _WIN32
35
# ifdef MRCuda_EXPORTS
46
# define MRCUDA_API __declspec(dllexport)
@@ -7,7 +9,10 @@
79
# endif
810
# define MRCUDA_CLASS
911
#else
10-
# define MRCUDA_CLASS __attribute__((visibility("default")))
11-
// to fix undefined reference to `typeinfo/vtable
12-
# define MRCUDA_API __attribute__((visibility("default")))
12+
# define MRCUDA_API __attribute__((visibility("default")))
13+
# ifdef __clang__
14+
# define MRCUDA_CLASS __attribute__((type_visibility("default")))
15+
# else
16+
# define MRCUDA_CLASS __attribute__((visibility("default")))
17+
# endif
1318
#endif

‎source/MREmbeddedPython/MREmbeddedPython.vcxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ProjectDir)..\..\thirdparty</AdditionalIncludeDirectories>
8989
<ForcedIncludeFiles>$(ProjectDir)..\MRPch\MRPch.h</ForcedIncludeFiles>
9090
<PrecompiledHeaderOutputFile>$(SolutionDir)TempOutput\MRPch\$(Platform)\$(Configuration)\MRPch.pch</PrecompiledHeaderOutputFile>
91-
<DebugInformationFormat>OldStyle</DebugInformationFormat>
9291
</ClCompile>
9392
<Link>
9493
<SubSystem>Console</SubSystem>
@@ -119,7 +118,6 @@
119118
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(ProjectDir)..\..\thirdparty</AdditionalIncludeDirectories>
120119
<ForcedIncludeFiles>$(ProjectDir)..\MRPch\MRPch.h</ForcedIncludeFiles>
121120
<PrecompiledHeaderOutputFile>$(SolutionDir)TempOutput\MRPch\$(Platform)\$(Configuration)\MRPch.pch</PrecompiledHeaderOutputFile>
122-
<DebugInformationFormat>OldStyle</DebugInformationFormat>
123121
</ClCompile>
124122
<Link>
125123
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)