silly little textured blocks
parent
6e3ed2ce90
commit
67a0aa7a28
|
@ -1,5 +1,5 @@
|
||||||
cmake_minimum_required(VERSION 3.25)
|
cmake_minimum_required(VERSION 3.25)
|
||||||
project(voxel-game VERSION 0.0.3)
|
project(voxel-game VERSION 0.0.4)
|
||||||
|
|
||||||
option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
|
option(ENABLE_ADDRSAN "Enable the address sanitizer" OFF)
|
||||||
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)
|
option(ENABLE_UBSAN "Enable the ub sanitizer" OFF)
|
||||||
|
|
|
@ -0,0 +1,94 @@
|
||||||
|
#pragma once
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2024 Brett Terpstra
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef VOXEL_GAME_BLOCK_H
|
||||||
|
#define VOXEL_GAME_BLOCK_H
|
||||||
|
|
||||||
|
#include <voxel/fwdecl.h>
|
||||||
|
#include <array>
|
||||||
|
#include <variant>
|
||||||
|
|
||||||
|
namespace voxel
|
||||||
|
{
|
||||||
|
enum class face_t : blt::u32
|
||||||
|
{
|
||||||
|
NORTH, SOUTH, EAST, WEST, UP, DOWN, COUNT
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr inline blt::u32 face_to_int(face_t face)
|
||||||
|
{
|
||||||
|
return static_cast<blt::u32>(face);
|
||||||
|
}
|
||||||
|
|
||||||
|
class textured_block_t
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit textured_block_t(texture_id_t id)
|
||||||
|
{
|
||||||
|
for (auto& f : faces)
|
||||||
|
f = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
explicit textured_block_t(texture_id_t top, texture_id_t id)
|
||||||
|
{
|
||||||
|
for (auto& f : faces)
|
||||||
|
f = id;
|
||||||
|
faces[face_to_int(face_t::UP)] = top;
|
||||||
|
}
|
||||||
|
|
||||||
|
explicit textured_block_t(texture_id_t top, texture_id_t bottom, texture_id_t sides)
|
||||||
|
{
|
||||||
|
for (auto& f : faces)
|
||||||
|
f = sides;
|
||||||
|
faces[face_to_int(face_t::UP)] = top;
|
||||||
|
faces[face_to_int(face_t::DOWN)] = bottom;
|
||||||
|
}
|
||||||
|
|
||||||
|
explicit textured_block_t(std::array<texture_id_t, face_to_int(face_t::COUNT)> faces): faces(faces)
|
||||||
|
{}
|
||||||
|
|
||||||
|
texture_id_t get_texture_facing(face_t face)
|
||||||
|
{
|
||||||
|
return faces[face_to_int(face)];
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::array<texture_id_t, face_to_int(face_t::COUNT)> faces{};
|
||||||
|
};
|
||||||
|
|
||||||
|
class block_model_t
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
|
||||||
|
private:
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Defines data about a block
|
||||||
|
*/
|
||||||
|
class block_t
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
private:
|
||||||
|
block_id_t id;
|
||||||
|
std::variant<block_model_t, textured_block_t> model;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif //VOXEL_GAME_BLOCK_H
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <voxel/fwdecl.h>
|
#include <voxel/fwdecl.h>
|
||||||
|
#include <voxel/block.h>
|
||||||
#include <blt/std/hashmap.h>
|
#include <blt/std/hashmap.h>
|
||||||
|
|
||||||
namespace voxel
|
namespace voxel
|
||||||
|
|
|
@ -28,8 +28,11 @@ namespace voxel
|
||||||
inline constexpr blt::u64 CHUNK_SIZE = 32;
|
inline constexpr blt::u64 CHUNK_SIZE = 32;
|
||||||
inline const blt::u64 CHUNK_MASK = static_cast<blt::u64>(std::log2(CHUNK_SIZE));
|
inline const blt::u64 CHUNK_MASK = static_cast<blt::u64>(std::log2(CHUNK_SIZE));
|
||||||
|
|
||||||
|
using block_id_t = blt::u64;
|
||||||
|
using texture_id_t = blt::u64;
|
||||||
using vid_t = blt::u16;
|
using vid_t = blt::u16;
|
||||||
|
|
||||||
|
class block_t;
|
||||||
class chunk_t;
|
class chunk_t;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
/*
|
||||||
|
* <Short Description>
|
||||||
|
* Copyright (C) 2024 Brett Terpstra
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
#include <voxel/chunk.h>
|
Loading…
Reference in New Issue