Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7140984
GLM updated Jun, 2025
ravimohan1991 Jun 19, 2025
2fc63ab
Minor change in cmake list for glm
ravimohan1991 Jun 19, 2025
5344abe
assimp update to June 2025
ravimohan1991 Jun 20, 2025
61b3112
Glfw update June 2025
ravimohan1991 Jun 20, 2025
baf4fdc
minor changes in assimp
ravimohan1991 Jun 20, 2025
e52adc4
spdlog update june 2025
ravimohan1991 Jun 20, 2025
0aa81ce
glslang update June 2025
ravimohan1991 Jun 20, 2025
112b2be
Macos compilable
ravimohan1991 Jun 20, 2025
ff302de
Include ordering for MacOS
ravimohan1991 Jun 20, 2025
626b68b
spdlogging fmt utf issue
ravimohan1991 Jun 20, 2025
906f340
Fixed some vertices getting leaked into 3dexhibitor on Mac
ravimohan1991 Oct 28, 2025
fef9099
Vulkan works - Take I
ravimohan1991 Nov 10, 2025
8a8d615
Vulkan works - Take II
ravimohan1991 Nov 19, 2025
6724be7
tentative and testing hypothesis
ravimohan1991 Nov 19, 2025
30a3966
assimp update to November 2025
ravimohan1991 Nov 20, 2025
c2fcc9b
Offscreen rendering working Ubuntu
ravimohan1991 Nov 20, 2025
740d8cd
Minor cleanup
ravimohan1991 Nov 20, 2025
2350626
Graphics pipeline for KarmaGui's window display done
ravimohan1991 Nov 21, 2025
efd8d41
Issue cleanup from Ubuntu
ravimohan1991 Nov 21, 2025
fe8408e
Destroying and cleaning up offscreen texture resources
ravimohan1991 Nov 21, 2025
00660a4
Triangulating meshes for appropriate loading
ravimohan1991 Nov 21, 2025
329e399
Orientation of meshes for tentative Karma's camera begin
ravimohan1991 Nov 21, 2025
9c3dfbb
Removing now redundant imgui in our context
ravimohan1991 Nov 21, 2025
ace5077
Minor tending of FrameRender routine with comments
ravimohan1991 Nov 22, 2025
5ba4cec
More clanup and commenting of KarmaGuiRenderer and KarmaGuiVUlkanHandler
ravimohan1991 Nov 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
path = Karma/vendor/GLFW
url = https://github.com/ravimohan1991/glfw
ignore = dirty
[submodule "Karma/vendor/ImGui"]
path = Karma/vendor/ImGui
url = https://github.com/ravimohan1991/imgui
[submodule "Karma/vendor/GLM"]
path = Karma/vendor/GLM
url = https://github.com/ravimohan1991/glm
Expand Down
2 changes: 1 addition & 1 deletion Karma/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ else()
endif()

if(BUILD_SHARED_LIBS)
set_property(TARGET glm_shared PROPERTY FOLDER "${KARMALIBRARYFOLDER}")
set_property(TARGET glm PROPERTY FOLDER "${KARMALIBRARYFOLDER}")
#[[
else()
set_property(TARGET glm_static PROPERTY FOLDER "${KARMALIBRARYFOLDER}")
Expand Down
5 changes: 5 additions & 0 deletions Karma/src/Karma/Core.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@
*/
#define BIT(x) (1 << x)

// https://github.com/gabime/spdlog/issues/3251
#ifdef KR_WINDOWS_PLATFORM
#define FMT_UNICODE 0
#endif

// Assertions
/**
* @brief Karma's Assertion
Expand Down
2 changes: 1 addition & 1 deletion Karma/src/Karma/Ganit/Transform.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "glm/glm.hpp"
#include <glm/gtc/quaternion.hpp>

#define GLM_ENABLE_EXPERIMENTAL
#include <glm/gtx/euler_angles.hpp>

namespace Karma
Expand Down
8 changes: 4 additions & 4 deletions Karma/src/Karma/KarmaGui/KarmaGui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10614,7 +10614,7 @@ void Karma::KarmaGuiInternal::NavInitWindow(KGGuiWindow* window, bool force_rein
bool init_for_nav = false;
if (window == window->RootWindow || (window->Flags & KGGuiWindowFlags_Popup) || (window->NavLastIds[0] == 0) || force_reinit)
init_for_nav = true;
KR_CORE_INFO("[nav] NavInitRequest: from NavInitWindow(), init_for_nav={0}, window=\"{1}\", layer={2}", init_for_nav, window->Name, g.NavLayer);
KR_CORE_INFO("[nav] NavInitRequest: from NavInitWindow(), init_for_nav={0}, window=\"{1}\"", init_for_nav, window->Name);
if (init_for_nav)
{
SetNavID(0, g.NavLayer, window->NavRootFocusScopeId, KGRect());
Expand Down Expand Up @@ -10858,7 +10858,7 @@ void Karma::KarmaGuiInternal::NavInitRequestApplyResult()

// Apply result from previous navigation init request (will typically select the first item, unless SetItemDefaultFocus() has been called)
// FIXME-NAV: On _NavFlattened windows, g.NavWindow will only be updated during subsequent frame. Not a problem currently.
KR_CORE_INFO("[nav] NavInitRequest: ApplyResult: NavID {0} in Layer {1} Window \"{2}\"", g.NavInitResultId, g.NavLayer, g.NavWindow->Name);
KR_CORE_INFO("[nav] NavInitRequest: ApplyResult: NavID {0} Window \"{1}\"", g.NavInitResultId, g.NavWindow->Name);
SetNavID(g.NavInitResultId, g.NavLayer, 0, g.NavInitResultRectRel);
g.NavIdIsAlive = true; // Mark as alive from previous frame as we got a result
if (g.NavInitRequestFromMove)
Expand Down Expand Up @@ -10929,7 +10929,7 @@ void Karma::KarmaGuiInternal::NavUpdateCreateMoveRequest()
// Moving with no reference triggers an init request (will be used as a fallback if the direction fails to find a match)
if (g.NavMoveSubmitted && g.NavId == 0)
{
KR_CORE_INFO("[nav] NavInitRequest: from move, window \"{0}\", layer={1}", window ? window->Name : "<NULL>", g.NavLayer);
KR_CORE_INFO("[nav] NavInitRequest: from move, window \"{0}\"", window ? window->Name : "<NULL>");
g.NavInitRequest = g.NavInitRequestFromMove = true;
g.NavInitResultId = 0;
g.NavDisableHighlight = false;
Expand Down Expand Up @@ -11068,7 +11068,7 @@ void Karma::KarmaGuiInternal::NavMoveRequestApplyResult()
}

// Focus
KR_CORE_INFO("[nav] NavMoveRequest: result NavID {0} in Layer {1} Window \"{1}\"", result->ID, g.NavLayer, g.NavWindow->Name);
KR_CORE_INFO("[nav] NavMoveRequest: result NavID {0} Window \"{1}\"", result->ID, g.NavWindow->Name);
SetNavID(result->ID, g.NavLayer, result->FocusScopeId, result->RectRel);

// Tabbing: Activates Inputable or Focus non-Inputable
Expand Down
2 changes: 1 addition & 1 deletion Karma/src/Karma/KarmaGui/KarmaGui.h
Original file line number Diff line number Diff line change
Expand Up @@ -2558,7 +2558,7 @@ enum KGDrawListFlags_
*
* This is the low-level list of polygons that KarmaGui:: functions are filling. At the end of the frame,
* all command lists are passed to your KarmaGuiIO::RenderDrawListFn function for rendering.
* Each KarmaGui window contains its own KGDrawList. You can use ImGui::GetWindowDrawList() to
* Each KarmaGui window contains its own KGDrawList. You can use KarmaGui::GetWindowDrawList() to
* access the current window draw list and draw custom primitives.
* You can interleave normal KarmaGui:: calls and adding primitives to the current draw list.
* In single viewport mode, top-left is == GetMainViewport()->Pos (generally 0,0), bottom-right is == GetMainViewport()->Pos+Size (generally io.DisplaySize).
Expand Down
2 changes: 1 addition & 1 deletion Karma/src/Karma/KarmaGui/KarmaGuiLayer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace Karma
style.Colors[KGGuiCol_WindowBg].w = 1.0f;
}

// Setting Dear ImGui ini file
// Setting KarmaGui ini file
io.IniFilename = "../Resources/Misc/KarmaGuiEditor.ini";//"yeehaw!";

GLFWwindow* window = static_cast<GLFWwindow*>(m_AssociatedWindow->GetNativeWindow());
Expand Down
Loading
Loading