From e5a5d4d32941e83983073f0cf7a7a12fd5b3ed8c Mon Sep 17 00:00:00 2001 From: bobke Date: Thu, 20 Jun 2024 02:39:29 +0200 Subject: [PATCH] order main entity tree --- src/bengine.cpp | 17 ++++++++--------- .../be_plugin_app_admin_window/plugin.cpp | 8 ++++---- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/bengine.cpp b/src/bengine.cpp index b819dd6..0b4cb8b 100644 --- a/src/bengine.cpp +++ b/src/bengine.cpp @@ -11,14 +11,18 @@ int main(int argc, char* argv[]) std::cout << "bengine3 starting..." << std::endl; // TOP PARENT ENTITY - BEntityTop* toptop = new BEntityTop(); // in this entity we do slower mem saving stuff + BEntityTop* toptop = new BEntityTop(); toptop->setName("root"); toptop->construct(); toptop->enableLoopManager(); toptop->spawnChildrenManager(); toptop->spawnCommandBuffer(); - toptop->spawnPluginManager(); + // assure bin directory comes firs + auto bin = toptop->addChild( "bin", new BEntity() ); + + // plugin manager (spawns /lib) + toptop->spawnPluginManager(); // PLUGIN MANAGER BEntity_Plugin_Manager* plugin_manager = toptop->pluginManager(); @@ -33,7 +37,6 @@ int main(int argc, char* argv[]) sys->addChild( "timer", new BTimer() ); sys->addChild( "sleeper", new BSleeper() ); - // binary path char buf3[1024]; readlink("/proc/self/exe", buf3, 1024); @@ -45,12 +48,10 @@ int main(int argc, char* argv[]) sys->addChild( "binary_path", new BEntity_string() )->set( buff2.c_str() ); } - // binary + // binary relative path std::string binary( argv[0] ); sys->addChild( "binary", new BEntity_string() )->set( binary.c_str() ); - std::cout << binary.c_str() << std::endl; - // LOAD SCENE if ( argc > 1 ) { @@ -66,10 +67,8 @@ int main(int argc, char* argv[]) plugin_manager->load( "app_admin window", "src/plugins/be_plugin_app_admin_window", "be_plugin_app_admin_window" ); } - // LOADING OBJECT FROM CLASS NAMED SCENE FROM LIBRARY // BEntity* scene = toptop->addChild("bin", "Scene"); - BEntity* bin = toptop->addChild( "bin", "entity" ); BEntity* scene = bin->addChild( "", "Scene" ); if ( scene != 0 ) @@ -108,7 +107,7 @@ int main(int argc, char* argv[]) std::cout << "running..." << std::endl; toptop->process_general(); } - + delete toptop; // FINISH diff --git a/src/plugins/be_plugin_app_admin_window/plugin.cpp b/src/plugins/be_plugin_app_admin_window/plugin.cpp index 0eb66b2..09ef3a3 100644 --- a/src/plugins/be_plugin_app_admin_window/plugin.cpp +++ b/src/plugins/be_plugin_app_admin_window/plugin.cpp @@ -58,7 +58,7 @@ setAdminWindow( this ); - setName( "Admin Window" ); + setName( "Entity Tree" ); // std::cout << "Scene::construct()" << std::endl; // LOAD QT APP FIXME THIS DOESN'T NEED TO GET ONTO THE TREE @@ -101,7 +101,7 @@ auto qwindow = addChild( "QMainWindow", "QMainWindow" ); - qwindow->addChild( "title", "string_property" )->set("Admin Window"); + qwindow->addChild( "title", "string_property" )->set("Entity Tree"); qwindow->addChild( "x", "uint_property" )->set(Buint(100)); qwindow->addChild( "y", "uint_property" )->set(Buint(30)); qwindow->addChild( "width", "uint_property" )->set(Buint(500)); @@ -138,7 +138,7 @@ // CREATE LEFT ENTITIES auto entity_groupbox = general_layout_H->addChild( "Entity Groupbox", "QGroupBox" ); - entity_groupbox->addChild( "title", "string_property" )->set("Entities"); + // entity_groupbox->addChild( "title", "string_property" )->set("Entities"); auto groupVbox = entity_groupbox->addChild( "QT VBoxlayout", "QVBoxLayout" ); entity_groupbox->addChild( "QGroupBox_end", "QGroupBox_end" ); @@ -405,7 +405,7 @@ // CREATE LEFT ENTITIES auto entity_groupbox = general_layout_H->addChild( "Entity Groupbox", "QGroupBox" ); - entity_groupbox->addChild( "title", "string_property" )->set("Entities"); + // entity_groupbox->addChild( "title", "string_property" )->set("Entities"); auto groupVbox = entity_groupbox->addChild( "QT VBoxlayout", "QVBoxLayout" ); add_admin_entity_groupbox(groupVbox, entity);