From 4e5869882e441bf02ab8998e8369d196eb043c55 Mon Sep 17 00:00:00 2001 From: lllzebralll Date: Tue, 28 Jun 2022 19:03:01 +0300 Subject: [PATCH] micro fix --- res/block.png | Bin 264609 -> 264603 bytes src/voxel_engine.cpp | 8 +++++++- src/voxels/WorldGenerator.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/res/block.png b/res/block.png index cf25628e477bf3ef0f05f1333e575c6970a6e8bf..b89677861bda446d15759012688719499c6ded2b 100644 GIT binary patch delta 1890 zcmV-o2c7t#lMtJe5RfDRj*%rIe<==y_kM~x0s;w%<1m`_4f^=?5jp%*S}&@4neG`q$orUl&XVVsA3olM z`>XNHv+yi$gP;4AYpDFRpng8(t8ua4#>?k6`4^Ak!%*h_X}s?n*iTpdfB2lU;t=z5 zXKU9=e(HNrAECV7m^esGc`d8l&c}H7*WI`y^)w&Rw9-t2drFfmB^^;&(&fm0J*P}u z)V#Cv%z5VW8jIq&+=nPvgzR zF!{l)^1Og9Of;VQw%FIZ0aC=?hBHz?AXO5%Z5r@x9z%p$8NhHsCLTHW2YWJaoXvhsJ&2qe!=Wd&f9(EYLavO#e<{9J9Tsz)y`xSlg*k2G z8dVhYEbo4fP1k)C^hToyA)==er&~_DJ!4#{+HI2bl`*=?rqHrzbgSN^!Jr{RX1rII zJ(O5;>@xZla!QxoL?7S1u=Q?nWY)f9s9oWUy84QwhId<2@NSm&T5Gr=A)gu$792n?NkAA39v;Qe>h6Mqs%&b598-EW{Z3}r7#@K z+QqWx(ku-ewn<;R#{-(nI(T0DJj|cgIwn2N&^Q~qda+8+^QBo})ugJ;WVOyW1Sw(q zY$aluyAV;E*B@P!>Je%<1{^etGmG6S8^xeI{S;Rn`0wk>pcy%8^B9L07`x_x=TV_C zgr$#8e}mqIc8HyEU7VSEZlY%RAvv!YbFot znbuOBTq!h$tYyZrwa(lPqVx5jPC;+Z%c8Rts4WMPEWK47?3*d#wD4mj_yd0Mhb}sN zQs=E6?EqfVGx{KUy=MZQ4w@vR*<}?Vc?E&1e~Jl-xVZ!p*_SqQfU!c4gptMHPp(E> zXRSMpY97URLqLd|-c3U1JW?b%rR!f%|PjrMuGX$|tp$sHoC1Vk@$53n49R z@8oGtQ~cNclrC`cAT=H3s%7m0rDr3*J2A6si?x)du_!>d1Va`ZQ^aTu6o$Rkwmo#p zD@iquZgenbS~)Zyv);p=XI`npv5@OMe@Xg?9h}9XTX!p>boDJDn?hjSF5 z;t`U z`&d2}2TT_ZnXe6dx>a!Xd>}&mfe~#j-*yle`p;|QTc*H>^b z**O~}wE20g$rHDhQ1Ab8~Qf% zZRp$3zca&yX zMi;aBCfxx85(@>h*(m-40tN)L*(~=14-*Ih0QdU<0PFPo03s9%v)?fC0}l)d1pxj4 z{s02`{Q&#^|FhsU@&gM1|Nj8-_xu132L!X-IQ9bz3I+lI1_S~C7!C%r-aPgL3j_lL z00;*L00#yGv)@4W0}liN{{Zjv`2Zpl2LR{r`LpCi1_A_-zg2~U?na01MgfQJMgq6) cMgyP16iXxG&0`tHS^xk507*qoM6N<$g8W~tM*si- delta 1906 zcmV-&2aWiflMtbk5RfDRl#wMOe>n<;_kM~#f{;L<<7hOi8`SapQ{?bZX}zefWrkaX zd&)Hc@9`j?{r6wz`4695b9&S~YO6Kz(WWhT9wPnt?Du<1>D*`KEAM0SIZK{jUVJ2l-IJ#<$R52e_f3$Qcv>{O)JebxTZA8QqmEXC0&l}*L}*w zM9n)p_nc=gudyheTb?BqDf$#GDkpnsWtAwo%)CosG=JJ6uXEe$xGBNGOPHC3&4d-N z>-l*2f3Gh$I%nPx3EqFie+s*DzA(s*V!6M}0uVVLJhE4SKd#?D0Lv!ItQ+RQ!Jfw3 z7Q^HRx61PZx-ikW>)T>q?;8*z&NhsZ0s^T@F{zR~XBQ!k0X`keb9pomAP}>>urg~Y z6>uWovsvTvnwu@Z4U<9uVWk!anpQekshZYDT>}nvE2d^v%`L21f3Kx#wOXs!n~U9x ztD9GM4{zS1goZ^8kBAoiX}J}0)mm-dqP5mLhjw=EtnSen7#%mTX5pvHOACAGkf_{XfMm|BT#oq5C(GdoFZeAonM3U!b z={EzUYtLi#I(GB3)yr9P>uGBrX1Ld~XW>Op_wVk$CldLre?3m|wd$~#>+BtMk}1q- z8`H?5m}hzSb8Ncqqo6k$NeB@=l{npU+U*(RO4V+Yps&oPt85Z2i$=HVO&SauB1Fb} zb=gDlHODTaUm+)TIZgEO-3v$W7Ds07ONQDNzNo9ONNQNOH3iRRX|E+0FyhqB`-W5m zuIJny)yw9rf4BqWXtd%?ekmIE=apjjD{=m+8E8rmcf%qbku|Q^Et__5?NodMj6JrW zRj2edPqVR?l#!YR<%Ko7v<-h`p3!E)xl6`WX~BYCu3BYqxUdgpD|nH(@BNl zVAd{{J(p%_V6aW<+HDUgF6&@RAej!K+ z(`PFl%iINz+PwDYB2|x&!!h8XS)5tyX4xnP-KnRT>cD>=UmKbcqc)GxyujEs2Rx4o zjUg;`e{>r3E|f#|83$&N)mTI;P_)CiKF63l>*d=c(QJ#l&?8}Fqs+o>cR^+Lki2H{ zu%0O`)rpltW5`-&99!$m-5@$Y59$=u=DaLAM}gXM5XsV8)xo)$Bu)!EMuI=!2Y;xd z!zX#(>d_A1B|W1Lyw}?k=ycE|7|kxL0Ld!|e^AK|EkM1px%NzF+>jo0b&2#;t6cvc zot?ZnV+83>HrIMqMq0Yf*>yYYEu<@QCkOx>)QU5nx(4rd@`2$rg-^4EHlTnFHH2Cy zSFVdj2*K?Y^{8VYX=pX9A&p2q?QXbgLr}YbSCC(ywoPLqNGP@gUO9A9m`!BoNdu)H ze{~%M01+OY9AqZ8!&;Oi^#;$V5z3rZ79?8V9e-P|Fz3dS?=*A&jcOtJLgG7JkLL4@KPEuWH z&(VO2MTiPZsRZE@1-J*(fNm@|MXoCyB3!Mwj@%*~&(+seZdlMX6SR$-1W4p&%g9F9$ZBqO%Q(=(bn>92YI0ay$-&K3T&tB1H zq*rO@Y$Va<^;nZ0@^vi1D4;OtF4`emVT??Y7rV1G#R?LWS|&&l9&9T3+t~{LXjS47 zlz+$xkle@s`VZ7AU*8E1vQw`g?dZI`4=N~Ku>t{cP`g#+?f%Gb1ON2?z0vnZ-y3~z z^u5vdM&BF#8yoSTG1GBgc{sRNo=JB(+5FZu< zS-C4$l7|M1hd&N@&gY6 z0|EdK3IqV`_WJ-A{syz!H1Y!r6bb|Y3v^008~`v)DZL z0}BTQ1OV{*{QwmW2ea8g_5%+G0{{T;^Z5WD9t;5C?D(_ZL 100 ? 100 : substeps)); physics->step(chunks, hitbox, delta, substeps, shift, player->flight ? 0.0f : 1.0f); camera->position.x = hitbox->position.x; - camera->position.y = hitbox->position.y + 0.5f; + camera->position.y = hitbox->position.y + 0.7f; camera->position.z = hitbox->position.z; if (player->flight && hitbox->grounded) @@ -245,6 +245,12 @@ void update_interaction(Chunks* chunks, PhysicsSolver* physics, Player* player, lighting->onBlockSet(x,y,z, player->choosenBlock); } } + if (Events::jclicked(GLFW_MOUSE_BUTTON_3)){ + int x = (int)iend.x; + int y = (int)iend.y; + int z = (int)iend.z; + player->choosenBlock = chunks->get(x,y,z)->id; + } } } diff --git a/src/voxels/WorldGenerator.cpp b/src/voxels/WorldGenerator.cpp index 60938091..9d6d5afc 100644 --- a/src/voxels/WorldGenerator.cpp +++ b/src/voxels/WorldGenerator.cpp @@ -135,7 +135,7 @@ void WorldGenerator::generate(voxel* voxels, int cx, int cy, int cz){ // id = 10; // } - if ( ((height - (1.5 - 0.2 * pow(height - 55, 4))) < real_y) && (real_y < height)){ + if ( ((height - (1.5 - 0.2 * pow(height - 54, 4))) < real_y) && (real_y < height)){ id = 10; } if (real_y <= 2)