Added icon to editor window, use new logo in exe files

PipeRift · Feb 6, 2024 · 5e96ff3 · 5e96ff3
1 parent af62f96
commit 5e96ff3
Show file tree

Hide file tree

Showing 12 changed files with 8,017 additions and 2 deletions.
diff --git a/Apps/CLI/CMakeLists.txt b/Apps/CLI/CMakeLists.txt
@@ -14,4 +14,4 @@ target_link_libraries(RiftCLIExe PUBLIC
 
 rift_module(RiftCLIExe)
 set_target_properties(RiftCLIExe PROPERTIES OUTPUT_NAME "Rift")
-set_icon(RiftCLIExe ../../Resources/Icon.ico)
+set_icon(RiftCLIExe Icon.ico)
diff --git a/Apps/CLI/Icon.ico b/Apps/CLI/Icon.ico
diff --git a/Apps/Editor/Icon.ico b/Apps/Editor/Icon.ico
diff --git a/Extern/CMakeLists.txt b/Extern/CMakeLists.txt
@@ -15,6 +15,10 @@ add_subdirectory(CLI11)
 
 
 if (RIFT_BUILD_EDITOR)
+  add_library(stb_image INTERFACE)
+  target_include_directories(stb_image INTERFACE stb)
+
+
   find_package(OpenGL REQUIRED)
   add_library(gl3w STATIC gl3w/GL/gl3w.c)
   target_include_directories(gl3w PUBLIC gl3w)

diff --git a/Extern/stb/stb_image.h b/Extern/stb/stb_image.h
diff --git a/Libs/Editor/CMakeLists.txt b/Libs/Editor/CMakeLists.txt
@@ -15,4 +15,3 @@ target_link_libraries(RiftEditor PUBLIC
 
 rift_module(RiftEditor)
 rift_enable_module_resources(RiftEditor)
-set_icon(RiftEditor ../../Resources/Icon.ico)
diff --git a/Libs/Editor/Resources/Editor/Icons/Icon.png b/Libs/Editor/Resources/Editor/Icons/Icon.png
diff --git a/Libs/UI/CMakeLists.txt b/Libs/UI/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries(RiftUI PUBLIC
     imgui
     IconFontCppHeaders
 )
+target_link_libraries(RiftUI PRIVATE stb_image)
 target_compile_definitions(RiftUI PRIVATE NOMINMAX)
 
 rift_module(RiftUI)
diff --git a/Libs/UI/Include/UI/Window.h b/Libs/UI/Include/UI/Window.h
@@ -22,4 +22,6 @@ namespace rift::UI
 	bool WantsToClose();
 
 	GLFWwindow* GetWindow();
+
+	void SetWindowIcon();
 };    // namespace rift::UI
diff --git a/Libs/UI/Src/Window.cpp b/Libs/UI/Src/Window.cpp
@@ -16,8 +16,12 @@
 // Include glfw3.h after our OpenGL definitions
 #include <GLFW/glfw3.h>
 #include <Pipe/Core/Log.h>
+#include <Pipe/Files/Paths.h>
 #include <PipeColor.h>
 
+#define STB_IMAGE_IMPLEMENTATION
+#include <stb_image.h>
+
 
 namespace rift::UI
 {
@@ -94,6 +98,8 @@ namespace rift::UI
 		ImGui_ImplGlfw_InitForOpenGL(gWindow, true);
 		ImGui_ImplOpenGL3_Init(glslVersion);
 
+		SetWindowIcon();
+
 		RegisterCoreKeyValueInspections();
 		return true;
 	}
@@ -164,4 +170,20 @@ namespace rift::UI
 	{
 		return gWindow;
 	}
+
+	void SetWindowIcon()
+	{
+		p::String iconPath = p::JoinPaths(p::GetBasePath(), "Resources/Editor/Icons/Icon.png");
+		GLFWimage image;
+		image.pixels = stbi_load(
+		    iconPath.c_str(), &image.width, &image.height, nullptr, 0);    // rgba channels
+		if (image.pixels == nullptr)
+		{
+			p::Error("Window icon couldn't be loaded");
+			return;
+		}
+		glfwSetWindowIcon(gWindow, 1, &image);
+
+		stbi_image_free(image.pixels);
+	}
 }    // namespace rift::UI
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
@@ -8,3 +8,5 @@ target_include_directories(RiftTests PUBLIC .)
 target_link_libraries(RiftTests PUBLIC RiftAST Bandit)
 
 add_test(NAME RiftTests COMMAND $<TARGET_FILE:RiftTests>)
+
+set_icon(RiftTests Icon.ico)
diff --git a/Tests/Icon.ico b/Tests/Icon.ico
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,3 @@ target_link_libraries(RiftEditor PUBLIC

		rift_module(RiftEditor)
		rift_enable_module_resources(RiftEditor)
		set_icon(RiftEditor ../../Resources/Icon.ico)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,5 @@ target_include_directories(RiftTests PUBLIC .)
		target_link_libraries(RiftTests PUBLIC RiftAST Bandit)

		add_test(NAME RiftTests COMMAND $<TARGET_FILE:RiftTests>)

		set_icon(RiftTests Icon.ico)