X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fchunk.cpp;h=7f2233e2def66a6e99dee791d6d2e0ce1a73b0ad;hb=3185bad87c06739e4ec19b456c7158437ba9621f;hp=97ec3e353600d0efa79cb49c67aca250da142786;hpb=242b87a5fb412f9006e4b7debc1408cf7ac83000;p=blank.git

diff --git a/src/world/chunk.cpp b/src/world/chunk.cpp
index 97ec3e3..7f2233e 100644
--- a/src/world/chunk.cpp
+++ b/src/world/chunk.cpp
@@ -33,7 +33,6 @@ Chunk::Chunk(const BlockTypeRegistry &types) noexcept
 : types(&types)
 , neighbor{0}
 , gravity()
-, blocks{}
 , light{0}
 , generated(false)
 , lighted(false)
@@ -114,7 +113,7 @@ struct UnsetNode
 	UnsetNode(Chunk *chunk, RoughLocation::Fine pos)
 	: SetNode(chunk, pos), level(Get()) { }
 
-	UnsetNode(const SetNode &set)
+	explicit UnsetNode(const SetNode &set)
 	: SetNode(set), level(Get()) { }
 
 
@@ -466,13 +465,13 @@ bool Chunk::Intersection(
 	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) {
@@ -503,7 +502,7 @@ bool Chunk::Intersection(
 	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;
 	}
 
@@ -515,13 +514,13 @@ bool Chunk::Intersection(
 	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) {
@@ -820,7 +819,7 @@ void ChunkRenderer::Render(Viewport &viewport) {
 	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;
 
 	for (int i = 0; i < index.TotalChunks(); ++i) {