diff --git a/.gitmodules b/.gitmodules index be73882..d3b1f3c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "vendor/gcml"] path = vendor/gcml url = https://dock-it.dev/GigabiteStudios/gcml.git +[submodule "vendor/ImGuizmo"] + path = vendor/ImGuizmo + url = https://github.com/CedricGuillemet/ImGuizmo.git diff --git a/assets/scripts/camera.lua b/assets/scripts/camera.lua index 4583feb..0bd1791 100644 --- a/assets/scripts/camera.lua +++ b/assets/scripts/camera.lua @@ -12,6 +12,8 @@ local Move_Speec = 300 function OnInit() local gameObject = Engine.GetGameObjectByTag("Camera") transform = gameObject:GetComponent("Transform") + Engine.Expose("Position X", "nil") + Engine.Log("Init Done") end @@ -22,6 +24,7 @@ function OnUpdate(deltaTime) local old_rotation = transform:GetRotation() + local Position = transform:GetPosition() if Engine.KeyDown(KeyCode.W) then @@ -39,6 +42,8 @@ function OnUpdate(deltaTime) transform:SetPosition(Position) + Engine.Expose("Position X", Position.x) + local rotation = { diff --git a/imgui.ini b/imgui.ini index 4cd78e8..2fc750c 100644 --- a/imgui.ini +++ b/imgui.ini @@ -19,7 +19,7 @@ DockId=0x00000002,0 Pos=374,27 Size=1212,770 Collapsed=0 -DockId=0x00000022,0 +DockId=0x0000001F,0 [Window][Performance] Pos=8,774 @@ -49,7 +49,7 @@ DockId=0x0000000B,0 Pos=374,27 Size=1202,849 Collapsed=0 -DockId=0x00000022,0 +DockId=0x0000001F,0 [Window][Lua Text Editor] Pos=8,481 @@ -77,13 +77,13 @@ DockId=0x00000016,0 Pos=332,30 Size=1158,430 Collapsed=0 -DockId=0x00000022,0 +DockId=0x0000001F,0 [Window][Performance##performance] -Pos=8,941 -Size=335,228 +Pos=8,702 +Size=335,467 Collapsed=0 -DockId=0x00000024,0 +DockId=0x0000001C,0 [Window][Logger##logger] Pos=332,348 @@ -95,7 +95,7 @@ DockId=0x00000019,0 Pos=8,27 Size=322,732 Collapsed=0 -DockId=0x0000001B,0 +DockId=0x00000023,0 [Window][Scene Window@SceneWindow] Pos=8,27 @@ -105,9 +105,9 @@ DockId=0x0000000F,0 [Window][Scene Window##SceneWindow] Pos=8,28 -Size=335,530 +Size=335,672 Collapsed=0 -DockId=0x0000001B,0 +DockId=0x00000023,0 [Window][Game Objects] Pos=182,27 @@ -134,28 +134,28 @@ Collapsed=0 DockId=0x0000001E,0 [Window][ Logger##logger] -Pos=345,789 -Size=376,380 +Pos=345,846 +Size=1189,323 Collapsed=0 -DockId=0x00000020,0 +DockId=0x00000025,0 [Window][ Editor##EditorWindow] -Pos=723,28 -Size=1189,1141 -Collapsed=0 -DockId=0x00000022,0 - -[Window][ Inspector##InspectorWindow] Pos=345,28 -Size=376,759 +Size=1189,816 Collapsed=0 DockId=0x0000001F,0 -[Window][ Profiler] -Pos=8,560 -Size=335,379 +[Window][ Inspector##InspectorWindow] +Pos=1536,28 +Size=376,1141 Collapsed=0 -DockId=0x00000023,0 +DockId=0x00000022,0 + +[Window][ Profiler] +Pos=-344,52 +Size=335,199 +Collapsed=0 +DockId=0x00000024,0 [Table][0xE9E836E4,4] Column 0 Weight=1.2999 @@ -164,47 +164,47 @@ Column 2 Weight=0.6474 Column 3 Weight=1.0088 [Table][0x08173DEA,4] -Column 0 Weight=1.4343 -Column 1 Weight=1.5458 -Column 2 Weight=0.9402 -Column 3 Weight=0.0797 +Column 0 Weight=1.4321 +Column 1 Weight=0.8821 +Column 2 Weight=0.9929 +Column 3 Weight=0.6929 [Docking][Data] DockSpace ID=0x14621557 Window=0x3DA2F1DE Pos=8,51 Size=1904,1141 Split=X Selected=0xF7365A5A - DockNode ID=0x00000013 Parent=0x14621557 SizeRef=335,1142 Split=Y Selected=0x818D04BB - DockNode ID=0x0000001B Parent=0x00000013 SizeRef=264,530 HiddenTabBar=1 Selected=0x1D5D92B6 - DockNode ID=0x0000001C Parent=0x00000013 SizeRef=264,609 Split=Y Selected=0x7A66B86B - DockNode ID=0x00000023 Parent=0x0000001C SizeRef=335,379 HiddenTabBar=1 Selected=0x7A66B86B - DockNode ID=0x00000024 Parent=0x0000001C SizeRef=335,228 HiddenTabBar=1 Selected=0x818D04BB - DockNode ID=0x00000014 Parent=0x14621557 SizeRef=1567,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=X Selected=0xDFF75B3F - DockNode ID=0x00000021 Parent=0x0000001D SizeRef=376,781 Split=Y Selected=0xD1D25642 - DockNode ID=0x0000001F Parent=0x00000021 SizeRef=385,759 HiddenTabBar=1 Selected=0xD1D25642 - DockNode ID=0x00000020 Parent=0x00000021 SizeRef=385,380 HiddenTabBar=1 Selected=0x1F29F1F5 - DockNode ID=0x00000022 Parent=0x0000001D SizeRef=1189,781 CentralNode=1 HiddenTabBar=1 Selected=0x9A7B23B9 - 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=0x00000020 Parent=0x14621557 SizeRef=886,684 Split=X + DockNode ID=0x00000013 Parent=0x00000020 SizeRef=335,1142 Split=Y Selected=0x818D04BB + DockNode ID=0x0000001B Parent=0x00000013 SizeRef=264,672 Split=Y Selected=0x1D5D92B6 + DockNode ID=0x00000023 Parent=0x0000001B SizeRef=335,337 HiddenTabBar=1 Selected=0x1D5D92B6 + DockNode ID=0x00000024 Parent=0x0000001B SizeRef=335,333 Selected=0x7A66B86B + DockNode ID=0x0000001C Parent=0x00000013 SizeRef=264,467 HiddenTabBar=1 Selected=0x818D04BB + DockNode ID=0x00000014 Parent=0x00000020 SizeRef=1567,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 Selected=0x9A7B23B9 + DockNode ID=0x00000025 Parent=0x0000001D SizeRef=549,323 Selected=0x1F29F1F5 + 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=376,684 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/vendor/ImGuizmo b/vendor/ImGuizmo new file mode 160000 index 0000000..b10e917 --- /dev/null +++ b/vendor/ImGuizmo @@ -0,0 +1 @@ +Subproject commit b10e91756d32395f5c1fefd417899b657ed7cb88