namespace blank {
const BlockType BlockType::DEFAULT;
+const NullShape BlockType::DEFAULT_SHAPE;
void BlockType::FillVBO(
const glm::vec3 &pos,
std::vector<glm::vec3> &colors,
std::vector<glm::vec3> &normals
) const {
- vertices.emplace_back(pos.x , pos.y , pos.z + 1); // front
- vertices.emplace_back(pos.x + 1, pos.y , pos.z + 1);
- vertices.emplace_back(pos.x , pos.y + 1, pos.z + 1);
- vertices.emplace_back(pos.x + 1, pos.y , pos.z + 1);
- vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z + 1);
- vertices.emplace_back(pos.x , pos.y + 1, pos.z + 1);
- vertices.emplace_back(pos.x , pos.y , pos.z ); // back
- vertices.emplace_back(pos.x , pos.y + 1, pos.z );
- vertices.emplace_back(pos.x + 1, pos.y , pos.z );
- vertices.emplace_back(pos.x + 1, pos.y , pos.z );
- vertices.emplace_back(pos.x , pos.y + 1, pos.z );
- vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z );
- vertices.emplace_back(pos.x , pos.y + 1, pos.z ); // top
- vertices.emplace_back(pos.x , pos.y + 1, pos.z + 1);
- vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z );
- vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z );
- vertices.emplace_back(pos.x , pos.y + 1, pos.z + 1);
- vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z + 1);
- vertices.emplace_back(pos.x , pos.y , pos.z ); // bottom
- vertices.emplace_back(pos.x + 1, pos.y , pos.z );
- vertices.emplace_back(pos.x , pos.y , pos.z + 1);
- vertices.emplace_back(pos.x + 1, pos.y , pos.z );
- vertices.emplace_back(pos.x + 1, pos.y , pos.z + 1);
- vertices.emplace_back(pos.x , pos.y , pos.z + 1);
- vertices.emplace_back(pos.x , pos.y , pos.z ); // left
- vertices.emplace_back(pos.x , pos.y , pos.z + 1);
- vertices.emplace_back(pos.x , pos.y + 1, pos.z );
- vertices.emplace_back(pos.x , pos.y + 1, pos.z );
- vertices.emplace_back(pos.x , pos.y , pos.z + 1);
- vertices.emplace_back(pos.x , pos.y + 1, pos.z + 1);
- vertices.emplace_back(pos.x + 1, pos.y , pos.z ); // right
- vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z );
- vertices.emplace_back(pos.x + 1, pos.y , pos.z + 1);
- vertices.emplace_back(pos.x + 1, pos.y , pos.z + 1);
- vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z );
- vertices.emplace_back(pos.x + 1, pos.y + 1, pos.z + 1);
-
- colors.insert(colors.end(), 6 * 6, color);
-
- normals.insert(normals.end(), 6, glm::vec3( 0.0f, 0.0f, 1.0f)); // front
- normals.insert(normals.end(), 6, glm::vec3( 0.0f, 0.0f, -1.0f)); // back
- normals.insert(normals.end(), 6, glm::vec3( 0.0f, 1.0f, 0.0f)); // top
- normals.insert(normals.end(), 6, glm::vec3( 0.0f, -1.0f, 0.0f)); // bottom
- normals.insert(normals.end(), 6, glm::vec3(-1.0f, 0.0f, 0.0f)); // left
- normals.insert(normals.end(), 6, glm::vec3( 1.0f, 0.0f, 0.0f)); // right
+ shape->Vertices(vertices, pos);
+ colors.insert(colors.end(), shape->VertexCount(), color);
+ shape->Normals(normals);
}
void BlockType::FillOutlineVBO(
std::vector<glm::vec3> &vertices,
std::vector<glm::vec3> &colors
) const {
- vertices = std::vector<glm::vec3>({
- { 0.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, 0.0f },
- { 1.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 0.0f },
- { 1.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 0.0f },
- { 0.0f, 1.0f, 0.0f }, { 0.0f, 0.0f, 0.0f },
- { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 1.0f },
- { 1.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, 1.0f },
- { 1.0f, 1.0f, 0.0f }, { 1.0f, 1.0f, 1.0f },
- { 0.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 1.0f },
- { 0.0f, 0.0f, 1.0f }, { 1.0f, 0.0f, 1.0f },
- { 1.0f, 0.0f, 1.0f }, { 1.0f, 1.0f, 1.0f },
- { 1.0f, 1.0f, 1.0f }, { 0.0f, 1.0f, 1.0f },
- { 0.0f, 1.0f, 1.0f }, { 0.0f, 0.0f, 1.0f },
- });
- colors.resize(24, outline_color);
+ shape->Outline(vertices);
+ colors.insert(colors.end(), shape->OutlineCount(), outline_color);
}
if (!blocks[id].type->visible) {
continue;
}
- const AABB bb{{x, y, z}, {x+1, y+1, z+1}};
float cur_dist;
glm::vec3 cur_norm;
- if (blank::Intersection(ray, bb, M, &cur_dist, &cur_norm)) {
+ glm::vec3 pos(float(x) + 0.5f, float(y) + 0.5f, float(z) + 0.5f);
+ if (blocks[id].type->shape->Intersects(ray, glm::translate(M, pos), cur_dist, cur_norm)) {
if (cur_dist < closest_dist) {
closest_id = id;
closest_dist = cur_dist;
int Chunk::VertexCount() const {
- // TODO: query blocks as soon as type shapes are implemented
- return Size() * 6 * 6;
+ int count = 0;
+ for (const auto &block : blocks) {
+ count += block.type->shape->VertexCount();
+ }
+ return count;
}
void Chunk::Update() {
model.Clear();
model.Reserve(VertexCount());
- for (int i = 0; i < Size(); ++i) {
- if (blocks[i].type->visible) {
- blocks[i].type->FillModel(ToCoords(i), model);
- }
+ for (size_t i = 0; i < Size(); ++i) {
+ blocks[i].type->FillModel(ToCoords(i), model);
}
model.Invalidate();
World::World()
: blockType()
+, blockShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }})
+, stairShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f })
+, slabShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }})
+, blockNoise(0)
+, colorNoise(1)
, chunks() {
- blockType.Add(BlockType(true, glm::vec3(1, 1, 1)));
- blockType.Add(BlockType(true, glm::vec3(1, 0, 0)));
- blockType.Add(BlockType(true, glm::vec3(0, 1, 0)));
- blockType.Add(BlockType(true, glm::vec3(0, 0, 1)));
+ blockType.Add(BlockType{ true, { 1.0f, 1.0f, 1.0f }, &blockShape }); // white block
+ blockType.Add(BlockType{ true, { 1.0f, 1.0f, 1.0f }, &stairShape }); // white stair
+ blockType.Add(BlockType{ true, { 1.0f, 1.0f, 1.0f }, &slabShape }); // white slab
+ blockType.Add(BlockType{ true, { 1.0f, 0.0f, 0.0f }, &blockShape }); // red block
+ blockType.Add(BlockType{ true, { 1.0f, 0.0f, 0.0f }, &stairShape }); // red stair
+ blockType.Add(BlockType{ true, { 1.0f, 0.0f, 0.0f }, &slabShape }); // red slab
+ blockType.Add(BlockType{ true, { 0.0f, 1.0f, 0.0f }, &blockShape }); // green block
+ blockType.Add(BlockType{ true, { 0.0f, 1.0f, 0.0f }, &stairShape }); // green stair
+ blockType.Add(BlockType{ true, { 0.0f, 1.0f, 0.0f }, &slabShape }); // green slab
+ blockType.Add(BlockType{ true, { 0.0f, 0.0f, 1.0f }, &blockShape }); // blue block
+ blockType.Add(BlockType{ true, { 0.0f, 0.0f, 1.0f }, &stairShape }); // blue stair
+ blockType.Add(BlockType{ true, { 0.0f, 0.0f, 1.0f }, &slabShape }); // blue slab
}
void World::Generate() {
- for (int z = -1; z < 2; ++z) {
- for (int y = -1; y < 2; ++y) {
- for (int x = -1; x < 2; ++x) {
+ for (int z = -2; z < 3; ++z) {
+ for (int y = -2; y < 3; ++y) {
+ for (int x = -2; x < 3; ++x) {
Generate(glm::vec3(x, y, z));
}
}
chunks.emplace_back();
Chunk &chunk = chunks.back();
chunk.Position(pos);
- chunk.BlockAt(glm::vec3(0, 0, 0)) = Block(blockType[4]);
- chunk.BlockAt(glm::vec3(0, 0, 1)) = Block(blockType[1]);
- chunk.BlockAt(glm::vec3(1, 0, 0)) = Block(blockType[2]);
- chunk.BlockAt(glm::vec3(1, 0, 1)) = Block(blockType[3]);
- chunk.BlockAt(glm::vec3(2, 0, 0)) = Block(blockType[4]);
- chunk.BlockAt(glm::vec3(2, 0, 1)) = Block(blockType[1]);
- chunk.BlockAt(glm::vec3(3, 0, 0)) = Block(blockType[2]);
- chunk.BlockAt(glm::vec3(3, 0, 1)) = Block(blockType[3]);
- chunk.BlockAt(glm::vec3(2, 0, 2)) = Block(blockType[4]);
- chunk.BlockAt(glm::vec3(2, 0, 3)) = Block(blockType[1]);
- chunk.BlockAt(glm::vec3(3, 0, 2)) = Block(blockType[2]);
- chunk.BlockAt(glm::vec3(3, 0, 3)) = Block(blockType[3]);
- chunk.BlockAt(glm::vec3(1, 1, 0)) = Block(blockType[1]);
- chunk.BlockAt(glm::vec3(1, 1, 1)) = Block(blockType[4]);
- chunk.BlockAt(glm::vec3(2, 1, 1)) = Block(blockType[3]);
- chunk.BlockAt(glm::vec3(2, 2, 1)) = Block(blockType[2]);
+ if (pos.x == 0 && pos.y == 0 && pos.z == 0) {
+ for (size_t i = 1; i < blockType.Size(); ++i) {
+ chunk.BlockAt(i) = Block(blockType[i]);
+ chunk.BlockAt(i + 257) = Block(blockType[i]);
+ chunk.BlockAt(i + 514) = Block(blockType[i]);
+ }
+ } else {
+ for (int z = 0; z < Chunk::Depth(); ++z) {
+ for (int y = 0; y < Chunk::Height(); ++y) {
+ for (int x = 0; x < Chunk::Width(); ++x) {
+ glm::vec3 block_pos{float(x), float(y), float(z)};
+ glm::vec3 gen_pos = (pos * Chunk::Extent() + block_pos) / 64.0f;
+ float val = blockNoise(gen_pos);
+ if (val > 0.8f) {
+ int col_val = int((colorNoise(gen_pos) + 1.0f) * 2.0f) % 4;
+ chunk.BlockAt(block_pos) = Block(blockType[col_val * 3 + 1]);
+ }
+ }
+ }
+ }
+ }
chunk.Invalidate();
return chunk;
}
projects / blank.git / blobdiff