From 34935940f21b1e33bef1a66ce0562bffe2a6808e Mon Sep 17 00:00:00 2001 From: ducphamhong Date: Wed, 5 May 2021 21:56:17 +0700 Subject: [PATCH] #123 Update viewpoint texture --- Assets/Editor/Font.meta | 3 - Assets/Editor/Fonts.meta | 3 + Assets/Editor/{Font => Fonts}/droidsans.ttf | Bin .../Editor/{Font => Fonts}/droidsans.ttf.meta | 0 Assets/Editor/Textures.meta | 3 + Assets/Editor/Textures/oxyz.png | Bin 0 -> 24155 bytes Assets/Editor/Textures/oxyz.png.meta | 3 + Assets/Editor/Textures/oxyz.psd | Bin 0 -> 111157 bytes Assets/Editor/Textures/oxyz.psd.meta | 3 + .../Source/Editor/Space/Scene/CSpaceScene.cpp | 2 +- .../Viewpoint/CViewpointData.cpp | 75 +++++++++++++++--- .../Viewpoint/CViewpointData.h | 2 +- .../Viewpoint/CViewpointRenderer.cpp | 5 +- .../Editor/Source/GUI/Theme/CThemeConfig.cpp | 2 +- 14 files changed, 83 insertions(+), 18 deletions(-) delete mode 100644 Assets/Editor/Font.meta create mode 100644 Assets/Editor/Fonts.meta rename Assets/Editor/{Font => Fonts}/droidsans.ttf (100%) rename Assets/Editor/{Font => Fonts}/droidsans.ttf.meta (100%) create mode 100644 Assets/Editor/Textures.meta create mode 100644 Assets/Editor/Textures/oxyz.png create mode 100644 Assets/Editor/Textures/oxyz.png.meta create mode 100644 Assets/Editor/Textures/oxyz.psd create mode 100644 Assets/Editor/Textures/oxyz.psd.meta diff --git a/Assets/Editor/Font.meta b/Assets/Editor/Font.meta deleted file mode 100644 index 0c5a08248..000000000 --- a/Assets/Editor/Font.meta +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Assets/Editor/Fonts.meta b/Assets/Editor/Fonts.meta new file mode 100644 index 000000000..0848e1182 --- /dev/null +++ b/Assets/Editor/Fonts.meta @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Assets/Editor/Font/droidsans.ttf b/Assets/Editor/Fonts/droidsans.ttf similarity index 100% rename from Assets/Editor/Font/droidsans.ttf rename to Assets/Editor/Fonts/droidsans.ttf diff --git a/Assets/Editor/Font/droidsans.ttf.meta b/Assets/Editor/Fonts/droidsans.ttf.meta similarity index 100% rename from Assets/Editor/Font/droidsans.ttf.meta rename to Assets/Editor/Fonts/droidsans.ttf.meta diff --git a/Assets/Editor/Textures.meta b/Assets/Editor/Textures.meta new file mode 100644 index 000000000..133bd24ca --- /dev/null +++ b/Assets/Editor/Textures.meta @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Assets/Editor/Textures/oxyz.png b/Assets/Editor/Textures/oxyz.png new file mode 100644 index 0000000000000000000000000000000000000000..4a78cdfa0dee9cd71b405c19c28cf20ad5541722 GIT binary patch literal 24155 zcmeI42{_c-|M9_Q@I*OYSP1E&A#AN+3^n%Ii*QF8 z1p6T@f=w*p!5(lG7hx?;X7wOdz6+>C_jXdf|Mcz4waD?Qc{tUQBYJ;QQ9LU3w)M_Doe{kAy5@n1vyoytkBmV zVNGVBr0(b9s%oyc|7&x=Ck`M9GnD6~83F93dj z{FfLpNY}sU2<6FNsv&}qf1yTsvZ}VSrdFp~9iXnd*AD^1p!_URC{NAR32UUc3n~yTsV@Dq%8!Nf!x};lhCyh`LS=>>B`Nc(uZ zsZ0N;q>@}&y{d-ZXbj97jxf~I1S+JENEcNY4CbmVqlkbgKxLdEF0S&55EW-A3?l0c zS5|RxR&jQ5Ud3T-Os)QlX+0F&pR$1f)2qJ51qBDpe_u$dDl!NaC={*;0m#82GBOBf zh_j-K62uiQgMcc!$jQ69%B*k)8lp1xOGBo9NWc}sJgH7p+*$71H2;ff_~B{( z@226$Du%nmyxkBkn$q7!_O0T7apvGC?*N3~KiNdUR)qmU5yB6x>FS5_5`y{ocp~92 z%7&B<@OJqcRebkjLKu_~m9t&tPG#eNajY%~Kjc4Ir&PWCj!EeMvoZhso%y%UyVYr3 z-MZ?vxlwnAV(OPwO0|mjqC8Q4#wZtrCJ-_G zn4}-oKbD0$CG}JVB6}dpTsgosfsEppx}W83C=t4+|4Ia|Bnt(8q-7|-zp7F{{#n)b zKdVwd{#o^hrj<7mqbd8fwV$e~v?%$p>dL4sfIA_CrlNv^oPxUa&(%L`m?47@o;G?& zAU8u(atv7o#ji>~Kl!bu?O$qAJ^8A+I@475H!BWiwHCM?0xqVczu!##;(J!z!GHPp zk0Je+4O5$2Z-ko0n&ov|Ya*f+SjR<8W6kn9t~C)+3#{X!rm<#u9oL$Os0G$>QPWtn zypC&4MAQQ7xTtBYSzgDrCL(HqbzIam)-12%S`!hqz&b8!8f%u$uiLL@lt6i<-uo<#k+ZBBB;p$3;zJ&GI^~H4#w@tmC4lv1WN4*P4i^1=ev<(^#{- zj%!Us)B@|csA;TOUdOd2B5HwkT+}qyEU)8Q6A`t*IxcD&YnIn>t%-z4VjWx^b zxYk5OEwGM@n#P*tbzEyAq83=kMNMPP@;a_H5m5`QeKp!Z|xA&K10={S5xC2M_%6HMS_oHmYwk9BL*hUZ0xd3J0q zjuO>ve4Dsy`#EjhgSyZ2iaL#JZ#0SC&=cFalYej1o&(PH%%?nUw;s~HRx)iSbV5Xi zjf-zUOzx7}lD=S+YFFUmhmf+RD;4;AF$a!~&vt6!?=7|7GR@G>xpj+ChmDz2Usq_u zIS`#rBAw8N6QUp;Hc^@lCxn=^+2{;GCxk@f!^6V+&Xp>*QhhX(?e@%q$wgK6V%i1}o<5;gLyst4PVXee8DR=8Y$9)73b48x?j~Ho zH$)QvHU;zJc>7hk$mc-MZf>&K5W1C5VCMb}Tx=7b!AWaUu7@VmFyC|vMXQJbXXA2l zj=63RI#?4Ys@?rP86(JtYOb8~I7~DG*Dkl^Gdh43X#@*JVJbPcWrhMvv$Y*OQ_@UA zxp8DkC*DaR=+oZwK__x5y{*KN>`_=l(3W{!omrRPeOk2LQxkMCpFR>;G*VtRQ*d7_R?SoN?8_il06EC-ok@ocYt z3{H@?t_tOpawnBrEK{nt+lg#KH!Vox&34NceKO`~Qa>+#Ua1Yw>DR6W&gZ_Ug3gP{ ziht!gg^D0UP4AYA&3Ke^c6xpEjm5GM&s+c<{#en?^|`>Zx{0R>FGi{~00}ZyNWFeo zXjk2Wslx9g`HSOZO5O>^R$UA*-&MTxEFTv+Wuf&F=p{}+$<`ZYzEM5$5}L6Jf12dK z6Q`E+G5rwKq53@l0;mwf<@(-IW`0wkSKY}~g}+Ji7sVZO5_r&Q)zolulojb6i;Z0# zH2}qP4TO%DY+(+q!}YO|d6pWKXbysTqGQ`^^d5WEM`P=j2hW4d30qwPtUHaLD#$3{ ztFd6>pa@C|YPGHEwPnBXu_{VMnSu?wPso*`4{d(Qmrb`#6357qCawmD3|;W;HX2v> zbKzmE6#{e1K7o38-f}FCwu51E-rB=?;nRf%z9MP&*CezTO})r~e}`N0W>>%ab3suk z0j=B1a|!-|!4Aapv305Tw)}HU(8DUxF>T8%!NkFHK)+gh^L(zPqvYtc29{tZDUzhOL(!2W5T0AaBmC$vHhuUrv|HuY;_LW z5e5AT5m$M!`@GUNH+ab`G!D95mO0@k1AX6Q*KkL@X0E8`k!i(M|Kt4j2@kI424*`R zcBo5!yY;*&?#;^!-f>^@yiyeKq4%*{rD8O^xWO3}Y}f+`lz)>x4S{9o6|rfCL^9uK66W5_^eMu!(j!%m-BW7kgiW^IQQAiLyGBjl0D4v{kDBt z)(PXIHR$fS@x5C^W|8}i!^D$FCwJnIip}BP2#CMQebmf{vl}7$p=zX&CF}PACZkvG zC_!HEV%_v(^18PSb$rH$9x9A)PO~du%IuWv<)_sT4lgeL6gBAa^yJY`caLc{jZOe& zAOcvJsu2dWYE&0WGTZ&9)qHG+z zPJlK{tK7N$#SKezNdldjTL>31Wpl@y=5dwYhTa4`w6j_4Q}0CXu-4?`@f(&!Ci-AL zmk=&lh~SrS*V%i;rG3(@fhW&lrhvT?^kwP86VhN)p!m&U!M3A`bWmlcq}qp}ZRJxT zXeY^&8zn3G!pS}t2IU=bXS;&ck@4wIRXMbc&9B|RdzMCnX?XtKCn*`yW>0=X?BS5fr%ho(ljE*%XPglhoAAi4%c2p_fU#4M?#FuHnSX zx9xjJu`?M>_eo8TfSjefga|u{T$1$`nB?VHaRUi%ph4$J{;5C){BiJ!uE+Nas{*sT zxp&*ExYc(vD=Gp_3Fk*0tP8>45+t|@XdAtGlV9{6o4rr-^__|Aa98_t_a+VtFbSof zGVpX)>0NkDULJaHN?^l$K4$w#>)kIU*M*my@mjPmpojns?zH#FxYIXL-`I2T ze0Ynijb=SZ8mpv;xyd%E>GWZ@H*Y^A%>yfSQ@dRVK5Tg>@5S`4W~FzYPoc$I&Zh2- zOlFr1j}5gcei$f9v363ih3I5mK3Ean7(&aAZ$FV4czH_snUlemB*o=r*G1cJf?a^1 z*4YrHWx&^u7Zq7&x1UJC^Mu;gC?H;mI7aT%lu9Efco~K0_iDL=haTK%vG4fM`{LaP zlr~Xu(+hcfvl_)dnMV4t=48;_N%H48&ilEhH%RF?`gSyLZR1pHYm0-D)p1m|pX+7c zx<>zxb|1-vVw$mKe{4g;9*6g87_!bFSlz=YPtKqCN}@qsL-n2TwFOVP?VJr;?G8&A zWAT^5Q=~r$loe(&IbG(~*uF)Tlw!T{dgpLRz!}TUMRERm6iXSM~kD$#O^eM#=H%VimEWqAth@vt>qO z5DF}vcBC&Jq93M4N2Z6!DW3+Y3dXP)* z(F4U>vT{#&#yl?j(zZDnUQ#)aRGTSybp z@gI22shoLa_&Fc>Qt^ybj|2G%(XCvxZEtpS%RRU7!{iZy05;skPOqt_zjFJ7hhsg4 z-EK)|W8PzS%qH>LsPyk!jGUsR$wq46hZDb+pjSmrYHX|g-aQYo# zb7kmz*{9?;)=wPY6>s;onY%~kdm(eA>~^{l3JU!H)Gee!?giCI3~-fl42aeFi80TxgXK4MVx z%l(-ve(VapS~R2?Ly!i+Z%?XNs#7qITSkSA%ru!XflJT=&BdN+D-mpC@0*APqQX(W zH?!QIO*FVqOl8M}bw;g5ldlLINap`Jl-5Ce?-tIBp^@o7w6v^w8=bhmDg)ycDm zi1q_oamTyxbX$Rlcq^`EkFv=WDv4ac6W~ra&h7TT#QIw(eWbk~O*q*rh1za;|KY}! z0Gv~M>pbh^ZRPq)`c|x7on5*_`yQ>aqOLMuw_PvNg&x&o(_^yoqOg_AYV7HBN;DqT zNT-&ZR56%u$P}u8eEV>qaqeKM{T{E^``bM$_EqmnF9?pt(k|;ic|3Ep=p=95?6C`EmmNv214G$RSH%!KYZ|BY{)nbqEtB=u2Jq^R#4qboVa)+h2 z8Jtr%uT+J-qW1V9trBfvgcfh+ypmPdMW=zb@F_z$`7|Cc(02fvyhg(Co`3>tRCV$H8rI#kruP`VU&tvHO}Ohs8_gAJyaG zP6fd}t;+Xm((R6+QB&SlXM(N7FYVk-N}^+n^X?HRoF*J}Ixp4`h4jBG7r~UXsmt$Z zES7WF?S%lWaM7AElqYp_oZ^`BT%Y%)Sy~`HbOh4FNhW;||NQRpp5(oR3?DW0mz;?W zy;?G#jfR-sFg?COVmf_hezQS$$4QnGi8kAqB7_XUY;-ytxc`)k|0*KzSw$e|S)iCf z@ys-@D1&YS6Tv)YVd(^$NCbNci|&=WZr)Q8hsi9BG3C8=<-DhqS+~(S^i8nnVqQp! zki=+G^&viDK3kysq8nTdZ_9~4)9ySi{$$8p{8>P!SXOxK9;Tfn$gKu?9oBHV)D58= zsrw$s>S{)pOZ*W#y+H^taLP!afNfshRf=U9NWod{c~o_nw28b@>VAnhA{^CaWETsM=xKvXKSC-SP9cSU%=yHjAbF_yy}4pweDMBY$v$$o{T6rS3`2ef+*`B&`E51Vql&6If%v0M|8MIY3=*~%ZU zUwy5Sjm$8Ab~jDjA>*u@TmdyU2dbUQV+^x|NE@dF^}(qd$3P=DXG2ngxzD%Ln^{kx z63MqY2?v}+%*0-Y9J=W|bCa(15RreNJ9;v3oMBv-q53oTEj6pVS57q>5&4I-Vgx0@ z;jDW&@e#J!&WDq6Wl`9Zz>clO(v|33aecLMSHQj$N8(CuUW*`aC^>v&puT8Vq@v>G zYCJuuQvLpTO8vc0CO(f&*FZ>+Nx{Qlo6}3-7LAqW+!pq10NaKR!CdNmjT#E}|B^{N(ckhL^X(G!qiztV~+;KZo33$GSRe0vF*sPYV;cJfI}B?m$C3@}bg})ZwAU}}?&2GEtZl$5 zG7;LEj~a=0{n5c3^>dOc5 zeZ$Wm+tCO}Ym6<-J=o3P7ygO2X!kI&@XVz$P68t?_F(?~ZlNm}Ba7F0xO|av^$C&* zLf|IvYXy~UoELytZ^E(m6}FLX(v+{F=cI+qDZoaUJIAv#dc4&4vc5wW|-dtcBEbO#uB7KH{1lBlT zax~S>he_xi+sB0Nyw^G0JxXZ>#25y96CCm!h&c^e#-T046TiG2>KZxGlbM+Z!ZT?B zpv?S8T=u#$4yARxxkQ%s?^&n^{rpDuP4Af}`S;llckz&Bcj%h{6$s=$ns$DSIbwM<&1g1T%Lpzj*yRR zxsw&g?k8YdXCT1jR1&Wst%8l2V1waXL&7=3SyM+dc2{nc+zV~OCIV@s$EW4U4IxEf z;y8)n)ojCQ)x9s-SSh&<>w}^%)kU+PGal|S+fA4lM>PVb`CJUPoXDc&98VSX38-hU z%k62x1F@9@i-XUczG*hKZKJv697WdK(abzqzQnKGs%3wS^=pex%goT5f@y;)dL`(& zU{U}vbFizsv6R$)4So+~OC#}=bh0+@p$4-_HCy+NXAr#I$FMo2z_r`u#9 zrk=#AH+Gx8f6AnM+WPgG(<9)MLyKADylDYBlPS~487Xj-;9v}#a^g*R&H|xQmbNqb zEY?KvHf&=lsNsNmUZ3sWIu6!pL3tX_^Feksir+q|(|ZPND@uF?Wm zSilYD@=9jG;n;V)_U(hyeA^J0LEE(tN6B20pR8o7<0UiAWO#vt1cq5(> zYM}vP)uX`S2Dd$**v%&Fcisrx1|CbY;jh^aIJYY73Cay+Fs_*c)i=NMO z^tsSx+It4|@gKRbeaZsNPGxw2hZwxim+)754Ykt(r+q5f($sX|aOJ6qMe?H(i%rrO z=4)P}2@emx!e7L*y_|@_8WGRD0V~h!DcN>Oj7MC95RSF-XfpWAgu7~{Bh6g&#oCh1LC-S#*nyKO zP=0$8q;|u7iMH#`UR!&+b;+un+G^06L|3Fal0h@;Yh}U!Z6{-=M8nA}jX4ONgTg#t zH6B4qXWR7oqV~!8wuGxW)y}l0=&hPn6ly1Vx9kwl% zb&O-st(`WMZhqhDn}P1=JI|JIMn2srp2geu{YOp&72!tq01?bYmCaN@kE@g7Du-Svo#-0u0t?Y*f`}#x|>^Um=DrlH7y_x zS_xbfDjWb_RVYW&yO%RJ`ipvWEm&Kop9?<$WK~2p28LY5c@?v>YDG;0A9}lTHqGXk z$QmCeiZBWBbrDQ)ED@IoJB_ZgzZbgtrvKK+Zum_P|?dw@vHQcXgmZ4p0TN9iLc5Nsy_GCb~)Q zV-dpyeP71ZINBHm@_ya|-bb8+Tby?LR7LiP%F|F@+*Blk;J)3`ST?>*tQO)2R$f}= zS9CLAz$-7Ud>LLj+`ybJpte;f9Z8A0ba)zep{ TZjhmT{k!2l6TN(0rxX7JbA^9R literal 0 HcmV?d00001 diff --git a/Assets/Editor/Textures/oxyz.png.meta b/Assets/Editor/Textures/oxyz.png.meta new file mode 100644 index 000000000..fe67edce1 --- /dev/null +++ b/Assets/Editor/Textures/oxyz.png.meta @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Assets/Editor/Textures/oxyz.psd b/Assets/Editor/Textures/oxyz.psd new file mode 100644 index 0000000000000000000000000000000000000000..de38718bfbe1d636e792f69da1f01babc3928c21 GIT binary patch literal 111157 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 P8$V>8%tZe;ndiR%`QJ#j literal 0 HcmV?d00001 diff --git a/Assets/Editor/Textures/oxyz.psd.meta b/Assets/Editor/Textures/oxyz.psd.meta new file mode 100644 index 000000000..907f5a124 --- /dev/null +++ b/Assets/Editor/Textures/oxyz.psd.meta @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Projects/Editor/Source/Editor/Space/Scene/CSpaceScene.cpp b/Projects/Editor/Source/Editor/Space/Scene/CSpaceScene.cpp index 93ef48ad6..250ada53d 100644 --- a/Projects/Editor/Source/Editor/Space/Scene/CSpaceScene.cpp +++ b/Projects/Editor/Source/Editor/Space/Scene/CSpaceScene.cpp @@ -205,7 +205,7 @@ namespace Skylicht core::vector3df up(matData[4], matData[5], matData[6]); up.normalize(); - float distance = 2.5f; + float distance = 2.0f; core::vector3df pos = -dir * distance; m_viewpointCamera->setPosition(pos); diff --git a/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointData.cpp b/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointData.cpp index 53f65f0a1..78b5a4713 100644 --- a/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointData.cpp +++ b/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointData.cpp @@ -26,7 +26,7 @@ This file is part of the "Skylicht Engine". #include "CViewpointData.h" #include "Projective/CProjective.h" #include "Material/Shader/CShaderManager.h" - +#include "TextureManager/CTextureManager.h" #include "GameObject/CGameObject.h" #include "Camera/CCamera.h" @@ -37,11 +37,14 @@ namespace Skylicht CViewpointData::CViewpointData() { Buffer = new CMeshBuffer(getVideoDriver()->getVertexDescriptor(EVT_STANDARD)); - Buffer->getMaterial().MaterialType = CShaderManager::getInstance()->getShaderIDByName("VertexColor"); + Buffer->getMaterial().MaterialType = CShaderManager::getInstance()->getShaderIDByName("TextureColorAlpha"); Buffer->getMaterial().BackfaceCulling = false; Buffer->setHardwareMappingHint(EHM_STREAM); - const float p = 1.0f; + ITexture* texture = CTextureManager::getInstance()->getTexture("Editor/Textures/oxyz.png"); + Buffer->getMaterial().setTexture(0, texture); + + const float p = 0.8f; Position[0].set(p, 0.0f, 0.0f); Position[1].set(-p, 0.0f, 0.0f); @@ -67,12 +70,12 @@ namespace Skylicht idx[i * 6 + 5] = i * 4 + 3; } - SColor blue = SColor(255, 65, 105, 140); + SColor blue = SColor(255, 44, 143, 255); SColor red = SColor(255, 155, 65, 80); SColor green = SColor(255, 105, 140, 45); core::vector3df zero(0.0f, 0.0f, 0.0f); - float s = 0.7f; + float s = 0.8f; addLineVertexBatch(zero, Position[0] * s, red); addLineVertexBatch(zero, Position[2] * s, blue); addLineVertexBatch(zero, Position[4] * s, green); @@ -83,7 +86,7 @@ namespace Skylicht } - void CViewpointData::updateBillboard(const core::vector3df& look, const core::vector3df& up) + void CViewpointData::updateBillboard(const core::vector3df& look, const core::vector3df& up, const core::vector3df& campos) { video::S3DVertex* vtx = (video::S3DVertex*)Buffer->getVertexBuffer()->getVertices(); @@ -97,17 +100,67 @@ namespace Skylicht sideQuad *= 0.25f; SColor color(255, 255, 255, 255); - core::vector2df uvScale(1.0f, 1.0f); + core::vector2df uvScale(0.5f, 0.5f); core::vector2df uvOffset(0.0f, 0.0f); + // sort to fix alpha depth + std::vector> sortPosition; + for (int i = 0; i < 6; i++) + { + float d = Position[i].getDistanceFromSQ(campos); + sortPosition.push_back(std::pair(i, d)); + } + struct { + bool operator()(const std::pair& a, const std::pair& b) const { return a.second > b.second; } + } customLess; + std::sort(sortPosition.begin(), sortPosition.end(), customLess); + for (int i = 0; i < 6; i++) { int offset = i * 4; - int offsetVertex = offset; - float x = Position[i].X; - float y = Position[i].Y; - float z = Position[i].Z; + int id = sortPosition[i].first; + + float x = Position[id].X; + float y = Position[id].Y; + float z = Position[id].Z; + + if (id == 1) + { + // -x + uvOffset.set(0.5f, 0.5f); + color.set(255, 154, 57, 71); + } + else if (id == 3) + { + // -y + uvOffset.set(0.5f, 0.5f); + color.set(255, 52, 100, 154); + } + else if (id == 5) + { + // -z + uvOffset.set(0.5f, 0.5f); + color.set(255, 98, 138, 34); + } + else if (id == 0) + { + // x + uvOffset.set(0.0f, 0.0f); + color.set(255, 255, 255, 255); + } + else if (id == 2) + { + // y + uvOffset.set(0.0f, 0.5f); + color.set(255, 255, 255, 255); + } + else if (id == 4) + { + // z + uvOffset.set(0.5f, 0.0f); + color.set(255, 255, 255, 255); + } // top left vertex vtx[offset].Pos.set( diff --git a/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointData.h b/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointData.h index 225a3e0e9..965bded54 100644 --- a/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointData.h +++ b/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointData.h @@ -56,7 +56,7 @@ namespace Skylicht virtual ~CViewpointData(); - void updateBillboard(const core::vector3df& look, const core::vector3df& up); + void updateBillboard(const core::vector3df& look, const core::vector3df& up, const core::vector3df& campos); EAxis hit(CCamera* camera, float x, float y, int viewportW, int viewportH); }; diff --git a/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointRenderer.cpp b/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointRenderer.cpp index eefdddc6b..146366e10 100644 --- a/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointRenderer.cpp +++ b/Projects/Editor/Source/EditorComponents/Viewpoint/CViewpointRenderer.cpp @@ -24,6 +24,7 @@ This file is part of the "Skylicht Engine". #include "pch.h" #include "CViewpointRenderer.h" +#include "Entity/CEntityManager.h" namespace Skylicht { @@ -90,6 +91,8 @@ namespace Skylicht look.normalize(); up.normalize(); + core::vector3df camPos = entityManager->getCamera()->getGameObject()->getPosition(); + for (u32 i = 0, n = m_viewpoints.size(); i < n; i++) { driver->setTransform(video::ETS_WORLD, transforms[i]->World); @@ -101,7 +104,7 @@ namespace Skylicht for (u32 i = 0, n = m_viewpoints.size(); i < n; i++) { driver->setTransform(video::ETS_WORLD, transforms[i]->World); - viewpoints[i]->updateBillboard(look, up); + viewpoints[i]->updateBillboard(look, up, camPos); IMeshBuffer* buffer = viewpoints[i]->Buffer; driver->setMaterial(buffer->getMaterial()); diff --git a/Projects/Editor/Source/GUI/Theme/CThemeConfig.cpp b/Projects/Editor/Source/GUI/Theme/CThemeConfig.cpp index 52d61f33d..4da9a2ccc 100644 --- a/Projects/Editor/Source/GUI/Theme/CThemeConfig.cpp +++ b/Projects/Editor/Source/GUI/Theme/CThemeConfig.cpp @@ -32,7 +32,7 @@ namespace Skylicht namespace GUI { std::string CThemeConfig::FontName = "Droid Sans"; - std::string CThemeConfig::FontPath = "Editor/Font/droidsans.ttf"; + std::string CThemeConfig::FontPath = "Editor/Fonts/droidsans.ttf"; SGUIColor CThemeConfig::White = SGUIColor(255, 255, 255, 255); SGUIColor CThemeConfig::Black = SGUIColor(255, 0, 0, 0);