: types(&types)
, neighbor{0}
, gravity()
-, blocks{}
, light{0}
, generated(false)
, lighted(false)
if (!type.collision || !type.shape) {
continue;
}
+ RoughLocation::Fine pos(x, y, z);
+
+ // center of the blok relative to the ray
+ glm::vec3 relative_center(glm::vec3((position - reference) * ExactLocation::Extent() + pos) + 0.5f);
+ if (ray.DistanceSquared(relative_center) > 3.0f) {
+ continue;
+ }
+
float cur_dist;
glm::vec3 cur_norm;
- if (type.shape->Intersects(ray, ToTransform(reference, RoughLocation::Fine(x, y, z), idx), cur_dist, cur_norm)) {
+ if (type.shape->Intersects(ray, ToTransform(reference, pos, idx), cur_dist, cur_norm)) {
if (cur_dist < coll.depth) {
coll.block = idx;
coll.depth = cur_dist;
constexpr float block_rad = 2.0f;
const float bb_radius = box_rad + block_rad;
- const RoughLocation::Fine begin(max(
+ const RoughLocation::Fine begin(glm::max(
RoughLocation::Fine(0),
- RoughLocation::Fine(floor(box_coords - bb_radius))
+ RoughLocation::Fine(glm::floor(box_coords - bb_radius))
));
- const RoughLocation::Fine end(min(
+ const RoughLocation::Fine end(glm::min(
RoughLocation::Fine(side - 1),
- RoughLocation::Fine(ceil(box_coords + bb_radius))
+ RoughLocation::Fine(glm::ceil(box_coords + bb_radius))
) - 1);
for (RoughLocation::Fine pos(begin); pos.z < end.y; ++pos.z) {
const glm::vec3 entity_coords(Mentity[3] - Mchunk[3]);
const float ec_radius = entity.Radius() + Radius();
- if (distance2(entity_coords, Center()) > ec_radius * ec_radius) {
+ if (glm::distance2(entity_coords, Center()) > ec_radius * ec_radius) {
return false;
}
constexpr float block_rad = 2.0f;
const float eb_radius = entity.Radius() + block_rad;
- const RoughLocation::Fine begin(max(
+ const RoughLocation::Fine begin(glm::max(
RoughLocation::Fine(0),
- RoughLocation::Fine(floor(entity_coords - eb_radius))
+ RoughLocation::Fine(glm::floor(entity_coords - eb_radius))
));
- const RoughLocation::Fine end(min(
+ const RoughLocation::Fine end(glm::min(
RoughLocation::Fine(side),
- RoughLocation::Fine(ceil(entity_coords + eb_radius))
+ RoughLocation::Fine(glm::ceil(entity_coords + eb_radius))
));
for (RoughLocation::Fine pos(begin); pos.z < end.z; ++pos.z) {
chunk_prog.SetTexture(block_tex);
chunk_prog.SetFogDensity(fog_density);
- Frustum frustum(transpose(chunk_prog.GetVP()));
+ Frustum frustum(glm::transpose(chunk_prog.GetVP()));
AABB box;
- //std::cout << "V = " << chunk_prog.View() << std::endl;
- //std::cout << "P = " << chunk_prog.Projection() << std::endl;
- //std::cout << "VP = " << chunk_prog.GetVP() << std::endl;
- //std::cout << "frustum = " << frustum << std::endl;
-
for (int i = 0; i < index.TotalChunks(); ++i) {
if (!index[i]) continue;
box.min = (index[i]->Position() - index.Base()) * ExactLocation::Extent();
box.max = box.min + ExactLocation::FExtent();
if (!CullTest(box, frustum)) {
-
- //glm::mat4 m(index[i]->Transform(index.Base()));
- //if (CullTest(Chunk::Bounds(), chunk_prog.GetVP() * m)) {
- // std::cout << "M = " << m << std::endl;
- // std::cout << "box = " << box.min << ", " << box.max << std::endl;
- // std::cout << "should've been culled" << std::endl;
- //}
-
if (index[i]->ShouldUpdateMesh()) {
index[i]->Update(models[i]);
}
- chunk_prog.SetM(index[i]->Transform(index.Base()));
- models[i].Draw();
+ if (!models[i].Empty()) {
+ chunk_prog.SetM(index[i]->Transform(index.Base()));
+ models[i].Draw();
+ }
}
}
- //std::cout << std::endl;
}