From 5c9c9fe6c774df3a3857049637d490cf8fdbfafd Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Wed, 4 Apr 2007 01:54:18 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@913 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- packages/misc/{newchars.png => chars.png} | Bin packages/misc/radaroverlay.png | Bin 9217 -> 4644 bytes source/src/protos.h | 2 +- source/src/rendergl.cpp | 11 ++++++----- source/src/renderhud.cpp | 16 +++++++++++++++- source/src/rendertext.cpp | 2 +- 6 files changed, 23 insertions(+), 8 deletions(-) rename packages/misc/{newchars.png => chars.png} (100%) diff --git a/packages/misc/newchars.png b/packages/misc/chars.png similarity index 100% rename from packages/misc/newchars.png rename to packages/misc/chars.png diff --git a/packages/misc/radaroverlay.png b/packages/misc/radaroverlay.png index fc30640f55baa1e682d8b9342a438f340838823e..a31b5dc423f9dff3c08ab6a84d2e7af6eea3d2ea 100644 GIT binary patch literal 4644 zcmaJ_c|6qJ_y5dd>_b@!V;@WQkhPeSWh{|oDWNRoiA*SKW`V=lkpT-}k;=_rC6VpL6dy=f3W__uPBa<(RFofV2Pr0K#ay zqpkn|+UWu~KG;r6Z+`xp!H==?iU0sXvELO06yDpr1M)_qove9>p-{ls1jJYSTTV98 z+B4EBEHpImQY2s%9(Xn~FhC(HIP!vm+l4>{TeOqQa)8Pu0N7QCK6=0w#DdB4kzE7%%~PdUj-tzL72s`9yoyUaU}YE%k2*?$@VIRR>bJ0q=B;sk7Z*^_0< zUp-6wCjWJaKV8GC9%2J})@tW1V{T6G#U5jBHv_=Kt@ zJ1c%lI6Q#9xojzv${yO*5B{RTQNTCbX;O_z=n3NCrN!*$m$IqbOKOjYwy5h@7{;WV z4T_%1dXFlcBgqQnW`%*F2l4F7jE8yg3pF+LV)Fp!-YRZY)jR6&=y#7z`RyC=40OZ8 zWcGIt%CK+VX=`E)EAW%ash?x~@2%s9UiH>uw_(qp%dd3p;bt!`QYS?c^tx+mJow^M z$iY^hl`*62#eIW(*NUiIj?nVNHjcEt2(j2&NV*YGRL-?H)ft5{C%@1m$kmi-Yqyb} zzk}e?YTLVqvFnIc*M%#+ePQGAjyMYNl%28_(s5 zNU!0O#ygP~x@tB&&QODFBDD(#D z29d*IctoEJ;|xcGybJfRTninGB%v76lZGQV)-IT7%h11 zv^g9)W-EN98VHdOe0K8c%87t9FMDbgq2jjII7>WP)-8HyRxO(=NlAvyW1Q z+^}nppbv0}L^R`tfBUQ^G7R>~Z#z$7jIWz~A{ES?`;@!)+-4sS61);UpA*gO7JN&Y$_nHixPTu82ksgw3r4G|-UYwN3JUJl>S={;x&zfu%6rO9qfutSs|q!0*A!im0;eKwh!YCGRWVqW;ggwL51_CAvYQV z$IqtnCe#SLTrvR7Cv^x3t4!B*LM*3!xdphj4jRVYaZCr%OFI6hY8$k+Al|Mt{{C%+ zQplc+S*rTXV8Z!B=E=2u#s>Qz-@vGr7Aw7)%|s10)HU{b!y1akt}>2u!kv0ve>@Tq zEOW&r`i0qJm*VDP@xO|`AtDgsKF>6;QK4$dqwvaLR|>QwPa??gnu+6=L4=#hlUl38upy$A$t}I)eO0C!h|g8*q>JN<2y2tVru{|NSDBfbZ~9JU z3J%NKVSe%(@y{-La3-7O_B=E1%dOa_hRlgkZ~J@guA_#2wx5ky1LdHh(!go`$A2Fs zq*U`&{v4=k@1H*->8R_D)+@i|C#^dzUpx`mv3BlG#d{N^iHx>-)8AKoMdwP$iMfc~ z_ipE6*Iw%KMatX1zM+{o64xs3Nq-r|A0*?0R>+a)Sa{WK8T+*r+9+K6CiL~Cj@@6= z1T>Ad_wYF6ydzp1YUOc=)Z}ii`HE{fO~_V(s(AA5UlY(U+TMcxa(0akpgxZ!T1jaEsNtCf9J=vi%!q zOF(@>PuiECqG9LBf|UGLKv`A8*kDFtd?t}sB``kZDaY%!2bGBnZXAj!tqu3CKwbF! zk6*3UWnLY~A;3`PgV=ZJki}oEJT5G?SzJ(g%-pk%fz!b09~=Xb&EiD#f)OnWNRT8H zIQ*l*`6DR%XPyx-tF?u_@3K47_jo9V`RBlFnTJ;>mKj z1PbXi3yTFL?7sDa_-H|PS8pVesFK0R1)SZcgETPadNfQk{nNL_tc5am+6UhOV9k?B zb%j6fs`-O_d3%-WzJvU~%oq2F7!T75$>o#)-f7g^#BF)vg=T`F! zflMzZwhZB#CUT@9iJ@zRMMG9@1acwMS*H&2QQ+OAFYFpw6F!8e#c;(oFu*?u`cXDv z+tw$T(%0>~1*(__r1>64B|EIf+4ypg#2B zv_+hqDo^tSIGQYnd#)uP=Z;6p8GWGYFC0m!Vn=jS>jbxj0AQkNfm_J1JJ|kvOQ>^| zR)-&U=tr??9g-x*K-t>Dst4}rzzb_&s6D*eEfA&C2)9T<8Yl`hUKbzY*nyNZstMa0 zv@3aM#9vWu%xed)G?&5u|uowpcz+FgT>hj9OF`1GN5Pw({3Xh>qu z$6Y+)aS%Nvnx1H9HZL^qpNL53GZA_d*#2bt@23LlOqk#2*JaXE{ZA#Q_Hj35>;5|H za(gg-FtO3O^vEqIt_7YmxIaiw+hj|9Cyj!rL|{`* z)wca^8^mt!6dm=te@-2XT$HL+VvozT{HrBF@Yhs=zJC{iVo~l@kAJ5j&P`)y7Hugcw@7;U@Vd zId@7xw`ph!Ts&Mbr=%MKChF)tWQf$R6H&8QO3@8(5fXb>;a7&f=t)QI6%IAatjzlQ zh@2kkw~5 z3v5p>ib>#{ldHwsG?o&G7EY@eeX;Y?N=_?Ud?{ z_l$lKD_h2}^m^xBo_(}uvbrG3{la)4&$S0BJx7Gk|GpFZh~3-(;k;z&k3s!yp^1~P zQ^(p~b8-__k1Rfcj_P|R8g*bMJDphAQ>2*tS5Nx>2q`4ykz0(w^(Q%@;8#*QXkBt> zDD>P@_E`Jd5u?@ozW0WCZ8bd4Hf!K{+W|T=U#IfhOuTiN2A~!*Z|2~zk^I||aJ}_) zrFL08=dD`vIm0{U15T#-zhd`O;dO(Pc=>BitAQ(0yb)pIk4txw1kz+#uOr;Sbjok( z_PKR2Kd;Rv%a|g{)BZe!WBZBga!Hk`)Qlt@2UDFzLJ}qFR=;(`8=uWpQbvdlT?a$8=k=YH!;7H|2!Q zWM*#hhwwhy+ZuFgp-DvPI6+B^)DkcIFTkD)Dgm z{@6;rrf7jmgT2(hDfokfpF=iQ(!85}QZIF?RioZyhm0#X284SFA20c9CT_FK942DX6`&?uFNi*2j9GwuBC+KOMcae@3SkU`0PQ^7lcRaA_ERw2Fu;BT zNvM%9JkA?%%aS%tAPtMU10R8CI5`HG1>$#+=WmFt?!r9>+W2YGINwmC^+117pR{N+s+WliN(XX*RiG8ZAUtUZHZqoUNUe+n6L3k$C;YIIUArKsCg3 r19zw<mK4h#+}*u&H>QY$BsTb;+Oaz=*8$- literal 9217 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 bV-bKto^$ZpFN~i#VTI7pSFgEY6Z!uDlmkE$ diff --git a/source/src/protos.h b/source/src/protos.h index 5da4d0c7..159441aa 100644 --- a/source/src/protos.h +++ b/source/src/protos.h @@ -48,7 +48,7 @@ extern void box(block &b, float z1, float z2, float z3, float z4); extern void dot(int x, int y, float z); extern void linestyle(float width, int r, int g, int b); extern void blendbox(int x1, int y1, int x2, int y2, bool border, int tex = -1); -extern void quad(GLuint tex, float x, float y, float s, float tx, float ty, float ts); +extern void quad(GLuint tex, float x, float y, float s, float tx, float ty, float tsx, float tsy = 0); extern void circle(GLuint tex, float x, float y, float r, float tx, float ty, float tr, int subdiv = 32); extern void gl_drawframe(int w, int h, float changelod, float curfps); extern void clearminimap(); diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp index 8e069bb1..9bce1a3e 100644 --- a/source/src/rendergl.cpp +++ b/source/src/rendergl.cpp @@ -77,14 +77,15 @@ void box(block &b, float z1, float z2, float z3, float z4) xtraverts += 4; } -void quad(GLuint tex, float x, float y, float s, float tx, float ty, float ts) +void quad(GLuint tex, float x, float y, float s, float tx, float ty, float tsx, float tsy) { + if(!tsy) tsy = tsx; glBindTexture(GL_TEXTURE_2D, tex); glBegin(GL_QUADS); - glTexCoord2f(tx, ty); glVertex2f(x, y); - glTexCoord2f(tx+ts, ty); glVertex2f(x+s, y); - glTexCoord2f(tx+ts, ty+ts); glVertex2f(x+s, y+s); - glTexCoord2f(tx, ty+ts); glVertex2f(x, y+s); + glTexCoord2f(tx, ty); glVertex2f(x, y); + glTexCoord2f(tx+tsx, ty); glVertex2f(x+s, y); + glTexCoord2f(tx+tsx, ty+tsy); glVertex2f(x+s, y+s); + glTexCoord2f(tx, ty+tsy); glVertex2f(x, y+s); glEnd(); xtraverts += 4; } diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index 3e41fcb6..4ffa9b40 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -145,6 +145,8 @@ bool insideradar(const vec ¢erpos, float radius, const vec &o) return o.distxy(centerpos)<=radius; } +VAR(foop, 0, 10, 1000); + void drawradar(int w, int h) { vec center = showmap ? vec(ssize/2, ssize/2, 0) : player1->o; @@ -155,13 +157,14 @@ void drawradar(int w, int h) float radarsize = worldsize/res*radarviewsize; float iconsize = radarentsize/(float)res*radarviewsize; float coordtrans = radarsize/worldsize; + float overlaysize = radarviewsize*4.0f/3.25f; glPushMatrix(); if(showmap) glTranslatef(VIRTW/2-radarviewsize/2, 0, 0); else { - glTranslatef(VIRTW-radarviewsize-10+radarviewsize/2, 10+radarviewsize/2, 0); + glTranslatef(VIRTW-radarviewsize-(overlaysize-radarviewsize)/2-10+radarviewsize/2, 10+(overlaysize-radarviewsize)/2+radarviewsize/2, 0); glRotatef(-camera1->yaw, 0, 0, 1); glTranslatef(-radarviewsize/2, -radarviewsize/2, 0); } @@ -207,6 +210,17 @@ void drawradar(int w, int h) glEnable(GL_BLEND); glPopMatrix(); + + if(!showmap) + { + glDisable(GL_CULL_FACE); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glColor3f(1, 1, 1); + static Texture *overlaytex = NULL; + if(!overlaytex) overlaytex = textureload("packages/misc/radaroverlay.png", 3); + quad(overlaytex->id, VIRTW-overlaysize-10, 10, overlaysize, 0.5f*team_int(player1->team), 0, 0.5f, 1.0f); + glEnable(GL_CULL_FACE); + } } void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwater) diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp index e54e2eed..2c92320a 100644 --- a/source/src/rendertext.cpp +++ b/source/src/rendertext.cpp @@ -181,7 +181,7 @@ void draw_textf(const char *fstr, int left, int top, ...) void draw_text(const char *str, int left, int top) { static Texture *charstex = NULL; - if(!charstex) charstex = textureload("packages/misc/newchars.png"); + if(!charstex) charstex = textureload("packages/misc/chars.png"); glBlendFunc(GL_ONE, GL_ONE); glBindTexture(GL_TEXTURE_2D, charstex->id);