From fd7fd188f086bd5ce4dbe40ee052f1c24eac6365 Mon Sep 17 00:00:00 2001 From: CobaltXII Date: Sun, 30 Dec 2018 17:48:08 -0500 Subject: [PATCH] Added id_sandstone --- src/inc/block.hpp | 6 ++++++ src/inc/face.hpp | 2 ++ src/inc/image.hpp | 6 ++++++ tex/sandstone_bottom.png | Bin 0 -> 638 bytes tex/sandstone_side.png | Bin 0 -> 777 bytes tex/sandstone_top.png | Bin 0 -> 735 bytes 6 files changed, 14 insertions(+) create mode 100755 tex/sandstone_bottom.png create mode 100755 tex/sandstone_side.png create mode 100755 tex/sandstone_top.png diff --git a/src/inc/block.hpp b/src/inc/block.hpp index 078af35..1eae247 100644 --- a/src/inc/block.hpp +++ b/src/inc/block.hpp @@ -23,6 +23,8 @@ enum block_id id_sand, + id_sandstone, + id_gravel, id_brick, @@ -137,6 +139,8 @@ std::vector block_id_to_string = "sand", + "sandstone", + "gravel", "brick", @@ -226,6 +230,8 @@ std::vector block_id_to_block_name = "Sand", + "Sandstone", + "Gravel", "Brick", diff --git a/src/inc/face.hpp b/src/inc/face.hpp index 025bc82..c7e8d4d 100644 --- a/src/inc/face.hpp +++ b/src/inc/face.hpp @@ -86,6 +86,8 @@ void load_block_face_info_array() make_face_info_all(block_name_to_layer.at("sand")), + make_face_info_caps(block_name_to_layer.at("sandstone_top"), block_name_to_layer.at("sandstone_bottom"), block_name_to_layer.at("sandstone_side")), + make_face_info_all(block_name_to_layer.at("gravel")), make_face_info_all(block_name_to_layer.at("brick")), diff --git a/src/inc/image.hpp b/src/inc/image.hpp index ec7dbb8..a650dca 100644 --- a/src/inc/image.hpp +++ b/src/inc/image.hpp @@ -61,6 +61,12 @@ std::vector all_tex = "sand", + "sandstone_bottom", + + "sandstone_side", + + "sandstone_top", + "stone", "water_0", diff --git a/tex/sandstone_bottom.png b/tex/sandstone_bottom.png new file mode 100755 index 0000000000000000000000000000000000000000..e1022209c5106497c0c4ad79635c1f84cab802b2 GIT binary patch literal 638 zcmV-^0)hRBP)HPW4i)$%#M-aNrExkTzr@p$+och4N4j0|Mn6nlRrw#21#pwr!ea!Rko zm^w2QWRRfM1^msRw)-Pw{uIu-2ajy-wl8*G55;>Zj9gH*WH)Xfc9dYdJcqq{DR=9( zgYEY-9P=9B@$?Qwq{&$lWL_QoGyf=y&yhXE-qT^NUclX`2&{hV^CO=lv_=Hfg~E=_ zLueTY%-0gc95g&I2ru@jVuLu*31CdzO`vc9JNeWbC*Z{ins$!aoE#~@s;l(Y1M(Td z{HDTL^`NkkTL|ruAozbPV0)FkZQEf~d#(Ogjc{;G=WPrBA~SK;?YW$bP)8nU#L0}7 zhKGD1_S1d=#kp5u-_?!@>0gEhs_2cN1m+NlJ#CXlRQj*uhgx3h-`%QExa8RFOMrFP zp(GPzu7)o+&!~b|LYlkj!Xz0vaQXSE_!iNe+U-*X>yA9IRJ;2ga$lD!*cKB?=1tHL z&8lQHY@DEs=X4&{BsP+j(To@#OM*jObK_FdMo!*&?4<=toVX+-BR2n_jIUajWg@9` zXMNTNC+>j8Sw$XB+xbu`>ZJ^f7DdQ%XtbSCt^2ksj*&A&Oe7bf)~Y6hR3*C1bwGqP zNiu&4K&8ywNx@b6Trcp(qXe_+`T(E_nmSHSwSyrFp^_mGB)iA;Tsrt}hj Y00`SPPCjF|a{vGU07*qoM6N<$g3b#sO#lD@ literal 0 HcmV?d00001 diff --git a/tex/sandstone_side.png b/tex/sandstone_side.png new file mode 100755 index 0000000000000000000000000000000000000000..1b79145ff09417564fca4b205abe6ca015153fb0 GIT binary patch literal 777 zcmV+k1NQuhP) z zG8<5GW`37a7UUAENJc)Rcxgl-WrUPn=ly)z2u-y^t9#I{?n8)(vnbF{xr^-8v86+YL2%k}p$?_6&IFCh9&K7lG$+*ZCc^%4BG`kJS%sWkL#<#X zqFspI7ZBv!52VkR7>UR{6I{^zs^mhe>cr`xfeE6dRa4nVP1->zvyNKnoNS0k zb33TyR?t$mkx4Ax`|n01Ff}A7((DbH1gi`oli%T!G4xd@szuwd?XnHU^cuvY5fax9 zRo+I(_Y!p)hejA9w#i2n)5}OkXZTbdow}3W%TP*Y#6vTr!2zOyafW#K48rg35gyQ# zcX3W3I&nWm#Q&V37l(Wkj6wUD3tRFQZaaR4&~G{@7{^?kj4t51?PRhC@$|x*ZkPp@ z^EMK99$i{@C}53>9YU8{)Cr2I6&|6KHk04hq2DySPEgKnQBIcmAMt3E?tz1BCULVC z2&vc?%Kj`g5=+m&lDFWB0#ujm2pmp8KOi2`)45Hp+t^B<^9coP0|C!d>VR6gZXePm zq41PVhy_0|g52A|N7~J<4LMm+>=dhF5PI?0p5>L>yC5Ii~_thj&B*ZHWvnzgB*4p1O*NRhlgSWy# z>Q0dz4D{I&Ww1cJ8zb0Wp-wE+v5nN5piM3QpCdiYaI9AN-G7E?;uWf3i7vTD9a>0s z2E4Tn??r?Aa)}}uBlD+--7$`ZjXE{(v%BMSkN55iL>bwtsYz_)2NT}wkc~Rr^(78J zu8_C`q`r>G)o^N-IJb9ba|b<#ovK@iE^|->CN~*;&k*f(WS+@k22m{$dm0gpad_2G z#Rg6_5yx{yE7}eratUv*p^T>7$ZZFm%~SFvEe`kDSVuFZPwJch2P_m~shbEkL*%}J zGMr+!{)Fw*1;U+6k1Xi@}q=QNl5z_XMnuQbK^_>?g!K{Y!v!B3LLO3YN=Oz39B}H4&`fe3z^8}}b!d_W1zWOVuC%El zixeFWpF?E92+?jpsJ1F7$g@jVs!^URT3e7_71R4-MJFDafqT5=D{3-=@HYd5v`T7` zcsd2M7%Um48TQnq&zJl@CaM94$N>*%(rc74-3tu}_xXZ{iJB(uO3AU$Z-|IPLR0Z? zvYD#ctv{m6ukq*j4d>=ob59{fm)q!-$5V8qlKBg?L=Y3Mv^Cs}ly&JrLgvj( z<~Y~4>SjuN#e4U_)H#Y<9h)j~l7HpT)xAiGtd17y3ZJVx@;B518N8B_{s%wfO2*QR R1ULWy002ovPDHLkV1k8lRDb{g literal 0 HcmV?d00001