X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmodel%2Fbounds.cpp;h=0c91af32021f39d918099e5862c01080d544bace;hb=e4a1425dccd0ba9b106e415dd02809f4308a85ee;hp=c1c04e113814d39d27314e2e2c852d1482ccfd6b;hpb=b61d462707dd3d40a32a6104d88eb24f6a52df63;p=blank.git

diff --git a/src/model/bounds.cpp b/src/model/bounds.cpp
index c1c04e1..0c91af3 100644
--- a/src/model/bounds.cpp
+++ b/src/model/bounds.cpp
@@ -4,203 +4,24 @@
 
 namespace blank {
 
-void CollisionBounds::Vertices(
-	EntityMesh::Buffer &out,
-	float tex_offset
-) const {
-	for (const auto &pos : vtx_pos) {
-		out.vertices.emplace_back(pos);
-	}
-	for (const auto &coord : vtx_tex_coords) {
-		out.tex_coords.emplace_back(coord.x, coord.y, coord.z + tex_offset);
-	}
-	for (const auto &nrm : vtx_nrm) {
-		out.normals.emplace_back(nrm);
-	}
-	for (auto idx : vtx_idx) {
-		out.indices.emplace_back(idx);
-	}
-}
-
-void CollisionBounds::Vertices(
-	EntityMesh::Buffer &out,
-	const glm::mat4 &transform,
-	float tex_offset,
-	EntityMesh::Index idx_offset
-) const {
-	for (const auto &pos : vtx_pos) {
-		out.vertices.emplace_back(transform * glm::vec4(pos, 1.0f));
-	}
-	for (const auto &coord : vtx_tex_coords) {
-		out.tex_coords.emplace_back(coord.x, coord.y, coord.z + tex_offset);
-	}
-	for (const auto &nrm : vtx_nrm) {
-		out.normals.emplace_back(transform * glm::vec4(nrm, 0.0f));
-	}
-	for (auto idx : vtx_idx) {
-		out.indices.emplace_back(idx_offset + idx);
-	}
-}
-
-void CollisionBounds::Vertices(
-	BlockMesh::Buffer &out,
-	const glm::mat4 &transform,
-	float tex_offset,
-	BlockMesh::Index idx_offset
-) const {
-	for (const auto &pos : vtx_pos) {
-		out.vertices.emplace_back(transform * glm::vec4(pos, 1.0f));
-	}
-	for (const auto &coord : vtx_tex_coords) {
-		out.tex_coords.emplace_back(coord.x, coord.y, coord.z + tex_offset);
-	}
-	for (auto idx : vtx_idx) {
-		out.indices.emplace_back(idx_offset + idx);
-	}
-}
-
-void CollisionBounds::Outline(OutlineMesh::Buffer &out) const {
+void CollisionBounds::Outline(PrimitiveMesh::Buffer &out) const {
 	out.vertices.insert(out.vertices.end(), out_pos.begin(), out_pos.end());
 	out.indices.insert(out.indices.end(), out_idx.begin(), out_idx.end());
 }
 
-void CollisionBounds::SetShape(
-	const EntityMesh::Positions &pos,
-	const EntityMesh::Normals &nrm,
-	const EntityMesh::Indices &idx
-) {
-	vtx_pos = pos;
-	vtx_nrm = nrm;
-	vtx_idx = idx;
-}
-
-void CollisionBounds::SetTexture(
-	const BlockMesh::TexCoords &tex_coords
-) {
-	vtx_tex_coords = tex_coords;
-}
-
 void CollisionBounds::SetOutline(
-	const OutlineMesh::Positions &pos,
-	const OutlineMesh::Indices &idx
+	const PrimitiveMesh::Positions &pos,
+	const PrimitiveMesh::Indices &idx
 ) {
 	out_pos = pos;
 	out_idx = idx;
 }
 
 
-NullBounds::NullBounds()
-: CollisionBounds() {
-
-}
-
-bool NullBounds::Intersects(
-	const Ray &,
-	const glm::mat4 &,
-	float &, glm::vec3 &
-) const noexcept {
-	return false;
-}
-
-bool NullBounds::Intersects(
-	const glm::mat4 &,
-	const AABB &,
-	const glm::mat4 &,
-	float &,
-	glm::vec3 &
-) const noexcept {
-	return false;
-}
-
-
 CuboidBounds::CuboidBounds(const AABB &b)
 : CollisionBounds()
 , bb(b) {
 	bb.Adjust();
-	SetShape({
-		{ bb.min.x, bb.min.y, bb.max.z }, // front
-		{ bb.max.x, bb.min.y, bb.max.z },
-		{ bb.min.x, bb.max.y, bb.max.z },
-		{ bb.max.x, bb.max.y, bb.max.z },
-		{ bb.min.x, bb.min.y, bb.min.z }, // back
-		{ bb.min.x, bb.max.y, bb.min.z },
-		{ bb.max.x, bb.min.y, bb.min.z },
-		{ bb.max.x, bb.max.y, bb.min.z },
-		{ bb.min.x, bb.max.y, bb.min.z }, // top
-		{ bb.min.x, bb.max.y, bb.max.z },
-		{ bb.max.x, bb.max.y, bb.min.z },
-		{ bb.max.x, bb.max.y, bb.max.z },
-		{ bb.min.x, bb.min.y, bb.min.z }, // bottom
-		{ bb.max.x, bb.min.y, bb.min.z },
-		{ bb.min.x, bb.min.y, bb.max.z },
-		{ bb.max.x, bb.min.y, bb.max.z },
-		{ bb.min.x, bb.min.y, bb.min.z }, // left
-		{ bb.min.x, bb.min.y, bb.max.z },
-		{ bb.min.x, bb.max.y, bb.min.z },
-		{ bb.min.x, bb.max.y, bb.max.z },
-		{ bb.max.x, bb.min.y, bb.min.z }, // right
-		{ bb.max.x, bb.max.y, bb.min.z },
-		{ bb.max.x, bb.min.y, bb.max.z },
-		{ bb.max.x, bb.max.y, bb.max.z },
-	}, {
-		{  0.0f,  0.0f,  1.0f }, // front
-		{  0.0f,  0.0f,  1.0f },
-		{  0.0f,  0.0f,  1.0f },
-		{  0.0f,  0.0f,  1.0f },
-		{  0.0f,  0.0f, -1.0f }, // back
-		{  0.0f,  0.0f, -1.0f },
-		{  0.0f,  0.0f, -1.0f },
-		{  0.0f,  0.0f, -1.0f },
-		{  0.0f,  1.0f,  0.0f }, // top
-		{  0.0f,  1.0f,  0.0f },
-		{  0.0f,  1.0f,  0.0f },
-		{  0.0f,  1.0f,  0.0f },
-		{  0.0f, -1.0f,  0.0f }, // bottom
-		{  0.0f, -1.0f,  0.0f },
-		{  0.0f, -1.0f,  0.0f },
-		{  0.0f, -1.0f,  0.0f },
-		{ -1.0f,  0.0f,  0.0f }, // left
-		{ -1.0f,  0.0f,  0.0f },
-		{ -1.0f,  0.0f,  0.0f },
-		{ -1.0f,  0.0f,  0.0f },
-		{  1.0f,  0.0f,  0.0f }, // right
-		{  1.0f,  0.0f,  0.0f },
-		{  1.0f,  0.0f,  0.0f },
-		{  1.0f,  0.0f,  0.0f },
-	}, {
-		  0,  1,  2,  2,  1,  3, // front
-		  4,  5,  6,  6,  5,  7, // back
-		  8,  9, 10, 10,  9, 11, // top
-		 12, 13, 14, 14, 13, 15, // bottom
-		 16, 17, 18, 18, 17, 19, // left
-		 20, 21, 22, 22, 21, 23, // right
-	});
-	SetTexture({
-		{ 0.0f, 1.0f, 0.0f }, // front
-		{ 1.0f, 1.0f, 0.0f },
-		{ 0.0f, 0.0f, 0.0f },
-		{ 1.0f, 0.0f, 0.0f },
-		{ 1.0f, 1.0f, 0.0f }, // back
-		{ 1.0f, 0.0f, 0.0f },
-		{ 0.0f, 1.0f, 0.0f },
-		{ 0.0f, 0.0f, 0.0f },
-		{ 0.0f, 0.0f, 0.0f }, // top
-		{ 0.0f, 1.0f, 0.0f },
-		{ 1.0f, 0.0f, 0.0f },
-		{ 1.0f, 1.0f, 0.0f },
-		{ 1.0f, 0.0f, 0.0f }, // bottom
-		{ 0.0f, 0.0f, 0.0f },
-		{ 1.0f, 1.0f, 0.0f },
-		{ 0.0f, 1.0f, 0.0f },
-		{ 0.0f, 1.0f, 0.0f }, // left
-		{ 1.0f, 1.0f, 0.0f },
-		{ 0.0f, 0.0f, 0.0f },
-		{ 1.0f, 0.0f, 0.0f },
-		{ 1.0f, 1.0f, 0.0f }, // right
-		{ 1.0f, 0.0f, 0.0f },
-		{ 0.0f, 1.0f, 0.0f },
-		{ 0.0f, 0.0f, 0.0f },
-	});
 	SetOutline({
 		{ bb.min.x, bb.min.y, bb.min.z }, // back
 		{ bb.max.x, bb.min.y, bb.min.z },
@@ -240,142 +61,6 @@ StairBounds::StairBounds(const AABB &bb, const glm::vec2 &clip)
 : CollisionBounds()
 , top({ { bb.min.x, clip.y, bb.min.z }, { bb.max.x, bb.max.y, clip.x } })
 , bot({ bb.min, { bb.max.x, clip.y, bb.max.z } }) {
-	SetShape({
-		{ top.min.x, top.min.y, top.max.z }, // front, upper
-		{ top.max.x, top.min.y, top.max.z },
-		{ top.min.x, top.max.y, top.max.z },
-		{ top.max.x, top.max.y, top.max.z },
-		{ bot.min.x, bot.min.y, bot.max.z }, // front, lower
-		{ bot.max.x, bot.min.y, bot.max.z },
-		{ bot.min.x, bot.max.y, bot.max.z },
-		{ bot.max.x, bot.max.y, bot.max.z },
-		{ bot.min.x, bot.min.y, bot.min.z }, // back
-		{ bot.min.x, top.max.y, bot.min.z },
-		{ top.max.x, bot.min.y, bot.min.z },
-		{ top.max.x, top.max.y, bot.min.z },
-		{ top.min.x, top.max.y, top.min.z }, // top, upper
-		{ top.min.x, top.max.y, top.max.z },
-		{ top.max.x, top.max.y, top.min.z },
-		{ top.max.x, top.max.y, top.max.z },
-		{ bot.min.x, bot.max.y, top.max.z }, // top, lower
-		{ bot.min.x, bot.max.y, bot.max.z },
-		{ bot.max.x, bot.max.y, top.max.z },
-		{ bot.max.x, bot.max.y, bot.max.z },
-		{ bot.min.x, bot.min.y, bot.min.z }, // bottom
-		{ bot.max.x, bot.min.y, bot.min.z },
-		{ bot.min.x, bot.min.y, bot.max.z },
-		{ bot.max.x, bot.min.y, bot.max.z },
-		{ top.min.x, top.min.y, top.min.z }, // left, upper
-		{ top.min.x, top.min.y, top.max.z },
-		{ top.min.x, top.max.y, top.min.z },
-		{ top.min.x, top.max.y, top.max.z },
-		{ bot.min.x, bot.min.y, bot.min.z }, // left, lower
-		{ bot.min.x, bot.min.y, bot.max.z },
-		{ bot.min.x, bot.max.y, bot.min.z },
-		{ bot.min.x, bot.max.y, bot.max.z },
-		{ top.max.x, top.min.y, top.min.z }, // right, upper
-		{ top.max.x, top.max.y, top.min.z },
-		{ top.max.x, top.min.y, top.max.z },
-		{ top.max.x, top.max.y, top.max.z },
-		{ bot.max.x, bot.min.y, bot.min.z }, // right, lower
-		{ bot.max.x, bot.max.y, bot.min.z },
-		{ bot.max.x, bot.min.y, bot.max.z },
-		{ bot.max.x, bot.max.y, bot.max.z },
-	}, {
-		{  0.0f,  0.0f,  1.0f }, // front x2
-		{  0.0f,  0.0f,  1.0f },
-		{  0.0f,  0.0f,  1.0f },
-		{  0.0f,  0.0f,  1.0f },
-		{  0.0f,  0.0f,  1.0f },
-		{  0.0f,  0.0f,  1.0f },
-		{  0.0f,  0.0f,  1.0f },
-		{  0.0f,  0.0f,  1.0f },
-		{  0.0f,  0.0f, -1.0f }, // back
-		{  0.0f,  0.0f, -1.0f },
-		{  0.0f,  0.0f, -1.0f },
-		{  0.0f,  0.0f, -1.0f },
-		{  0.0f,  1.0f,  0.0f }, // top x2
-		{  0.0f,  1.0f,  0.0f },
-		{  0.0f,  1.0f,  0.0f },
-		{  0.0f,  1.0f,  0.0f },
-		{  0.0f,  1.0f,  0.0f },
-		{  0.0f,  1.0f,  0.0f },
-		{  0.0f,  1.0f,  0.0f },
-		{  0.0f,  1.0f,  0.0f },
-		{  0.0f, -1.0f,  0.0f }, // bottom
-		{  0.0f, -1.0f,  0.0f },
-		{  0.0f, -1.0f,  0.0f },
-		{  0.0f, -1.0f,  0.0f },
-		{ -1.0f,  0.0f,  0.0f }, // left x2
-		{ -1.0f,  0.0f,  0.0f },
-		{ -1.0f,  0.0f,  0.0f },
-		{ -1.0f,  0.0f,  0.0f },
-		{ -1.0f,  0.0f,  0.0f },
-		{ -1.0f,  0.0f,  0.0f },
-		{ -1.0f,  0.0f,  0.0f },
-		{ -1.0f,  0.0f,  0.0f },
-		{  1.0f,  0.0f,  0.0f }, // right x2
-		{  1.0f,  0.0f,  0.0f },
-		{  1.0f,  0.0f,  0.0f },
-		{  1.0f,  0.0f,  0.0f },
-		{  1.0f,  0.0f,  0.0f },
-		{  1.0f,  0.0f,  0.0f },
-		{  1.0f,  0.0f,  0.0f },
-		{  1.0f,  0.0f,  0.0f },
-	}, {
-		 0,  1,  2,  2,  1,  3, // front, upper
-		 4,  5,  6,  6,  5,  7, // front, lower
-		 8,  9, 10, 10,  9, 11, // back
-		12, 13, 14, 14, 13, 15, // top, upper
-		16, 17, 18, 18, 17, 19, // top, lower
-		20, 21, 22, 22, 21, 23, // bottom
-		24, 25, 26, 26, 25, 27, // left, upper
-		28, 29, 30, 30, 29, 31, // left, lower
-		32, 33, 34, 34, 33, 35, // right, upper
-		36, 37, 38, 38, 37, 39, // right, lower
-	});
-	SetTexture({
-		{ 0.0f, 0.5f, 0.0f }, // front, upper
-		{ 1.0f, 0.5f, 0.0f },
-		{ 0.0f, 0.0f, 0.0f },
-		{ 1.0f, 0.0f, 0.0f },
-		{ 0.0f, 1.0f, 0.0f }, // front, lower
-		{ 1.0f, 1.0f, 0.0f },
-		{ 0.0f, 0.5f, 0.0f },
-		{ 1.0f, 0.5f, 0.0f },
-		{ 1.0f, 1.0f, 0.0f }, // back
-		{ 1.0f, 0.0f, 0.0f },
-		{ 0.0f, 1.0f, 0.0f },
-		{ 0.0f, 0.0f, 0.0f },
-		{ 0.0f, 0.0f, 0.0f }, // top, upper
-		{ 0.0f, 0.5f, 0.0f },
-		{ 1.0f, 0.0f, 0.0f },
-		{ 1.0f, 0.5f, 0.0f },
-		{ 0.0f, 0.5f, 0.0f }, // top, lower
-		{ 0.0f, 1.0f, 0.0f },
-		{ 1.0f, 0.5f, 0.0f },
-		{ 1.0f, 1.0f, 0.0f },
-		{ 1.0f, 0.0f, 0.0f }, // bottom
-		{ 0.0f, 0.0f, 0.0f },
-		{ 1.0f, 1.0f, 0.0f },
-		{ 0.0f, 1.0f, 0.0f },
-		{ 0.0f, 0.5f, 0.0f }, // left, upper
-		{ 0.5f, 0.5f, 0.0f },
-		{ 0.0f, 0.0f, 0.0f },
-		{ 0.5f, 0.0f, 0.0f },
-		{ 0.0f, 1.0f, 0.0f }, // left, lower
-		{ 1.0f, 1.0f, 0.0f },
-		{ 0.0f, 0.5f, 0.0f },
-		{ 1.0f, 0.5f, 0.0f },
-		{ 1.0f, 0.5f, 0.0f }, // right, upper
-		{ 1.0f, 0.0f, 0.0f },
-		{ 0.5f, 0.5f, 0.0f },
-		{ 0.5f, 0.0f, 0.0f },
-		{ 1.0f, 1.0f, 0.0f }, // right, lower
-		{ 1.0f, 0.5f, 0.0f },
-		{ 0.0f, 1.0f, 0.0f },
-		{ 0.0f, 0.5f, 0.0f },
-	});
 	SetOutline({
 		{ bot.min.x, bot.min.y, bot.min.z }, // bottom
 		{ bot.max.x, bot.min.y, bot.min.z },