Add
This commit is contained in:
parent
2675fb006c
commit
ddce1caaed
@ -131,7 +131,7 @@ namespace Deer {
|
|||||||
|
|
||||||
// ---- PanelS -----
|
// ---- PanelS -----
|
||||||
TerrainEditor::onImGui();
|
TerrainEditor::onImGui();
|
||||||
//viewport_onImGui();
|
viewport_onImGui();
|
||||||
EditorEngine::execute();
|
EditorEngine::execute();
|
||||||
// ---- PanelS -----
|
// ---- PanelS -----
|
||||||
Scene::gizmoRenderer.refresh();
|
Scene::gizmoRenderer.refresh();
|
||||||
|
@ -56,8 +56,6 @@ namespace Deer {
|
|||||||
{TextureBufferType::RGBA8, TextureBufferType::RED_INTEGER}, 4,
|
{TextureBufferType::RGBA8, TextureBufferType::RED_INTEGER}, 4,
|
||||||
false)));
|
false)));
|
||||||
}
|
}
|
||||||
m_frameBuffer->unbind();
|
|
||||||
return;
|
|
||||||
|
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
|
||||||
ImGui::Begin("Viewport");
|
ImGui::Begin("Viewport");
|
||||||
|
@ -16,9 +16,9 @@ DockId=0x00000004,1
|
|||||||
|
|
||||||
[Window][Game Window]
|
[Window][Game Window]
|
||||||
Pos=377,24
|
Pos=377,24
|
||||||
Size=504,520
|
Size=532,462
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000009,0
|
DockId=0x00000006,0
|
||||||
|
|
||||||
[Window][Tree Panel]
|
[Window][Tree Panel]
|
||||||
Pos=0,24
|
Pos=0,24
|
||||||
@ -27,16 +27,16 @@ Collapsed=0
|
|||||||
DockId=0x00000001,0
|
DockId=0x00000001,0
|
||||||
|
|
||||||
[Window][Terrain Editor]
|
[Window][Terrain Editor]
|
||||||
Pos=883,24
|
Pos=911,24
|
||||||
Size=397,520
|
Size=369,462
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000004,0
|
DockId=0x00000004,0
|
||||||
|
|
||||||
[Window][Viewport]
|
[Window][Viewport]
|
||||||
Pos=369,24
|
Pos=377,24
|
||||||
Size=471,696
|
Size=532,462
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x0000000A,0
|
DockId=0x00000006,2
|
||||||
|
|
||||||
[Window][Scene Explorer]
|
[Window][Scene Explorer]
|
||||||
Pos=0,389
|
Pos=0,389
|
||||||
@ -57,14 +57,14 @@ Collapsed=0
|
|||||||
DockId=0x00000008,1
|
DockId=0x00000008,1
|
||||||
|
|
||||||
[Window][MeshExplorer]
|
[Window][MeshExplorer]
|
||||||
Pos=0,546
|
Pos=0,488
|
||||||
Size=1280,174
|
Size=1280,232
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000008,0
|
DockId=0x00000008,0
|
||||||
|
|
||||||
[Window][TreePannel]
|
[Window][TreePannel]
|
||||||
Pos=0,24
|
Pos=0,24
|
||||||
Size=375,520
|
Size=375,462
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000005,0
|
DockId=0x00000005,0
|
||||||
|
|
||||||
@ -79,8 +79,8 @@ Size=351,75
|
|||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
[Window][PropertiesPannel]
|
[Window][PropertiesPannel]
|
||||||
Pos=883,24
|
Pos=911,24
|
||||||
Size=397,520
|
Size=369,462
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000004,1
|
DockId=0x00000004,1
|
||||||
|
|
||||||
@ -91,27 +91,25 @@ Collapsed=0
|
|||||||
DockId=0x00000004,1
|
DockId=0x00000004,1
|
||||||
|
|
||||||
[Window][ShaderExplorer]
|
[Window][ShaderExplorer]
|
||||||
Pos=0,546
|
Pos=0,488
|
||||||
Size=1280,174
|
Size=1280,232
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000008,1
|
DockId=0x00000008,1
|
||||||
|
|
||||||
[Window][Test]
|
[Window][Test]
|
||||||
Pos=377,24
|
Pos=377,24
|
||||||
Size=504,520
|
Size=532,462
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000009,1
|
DockId=0x00000006,1
|
||||||
|
|
||||||
[Docking][Data]
|
[Docking][Data]
|
||||||
DockSpace ID=0xA1672E74 Window=0x4647B76E Pos=0,24 Size=1280,696 Split=Y
|
DockSpace ID=0xA1672E74 Window=0x4647B76E Pos=0,24 Size=1280,696 Split=Y
|
||||||
DockNode ID=0x00000007 Parent=0xA1672E74 SizeRef=1280,520 Split=Y
|
DockNode ID=0x00000007 Parent=0xA1672E74 SizeRef=1280,462 Split=Y
|
||||||
DockNode ID=0x00000001 Parent=0x00000007 SizeRef=2560,363 Split=X Selected=0x13926F0B
|
DockNode ID=0x00000001 Parent=0x00000007 SizeRef=2560,363 Split=X Selected=0x13926F0B
|
||||||
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=881,338 Split=X Selected=0x13926F0B
|
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=909,338 Split=X Selected=0x13926F0B
|
||||||
DockNode ID=0x00000005 Parent=0x00000003 SizeRef=375,446 Selected=0xE45B9F93
|
DockNode ID=0x00000005 Parent=0x00000003 SizeRef=375,446 Selected=0xE45B9F93
|
||||||
DockNode ID=0x00000006 Parent=0x00000003 SizeRef=504,446 Split=X Selected=0x44A6A033
|
DockNode ID=0x00000006 Parent=0x00000003 SizeRef=532,446 CentralNode=1 Selected=0x13926F0B
|
||||||
DockNode ID=0x00000009 Parent=0x00000006 SizeRef=367,520 CentralNode=1 Selected=0x44A6A033
|
DockNode ID=0x00000004 Parent=0x00000001 SizeRef=369,338 Selected=0xA35A27E3
|
||||||
DockNode ID=0x0000000A Parent=0x00000006 SizeRef=471,520 Selected=0x13926F0B
|
|
||||||
DockNode ID=0x00000004 Parent=0x00000001 SizeRef=397,338 Selected=0xA35A27E3
|
|
||||||
DockNode ID=0x00000002 Parent=0x00000007 SizeRef=2560,331 Selected=0xCF339702
|
DockNode ID=0x00000002 Parent=0x00000007 SizeRef=2560,331 Selected=0xCF339702
|
||||||
DockNode ID=0x00000008 Parent=0xA1672E74 SizeRef=1280,174 Selected=0xD962995A
|
DockNode ID=0x00000008 Parent=0xA1672E74 SizeRef=1280,232 Selected=0xD962995A
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user