From e3d13be8dd373111998cc8a6a1cfff8eb2034c14 Mon Sep 17 00:00:00 2001 From: Vishnu Date: Tue, 1 Jul 2025 13:01:03 +0530 Subject: [PATCH] refactor: change floor and wall props --- app/src/assets/textures/floor/blue.png | Bin 0 -> 15462 bytes app/src/assets/textures/floor/white.png | Bin 15401 -> 14923 bytes app/src/assets/textures/floor/white1.png | Bin 0 -> 14924 bytes .../geomentries/floors/addFloorToScene.ts | 2 +- .../geomentries/floors/loadOnlyFloors.ts | 13 ++++++++++--- app/src/types/world/worldConstants.ts | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 app/src/assets/textures/floor/blue.png create mode 100644 app/src/assets/textures/floor/white1.png diff --git a/app/src/assets/textures/floor/blue.png b/app/src/assets/textures/floor/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..343445d6c21e2eacf2fd739576dd7c3141b56298 GIT binary patch literal 15462 zcmeI3`%fHI6vt<7FL-xx>9DY90pqY;pmDdgjke&E={^KP3JZbFf(cn4jS(ylsjpCB zMl6;`n!Y5BrLIMj5?tD)amypEY)gt&4Alr|meOt{eOLvl+LC|}?<{urAFzqW^TTE) zb29m!nS1t}d(Y=iqctZ(rHoTD45P}*H0LwS3SRyZM6VR6_omYWTb-X_WR8s_{KPOk zlV#pq@FqL$+fcgou^3C<1<%#ODc9HU`;-TE93Jj-e-Jr;bF(_z=zDZ&{`Wa&or2@7 z`q{-Pr_WM+KZ|grbbM+eg`RZc+CRqL7&~idU|4h?D_yDcNAcFRyn9`0uaj^c8qPkJ zn?2pvy&k=QP+5!5jLDNRoEjf_;xN`;G`jeZy(v3h+n?;h&dVivt7R!VYH zw_`c`%8DJPC|)*oI$OJ|9a`j}UcO#tXknyg(W|y&QV>C0!>XASgiFJ)?bdhsHRXmD z??KTU_wlAE7Of1!tzPPOvEX>>)J>H|luezr#X}=fBNSy7Q7CjYzMqFcxe!6 z@b`qA2895sCsa?Ea=<(dCbzI6fMpacqhRd`3wG#oKx+v4Y0yuDCM0xjq1_FP0Kf`> z6`)ao@cy0L^Yhx0lBGkG2xG$Wg1?%A-o7JI^0`Pa4q!a~aO8slo5)BPD7n4X@XWFe zlRwq788b`g4^uuYIa9|62hulELX6u3h`4d)^cjVVdG9 zWyW%cn;v;_udJ^Bs;m-WV+ht7dj_6UaJwkSy>T?De=a=5Z4?|`KO{Hn1V6p?Z^HfB zMc>m3PL`n^V~8m-~OvA$FWoN7I$xn%@V!z);r|7 z*YmcTmt`mh*N^P6sAcsv$ImD@q6orr<>XRBlE6O{P`rLAzRjy-CC~GR4Eq?#6oTbd zWxDVjx)&fJM&1jspc7L zHWleu^j-*vPmSNEPE$!r*Ij9**euzT_EX_00m_-%MB7A=m;O_MZ(l2(ab-A`oDADVsrn zL4e)WatQ$j0R{mEbFlyJgdZ{(WH88Jkij5>5f`*6?tJI~J+a^iBvoZlBB4Y=iG&gf pB@#+xh(kb$gcA9GLPbj}KDioa8m(FrMn4>8vMf2~V@Ah2e*sOA)UN;l literal 0 HcmV?d00001 diff --git a/app/src/assets/textures/floor/white.png b/app/src/assets/textures/floor/white.png index efc1ea41eb1f72421152aacef059fc897a7fb8da..3d3418b950714580e8a20ce33e00df1ff8f3b2c3 100644 GIT binary patch literal 14923 zcmeHOX;2hL6rO3DN-u~RmJo!94970sAXG{sQcRRnaWNvNfMZa=BLNFVB$%B+&{&A5 z0putJlV}+(R}(Y=fhjKnCRPk3fryF{P&t$su>=j9=bz+Xe&t6})jzg&YpeS8``-Ir z&vd`9_pZVJ7jfJ_Nx(tJDX5;EPRN8L*hCy*BM3!|+Uy@4Ktg z+2Na4YlqHS2-ja4JME`c1Qe|`t5@e%x3tX|Zdd14*{q zBt^%{b)h$-FsW8^kyXx(dl;ExWvdGV$1%ZXq*@eDxd=UFk}}?Ze*?nT2&wjXq|*pJ z$0Q|#^lifA3mEui$J(g~Pt4>E6Ep95u*eGI@SM3N2NjW(-%cN^)m0cIW!CvcpIa95 zyg|FU%TD#wl8gK!ZNMK#t4MYD;8q(Hk8wwFSi=mt6rrmA+ri7ldPymrFiX*+Rudfl z#Kb0_k@Z$wq_ORuy_!GZCy492vflxWmaIJL65X^+QqlmSV1TLLj202UeJDw&o&lw%P?sN;v@Yx&9;;;WO}SPMO#_?0ym-7s171{eAIvCKS1_JBO?YY0_w z&$YavX>3O+BSS>3CJ&8bk`30ma952W76Kg2LvKumV4zps5kE<>ht&CKe`i>vf>dN_ zrpk#(`l#LI%%6*Bz8b83ZWmAIIEl?26qt8~Ulbm^j?cDY- zvK6e_og2{MaWFdJm9_*O2Rsi)ZH_9DklwV>dAf?-fakPJsG3g!(-E(i6D|-uJ~a1| zC%^%Mx zl9Vt(jP=fR6!;Rz{#mXU3I~GY{r(dT!aDFR^vN|Sgj}eN&+bPdd;zBQJUxkU1h~hZ zi~|b`fsWUHDkEH{3vYN980|@5{RN8+^VKC_iTV8g0CxNe$l(u@CR11Ct zs^epV$tsAw)wzTOv z)jr5Ue8l5>cq356_9J%BfElc zxknRK9D%yHdua+U@PZ(kRAhjKL2zKF zDS-3Q)|WutYM5v+;d|g>h#-zRaQq60eOPyCiE1+NVOP;`CAJ0J{#UnJAv=g%OHI9{ zJOSX0`)?f(HUJwlcJ6j@3y128ZOpYi>A)K{4z(6w5(A04anS|gLoj@u+59Oi$_L+^ zv}=GU1>lJ0aSXyu;G1j4QH{XI2x5+<7p#yBP)!;rgryFGJ2_pKkE!X&5~Xqo-l?=$IZI)1za0bo}r2S(H1*TYb%z z(Bg#l4~7QlKmJhcO*6;rQ=rGhqU%U+jEH_3bvp#w0AXliO*ZXx(oW}pvD2B_76ys| zo3U3~0NVAWT~FHeq!Ixt5ug$Qs;8lP8mgzE;xj5fqvA8F)TByHs??-PO)6`qvSuo4 vrgs479RPX%ng9LmvL0iwTUBs>@B(kR9m)jx>3nM!i&=jH&}*Wx literal 15401 zcmeHOYfKbZ6rQ;b?JOb=ix7k=19TC(3#p}`m+ z$V^?ac02j|k1IZYb_v6Mea>U<>T=&5uG-UR!-CO!PX@+%&ibbCLXOi_S#~R#69hZ!rq#Qvmis1Q&@s8)pN3Z#ai%Bs)?Ts)* zE%c^MqFLYyIevNTS~a)ie|P)u@V(XqK%|@XX~$T&m)lye?g_Q?$E5+e&2f2_FE@UFGiFv zLfO0@yC;ybR_n$ikh)Bz^R>(M^?pJAjMdg37|yvq(pJ1sGm%HpbvoL9`^pOyzNS>x z$V%;wPVDSbdV2c{BF{F^jIzw_EBlr&Nl4>!IKDn_J>G1!w&L7H9qE4T^O3C7x9;L# zqQoekbaw=YL~t&4di&)ETuI@avP|E)?7KsQK@czq7!MgXT?F7K2{jCgKA0Pbw7=g(|-v4b7&QQBZa#>;W-}98e_@%Ba{V;uy>Y~ z?jpo&QZz_3lQEmNU)(sp8SA+emH%K<=AnR=Fe#js@&{wG1UX%^YFP90WgTPnW2`q$ zzCMy;ZRD~z{`f1^Jq)`wT2o6Cdn)S*u~C(TPn>x*j>^Z9u=f{c9W(h4N%+m~sYDVP zRY}<1s;kv!U`4loOq!3VSTCwc#)4}ME5){*bKse(URlymo?p64-Yv+5#h*oyC{(jb z%6%(&5yzYHZX8YfTg8X^w^^P<_4S=Jmzu@$I#g)xf zKOLdycQmU9OGh5I5@G<}O-EsV@B3z*662fYgFYl`)@11B?}rBPL8y}UzGcRQm5M8$ zNb4I3vEi}RrSGz2f(RK3#v^h?@>fR}U2 ziX!kG0=0>~X&>}a+;X1Zl82}y&8o8Xk9Ttg<&^NX0Z6zfHsK)2psM}nRSl91k_?gz z;PUUggimmP29*pd8B{W;WKhX~T{>Z$G1E8$;1b{x;1b{x;1b{x;Bv<4KfooxCBWtX d7A_xojhWI8R!#h7!vFmxGR?WEr&9Qxe*vB_jtc+) diff --git a/app/src/assets/textures/floor/white1.png b/app/src/assets/textures/floor/white1.png new file mode 100644 index 0000000000000000000000000000000000000000..0270b48c7691eddb3e7656198e7d29ee927ef1a3 GIT binary patch literal 14924 zcmeHOSx^*L6zzUIOb>!KAQGrRnq?qC5hP`#m>3_spc#p5gTgolMZ}b7x#L2&MwZ}8 zST!=lDx(FX3>c7-C>>)osG)+2Vno0g69r_kM3BNE*PrAsU-?L?-p3SEQ@q>f+@-tU zyXWRcsl%--94#1zv5J@%vWQ{Kgx4Pq!7nj3hvvc`cKxF8Am()QTTd89U?M^SW45qQ z@6B(1US~~OdNUVxED@a(vb-M`YnIPZhpo!=uHI6ytUd5qW8+vh!=hYs)9~4Gcjud_ znB(iYvHoXGZy?OM+m0+*`f@n7=Kh=6j5I!Vz{fCNH)xNr4aXVqd|$+(%;|#BRC3)6 zbG=h|jjHx&s3?1}Qf=goZ5+>8^BNa}Hc});QMQ=yA_L(I3eJ$ev&@5Z?G@#KhkY>! zJ6mvu?5GQ2B7ud4X--)#q)U%bkKXk|TOlft=wjRQ9Tb*RdCl(P{%&kBkuzMp_FjOb zKxp;FqWg!)TvlpLKd~mHyik=PW$|_@h4ZE5$8v+^pf0G?a|-?ULArcceIkDq91Rvi@SG+a=0} zjVm_0M`?)8PFvRUw>!K5fyEL(Hx`Y9o$)DyrHmAV(6rV7%V1Fs29EsII~?!tCK#LR zRfUX{4p5HhPbhc}Jo=riT_}5s093ht`RT4irx)d4 zRz7t{SPSOuQ=K8j>LLFwATwTA>nRxfHjM3KBm-QiC*?Y%@Is<{>B0+9A4B%FA1+l` z+CcUdJ*~iw;GwW<8|;viIgYz>>YS})0&?T~?;j+qSSdDRN0z5=9Asb8`8?Z`E|7h_ zO$C@sG{?7FzxRab!}8@5XHH_#0l?)uv!{9LPNx zawwBEtTb!W&{ z{6i>IaL$}ho+%Ml1GeaA%}UY*RXlp^j|7A-!e#xd&EUSq^BVS~7AyonnKa)x!trg8 zL@yFl-~)TWZGJc$a&(4Z++QU#m}>`HDyK|0B2>a1;he*IYheK5xs#*CLW_kK3oRD< zWT8(M`edQ6Ve~bOzJ}2~3*EEOJqz97(+xh|;M3DEdKyMg!|2g5JvydG$Mop<-|MrC zz3NOdsaR-n@&XZ|+3=5F#=eq^$Jt`&F$ui)z;NdAQ2nDBGQ2v9u@)zeTt4HchJ@fj7LQKcqTYEq>pRccaM zGnF+{Su>phpfdn;27nIC(195`F!TSPE;CKeUgJ`CV_!!HjE6E2q3V#+LAqUk0_Ucn AumAu6 literal 0 HcmV?d00001 diff --git a/app/src/modules/builder/geomentries/floors/addFloorToScene.ts b/app/src/modules/builder/geomentries/floors/addFloorToScene.ts index 71f2d24..c0b3453 100644 --- a/app/src/modules/builder/geomentries/floors/addFloorToScene.ts +++ b/app/src/modules/builder/geomentries/floors/addFloorToScene.ts @@ -2,7 +2,7 @@ import * as THREE from 'three'; import * as Types from "../../../../types/world/worldTypes"; import * as CONSTANTS from "../../../../types/world/worldConstants"; -import texturePath from "../../../../assets/textures/floor/white.png"; +import texturePath from "../../../../assets/textures/floor/white1.png"; import texturePathDark from "../../../../assets/textures/floor/black.png"; // Cache for materials diff --git a/app/src/modules/builder/geomentries/floors/loadOnlyFloors.ts b/app/src/modules/builder/geomentries/floors/loadOnlyFloors.ts index 9400be2..4d32979 100644 --- a/app/src/modules/builder/geomentries/floors/loadOnlyFloors.ts +++ b/app/src/modules/builder/geomentries/floors/loadOnlyFloors.ts @@ -3,6 +3,9 @@ import * as turf from '@turf/turf'; import * as CONSTANTS from '../../../../types/world/worldConstants'; import * as Types from "../../../../types/world/worldTypes"; +// temp +import blueFloorImage from "../../../../assets/textures/floor/blue.png" + function loadOnlyFloors( floorGroup: Types.RefGroup, linesByLayer: any, @@ -160,18 +163,22 @@ function loadOnlyFloors( shape.closePath(); const extrudeSettings = { - depth: CONSTANTS.floorConfig.height, + depth: 0.3, bevelEnabled: false }; + const texture = new THREE.TextureLoader().load(blueFloorImage); + texture.wrapS = texture.wrapT = THREE.RepeatWrapping; + texture.colorSpace = THREE.SRGBColorSpace; + const geometry = new THREE.ExtrudeGeometry(shape, extrudeSettings); - const material = new THREE.MeshStandardMaterial({ color: CONSTANTS.floorConfig.defaultColor, side: THREE.DoubleSide }); + const material = new THREE.MeshStandardMaterial({ color: CONSTANTS.floorConfig.defaultColor, side: THREE.DoubleSide, map: texture }); const mesh = new THREE.Mesh(geometry, material); mesh.castShadow = true; mesh.receiveShadow = true; - mesh.position.y = (floor[0][0][2] - 1) * CONSTANTS.wallConfig.height; + mesh.position.y = (floor[0][0][2] - 0.99) * CONSTANTS.wallConfig.height; mesh.rotateX(Math.PI / 2); mesh.name = `Only_Floor_Line_${floor[0][0][2]}`; diff --git a/app/src/types/world/worldConstants.ts b/app/src/types/world/worldConstants.ts index 1d49585..83933b7 100644 --- a/app/src/types/world/worldConstants.ts +++ b/app/src/types/world/worldConstants.ts @@ -331,7 +331,7 @@ export const lineConfig: LineConfig = { export const wallConfig: WallConfig = { defaultColor: "#f2f2f2", // Default color of the walls - height: 7, // Height of the walls + height: 7.5, // Height of the walls width: 0.05, // Width of the walls };