Working on cutscene skip
This commit is contained in:
1 parent
c991b5dbc1
commit
7011bbb754
16 files changed
+112
-17
No files matched your search
+12
-10
@@ -934,14 +934,6 @@ namespace ZL {
|
||||
|
||||
void UiManager::replaceRoot(std::shared_ptr<UiNode> newRoot) {
|
||||
root = newRoot;
|
||||
layoutNode(
|
||||
root,
|
||||
0.0f, 0.0f, // parentX, parentY (экран начинается с 0,0)
|
||||
Environment::projectionWidth, // parentW
|
||||
Environment::projectionHeight, // parentH
|
||||
root->localX, // finalLocalX
|
||||
root->localY // finalLocalY
|
||||
);
|
||||
buttons.clear();
|
||||
textButtons.clear();
|
||||
allInteractives.clear();
|
||||
@@ -952,10 +944,20 @@ namespace ZL {
|
||||
chatBubbles.clear();
|
||||
pulsingNodes.clear();
|
||||
popInNodes.clear();
|
||||
collectButtonsAndSliders(root);
|
||||
|
||||
nodeActiveAnims.clear();
|
||||
|
||||
if (!root) return;
|
||||
|
||||
layoutNode(
|
||||
root,
|
||||
0.0f, 0.0f,
|
||||
Environment::projectionWidth,
|
||||
Environment::projectionHeight,
|
||||
root->localX,
|
||||
root->localY
|
||||
);
|
||||
collectButtonsAndSliders(root);
|
||||
|
||||
for (auto& b : buttons) {
|
||||
b->buildMesh();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user