From beea89699d2c7efed8b8f16cf68bb607c8c8d9db Mon Sep 17 00:00:00 2001 From: Piotrek Date: Mon, 26 Apr 2021 14:07:56 +0200 Subject: [PATCH] testing 48x48x48 world and different scales --- src/app/mod.rs | 4 ++-- src/renderer/buffers/mod.rs | 2 +- src/shaders/bin/shader.frag.spv | Bin 14428 -> 14488 bytes src/shaders/raycasting.cginc | 4 ++-- src/shaders/shader.frag | 6 ++++-- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/app/mod.rs b/src/app/mod.rs index 9ed1847..d848a38 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -25,9 +25,9 @@ impl App { let mut world_gen = WorldGen::new(); let start = std::time::Instant::now(); - for x in 0..32 { + for x in 0..48 { for y in 0..16 { - for z in 0..32 { + for z in 0..48 { world_gen.generate(&mut renderer, Point3{x, y, z}); } } diff --git a/src/renderer/buffers/mod.rs b/src/renderer/buffers/mod.rs index ffb0e63..029c5ec 100644 --- a/src/renderer/buffers/mod.rs +++ b/src/renderer/buffers/mod.rs @@ -3,7 +3,7 @@ pub const BLOCK_SIZE : usize = 32; // 32x32x32 block size pub const BLOCK_TEX_SIZE : usize = 64; // 64x64 blocks in texture -pub const NODE_TEX_SIZE: usize = 32; // 32x32x32 nodes in texture +pub const NODE_TEX_SIZE: usize = 48; // 32x32x32 nodes in texture pub const NODE_TEX_LEN: usize = NODE_TEX_SIZE*NODE_TEX_SIZE*NODE_TEX_SIZE; // Number of u32 in node texture diff --git a/src/shaders/bin/shader.frag.spv b/src/shaders/bin/shader.frag.spv index d305dd6690424608bc2c2684e643da407b43dfe3..7887910df3b031ca9ddb31f5fdec8b6bace020d9 100644 GIT binary patch delta 2862 zcmZ9O%WqXx6vp?xZSMu7ys9m!0m@6jB0_l~XM`_|fPuYJxst9*Ox{o{>w z`MJdqa$!Pf42Lf?_BY(jg;4%vXR(mGmXr!jN9Cu7Dkt}zIvpB9eYgX!l+N}YsRVdK zsLO|Nta9XNsd9E(>8x6Pc;tbW@fu_GkpK>8^e|4W?^-;ZH#vw{P2;J z1H&h3CoYDcI9xg~d?r0GJz?31Ry$$&m>eq~;&q`1e(G2)cEG(uLkB31Tn+h9zVt!y zquf+)K2wojKesAhdU5=g`f59H9MWanA@po)gZ~01OW1?8z<+}qqo)4`oPVjlF5{+G zGv9L7dV-CY7g#4ktSO$i2!7`C_STLV(1FlFz+%G3v-T#lC$&`jQFnB%SRc1N2OoI1 zr91NH;WsWG?2fxO!`)+?KFi(8Y6)J!a^*fHwU}oR9>SNs#%}|A72-FK1iWHE+r>UN zc)wlnde)fWb^Sdb_L-mru7mEzJWyUva+4QSP5lz))A|Z;7hcQSp6T!K%H%J@ElGU? zn)_bG+_!4fz8#q!_w9sRsrtDr*K1(&;j5;}dPuMvVIQm4h(+uHtH)$}!D?PDCff%# zp}zH8(&wnw$who?`@!w3gW2H+;A;K`!Ob<>Z)Z?La1UEg81*>Q!{-#yAS<|j<;4m~Qq%UaI( zmE?=1kI(-ZwikPgi}=2;g4Mdg)}Zfd(zvX*bPdGNN#FD|R!2(Y^Wct@$P;{ylgRZu zP9k@8oJ4NE=H%05?N!l?Q63}OMsfX)mblZ*j+V$h*|8G2e#c7Wu8x(+2jM*#rvnS= zP`I9yI-07#lIl8U-#8k6$85~_DsN>P8Ah}}GL2>A_5KMlR^N8?e(VB|+t21NG|w?+ zE1!hDbsLOcO`Y)cBc;UjefSm(@N02?-Np9dTY*`qv+Q1`%T4$<+C6!09GH!25B*$oS)HL9fzc=h{e$HU~>+TZZ7F2z>QP4$!%RVaf1dHvl6l|or zX`C-=u{~CR)$}=A?^?5F%{OaS`SA5`ChN*d z8>&Jm3ALdvjGeFRuee$gLhh5pRh1=I3i--aiTw1~)T!L`=}-~M!*%#n{%r5~RDf56 z($Wwnr^Zj@r_LV8pH(Xl)$>})YvuW={E1MsFImJ_!H-S6IzhPeel6| z>$@U<9Da4?m9Ds|AMP6cw3+VH%%zzvRE&GjfX8sgLM<&Fv1A4$B0S12v(25j)2uXS`0P} zHlVgn4(WGP>);^X+6cIjc_`aF4_EUy6!sNQcQh0I$kFjwrs+Evs?u*a3Ne8G+WWD& zsr5WMdv5u)^|jv-<6FjbD7@Lcrtf>;*Nm?inl3P|v*Hr7zgwiK&qapXjZm86o6JWu zeyMPw`M%9Rz;cYYIEeRs8LZX?PICZXF05_oNv?qCIq6NWWVWM3z6oweiM)W#ZW6h6 zyGi8Ec9Y1BXE#~M?IsI&;q#WYiG1yyda%nxKlicAL~b5-n8>x;VIp_7!$dv=x5LP- zM?1t%j1f3rr0_;-P4aW5Sx$D0-x$_wyy4$7jU{v1wM=80yY)XH`f59f-p@GCp1!6( z(cDL$0bYtF_ZJvFNsaLI?UHMHO;)%->6 zpG;FOYDozHW}=(N8orHY02gTYMDaBL!QEV+CA1??NFk;N=mTnxrz|mO96(GdwHB?o zk_4ltY{yUz9$~f#$5T~+)g!M2yKs;-4fs~U^-(uyTDD;QwciC+(`L!a#g?nhJ?Y>C zYjCWCY-83*qfXYmx(QlCOTlXK8f?YO;OZaa^C^5eSj|4^8(sIU+~$vd)2 z+yGupKsTsotYPS*udi5p+;k&&agq&a>i8sSW}7mnh4;7_P5nKxw_3M?)wVF+&a`b{ zgK2YfTY*~q8V`ciOvZX?1dlN18ATtec{`$pSRfC9U8rtQ`-xgCkQT6-HhYO&Y#(W2 z#QN9)wm$UHrjNZy-Gr=JiK2fMVgTnDU^iH&+t|f!U?s-8?F9Q&78YO^T>X7c=wJA~+8N!9bD8!S wSe-