v1.3.9

Author: Muppetsg2

.gitignore

@@ -32,5 +32,5 @@
 *.app
 
 /\.vs/
-/out/
+*out/
 *_data/

README.md

@@ -4,7 +4,7 @@
   <div id="toc">
     <ul style="list-style: none;">
       <summary>
-        <h1>PBR Visualiser 1.3.8</h1>
+        <h1>PBR Visualiser 1.3.9</h1>
       </summary>
     </ul>
   </div>

cmake/CPM.cmake

@@ -1,4 +1,4 @@
-set(CPM_DOWNLOAD_VERSION 0.40.5)
+set(CPM_DOWNLOAD_VERSION 0.40.8)
 
 set(CPM_SOURCE_CACHE "${CMAKE_SOURCE_DIR}/out/thirdparty")
 set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")

res/build_resources/imgui.ini

@@ -0,0 +1,112 @@
+[Window][Debug##Default]
+Pos=60,60
+Size=400,400
+Collapsed=0
+
+[Window][PBR VISUALISER]
+Pos=18,8
+Size=402,1000
+Collapsed=0
+
+[Window][Camera]
+Pos=1500,44
+Size=368,137
+Collapsed=0
+DockId=0x00000002,0
+
+[Window][Skybox]
+Pos=1500,183
+Size=368,564
+Collapsed=0
+DockId=0x00000003,0
+
+[Window][Choose HDR image]
+Pos=60,60
+Size=740,410
+Collapsed=0
+
+[Window][Choose Albedo image]
+Pos=616,174
+Size=740,410
+Collapsed=0
+
+[Window][Choose Normal image]
+Pos=517,132
+Size=740,410
+Collapsed=0
+
+[Window][Choose Metallic image]
+Pos=514,171
+Size=740,410
+Collapsed=0
+
+[Window][Choose Displacement image]
+Pos=547,131
+Size=740,410
+Collapsed=0
+
+[Window][Choose Roughness image]
+Pos=477,200
+Size=740,410
+Collapsed=0
+
+[Window][Choose AO image]
+Pos=471,211
+Size=740,410
+Collapsed=0
+
+[Window][Screenshot Saved]
+Pos=851,396
+Size=300,88
+Collapsed=0
+
+[Window][Choose 3D Object File]
+Pos=60,60
+Size=740,410
+Collapsed=0
+
+[Window][Help Window]
+Pos=718,351
+Size=542,290
+Collapsed=0
+
+[Window][Skybox Faces Loader Window]
+Pos=727,210
+Size=521,488
+Collapsed=0
+
+[Window][Error Loading Image Right]
+Pos=759,446
+Size=500,88
+Collapsed=0
+
+[Window][Error Loading Image Bottom]
+Pos=726,394
+Size=500,88
+Collapsed=0
+
+[Window][Error Loading Image Left]
+Pos=731,449
+Size=441,88
+Collapsed=0
+
+[Window][Error Loading Image Top]
+Pos=710,464
+Size=500,88
+Collapsed=0
+
+[Window][Error Loading Image Albedo]
+Pos=710,496
+Size=500,88
+Collapsed=0
+
+[Window][Model Loaded]
+Pos=847,502
+Size=300,71
+Collapsed=0
+
+[Docking][Data]
+DockNode    ID=0x00000001 Pos=1500,44 Size=368,703 Split=Y
+  DockNode  ID=0x00000002 Parent=0x00000001 SizeRef=304,114 Selected=0xAA49D574
+  DockNode  ID=0x00000003 Parent=0x00000001 SizeRef=304,470 Selected=0x450B616F
+

src/CMakeLists.txt

@@ -6,6 +6,9 @@ include(${CMAKE_SOURCE_DIR}/cmake/pack_shaders.cmake)
 generate_key(6 SHADERS_KEY)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/icon.png ${CMAKE_CURRENT_BINARY_DIR}/icon.png COPYONLY)
+if (WINDOW_APP)
+	configure_file(${CMAKE_SOURCE_DIR}/res/build_resources/imgui.ini ${CMAKE_CURRENT_BINARY_DIR}/imgui.ini COPYONLY)
+endif()
 
 # Add source files
 file(GLOB_RECURSE SOURCE_FILES 
@@ -56,6 +59,14 @@ if(WINDOW_APP)
 	target_compile_definitions(${PROJECT_NAME} PRIVATE WINDOW_APP)
 endif()
 
+if(WIN32)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE _WIN32)
+elseif(APPLE)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE __APPLE__)
+elseif(UNIX)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE __linux__)
+endif()
+
 target_precompile_headers(${PROJECT_NAME} PUBLIC ${PRECOMPILE_HEADERS_FILE})
 
 target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
@@ -90,6 +101,10 @@ if(WINDOW_APP)
 												  tiny_file_dialogs)
 endif()
 
+if(APPLE)
+    target_link_libraries(${PROJECT_NAME} PUBLIC "-framework CoreFoundation")
+endif()
+
 # Shader Packing
 file(GLOB SHADER_FILES ${CMAKE_SOURCE_DIR}/res/shader/*)
 

src/main.cpp

@@ -4,9 +4,9 @@
 //   / ___/ _  / , _/  | |/ / (_-</ // / _ `/ / (_-</ -_) __/
 //  /_/  /____/_/|_|   |___/_/___/\_,_/\_,_/_/_/___/\__/_/   
 //
-// Version: 1.3.8
+// Version: 1.3.9
 // Author: Marceli Antosik (Muppetsg2)
-// Last Update: 29.03.2025
+// Last Update: 22.04.2025
 
 extern "C" {
     _declspec(dllexport) unsigned long NvOptimusEnablement = 1;
@@ -115,6 +115,7 @@ static void FramebufferSizeCallback(GLFWwindow* window, int width, int height)
 }
 
 bool init();
+std::string get_executable_path();
 void drawBanner();
 void render();
 GLuint LoadDefaultWhiteTexture();
@@ -243,7 +244,7 @@ static const std::vector<std::string> skyboxPaths =
 
 int main(int argc, char** argv)
 {
-    exeDirPath = std::filesystem::absolute(argv[0]).parent_path().string();
+    exeDirPath = get_executable_path();
 
     ShadersExtractor::Init(exeDirPath + "\\shaders.dat");
 
@@ -498,6 +499,39 @@ bool init()
     return true;
 }
 
+std::string get_executable_path() {
+#if defined(_WIN32)
+    char buffer[MAX_PATH];
+    GetModuleFileNameA(NULL, buffer, MAX_PATH);
+    return std::filesystem::path(buffer).parent_path().string();
+
+#elif defined(__APPLE__)
+    char buffer[4096];
+    uint32_t size = sizeof(buffer);
+    if (_NSGetExecutablePath(buffer, &size) == 0) {
+        return std::filesystem::weakly_canonical(buffer).parent_path().string();
+    }
+    else {
+        printf("Error: _NSGetExecutablePath(): Buffer too small for executable path");
+        exit(EXIT_FAILURE);
+    }
+
+#elif defined(__linux__)
+    char buffer[4096];
+    ssize_t count = readlink("/proc/self/exe", buffer, sizeof(buffer));
+    if (count != -1) {
+        return std::filesystem::weakly_canonical(std::string(buffer, count)).parent_path().string();
+    }
+    else {
+        printf("Error: readlink(): Cannot read /proc/self/exe");
+        exit(EXIT_FAILURE);
+    }
+
+#else
+#error "Unsupported platform"
+#endif
+}
+
 void drawBanner()
 {
     spdlog::set_pattern("%v");

src/pch.h

@@ -64,6 +64,15 @@
 #include <iostream>
 #endif
 
+// PLATFORM DEPENDANT
+#if defined(_WIN32)
+#include <windows.h>
+#elif defined(__APPLE__)
+#include <mach-o/dyld.h>
+#elif defined(__linux__)
+#include <unistd.h>
+#endif
+
 // PROGRAM INFO
 #include <Config.h>
 #include <version.h>

src/version.h

@@ -2,9 +2,9 @@
 
 #define PBR_VISUALISER_VER_MAJOR 1
 #define PBR_VISUALISER_VER_MINOR 3
-#define PBR_VISUALISER_VER_PATCH 8
+#define PBR_VISUALISER_VER_PATCH 9
 
-#define PBR_VISUALISER_LAST_UPDATE "29.03.2025"
+#define PBR_VISUALISER_LAST_UPDATE "22.04.2025"
 
 #define PBR_VISUALISER_TO_STRING_VERSION(major, minor, patch) std::format("{}.{}.{}", major, minor, patch)
 #define PBR_VISUALISER_TO_INT_VERSION(major, minor, patch) (major * 10000 + minor * 100 + patch)
@@ -17,6 +17,16 @@
 //  \___/_//_/\_,_/_//_/\_, /\__/_/\___/\_, / 
 //                     /___/           /___/  
 // 
+// --- 1.3.9 ---
+// - added better support for finding the path of a program's executable file
+// - updated CMake project global settings and c++ version settings
+// - repaired ignoring out folder in gitignore
+// - improved caching of libraries downloaded using CPM
+// - added file with default PBR_Visualiser ImGui windows setup to res folder
+// - updated imgui version in window build
+// - updated spdlog version
+// - updated CPM version
+// 
 // --- 1.3.8 ---
 // - added fbx 3d model loading using OpenFBX library in window build
 // - fixed behaviour when loading 3d model is canceled in window build

thirdparty/CMakeLists.txt

@@ -30,7 +30,7 @@ CPMAddPackage(
     GIT_REPOSITORY https://github.com/g-truc/gli.git
     GIT_TAG master
 )
-CPMAddPackage("gh:gabime/spdlog@1.15.1")
+CPMAddPackage("gh:gabime/spdlog@1.15.2")
 
 if(WINDOW_APP)
     # cgltf https://github.com/jkuhlmann/cgltf
@@ -62,7 +62,7 @@ if(WINDOW_APP)
     add_library(tiny_file_dialogs STATIC ${tiny_file_dialogs_SOURCE_DIR}/tinyfiledialogs.c)
 
     CPMAddPackage("gh:freetype/freetype#VER-2-13-3")
-    CPMAddPackage("gh:ocornut/imgui@1.91.8-docking")
+    CPMAddPackage("gh:ocornut/imgui@1.91.9b-docking")
 
     set(imgui_SOURCE_DIR ${imgui_SOURCE_DIR} CACHE INTERNAL "")
     add_library(imgui STATIC ${imgui_SOURCE_DIR}/imgui.cpp