diff --git a/src/inc/block.hpp b/src/inc/block.hpp index 8146826..ad1401f 100644 --- a/src/inc/block.hpp +++ b/src/inc/block.hpp @@ -93,10 +93,7 @@ enum block_id id_glass, - id_null -}; - -// Returns true if the block is not opaque. Otherwise, returns false. + id_rose, inline bool is_transparent(block_id id) { @@ -107,6 +104,7 @@ inline bool is_transparent(block_id id) id == id_oak_leaves || id == id_birch_leaves || + id_dandelion, id == id_water || @@ -120,6 +118,8 @@ inline bool is_transparent(block_id id) return false; } + id_null +}; // Conversion from block_id to std::string. @@ -212,6 +212,10 @@ std::vector block_id_to_string = "black_wool", "glass", + + "rose", + + "dandelion" }; // Conversion from block_id to std::string (used for in-game text). @@ -305,4 +309,9 @@ std::vector block_id_to_block_name = "Black Wool", "Glass" -}; \ No newline at end of file +}; "Glass", + + "Rose", + + "Dandelion" +}; diff --git a/src/inc/face.hpp b/src/inc/face.hpp index 177ce75..53f7421 100644 --- a/src/inc/face.hpp +++ b/src/inc/face.hpp @@ -154,6 +154,10 @@ void load_block_face_info_array() make_face_info_all(block_name_to_layer.at("wool_colored_black")), - make_face_info_all(block_name_to_layer.at("glass")) + make_face_info_all(block_name_to_layer.at("glass")), + + make_face_info_all(block_name_to_layer.at("rose")), + + make_face_info_all(block_name_to_layer.at("dandelion")) }; } \ No newline at end of file diff --git a/src/inc/image.hpp b/src/inc/image.hpp index b93e2b6..6383e5e 100644 --- a/src/inc/image.hpp +++ b/src/inc/image.hpp @@ -23,6 +23,8 @@ std::vector all_tex = "cobblestone", + "dandelion", + "diamond_ore", "dirt", @@ -61,6 +63,8 @@ std::vector all_tex = "oak_planks", + "rose", + "sand", "sandstone_bottom", diff --git a/tex/dandelion.png b/tex/dandelion.png new file mode 100755 index 0000000..873e3f5 Binary files /dev/null and b/tex/dandelion.png differ diff --git a/tex/rose.png b/tex/rose.png new file mode 100644 index 0000000..1a32cb4 Binary files /dev/null and b/tex/rose.png differ