Merge branch 'MihailRis:main' into main

This commit is contained in:
Astazium 2026-09-20 12:36:56 +03:00 • committed by GitHub
commit 2c3c217fef
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
71 changed files with 3978 additions and 786 deletions

View file

@ -485,6 +485,7 @@ void Entities::render(
if (eid.uid == fpsEntity) {
continue;
}
const auto& def = eid.def;
const auto& pos = transform.pos;
const auto& size = transform.size;
if (frustum && !frustum->isBoxVisible(pos - size, pos + size)) {
@ -494,7 +495,13 @@ void Entities::render(
const auto& rigConfig = skeleton.config;
if (rigConfig) {
rigConfig->render(
assets, batch, skeleton, transform.rot, pos, size
assets,
batch,
skeleton,
def.lightingMode,
transform.rot,
pos,
size
);
}
}

View file

@ -14,4 +14,5 @@ void EntityDef::cloneTo(EntityDef& dst) {
dst.elasticity = elasticity;
dst.stepHeight = stepHeight;
dst.save = save;
dst.lightingMode = lightingMode;
}

View file

@ -8,10 +8,7 @@
#include "data/dv.hpp"
#include "maths/aabb.hpp"
#include "physics/Hitbox.hpp"
namespace rigging {
class SkeletonConfig;
}
#include "animation/rigging.hpp"
struct ComponentInstance {
std::string component;
@ -42,6 +39,9 @@ struct EntityDef {
/// @brief Solid entity material material
std::string material;
/// @brief Model lighting mode
ModelLightingMode lightingMode = ModelLightingMode::SOLID;
/// @brief Can the entity be interacted with cursor (on_attack, on_use)
bool selectable = true;