viewer: add console in UI

Author: cdcseacave

.github/workflows/continuous_integration.yml

@@ -12,18 +12,13 @@ on:
 env:
   CTEST_OUTPUT_ON_FAILURE: 1
 
-defaults:
-  run:
-    shell: bash
-
 jobs:
   build-tests:
     name: Build on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest,  macOS-latest, windows-latest]
         include:
           - os: windows-latest
             triplet: x64-windows-release
@@ -34,15 +29,21 @@ jobs:
           - os: macos-latest
             triplet: arm64-osx
             build-type: Release
+    env:
+      # Turn on manifests and binary caching; use the GHA backend
+      VCPKG_FEATURE_FLAGS: manifests,binarycaching,registries
+      VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
+      VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
+      VCPKG_COMMIT: 'ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0'
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Restore artifacts, or setup vcpkg for building artifacts
+      - name: Setup vcpkg and cache artifacts
         uses: lukka/run-vcpkg@v11
         with:
-          vcpkgDirectory: '${{ github.workspace }}/vcpkg'
-          vcpkgGitCommitId: 'ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0'
+          vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
 
       - name: Install Ubuntu dependencies
         if: matrix.os == 'ubuntu-latest'
@@ -51,7 +52,7 @@ jobs:
           sudo apt-get install -y autoconf-archive libxmu-dev libdbus-1-dev libxtst-dev libxi-dev libxinerama-dev libxcursor-dev xorg-dev libgl-dev libglu1-mesa-dev autoconf automake bison libtool libltdl-dev pkg-config ninja-build
 
       - name: Install macOS dependencies
-        if: matrix.os == 'macOS-latest'
+        if: matrix.os == 'macos-latest'
         run: |
           brew install automake autoconf autoconf-archive libtool ninja
 
@@ -85,3 +86,21 @@ jobs:
           path: |
             ${{ github.workspace }}/make/bin/**/x64
             !${{ github.workspace }}/make/bin/**/*.exp
+
+      - name: Deploy Ubuntu release
+        if: matrix.os == 'ubuntu-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: OpenMVS_Ubuntu_Release_x64
+          path: |
+            ${{ github.workspace }}/make/bin/**
+            !${{ github.workspace }}/make/bin/**/*.exp
+
+      - name: Deploy macOS release
+        if: matrix.os == 'macos-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: OpenMVS_macOS_Release_arm64
+          path: |
+            ${{ github.workspace }}/make/bin/**
+            !${{ github.workspace }}/make/bin/**/*.exp

apps/Viewer/CMakeLists.txt

@@ -46,6 +46,16 @@ SOURCE_GROUP("Shaders" FILES ${SHADERS_LIBRARY_FILES})
 
 cxx_executable_with_flags(${VIEWER_NAME} "Apps" "${cxx_default}" "MVS;glad::glad;${GLFW_STATIC_LIBRARIES};${glfw3_LIBRARY};${GLFW3_LIBRARY};glfw;imgui::imgui" ${LIBRARY_FILES_C} ${LIBRARY_FILES_H})
 
+# Build the Viewer as a GUI application on platforms that support it so
+# launching from the desktop does not open or attach a console/terminal.
+if(WIN32)
+	# On Windows: tell CMake/Visual Studio to build a Win32 GUI executable (no console)
+	set_target_properties(${VIEWER_NAME} PROPERTIES WIN32_EXECUTABLE TRUE)
+elseif(APPLE)
+	# On macOS: create a macOS app bundle so it's treated as a GUI app by Finder
+	set_target_properties(${VIEWER_NAME} PROPERTIES MACOSX_BUNDLE TRUE)
+endif()
+
 # Link portable-file-dialogs if available
 if(portable-file-dialogs_FOUND)
 	target_link_libraries(${VIEWER_NAME} PRIVATE portable-file-dialogs::portable-file-dialogs)
@@ -56,7 +66,76 @@ IF(CMAKE_VERSION VERSION_GREATER_EQUAL 3.16.0)
 	TARGET_PRECOMPILE_HEADERS(${VIEWER_NAME} PRIVATE "Common.h")
 endif()
 
+if(APPLE)
+	# Configure Info.plist from the templates directory and attach it to the
+	# macOS bundle. Use the project's OpenMVS version variables and the
+	# Viewer icon basename for the bundle icon.
+	set(INFO_PLIST_IN "${CMAKE_CURRENT_SOURCE_DIR}/templates/Info.plist.in")
+	set(ICON_SRC "${CMAKE_CURRENT_SOURCE_DIR}/Viewer.icns")
+	get_filename_component(ICON_NAME "${ICON_SRC}" NAME_WE)
+	# Copy the icns into the build dir and add it to the bundle resources
+	configure_file(${ICON_SRC} ${CMAKE_CURRENT_BINARY_DIR}/Viewer.icns COPYONLY)
+	# Add the icns as a resource so CMake includes it in the built .app
+	target_sources(${VIEWER_NAME} PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/Viewer.icns")
+	set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/Viewer.icns" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources")
+	# Tell CMake which icon file to use for the bundle (filename only)
+	set_target_properties(${VIEWER_NAME} PROPERTIES MACOSX_BUNDLE_ICON_FILE "${ICON_NAME}.icns")
+	configure_file(${INFO_PLIST_IN} ${CMAKE_CURRENT_BINARY_DIR}/Info.plist @ONLY)
+	set_target_properties(${VIEWER_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
+endif()
+
+if(LINUX)
+	# Prepare a Linux desktop entry for better integration. Exec path is configured
+	# to the installed binary location (prefix + install bin dir). Install the
+	# resulting .desktop file into share/applications so desktop environments pick it up.
+	set(DESKTOP_IN "${CMAKE_CURRENT_SOURCE_DIR}/templates/openMVS-Viewer.desktop.in")
+	set(EXEC_PATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_BIN_DIR}/${VIEWER_NAME}")
+	get_filename_component(ICON_NAME "${CMAKE_CURRENT_SOURCE_DIR}/Viewer.svg" NAME_WE)
+	# Register both .mvs and .dmap MIME types so desktop environments treat
+	# both as owned by the OpenMVS Viewer. openmvs-mime.xml.in defines both
+	# application/x-openmvs-mvs and application/x-openmvs-dmap.
+	set(MIME_TYPE "application/x-openmvs-mvs;application/x-openmvs-dmap")
+	configure_file(${DESKTOP_IN} ${CMAKE_CURRENT_BINARY_DIR}/openMVS-Viewer.desktop @ONLY)
+	INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/openMVS-Viewer.desktop"
+		DESTINATION "share/applications" COMPONENT desktop)
+	# Install an SVG icon into hicolor icon theme (scalable) if present
+	INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/Viewer.svg"
+		DESTINATION "share/icons/hicolor/scalable/apps" COMPONENT desktop)
+	# Install shared-mime-info XML so the system knows about .mvs files, then
+	# update the MIME database so the desktop file association works immediately.
+	set(MIME_IN "${CMAKE_CURRENT_SOURCE_DIR}/templates/openmvs-mime.xml.in")
+	configure_file(${MIME_IN} ${CMAKE_CURRENT_BINARY_DIR}/openmvs-mime.xml @ONLY)
+	INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/openmvs-mime.xml"
+		DESTINATION "share/mime/packages" COMPONENT desktop)
+	FIND_PROGRAM(MIME_UPDATE_CMD update-mime-database)
+	if(MIME_UPDATE_CMD)
+		# run update-mime-database at install time (best effort)
+		INSTALL(CODE "execute_process(COMMAND ${MIME_UPDATE_CMD} \"${CMAKE_INSTALL_PREFIX}/share/mime\" RESULT_VARIABLE _res) if(NOT _res EQUAL 0) message(WARNING \"update-mime-database failed: \${_res}\") endif()")
+	endif()
+endif()
+
+if(WIN32)
+	# Configure a Windows registry template for packagers/installers (manual import)
+	set(REG_IN "${CMAKE_CURRENT_SOURCE_DIR}/templates/Viewer-fileassoc.reg.in")
+	configure_file(${REG_IN} ${CMAKE_CURRENT_BINARY_DIR}/Viewer-fileassoc.reg @ONLY)
+	INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/Viewer-fileassoc.reg"
+	    DESTINATION "share/doc/${VIEWER_NAME}" COMPONENT doc)
+endif()
+
 # Install
-INSTALL(TARGETS ${VIEWER_NAME}
-	EXPORT OpenMVSTargets
-	RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT bin)
+if(APPLE)
+	# When installing a MACOSX_BUNDLE target, CMake requires a BUNDLE DESTINATION.
+	# Install the .app bundle into the same bin install directory variable the project uses.
+	INSTALL(TARGETS ${VIEWER_NAME}
+		EXPORT OpenMVSTargets
+		BUNDLE DESTINATION "${INSTALL_BIN_DIR}"
+		RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT bin)
+	INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/Info.plist"
+		DESTINATION "${INSTALL_BIN_DIR}/${VIEWER_NAME}.app/Contents" COMPONENT bin)
+	INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/Viewer.icns"
+		DESTINATION "${INSTALL_BIN_DIR}/${VIEWER_NAME}.app/Contents/Resources" COMPONENT bin)
+else()
+	INSTALL(TARGETS ${VIEWER_NAME}
+		EXPORT OpenMVSTargets
+		RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT bin)
+endif()

apps/Viewer/Renderer.cpp

@@ -1208,12 +1208,16 @@ void Renderer::RenderSelection(const Window& window) {
 
 	// Use different colors for different selection types
 	if (window.selectionType == Window::SEL_POINT) {
+		selectionShader->SetFloat("lineWidth", MAXF(window.pointSize*0.5f, 1.f)); // Line width based on point size
 		selectionShader->SetVector3("selectionColor", Eigen::Vector3f(1.f, 0.f, 0.f)); // Red lines for points
 	} else if (window.selectionType == Window::SEL_TRIANGLE) {
+		selectionShader->SetFloat("lineWidth", 2.f);
 		selectionShader->SetVector3("selectionColor", Eigen::Vector3f(1.f, 0.f, 0.f)); // Red lines for triangles
 	} else if (window.selectionType == Window::SEL_CAMERA) {
+		selectionShader->SetFloat("lineWidth", 1.f);
 		selectionShader->SetVector3("selectionColor", Eigen::Vector3f(0.f, 1.f, 1.f)); // Cyan lines for cameras
 	} else {
+		selectionShader->SetFloat("lineWidth", 1.f);
 		selectionShader->SetVector3("selectionColor", Eigen::Vector3f(1.f, 1.f, 0.f)); // Yellow for other selections
 	}
 
@@ -1222,8 +1226,8 @@ void Renderer::RenderSelection(const Window& window) {
 
 	// Render neighbor camera with different color
 	if (window.selectedNeighborCamera != NO_ID) {
+		selectionShader->SetFloat("lineWidth", 1.f);
 		selectionShader->SetVector3("selectionColor", Eigen::Vector3f(1.f, 0.f, 1.f)); // Magenta for neighbor camera
-
 		// Render neighbor camera geometry as lines (starting after primary selection vertices)
 		GL_CHECK(glDrawArrays(GL_LINES, selectionPrimitiveCount, selectionPrimitiveCount));
 	}

apps/Viewer/Scene.cpp

@@ -361,7 +361,7 @@ bool Scene::Export(const String& _fileName, const String& exportType, bool bView
 	return bPoints || bMesh;
 }
 
-bool Scene::RunDensifyWorkflow(const DensifyWorkflowOptions& options) {
+bool Scene::RunDensifyWorkflow(const DensifyWorkflowOptions& options, bool bUpdateGeometry) {
 	if (!IsOpen()) {
 		DEBUG("error: no scene loaded");
 		return false;
@@ -395,11 +395,12 @@ bool Scene::RunDensifyWorkflow(const DensifyWorkflowOptions& options) {
 		return false;
 	}
 
-	UpdateGeometryAfterModification();
+	if (bUpdateGeometry)
+		UpdateGeometryAfterModification();
 	return true;
 }
 
-bool Scene::RunReconstructMeshWorkflow(const ReconstructMeshWorkflowOptions& options) {
+bool Scene::RunReconstructMeshWorkflow(const ReconstructMeshWorkflowOptions& options, bool bUpdateGeometry) {
 	if (!IsOpen()) {
 		DEBUG("error: no scene loaded");
 		return false;
@@ -440,11 +441,12 @@ bool Scene::RunReconstructMeshWorkflow(const ReconstructMeshWorkflowOptions& opt
 	mvsScene.mesh.Clean(decimate, 0.f, options.removeSpikes, options.closeHoles, 0u, 0.f, false);
 	mvsScene.mesh.Clean(1.f, 0.f, false, 0u, 0u, 0.f, true);
 
-	UpdateGeometryAfterModification();
+	if (bUpdateGeometry)
+		UpdateGeometryAfterModification();
 	return true;
 }
 
-bool Scene::RunRefineMeshWorkflow(const RefineMeshWorkflowOptions& options) {
+bool Scene::RunRefineMeshWorkflow(const RefineMeshWorkflowOptions& options, bool bUpdateGeometry) {
 	if (!IsOpen()) {
 		DEBUG("error: no scene loaded");
 		return false;
@@ -463,11 +465,12 @@ bool Scene::RunRefineMeshWorkflow(const RefineMeshWorkflowOptions& options) {
 		return false;
 	}
 
-	UpdateGeometryAfterModification();
+	if (bUpdateGeometry)
+		UpdateGeometryAfterModification();
 	return true;
 }
 
-bool Scene::RunTextureMeshWorkflow(const TextureMeshWorkflowOptions& options) {
+bool Scene::RunTextureMeshWorkflow(const TextureMeshWorkflowOptions& options, bool bUpdateGeometry) {
 	if (!IsOpen()) {
 		DEBUG("error: no scene loaded");
 		return false;
@@ -491,7 +494,8 @@ bool Scene::RunTextureMeshWorkflow(const TextureMeshWorkflowOptions& options) {
 		return false;
 	}
 
-	UpdateGeometryAfterModification();
+	if (bUpdateGeometry)
+		UpdateGeometryAfterModification();
 	return true;
 }
 

apps/Viewer/Scene.h

@@ -172,10 +172,10 @@ class Scene {
 	bool Export(const String& fileName, const String& exportType = String(), bool bViews = true) const;
 
 	// Workflows
-	bool RunDensifyWorkflow(const DensifyWorkflowOptions& options);
-	bool RunReconstructMeshWorkflow(const ReconstructMeshWorkflowOptions& options);
-	bool RunRefineMeshWorkflow(const RefineMeshWorkflowOptions& options);
-	bool RunTextureMeshWorkflow(const TextureMeshWorkflowOptions& options);
+	bool RunDensifyWorkflow(const DensifyWorkflowOptions& options, bool bUpdateGeometry=true);
+	bool RunReconstructMeshWorkflow(const ReconstructMeshWorkflowOptions& options, bool bUpdateGeometry=true);
+	bool RunRefineMeshWorkflow(const RefineMeshWorkflowOptions& options, bool bUpdateGeometry=true);
+	bool RunTextureMeshWorkflow(const TextureMeshWorkflowOptions& options, bool bUpdateGeometry=true);
 
 	// Geometry operations
 	void RemoveSelectedGeometry();