diff --git a/README.md b/README.md index fef3bac..d72a339 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,22 @@ Join The Discord! ### Note: Screenshots are sorted by version. +## **Version 0.0.102** +**Updates:** +- Added Guizmos +- Added Mesh Visualisers +- Added Global Settings +- Lua Changes + - Added Intelisence Headers for Engine and KeyCodes + - Changed Lua `require` to not need a path +- Added Culling +- Fixed GLCalls Count +- Removed Unused Code (TestMesh.cpp) + +**Screenshot:** + +![](./assets/images/SS-Dev2_5.png) + ## **Version 0.0.102** **Updates:** - Added More Themes diff --git a/assets/images/SS-Dev-2_5.png b/assets/images/SS-Dev-2_5.png new file mode 100644 index 0000000..7f1149c Binary files /dev/null and b/assets/images/SS-Dev-2_5.png differ diff --git a/imgui.ini b/imgui.ini index b2668ba..38cedd7 100644 --- a/imgui.ini +++ b/imgui.ini @@ -134,14 +134,14 @@ Collapsed=0 DockId=0x0000001E,0 [Window][ Logger##logger] -Pos=345,846 -Size=1170,323 +Pos=345,739 +Size=586,430 Collapsed=0 -DockId=0x00000025,0 +DockId=0x00000021,0 [Window][ Editor##EditorWindow] Pos=345,28 -Size=1170,816 +Size=1170,709 Collapsed=0 DockId=0x0000001F,0 @@ -152,10 +152,10 @@ Collapsed=0 DockId=0x00000022,0 [Window][ Profiler] -Pos=345,846 -Size=1170,323 +Pos=933,739 +Size=582,430 Collapsed=0 -DockId=0x00000025,1 +DockId=0x00000023,0 [Table][0xE9E836E4,4] Column 0 Weight=1.2999 @@ -170,40 +170,42 @@ Column 2 Weight=0.9665 Column 3 Weight=0.6950 [Docking][Data] -DockSpace ID=0x14621557 Window=0x3DA2F1DE Pos=8,51 Size=1904,1141 Split=X Selected=0xF7365A5A - DockNode ID=0x00000020 Parent=0x14621557 SizeRef=884,684 Split=X - DockNode ID=0x00000013 Parent=0x00000020 SizeRef=335,1142 Split=Y Selected=0x818D04BB - DockNode ID=0x0000001B Parent=0x00000013 SizeRef=264,551 HiddenTabBar=1 Selected=0x1D5D92B6 - DockNode ID=0x0000001C Parent=0x00000013 SizeRef=264,588 HiddenTabBar=1 Selected=0x818D04BB - DockNode ID=0x00000014 Parent=0x00000020 SizeRef=547,1142 Split=X - DockNode ID=0x00000015 Parent=0x00000014 SizeRef=1158,1142 Split=X - DockNode ID=0x00000011 Parent=0x00000015 SizeRef=265,1142 Selected=0x1D5D92B6 - DockNode ID=0x00000012 Parent=0x00000015 SizeRef=1259,1142 Split=X - DockNode ID=0x00000009 Parent=0x00000012 SizeRef=364,1142 Split=Y Selected=0x3DC5AC3F - DockNode ID=0x00000005 Parent=0x00000009 SizeRef=364,745 Split=Y Selected=0x3DC5AC3F - DockNode ID=0x0000000B Parent=0x00000005 SizeRef=364,452 HiddenTabBar=1 Selected=0x3DC5AC3F - DockNode ID=0x0000000C Parent=0x00000005 SizeRef=364,291 Selected=0xAE3C694A - DockNode ID=0x00000006 Parent=0x00000009 SizeRef=364,395 HiddenTabBar=1 Selected=0x726D8899 - DockNode ID=0x0000000A Parent=0x00000012 SizeRef=1538,1142 Split=X - DockNode ID=0x00000007 Parent=0x0000000A SizeRef=357,1142 Selected=0x7737E8B2 - DockNode ID=0x00000008 Parent=0x0000000A SizeRef=1545,1142 Split=X - DockNode ID=0x00000001 Parent=0x00000008 SizeRef=1202,1142 Split=Y Selected=0xDF0EC458 - DockNode ID=0x00000003 Parent=0x00000001 SizeRef=1202,849 Split=Y Selected=0xDF0EC458 - DockNode ID=0x0000000D Parent=0x00000003 SizeRef=1202,571 Split=Y Selected=0xDFF75B3F - DockNode ID=0x00000017 Parent=0x0000000D SizeRef=1202,776 Split=Y Selected=0xDFF75B3F - DockNode ID=0x0000001D Parent=0x00000017 SizeRef=518,720 Split=Y Selected=0x9A7B23B9 - DockNode ID=0x0000001F Parent=0x0000001D SizeRef=549,359 CentralNode=1 HiddenTabBar=1 Selected=0x9A7B23B9 - DockNode ID=0x00000025 Parent=0x0000001D SizeRef=549,323 Selected=0x7A66B86B - DockNode ID=0x0000001E Parent=0x00000017 SizeRef=518,417 Selected=0xC74E1AEE - DockNode ID=0x00000018 Parent=0x0000000D SizeRef=1202,364 Split=X Selected=0x1C0788A1 - DockNode ID=0x00000019 Parent=0x00000018 SizeRef=601,364 Selected=0x1C0788A1 - DockNode ID=0x0000001A Parent=0x00000018 SizeRef=599,364 Selected=0x9B5D3198 - DockNode ID=0x0000000E Parent=0x00000003 SizeRef=1202,569 Selected=0xE98146C5 - DockNode ID=0x00000004 Parent=0x00000001 SizeRef=1202,291 Selected=0x9DD4E196 - DockNode ID=0x00000002 Parent=0x00000008 SizeRef=334,1142 HiddenTabBar=1 Selected=0x36DC96AB - DockNode ID=0x00000016 Parent=0x00000014 SizeRef=420,1142 Selected=0x8D0E8380 - DockNode ID=0x00000022 Parent=0x14621557 SizeRef=395,684 HiddenTabBar=1 Selected=0xD1D25642 -DockSpace ID=0xC6145A92 Pos=8,27 Size=1904,1142 Split=X - DockNode ID=0x0000000F Parent=0xC6145A92 SizeRef=301,1142 Selected=0xA8433A03 - DockNode ID=0x00000010 Parent=0xC6145A92 SizeRef=1601,1142 CentralNode=1 +DockSpace ID=0x14621557 Window=0x3DA2F1DE Pos=8,51 Size=1904,1141 Split=X Selected=0xF7365A5A + DockNode ID=0x00000020 Parent=0x14621557 SizeRef=884,684 Split=X + DockNode ID=0x00000013 Parent=0x00000020 SizeRef=335,1142 Split=Y Selected=0x818D04BB + DockNode ID=0x0000001B Parent=0x00000013 SizeRef=264,551 HiddenTabBar=1 Selected=0x1D5D92B6 + DockNode ID=0x0000001C Parent=0x00000013 SizeRef=264,588 HiddenTabBar=1 Selected=0x818D04BB + DockNode ID=0x00000014 Parent=0x00000020 SizeRef=547,1142 Split=X + DockNode ID=0x00000015 Parent=0x00000014 SizeRef=1158,1142 Split=X + DockNode ID=0x00000011 Parent=0x00000015 SizeRef=265,1142 Selected=0x1D5D92B6 + DockNode ID=0x00000012 Parent=0x00000015 SizeRef=1259,1142 Split=X + DockNode ID=0x00000009 Parent=0x00000012 SizeRef=364,1142 Split=Y Selected=0x3DC5AC3F + DockNode ID=0x00000005 Parent=0x00000009 SizeRef=364,745 Split=Y Selected=0x3DC5AC3F + DockNode ID=0x0000000B Parent=0x00000005 SizeRef=364,452 HiddenTabBar=1 Selected=0x3DC5AC3F + DockNode ID=0x0000000C Parent=0x00000005 SizeRef=364,291 Selected=0xAE3C694A + DockNode ID=0x00000006 Parent=0x00000009 SizeRef=364,395 HiddenTabBar=1 Selected=0x726D8899 + DockNode ID=0x0000000A Parent=0x00000012 SizeRef=1538,1142 Split=X + DockNode ID=0x00000007 Parent=0x0000000A SizeRef=357,1142 Selected=0x7737E8B2 + DockNode ID=0x00000008 Parent=0x0000000A SizeRef=1545,1142 Split=X + DockNode ID=0x00000001 Parent=0x00000008 SizeRef=1202,1142 Split=Y Selected=0xDF0EC458 + DockNode ID=0x00000003 Parent=0x00000001 SizeRef=1202,849 Split=Y Selected=0xDF0EC458 + DockNode ID=0x0000000D Parent=0x00000003 SizeRef=1202,571 Split=Y Selected=0xDFF75B3F + DockNode ID=0x00000017 Parent=0x0000000D SizeRef=1202,776 Split=Y Selected=0xDFF75B3F + DockNode ID=0x0000001D Parent=0x00000017 SizeRef=518,720 Split=Y Selected=0x9A7B23B9 + DockNode ID=0x0000001F Parent=0x0000001D SizeRef=549,709 CentralNode=1 HiddenTabBar=1 Selected=0x9A7B23B9 + DockNode ID=0x00000025 Parent=0x0000001D SizeRef=549,430 Split=X Selected=0x1F29F1F5 + DockNode ID=0x00000021 Parent=0x00000025 SizeRef=586,323 Selected=0x1F29F1F5 + DockNode ID=0x00000023 Parent=0x00000025 SizeRef=582,323 Selected=0x7A66B86B + DockNode ID=0x0000001E Parent=0x00000017 SizeRef=518,417 Selected=0xC74E1AEE + DockNode ID=0x00000018 Parent=0x0000000D SizeRef=1202,364 Split=X Selected=0x1C0788A1 + DockNode ID=0x00000019 Parent=0x00000018 SizeRef=601,364 Selected=0x1C0788A1 + DockNode ID=0x0000001A Parent=0x00000018 SizeRef=599,364 Selected=0x9B5D3198 + DockNode ID=0x0000000E Parent=0x00000003 SizeRef=1202,569 Selected=0xE98146C5 + DockNode ID=0x00000004 Parent=0x00000001 SizeRef=1202,291 Selected=0x9DD4E196 + DockNode ID=0x00000002 Parent=0x00000008 SizeRef=334,1142 HiddenTabBar=1 Selected=0x36DC96AB + DockNode ID=0x00000016 Parent=0x00000014 SizeRef=420,1142 Selected=0x8D0E8380 + DockNode ID=0x00000022 Parent=0x14621557 SizeRef=395,684 HiddenTabBar=1 Selected=0xD1D25642 +DockSpace ID=0xC6145A92 Pos=8,27 Size=1904,1142 Split=X + DockNode ID=0x0000000F Parent=0xC6145A92 SizeRef=301,1142 Selected=0xA8433A03 + DockNode ID=0x00000010 Parent=0xC6145A92 SizeRef=1601,1142 CentralNode=1 diff --git a/scenes/Default.scene b/scenes/Default.scene index d08d64d..bf16638 100644 --- a/scenes/Default.scene +++ b/scenes/Default.scene @@ -2,6 +2,10 @@ Entities: - ID: 0 Name: Bacround Components: + Transform: + Position: [0, 300, 0] + Rotation: [0, 0, 0] + Scale: [1, 1, 1] Mesh: MeshPath: assets/models/sponza.obj submeshes_len: 26 @@ -12,157 +16,159 @@ Entities: - id: 24 type: texture_diffuse path: textures/sponza_roof_diff.tga - - vao: 2 + - vao: 3 indexCount: 27552 textures: - id: 25 type: texture_diffuse path: textures/vase_dif.tga - - vao: 3 + - vao: 5 indexCount: 33024 textures: - id: 15 type: texture_diffuse path: textures/sponza_fabric_diff.tga - - vao: 4 + - vao: 7 indexCount: 54 textures: ~ - - vao: 5 + - vao: 9 indexCount: 12258 textures: - id: 5 type: texture_diffuse path: textures/background.tga - - vao: 6 + - vao: 11 indexCount: 10416 textures: - id: 6 type: texture_diffuse path: textures/vase_plant.tga - - vao: 7 + - vao: 13 indexCount: 49536 textures: - id: 17 type: texture_diffuse path: textures/sponza_fabric_blue_diff.tga - - vao: 8 + - vao: 15 indexCount: 94308 textures: - id: 23 type: texture_diffuse path: textures/sponza_thorn_diff.tga - - vao: 9 + - vao: 17 indexCount: 49536 textures: - id: 18 type: texture_diffuse path: textures/sponza_fabric_green_diff.tga - - vao: 10 + - vao: 19 indexCount: 17628 textures: - id: 9 type: texture_diffuse path: textures/sponza_ceiling_a_diff.tga - - vao: 11 + - vao: 21 indexCount: 30504 textures: - id: 7 type: texture_diffuse path: textures/sponza_arch_diff.tga - - vao: 12 + - vao: 23 indexCount: 53064 textures: - id: 27 type: texture_diffuse path: textures/vase_round.tga - - vao: 13 + - vao: 25 indexCount: 69624 textures: - id: 12 type: texture_diffuse path: textures/sponza_column_b_diff.tga - - vao: 14 + - vao: 27 indexCount: 2640 textures: - id: 14 type: texture_diffuse path: textures/sponza_details_diff.tga - - vao: 15 + - vao: 29 indexCount: 43008 textures: - id: 20 type: texture_diffuse path: textures/sponza_curtain_blue_diff.tga - - vao: 16 + - vao: 31 indexCount: 0 textures: ~ - - vao: 17 + - vao: 33 indexCount: 2388 textures: - id: 8 type: texture_diffuse path: textures/spnza_bricks_a_diff.tga - - vao: 18 + - vao: 35 indexCount: 21264 textures: - id: 13 type: texture_diffuse path: textures/sponza_column_c_diff.tga - - vao: 19 + - vao: 37 indexCount: 63 textures: - id: 22 type: texture_diffuse path: textures/sponza_floor_a_diff.tga - - vao: 20 + - vao: 39 indexCount: 43008 textures: - id: 19 type: texture_diffuse path: textures/sponza_curtain_green_diff.tga - - vao: 21 + - vao: 41 indexCount: 9126 textures: - id: 4 type: texture_diffuse path: textures/lion.tga - - vao: 22 + - vao: 43 indexCount: 96 textures: - id: 10 type: texture_diffuse path: textures/chain_texture.tga - - vao: 23 + - vao: 45 indexCount: 56832 textures: - id: 16 type: texture_diffuse path: textures/sponza_curtain_diff.tga - - vao: 24 + - vao: 47 indexCount: 8448 textures: - id: 11 type: texture_diffuse path: textures/sponza_column_a_diff.tga - - vao: 25 + - vao: 49 indexCount: 49488 textures: - id: 21 type: texture_diffuse path: textures/sponza_flagpole_diff.tga - - vao: 26 + - vao: 51 indexCount: 59484 textures: - id: 26 type: texture_diffuse path: textures/vase_hanging.tga - Transform: - Position: [0, 300, 0] - Rotation: [0, 0, 0] - Scale: [1, 1, 1] - ID: 1 Name: Camera Components: + ScriptComponent: + ScriptPath: assets/scripts/camera.lua + Transform: + Position: [578.542908, 200, -169.946655] + Rotation: [0, 160.221146, 0] + Scale: [1, 1, 1] CameraComponent: IsPerspective: true DefaultRuntimeCamera: true @@ -170,9 +176,14 @@ Entities: AspectRatio: 1.75 NearPlane: 0.100000001 FarPlane: 7000 + - ID: 2 + Name: New GameObject 2 + Components: + Mesh: + MeshPath: assets/models/DefaultMesh.obj + submeshes_len: 0 + submeshes: ~ Transform: - Position: [-850.547668, 200, -43.3881149] - Rotation: [0, 177.660431, 0] - Scale: [1, 1, 1] - ScriptComponent: - ScriptPath: assets/scripts/camera.lua \ No newline at end of file + Position: [0, 0, 0] + Rotation: [0, 0, 0] + Scale: [1, 1, 1] \ No newline at end of file