Skip to content

Commit

Permalink
expose setDocument of UI
Browse files Browse the repository at this point in the history
  • Loading branch information
ShreeSinghi committed Sep 3, 2023
1 parent 5fb0034 commit 7c23555
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "assets"]
path = game/assets
url = https://gitlab.com/sdslabs/rootex-game.git
branch = main
url = https://gitlab.com/sdslabs/rootex-assets.git
branch = WIP
2 changes: 1 addition & 1 deletion game/assets
Submodule assets updated from a7d4b4 to e04c81
55 changes: 26 additions & 29 deletions imgui.ini
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[Window][Rootex Editor]
Pos=0,0
Size=1920,991
Size=1536,793
Collapsed=0

[Window][Output]
Pos=0,620
Size=1114,371
Pos=0,487
Size=821,306
Collapsed=0
DockId=0x00000003,0
DockId=0x0000000A,1

[Window][Debug##Default]
Pos=256,142
Expand All @@ -33,26 +33,25 @@ Collapsed=0
DockId=0x0000000D,0

[Window][Toolbar]
Pos=1116,620
Size=333,371
Pos=1251,268
Size=304,220
Collapsed=0
DockId=0x00000004,0

[Window][Viewport]
Pos=0,28
Size=1449,590
Size=821,457
Collapsed=0
DockId=0x00000008,0

[Window][Inspector]
Pos=1451,409
Size=469,582
Pos=823,343
Size=713,450
Collapsed=0
DockId=0x00000009,0

[Window][File Viewer]
Pos=1451,28
Size=469,379
Pos=823,28
Size=713,313
Collapsed=0
DockId=0x00000007,1

Expand Down Expand Up @@ -154,8 +153,8 @@ Size=745,480
Collapsed=0

[Window][Scene]
Pos=1451,28
Size=469,379
Pos=823,28
Size=713,313
Collapsed=0
DockId=0x00000007,0

Expand All @@ -170,12 +169,12 @@ Size=750,643
Collapsed=0

[Window][Load Scene]
Pos=1117,620
Pos=1121,620
Size=30,58
Collapsed=0

[Window][Save]
Pos=1233,626
Pos=1229,627
Size=262,110
Collapsed=0

Expand All @@ -191,7 +190,7 @@ Collapsed=0

[Window][File Editor]
Pos=0,28
Size=1449,590
Size=821,457
Collapsed=0
DockId=0x00000008,1

Expand All @@ -201,23 +200,21 @@ Size=241,158
Collapsed=0

[Window][Content Browser]
Pos=0,620
Size=1114,371
Pos=0,487
Size=821,306
Collapsed=0
DockId=0x00000003,1
DockId=0x0000000A,0

[Docking][Data]
DockSpace ID=0x654E7FDC Window=0xDC8952A0 Pos=0,28 Size=1920,963 Split=X
DockNode ID=0x00000001 Parent=0x654E7FDC SizeRef=1932,1359 Split=Y Selected=0x995B0CF8
DockNode ID=0x00000008 Parent=0x00000001 SizeRef=1932,596 Selected=0x995B0CF8
DockNode ID=0x0000000A Parent=0x00000001 SizeRef=1932,375 Split=X Selected=0xCB7211A8
DockNode ID=0x00000003 Parent=0x0000000A SizeRef=1114,226 Selected=0x371352B7
DockNode ID=0x00000004 Parent=0x0000000A SizeRef=333,226 Selected=0x507852CA
DockNode ID=0x00000002 Parent=0x654E7FDC SizeRef=626,1359 Split=X
DockSpace ID=0x654E7FDC Window=0xDC8952A0 Pos=0,28 Size=1536,765 Split=X
DockNode ID=0x00000001 Parent=0x654E7FDC SizeRef=821,1359 Split=Y Selected=0x995B0CF8
DockNode ID=0x00000008 Parent=0x00000001 SizeRef=1932,457 Selected=0x995B0CF8
DockNode ID=0x0000000A Parent=0x00000001 SizeRef=1932,306 Selected=0xCB7211A8
DockNode ID=0x00000002 Parent=0x654E7FDC SizeRef=713,1359 Split=X
DockNode ID=0x00000005 Parent=0x00000002 SizeRef=291,1038 Split=Y Selected=0xCD504759
DockNode ID=0x0000000D Parent=0x00000005 SizeRef=353,818 Selected=0x8988DF52
DockNode ID=0x0000000E Parent=0x00000005 SizeRef=353,543 Selected=0xEA4A1D17
DockNode ID=0x00000006 Parent=0x00000002 SizeRef=1627,1038 Split=Y Selected=0x18B8C0DE
DockNode ID=0x00000007 Parent=0x00000006 SizeRef=465,379 CentralNode=1 Selected=0x18B8C0DE
DockNode ID=0x00000009 Parent=0x00000006 SizeRef=465,582 Selected=0xF02CD328
DockNode ID=0x00000007 Parent=0x00000006 SizeRef=465,313 CentralNode=1 Selected=0x18B8C0DE
DockNode ID=0x00000009 Parent=0x00000006 SizeRef=465,450 Selected=0xF02CD328

1 change: 1 addition & 0 deletions rootex/script/interpreter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -571,6 +571,7 @@ void LuaInterpreter::registerTypes()
sol::base_classes, sol::bases<Component>(),
"document", sol::property(&UIComponent::getDocument));
ui["getDocumentID"] = [](UIComponent* ui) { return ui->getDocument()->GetId(); };
ui["setDocument"] = &UIComponent::setDocument;
}
{
sol::usertype<AudioComponent> audioComponent = rootex.new_usertype<AudioComponent>(
Expand Down

0 comments on commit 7c23555

Please sign in to comment.