mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-10-06 11:31:49 +00:00
update 'hitbox' property semantics
This commit is contained in:
parent
37f28a768c
commit
91230ecbeb
6 changed files with 7 additions and 6 deletions
|
|
@ -143,9 +143,10 @@ void CameraControl::switchCamera() {
|
|||
}
|
||||
|
||||
void CameraControl::update(const PlayerInput& input, float delta, Chunks* chunks) {
|
||||
offset = glm::vec3(0.0f, 0.7f, 0.0f);
|
||||
offset = glm::vec3(0.0f, 0.0f, 0.0f);
|
||||
|
||||
if (auto hitbox = player->getHitbox()) {
|
||||
offset.y += hitbox->halfsize.y * (0.7f/0.9f);
|
||||
if (settings.shaking.get() && !input.cheat) {
|
||||
offset += updateCameraShaking(*hitbox, delta);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ entityid_t Entities::spawn(
|
|||
const auto& tsf = registry.emplace<Transform>(
|
||||
entity, position, glm::vec3(1.0f), glm::mat3(1.0f), glm::mat4(1.0f), true);
|
||||
auto& body = registry.emplace<Rigidbody>(
|
||||
entity, true, Hitbox {def.bodyType, position, def.hitbox}, std::vector<Sensor>{});
|
||||
entity, true, Hitbox {def.bodyType, position, def.hitbox*0.5f}, std::vector<Sensor>{});
|
||||
|
||||
body.sensors.resize(def.radialSensors.size() + def.boxSensors.size());
|
||||
for (auto& [i, box] : def.boxSensors) {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ struct EntityDef {
|
|||
std::vector<std::string> components;
|
||||
|
||||
BodyType bodyType = BodyType::DYNAMIC;
|
||||
glm::vec3 hitbox {0.5f};
|
||||
glm::vec3 hitbox {0.25f};
|
||||
std::vector<std::pair<size_t, AABB>> boxSensors {};
|
||||
std::vector<std::pair<size_t, float>> radialSensors {};
|
||||
std::string rigName = name;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue