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

I am so stupid, how did i not check that the extern was correct............. Please end my life

Browse Source
This commit is contained in:
OusmBlueNinja 2024-12-27 12:47:48 -06:00
parent 8ffb93b944
commit 1a9f9eda39
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
imgui.ini
View File

@ -9,8 +9,8 @@ Size=400,400
Collapsed=0 Collapsed=0
[Window][Inspector] [Window][Inspector]
Pos=1566,27 Pos=1543,27
Size=346,1142 Size=369,1142
Collapsed=0 Collapsed=0
DockId=0x00000002,0 DockId=0x00000002,0
@ -28,7 +28,7 @@ DockId=0x00000006,0
[Window][Logger] [Window][Logger]
Pos=374,799 Pos=374,799
Size=1190,370 Size=1167,370
Collapsed=0 Collapsed=0
DockId=0x00000004,0 DockId=0x00000004,0
@ -46,7 +46,7 @@ DockId=0x00000005,0
[Window][Editor] [Window][Editor]
Pos=374,27 Pos=374,27
Size=1190,770 Size=1167,770
Collapsed=0 Collapsed=0
DockId=0x00000003,0 DockId=0x00000003,0
@ -54,12 +54,12 @@ DockId=0x00000003,0
DockSpace ID=0x14621557 Window=0x3DA2F1DE Pos=8,27 Size=1904,1142 Split=X Selected=0xF7365A5A DockSpace ID=0x14621557 Window=0x3DA2F1DE Pos=8,27 Size=1904,1142 Split=X Selected=0xF7365A5A
DockNode ID=0x00000009 Parent=0x14621557 SizeRef=364,1142 Split=Y Selected=0x3DC5AC3F DockNode ID=0x00000009 Parent=0x14621557 SizeRef=364,1142 Split=Y Selected=0x3DC5AC3F
DockNode ID=0x00000005 Parent=0x00000009 SizeRef=364,748 HiddenTabBar=1 Selected=0x3DC5AC3F DockNode ID=0x00000005 Parent=0x00000009 SizeRef=364,748 HiddenTabBar=1 Selected=0x3DC5AC3F
DockNode ID=0x00000006 Parent=0x00000009 SizeRef=364,392 Selected=0x726D8899 DockNode ID=0x00000006 Parent=0x00000009 SizeRef=364,392 HiddenTabBar=1 Selected=0x726D8899
DockNode ID=0x0000000A Parent=0x14621557 SizeRef=1538,1142 Split=X DockNode ID=0x0000000A Parent=0x14621557 SizeRef=1538,1142 Split=X
DockNode ID=0x00000007 Parent=0x0000000A SizeRef=357,1142 Selected=0x7737E8B2 DockNode ID=0x00000007 Parent=0x0000000A SizeRef=357,1142 Selected=0x7737E8B2
DockNode ID=0x00000008 Parent=0x0000000A SizeRef=1545,1142 Split=X DockNode ID=0x00000008 Parent=0x0000000A SizeRef=1545,1142 Split=X
DockNode ID=0x00000001 Parent=0x00000008 SizeRef=1190,1142 Split=Y Selected=0xF7365A5A DockNode ID=0x00000001 Parent=0x00000008 SizeRef=1167,1142 Split=Y Selected=0xF7365A5A
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=1578,770 CentralNode=1 HiddenTabBar=1 Selected=0xDF0EC458 DockNode ID=0x00000003 Parent=0x00000001 SizeRef=1578,770 CentralNode=1 HiddenTabBar=1 Selected=0xDF0EC458
DockNode ID=0x00000004 Parent=0x00000001 SizeRef=1578,370 HiddenTabBar=1 Selected=0x9DD4E196 DockNode ID=0x00000004 Parent=0x00000001 SizeRef=1578,370 HiddenTabBar=1 Selected=0x9DD4E196
DockNode ID=0x00000002 Parent=0x00000008 SizeRef=346,1142 HiddenTabBar=1 Selected=0x36DC96AB DockNode ID=0x00000002 Parent=0x00000008 SizeRef=369,1142 HiddenTabBar=1 Selected=0x36DC96AB

8
src/Componenets/Mesh.cpp
View File

@ -6,7 +6,7 @@
#include "../Engine/AssetManager.h" #include "../Engine/AssetManager.h"
extern AssetManager *g_AssetManager; extern AssetManager g_AssetManager;
//TODO: Make this have a OBJ path, make indexCount derive from AssetManager //TODO: Make this have a OBJ path, make indexCount derive from AssetManager
//TODO: and make texture id also get from AssetManager //TODO: and make texture id also get from AssetManager
@ -67,13 +67,13 @@ void MeshComponent::Deserialize(const YAML::Node& node)
if (node["MeshPath"]) if (node["MeshPath"])
{ {
MeshPath = static_cast<std::string>(node["MeshPath"].as<std::string>()); MeshPath = static_cast<std::string>(node["MeshPath"].as<std::string>());
g_AssetManager->DebugAssetMap(); g_AssetManager.DebugAssetMap();
#if 0 #if 1
DEBUG_PRINT("Loading Mesh: >%s<", MeshPath.c_str()); DEBUG_PRINT("Loading Mesh: >%s<", MeshPath.c_str());
Model* model = g_AssetManager->loadAsset<Model*>(AssetType::MODEL, MeshPath.c_str()); Model* model = g_AssetManager.loadAsset<Model*>(AssetType::MODEL, MeshPath.c_str());
DEBUG_PRINT("Model loaded successfully with %lld vertices and %lld indices.", model->vertices.size(), model->indices.size()); DEBUG_PRINT("Model loaded successfully with %lld vertices and %lld indices.", model->vertices.size(), model->indices.size());
#else #else

1
src/Engine/AssetManager.cpp
View File

@ -52,6 +52,7 @@ void AssetManager::DebugAssetMap()
// Implementation of AssetManager::loadAssetFromDisk // Implementation of AssetManager::loadAssetFromDisk
AssetManager::AssetVariant AssetManager::loadAssetFromDisk(AssetType type, const std::string &path) AssetManager::AssetVariant AssetManager::loadAssetFromDisk(AssetType type, const std::string &path)
{ {
DebugAssetMap();
switch (type) switch (type)
{ {
case AssetType::TEXTURE: case AssetType::TEXTURE: