Bit-By-Byte/Tesseract-Engine
Bit-By-Byte/Tesseract-Engine
3
2
Fork 0
Code Issues 14 Pull Requests Actions Packages Projects 1 Releases 3 Wiki Activity

Fixed Crashing

Browse Source
This commit is contained in:
OusmBlueNinja 2025-01-01 13:39:45 -06:00
parent 195f7abbe0
commit 58be5709a3
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Windows/InspectorWindow.cpp
View File

@ -14,7 +14,7 @@ extern GameObject *g_SelectedObject; // Pointer to the currently selected object
extern std::shared_ptr<CameraComponent> g_RuntimeCameraObject; extern std::shared_ptr<CameraComponent> g_RuntimeCameraObject;
#include "Engine/AssetManager.h" #include "Engine/AssetManager.h"
extern AssetManager *g_AssetManager; extern AssetManager g_AssetManager;
extern LoggerWindow *g_LoggerWindow; extern LoggerWindow *g_LoggerWindow;
void InspectorWindow::Show() void InspectorWindow::Show()
@ -428,7 +428,7 @@ void InspectorWindow::Show()
mesh->MeshPath = buffer; mesh->MeshPath = buffer;
} }
if (ImGui::Button("Reload Mesh")) { if (ImGui::Button("Reload Mesh")) {
std::shared_ptr<Model> model = g_AssetManager->loadAsset<Model>(AssetType::MODEL, mesh->MeshPath.c_str()); std::shared_ptr<Model> model = g_AssetManager.loadAsset<Model>(AssetType::MODEL, mesh->MeshPath.c_str());
} }

22
src/Windows/RenderWindow.cpp
View File

@ -94,14 +94,9 @@ bool PlayPauseButton(const char *label, bool *isPlaying, ImVec2 Size)
return false; // No toggle occurred return false; // No toggle occurred
} }
void RenderWindow::Show(bool *GameRunning) void RenderWindow::Show(bool *GameRunning)
{ {
ImGui::Begin(ICON_FA_GAMEPAD " Editor##EditorWindow"); ImGui::Begin(ICON_FA_GAMEPAD " Editor##EditorWindow");
if (!m_Initialized) if (!m_Initialized)
{ {
@ -153,11 +148,6 @@ void RenderWindow::Show(bool *GameRunning)
ImGui::End(); ImGui::End();
} }
void RenderWindow::InitGLResources() void RenderWindow::InitGLResources()
{ {
// ---------------------------------------------------- // ----------------------------------------------------
@ -175,7 +165,6 @@ void RenderWindow::InitGLResources()
m_ShaderPtr = shaderAsset.get(); m_ShaderPtr = shaderAsset.get();
} }
// ---------------------------------------------------- // ----------------------------------------------------
// 3) Load TEXTURE from the asset manager // 3) Load TEXTURE from the asset manager
// ---------------------------------------------------- // ----------------------------------------------------
@ -223,6 +212,11 @@ void RenderWindow::RenderSceneToFBO(bool *GameRunning)
m_FBO.Bind(); m_FBO.Bind();
glViewport(0, 0, m_LastWidth, m_LastHeight); glViewport(0, 0, m_LastWidth, m_LastHeight);
#if TRANSPERANCY
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
#endif
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glClearColor(0.f, 0.f, 0.f, 1.f); glClearColor(0.f, 0.f, 0.f, 1.f);
@ -351,6 +345,10 @@ void RenderWindow::RenderSceneToFBO(bool *GameRunning)
} }
// Cleanup: Unbind the shader program // Cleanup: Unbind the shader program
#if TRANSPERANCY
glDisable(GL_BLEND);
#endif
glUseProgram(0); glUseProgram(0);
// Unbind the FBO // Unbind the FBO