reduce redundancy

This commit is contained in:
MihailRis 2024-07-10 06:51:14 +03:00
parent 5874abff98
commit 8edf9440a3
4 changed files with 5 additions and 6 deletions

View File

@ -359,7 +359,7 @@ void ContentLoader::loadEntity(EntityDef& def, const std::string& full, const st
for (auto& componentName : def.components) {
auto scriptfile = folder/fs::path("scripts/components/"+componentName+".lua");
if (fs::is_regular_file(scriptfile)) {
scripting::load_entity_component(env, componentName, scriptfile);
scripting::load_entity_component(componentName, scriptfile);
}
}
}

View File

@ -514,11 +514,11 @@ void scripting::load_item_script(const scriptenv& senv, const std::string& prefi
funcsset.on_block_break_by = register_event(env, "on_block_break_by", prefix+".blockbreakby");
}
void scripting::load_entity_component(const scriptenv& penv, const std::string& name, const fs::path& file) {
void scripting::load_entity_component(const std::string& name, const fs::path& file) {
auto L = lua::get_main_thread();
std::string src = files::read_string(file);
logger.info() << "script (component) " << file.u8string();
lua::loadbuffer(L, *penv, src, file.u8string());
lua::loadbuffer(L, 0, src, file.u8string());
lua::store_in(L, lua::CHUNKS_TABLE, name);
}

View File

@ -127,7 +127,6 @@ namespace scripting {
item_funcs_set& funcsset);
void load_entity_component(
const scriptenv& env,
const std::string& name,
const fs::path& file);

View File

@ -405,8 +405,8 @@ void Entities::render(Assets* assets, ModelBatch& batch, const Frustum& frustum,
}
bool Entities::hasBlockingInside(AABB aabb) {
auto view = registry.view<EntityId, Transform, Rigidbody>();
for (auto [entity, eid, transform, body] : view.each()) {
auto view = registry.view<EntityId, Rigidbody>();
for (auto [entity, eid, body] : view.each()) {
if (eid.def.blocking && aabb.intersect(body.hitbox.getAABB())) {
return true;
}