Action nodes work better now
This commit is contained in:
@@ -543,7 +543,8 @@ struct GUIListener : public Ogre::RenderTargetListener {
|
||||
} else {
|
||||
ECS::ActionNodeList &list =
|
||||
ECS::get_mut<ECS::ActionNodeList>();
|
||||
if (list.dynamicNodes.size() > 0) {
|
||||
if (list.dynamicNodes.size() > 0 &&
|
||||
ECS::get<GUI>().enableActions) {
|
||||
int j;
|
||||
Ogre::Vector3 queryPos;
|
||||
std::vector<size_t> points =
|
||||
@@ -686,6 +687,7 @@ GUIModule::GUIModule(flecs::world &ecs)
|
||||
gui.enabled = false;
|
||||
gui.grab = false;
|
||||
gui.grabChanged = false;
|
||||
gui.enableActions = true;
|
||||
})
|
||||
.add(flecs::Singleton);
|
||||
ecs.component<GUIData>()
|
||||
@@ -695,7 +697,7 @@ GUIModule::GUIModule(flecs::world &ecs)
|
||||
priv.mGuiOverlay = nullptr;
|
||||
})
|
||||
.add(flecs::Singleton);
|
||||
ecs.set<GUI>({ false, true, false, false, false, "", {}, -1 });
|
||||
ecs.set<GUI>({ false, true, false, false, false, true, "", {}, -1 });
|
||||
ecs.set<GUIData>({ nullptr, {}, nullptr });
|
||||
ui_wait =
|
||||
ecs.system<const RenderWindow, App, GUIData>("SetupGUI")
|
||||
|
||||
Reference in New Issue
Block a user