Merge branch 'fastgltf'

This commit is contained in:
Erris
2026-03-12 20:08:43 +01:00
6 changed files with 55 additions and 14 deletions

View File

@@ -10,6 +10,7 @@
#include "open_engine/renderer/renderer3d.hpp"
#include "open_engine/scene/components.hpp"
#include "panels/content_browser.hpp"
#include "panels/models_panel.hpp"
#include "panels/scene_hierarchy.hpp"
#include <Jolt/Physics/Collision/Shape/Shape.h>
@@ -585,6 +586,7 @@ namespace OpenEngine {
DrawStats();
scene_hierarchy.OnImGuiRender();
browser.OnImGuiRender();
ModelsPanelOnImGuiRender();
DrawViewport();
DrawPlayBar();

View File

@@ -0,0 +1,10 @@
#ifndef MODELS_PANEL_HPP
#define MODELS_PANEL_HPP
namespace OpenEngine {
void ModelsPanelOnImGuiRender();
}
#endif // MODELS_PANEL_HPP

View File

@@ -0,0 +1,20 @@
#include <panels/models_panel.hpp>
#include <open_engine.hpp>
#include "imgui.h"
#include <vector>
namespace OpenEngine {
static std::vector<Ref<Model3D>> temp_model_list;
void ModelsPanelOnImGuiRender()
{
ImGui::Begin("Models");
ImGui::End();
}
}

View File

@@ -1,6 +1,6 @@
[Window][WindowOverViewport_11111111]
Pos=0,24
Size=1272,1363
Size=2560,1371
Collapsed=0
[Window][Debug##Default]
@@ -10,31 +10,31 @@ Collapsed=0
[Window][Statistics]
Pos=0,24
Size=409,437
Size=409,439
Collapsed=0
DockId=0x00000003,0
[Window][Properties]
Pos=822,24
Size=450,805
Pos=2110,24
Size=450,810
Collapsed=0
DockId=0x00000007,0
[Window][Viewport]
Pos=411,61
Size=409,956
Size=1697,964
Collapsed=0
DockId=0x00000012,0
[Window][Dear ImGui Demo]
Pos=822,831
Size=450,556
Pos=2110,836
Size=450,559
Collapsed=0
DockId=0x00000008,0
[Window][Scene]
Pos=0,463
Size=409,924
Pos=0,465
Size=409,930
Collapsed=0
DockId=0x00000004,0
@@ -143,8 +143,8 @@ Collapsed=0
DockId=0x00000012,1
[Window][Assets]
Pos=411,1019
Size=409,368
Pos=411,1027
Size=1697,368
Collapsed=0
DockId=0x0000000C,0
@@ -156,12 +156,18 @@ DockId=0x0000000F,0
[Window][##play_state_bar]
Pos=411,24
Size=409,35
Size=1697,35
Collapsed=0
DockId=0x00000011,0
[Window][Models]
Pos=411,1027
Size=1697,368
Collapsed=0
DockId=0x0000000C,1
[Docking][Data]
DockSpace ID=0x08BD597D Window=0x1BBC0F80 Pos=0,24 Size=1272,1363 Split=X
DockSpace ID=0x08BD597D Window=0x1BBC0F80 Pos=0,24 Size=2560,1371 Split=X
DockNode ID=0x00000005 Parent=0x08BD597D SizeRef=820,1386 Split=X
DockNode ID=0x00000001 Parent=0x00000005 SizeRef=409,1386 Split=Y Selected=0xE601B12F
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=255,417 Selected=0x553E127E
@@ -175,7 +181,7 @@ DockSpace ID=0x08BD597D Window=0x1BBC0F80 Pos=0,24 Size=1272,1363
DockNode ID=0x00000011 Parent=0x00000010 SizeRef=594,35 HiddenTabBar=1 Selected=0xAB37695D
DockNode ID=0x00000012 Parent=0x00000010 SizeRef=594,964 CentralNode=1 Selected=0xC450F867
DockNode ID=0x0000000E Parent=0x0000000B SizeRef=800,993 Selected=0x3EEA4247
DockNode ID=0x0000000C Parent=0x00000009 SizeRef=409,368 Selected=0x42C24103
DockNode ID=0x0000000C Parent=0x00000009 SizeRef=409,368 Selected=0xEAE75860
DockNode ID=0x0000000A Parent=0x00000002 SizeRef=483,600 Selected=0x1BCA3180
DockNode ID=0x00000006 Parent=0x08BD597D SizeRef=450,1386 Split=Y Selected=0x8C72BEA8
DockNode ID=0x00000007 Parent=0x00000006 SizeRef=444,805 Selected=0x8C72BEA8

View File

@@ -27,6 +27,7 @@
#include "open_engine/renderer/renderer2d.hpp"
#include "open_engine/renderer/renderer3d.hpp"
#include "open_engine/renderer/renderer.hpp"
#include <open_engine/renderer/model3d.hpp>
#include "open_engine/renderer/texture.hpp"
#include "open_engine/renderer/buffer.hpp"
#include "open_engine/renderer/shader.hpp"

View File

@@ -1,3 +1,4 @@
#include "core/uuid.hpp"
#include "logging.hpp"
#include "scene/scene_camera.hpp"
#include <pch.hpp>
@@ -19,6 +20,7 @@
#include <cstdint>
#include <glad/glad.h>
#include <vector>
namespace OpenEngine {