ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.283 by root, Thu Dec 11 00:11:58 2008 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
34 37
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 39
37#include <SDL.h> 40#include <SDL.h>
38#include <SDL_thread.h> 41#include <SDL_thread.h>
42#include <SDL_opengl.h> 45#include <SDL_opengl.h>
43 46
44/* work around os x broken headers */ 47/* work around os x broken headers */
45#ifdef __MACOSX__ 48#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 49typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
50typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
51typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 52#endif
48 53
49#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
51 56
52#include <glib/gmacros.h> 57#include <glib.h>
53 58
54#include <pango/pango.h> 59#include <pango/pango.h>
55 60
56#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 86#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 87#define expect_true(expr) expect ((expr) != 0, 1)
83 88
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 89#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 90
91/* this is used as fow flag as well, so has to have a different value */
92/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 16 93#define FOW_DARKNESS 50
94#define DARKNESS_ADJUST(n) (n)
87 95
88#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
90 98
91#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
92 100
93/* mask out modifiers we are not interested in */ 101/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 102#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 103
96#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
105
106#define TEXID_SPEECH 1
107#define TEXID_NOFACE 2
108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
97 127
98static AV *texture_av; 128static AV *texture_av;
99 129
100static struct 130static struct
101{ 131{
158{ 188{
159 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
160 190
161 while (attrs) 191 while (attrs)
162 { 192 {
163 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 194
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 196 return 1;
167 197
168 attrs = attrs->next; 198 attrs = attrs->next;
186static void 216static void
187substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
188{ 218{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 222#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 224}
195 225
196static void 226static void
413 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
414 } 444 }
415 } 445 }
416} 446}
417 447
418typedef struct { 448struct smooth_key
449{
419 tileid tile; 450 tileid tile;
420 uint8_t x, y, level; 451 uint8_t x, y, level;
421} smooth_key; 452
453 bool operator == (const smooth_key &o) const
454 {
455 return tile == o.tile && x == o.x && y == o.y && level == o.level;
456 }
457};
458
459typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
460
461namespace std {
462 template <>
463 struct hash<smooth_key>
464 {
465 size_t operator () (const smooth_key &v) const
466 {
467 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
468 }
469 };
470}
422 471
423static void 472static void
424smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
425{ 474{
426 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
427 476
428 if (SvIOK (*sv)) 477 if (it == h.end ())
429 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
430 else 479 else
431 sv_setiv (*sv, bits); 480 it->second |= bits;
432} 481}
433 482
434static void 483static void
435music_finished (void) 484music_finished (void)
436{ 485{
453 ev.code = 1; 502 ev.code = 1;
454 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
455 ev.data2 = 0; 504 ev.data2 = 0;
456 505
457 SDL_PushEvent ((SDL_Event *)&ev); 506 SDL_PushEvent ((SDL_Event *)&ev);
507}
508
509// approximately divide by 255
510static unsigned int
511div255 (unsigned int n)
512{
513 return (n + (n >> 8)) >> 8;
458} 514}
459 515
460static unsigned int 516static unsigned int
461minpot (unsigned int n) 517minpot (unsigned int n)
462{ 518{
545 601
546 return mod; 602 return mod;
547} 603}
548 604
549static void 605static void
550deliantra_main () 606deliantra_main (SV *real_main)
551{ 607{
552 char *argv[] = { 0 }; 608 dSP;
553 call_argv ("::main", G_DISCARD | G_VOID, argv); 609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
554} 612}
555 613
556#ifdef __MACOSX__ 614#ifdef __MACOSX__
615 static SV *real_main;
616
557 /* to due surprising braindamage on the side of SDL design, we 617 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main() 618 * do some mind-boggling hack here: SDL requires a custom main()
559 * on OS X, so... we provide one and call the original main(), which, 619 * on OS X, so... we provide one and call the original main(), which,
560 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 620 * due to shared library magic, calls -lSDLmain's main, not perl's main,
561 * and which calls our main (== SDL_main) back. 621 * and which calls our main (== SDL_main) back.
562 */ 622 */
563 extern C_LINKAGE int 623 extern C_LINKAGE int
564 main (int argc, char *argv[]) 624 main (int argc, char *argv[])
565 { 625 {
566 deliantra_main (); 626 deliantra_main (real_main);
567 } 627 }
568 628
569 #undef main 629 #undef main
570 630
571 extern C_LINKAGE int main (int argc, char *argv[]); 631 extern C_LINKAGE int main (int argc, char *argv[]);
572 632
573 static void 633 static void
574 SDL_braino (void) 634 SDL_main_hack (SV *real_main_)
575 { 635 {
636 real_main = real_main_;
637
576 char *argv[] = { "deliantra client", 0 }; 638 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv); 639 (main) (1, argv);
578 } 640 }
579#else 641#else
580 static void 642 static void
581 SDL_braino (void) 643 SDL_main_hack (SV *real_main)
582 { 644 {
583 deliantra_main (); 645 deliantra_main (real_main);
584 } 646 }
585#endif 647#endif
586 648
587MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
588 650
789 851
790 const_iv (FOW_DARKNESS) 852 const_iv (FOW_DARKNESS)
791# undef const_iv 853# undef const_iv
792 }; 854 };
793 855
794 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 856 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
796 858
797 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
798 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
799} 861}
800 862
816NV ceil (NV x) 878NV ceil (NV x)
817 879
818IV minpot (UV n) 880IV minpot (UV n)
819 881
820IV popcount (UV n) 882IV popcount (UV n)
883
884NV distance (NV dx, NV dy)
885 CODE:
886 RETVAL = pow (dx * dx + dy * dy, 0.5);
887 OUTPUT:
888 RETVAL
821 889
822void 890void
823pango_init () 891pango_init ()
824 CODE: 892 CODE:
825{ 893{
833#endif 901#endif
834} 902}
835 903
836char *SDL_GetError () 904char *SDL_GetError ()
837 905
838void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
839 908
840int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
841 910
842int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
843 912
844void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
845 914
846void SDL_Quit () 915void SDL_Quit ()
847 916
848int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
849 919
850int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
851 CODE: 921 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
853 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
854 OUTPUT: 924 OUTPUT:
855 RETVAL 925 RETVAL
856 926
857void 927void
912 ); 982 );
913 983
914 if (RETVAL) 984 if (RETVAL)
915 { 985 {
916 av_clear (texture_av); 986 av_clear (texture_av);
917
918 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
920#include "glfunc.h" 988#include "glfunc.h"
921#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922 } 992 }
923} 993}
924 OUTPUT: 994 OUTPUT:
925 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
926 999
927void 1000void
928SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
929 1002
930char * 1003char *
931SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
932 1006
933int 1007int
934SDL_GetAppState () 1008SDL_GetAppState ()
935 1009
936int 1010int
937SDL_GetModState () 1011SDL_GetModState ()
938 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
939void 1017void
1018SDL_PumpEvents ()
1019
1020void
940poll_events () 1021peep_events ()
941 PPCODE: 1022 PPCODE:
942{ 1023{
943 SDL_Event ev; 1024 SDL_Event ev;
944 1025
945 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
1011 1092
1012 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1093 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1013 } 1094 }
1014} 1095}
1015 1096
1097char *
1098SDL_AudioDriverName ()
1099 CODE:
1100{
1101 char buf [256];
1102 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1103 XSRETURN_UNDEF;
1104
1105 RETVAL = buf;
1106}
1107 OUTPUT:
1108 RETVAL
1109
1016int 1110int
1017Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1018 POSTCALL: 1112 POSTCALL:
1019 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1020 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1021 1115
1022void 1116void
1023Mix_QuerySpec () 1117Mix_QuerySpec ()
1082add_font (char *file) 1176add_font (char *file)
1083 CODE: 1177 CODE:
1084 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085 OUTPUT: 1179 OUTPUT:
1086 RETVAL 1180 RETVAL
1181
1182void
1183IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1184
1185# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1186void
1187Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1087 1188
1088void 1189void
1089load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1090 ALIAS: 1191 ALIAS:
1091 load_image_file = 1 1192 load_image_file = 1
1137 1238
1138 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1139 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1140 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1141 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1142 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1143 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1244 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1144 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1145 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1146 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1147 1248
1219MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1220 1321
1221PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1222 1323
1223DC::Font 1324DC::Font
1224new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1225 CODE: 1326 CODE:
1226{ 1327{
1227 int count; 1328 int count;
1228 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1229 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1258 PROTOTYPE: 1359 PROTOTYPE:
1259 CODE: 1360 CODE:
1260 tc_restore (); 1361 tc_restore ();
1261 1362
1262DC::Layout 1363DC::Layout
1263new (SV *class) 1364new (SV *klass)
1264 CODE: 1365 CODE:
1265 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1266 1367
1267 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1268 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1417 1518
1418void 1519void
1419set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1420 CODE: 1521 CODE:
1421 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1422 { 1523 {
1423 self->base_height = base_height; 1524 self->base_height = base_height;
1424 layout_update_font (self); 1525 layout_update_font (self);
1425 } 1526 }
1426 1527
1427void 1528void
1654 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1655 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1656 } 1757 }
1657} 1758}
1658 1759
1760void
1761draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1762 PROTOTYPE: @
1763 CODE:
1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1767 glEnable (GL_TEXTURE_2D);
1768 glBindTexture (GL_TEXTURE_2D, name1);
1769
1770 glColor3f (intensity, intensity, intensity);
1771 glPushMatrix ();
1772 glScalef (1./3, 1./3, 1.);
1773
1774 if (blend > 0.f)
1775 {
1776 float dx3 = dx * -3.f / w;
1777 float dy3 = dy * -3.f / h;
1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1779
1780 /* interpolate the two shadow textures */
1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1783
1784 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1785 gl.ActiveTexture (GL_TEXTURE1);
1786 glEnable (GL_TEXTURE_2D);
1787 glBindTexture (GL_TEXTURE_2D, name2);
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1789
1790 /* rgb == rgb(glcolor) */
1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1794
1795 /* alpha = interpolate t0, t1 by env_alpha */
1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1797
1798 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1801
1802 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1804
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1807
1808 glBegin (GL_QUADS);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1813 glEnd ();
1814
1815 glDisable (GL_TEXTURE_2D);
1816 gl.ActiveTexture (GL_TEXTURE0);
1817 }
1818 else
1819 {
1820 /* simple blending of one texture, also opengl <1.3 path */
1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1822
1823 glBegin (GL_QUADS);
1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1825 glTexCoord2f (0, t); glVertex2f (0, h);
1826 glTexCoord2f (s, t); glVertex2f (w, h);
1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1828 glEnd ();
1829 }
1830
1831 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1832 {
1833 int x, y;
1834 int dx3 = dx * 3;
1835 int dy3 = dy * 3;
1836
1837 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1838 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1839 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1840 glTranslatef (-1., -1., 0);
1841 glBegin (GL_QUADS);
1842
1843 for (y = 1; y < h; y += 3)
1844 {
1845 int y1 = y - dy3;
1846 int y1valid = y1 >= 0 && y1 < h;
1847
1848 for (x = 1; x < w; x += 3)
1849 {
1850 int x1 = x - dx3;
1851 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1852 uint8_t h2;
1853
1854 if (y1valid && x1 >= 0 && x1 < w)
1855 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1856 else
1857 h2 = 1; /* out of range == invisible */
1858
1859 if (h1 || h2)
1860 {
1861 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1862 glColor4f (1., 1., 1., alpha);
1863
1864 glTexCoord2f (0, 0.); glVertex2i (x , y );
1865 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1866 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1867 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1868 }
1869 }
1870 }
1871 }
1872
1873 glEnd ();
1874
1875 glPopMatrix ();
1876
1877 glDisable (GL_TEXTURE_2D);
1878 glDisable (GL_BLEND);
1879}
1880
1659IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1881IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1660 CODE: 1882 CODE:
1661{ 1883{
1662 GLint width; 1884 GLint width;
1663 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1885 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1670MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1671 1893
1672PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1673 1895
1674DC::Map 1896DC::Map
1675new (SV *class) 1897new (SV *klass)
1676 CODE: 1898 CODE:
1677 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1678 RETVAL->x = 0; 1900 RETVAL->x = 0;
1679 RETVAL->y = 0; 1901 RETVAL->y = 0;
1680 RETVAL->w = 0; 1902 RETVAL->w = 0;
1719 1941
1720void 1942void
1721set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1722 CODE: 1944 CODE:
1723{ 1945{
1724 tileid texid; 1946 tileid texid;
1725 maptex *tex; 1947 maptex *tex;
1726 1948
1727 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1728 return; 1950 return;
1729 1951
1730 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1731 return; 1953 return;
1732 1954
1733 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1734 1956
1735 if (!texid) 1957 if (!texid)
1736 return; 1958 return;
1737 1959
1738 tex = self->tex + texid; 1960 tex = self->tex + texid;
1771} 1993}
1772 1994
1773void 1995void
1774expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1775 PPCODE: 1997 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1777 { 1999 {
1778 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1779 2001
1780 if (tex->name) 2002 if (tex->name)
1781 { 2003 {
1836 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1837 } 2059 }
1838} 2060}
1839 2061
1840SV * 2062SV *
1841map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1842 CODE: 2064 CODE:
1843{ 2065{
1844 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1845 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1846 mapcell *cell; 2068 mapcell *cell;
1867 2089
1868 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1869 2091
1870 if (flags & 8) 2092 if (flags & 8)
1871 { 2093 {
2094 uint8_t ext, cmd;
2095
1872 if (extmap) 2096 do
1873 { 2097 {
1874 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1875 2100
1876 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
1877 { 2104 {
1878 ext = *data++;
1879 cmd = ext & 0x7f;
1880
1881 if (cmd < 4)
1882 cell->darkness = 255 - ext * 64 + 1;
1883 else if (cmd == 5) // health
1884 {
1885 cell->stat_width = 1; 2105 cell->stat_width = 1;
1886 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1887 }
1888 else if (cmd == 6) // monster width
1889 cell->stat_width = *data++ + 1;
1890 else if (cmd == 0x47)
1891 {
1892 if (*data == 1) cell->player = data [1];
1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1896
1897 data += *data + 1;
1898 }
1899 else if (cmd == 8) // cell flags
1900 cell->flags = *data++;
1901 else if (ext & 0x40) // unknown, multibyte => skip
1902 data += *data + 1;
1903 else
1904 data++;
1905 } 2107 }
1906 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
1907 } 2125 }
1908 else 2126 while (ext & 0x80);
1909 cell->darkness = *data++ + 1;
1910 } 2127 }
1911 2128
1912 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1913 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1914 { 2131 {
1962 ? self->row + y 2179 ? self->row + y
1963 : 0; 2180 : 0;
1964 2181
1965 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1966 { 2183 {
1967 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1968 2185
1969 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1970 { 2187 {
1971 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1972 2189
1974 { 2191 {
1975 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1976 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1977 int a1 = tex.a; 2194 int a1 = tex.a;
1978 2195
1979 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1980 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1981 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1982 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1983 } 2200 }
1984 } 2201 }
1985 2202
1986 *map++ = (r ) 2203 *map++ = (r )
1987 | (g << 8) 2204 | (g << 8)
1988 | (b << 16) 2205 | (b << 16)
1989 | (a << 24); 2206 | (a << 24);
1990 } 2207 }
1991 } 2208 }
1992 2209
1993 RETVAL = map_sv; 2210 RETVAL = map_sv;
1994} 2211}
1995 OUTPUT: 2212 OUTPUT:
1996 RETVAL 2213 RETVAL
1997 2214
1998void 2215void
1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2000 CODE: 2217 CODE:
2001{ 2218{
2002 int x, y, z; 2219 int x, y, z;
2003 2220
2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2005 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2221 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2222 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2007 smooth_key skey; 2223 smooth_key skey;
2008 int pl_x, pl_y; 2224 int pl_x, pl_y;
2009 maptex pl_tex; 2225 maptex pl_tex;
2010 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2227 rc_t *rc_ov = rc_alloc ();
2011 rc_key_t key; 2228 rc_key_t key;
2012 rc_array_t *arr; 2229 rc_array_t *arr;
2013 2230
2014 pl_tex.name = 0; 2231 pl_tex.name = 0;
2015 2232
2016 // thats current max. sorry. 2233 // that's current max. sorry.
2017 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
2018 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
2019 2236
2020 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
2021 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
2057 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2058 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2059 2276
2060 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
2061 { 2278 {
2279 smooth_hash smooth;
2062 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2063 key.texname = -1; 2281 key.texname = -1;
2064 2282
2065 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
2066 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
2074 tileid tile = cell->tile [z]; 2292 tileid tile = cell->tile [z];
2075 2293
2076 if (tile) 2294 if (tile)
2077 { 2295 {
2078 maptex tex = self->tex [tile]; 2296 maptex tex = self->tex [tile];
2079 int px = (x + 1) * T - tex.w; 2297 int px, py;
2080 int py = (y + 1) * T - tex.h;
2081 2298
2082 if (key.texname != tex.name) 2299 if (key.texname != tex.name)
2083 { 2300 {
2084 self->tex [tile].unused = 0; 2301 self->tex [tile].unused = 0;
2085 2302
2086 if (!tex.name) 2303 if (!tex.name)
2087 tex = self->tex [2]; /* missing, replace by noface */ 2304 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088 2305
2089 key.texname = tex.name; 2306 key.texname = tex.name;
2090 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
2091 } 2308 }
2309
2310 px = (x + 1) * Th - tex.w;
2311 py = (y + 1) * Tw - tex.h;
2092 2312
2093 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2094 { 2314 {
2095 pl_x = px; 2315 pl_x = px;
2096 pl_y = py; 2316 pl_y = py;
2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2321 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2322 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2103 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2323 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2324 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2105 2325
2106 if (expect_false (cell->flags) && expect_false (z == 2))
2107 {
2108 // overlays such as the speech bubble, probably more to come
2109 if (cell->flags & 1)
2110 {
2111 maptex tex = self->tex [1];
2112 int px = x * T + T * 2 / 32;
2113 int py = y * T - T * 6 / 32;
2114
2115 if (tex.name)
2116 {
2117 if (key.texname != tex.name)
2118 {
2119 key.texname = tex.name;
2120 arr = rc_array (rc, &key);
2121 }
2122
2123 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2124 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2125 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2126 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2127 }
2128 }
2129 }
2130
2131 // update smooth hash 2326 // update smooth hash
2132 if (tex.smoothtile) 2327 if (tex.smoothtile)
2133 { 2328 {
2134 skey.tile = tex.smoothtile; 2329 skey.tile = tex.smoothtile;
2135 skey.level = tex.smoothlevel; 2330 skey.level = tex.smoothlevel;
2150 2345
2151 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2152 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2153 2348
2154 // full tile 2349 // full tile
2155 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2350 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2156 2351
2157 // borders 2352 // borders
2158 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2353 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2159 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2354 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2160 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2355 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2161 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2356 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2162 2357
2163 // corners 2358 // corners
2164 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2359 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2165 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2360 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2166 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2361 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2167 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2362 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2363 }
2364 }
2365
2366 if (expect_false (z == 2) && expect_false (cell->flags))
2367 {
2368 // overlays such as the speech bubble, probably more to come
2369 if (cell->flags & 1)
2370 {
2371 rc_key_t key_ov = key;
2372 maptex tex = self->tex [TEXID_SPEECH];
2373 rc_array_t *arr;
2374 int px = x * Tw + Tw * 2 / 32;
2375 int py = y * Th - Th * 6 / 32;
2376
2377 key_ov.texname = tex.name;
2378 arr = rc_array (rc_ov, &key_ov);
2379
2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2168 } 2384 }
2169 } 2385 }
2170 } 2386 }
2171 } 2387 }
2172 2388
2188 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2189 { 2405 {
2190 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2191 HE *he; 2407 HE *he;
2192 2408
2193 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2194 while ((he = hv_iternext (smooth)))
2195 { 2410 {
2196 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2197 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2198 2413
2199 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2200 && skey->level == level 2415 && skey.level == level
2201 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2202 { 2417 {
2203 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2204 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2205 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2206 int border = bits & 15; 2421 int border = bits & 15;
2207 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2208 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2209 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2210 2425
2212 { 2427 {
2213 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2214 // save gobs of state changes. 2429 // save gobs of state changes.
2215 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2216 { 2431 {
2217 self->tex [skey->tile].unused = 0; 2432 self->tex [skey.tile].unused = 0;
2218 2433
2219 glEnd (); 2434 glEnd ();
2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2221 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2222 } 2437 }
2223 2438
2224 if (border) 2439 if (border)
2225 { 2440 {
2226 float ox = border * dx; 2441 float ox = border * dx;
2227 2442
2228 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2229 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2230 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2231 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2232 } 2447 }
2233 2448
2234 if (corner) 2449 if (corner)
2235 { 2450 {
2236 float ox = corner * dx; 2451 float ox = corner * dx;
2237 2452
2238 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2239 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2240 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2241 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2242 } 2457 }
2243 } 2458 }
2244 } 2459 }
2245 } 2460 }
2246 } 2461 }
2248 2463
2249 glEnd (); 2464 glEnd ();
2250 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2251 key.texname = -1; 2466 key.texname = -1;
2252 } 2467 }
2253
2254 hv_clear (smooth);
2255 } 2468 }
2256 2469
2257 if (pl_tex.name) 2470 if (pl_tex.name)
2258 { 2471 {
2259 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2269 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2482 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270 2483
2271 rc_draw (rc); 2484 rc_draw (rc);
2272 } 2485 }
2273 2486
2487 rc_draw (rc_ov);
2488 rc_clear (rc_ov);
2489
2274 glDisable (GL_BLEND); 2490 glDisable (GL_BLEND);
2275 rc_free (rc); 2491 rc_free (rc);
2492 rc_free (rc_ov);
2276 2493
2277 // top layer: overlays such as the health bar 2494 // top layer: overlays such as the health bar
2278 for (y = 0; y < sh; y++) 2495 for (y = 0; y < sh; y++)
2279 if (0 <= y + my && y + my < self->rows) 2496 if (0 <= y + my && y + my < self->rows)
2280 { 2497 {
2283 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2284 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2285 { 2502 {
2286 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2287 2504
2288 int px = x * T; 2505 int px = x * Tw;
2289 int py = y * T; 2506 int py = y * Th;
2290 2507
2291 if (expect_false (cell->player == player)) 2508 if (expect_false (cell->player == player))
2292 { 2509 {
2293 px += sdx; 2510 px += sdx;
2294 py += sdy; 2511 py += sdy;
2295 } 2512 }
2296 2513
2297 if (cell->stat_hp) 2514 if (cell->stat_hp)
2298 { 2515 {
2299 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2301 2518
2302 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2303 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2304 px + width - 1, py); 2521 px + width - 1, py);
2305 2522
2311 } 2528 }
2312 } 2529 }
2313} 2530}
2314 2531
2315void 2532void
2316draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2533draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2317 CODE: 2534 CODE:
2318{ 2535{
2319 static float color[16][3] = { 2536 static float color[16][3] = {
2320 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2321 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2322 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2323 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2324 2541
2325 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2326 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2327 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2328 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2329 2546
2330 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2331 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2332 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2333 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2334 2551
2335 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2336 2553
2337 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2338 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2339 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2340 }; 2557 };
2341 2558
2342 int x, y; 2559 int x, y;
2343 2560
2344 glEnable (GL_TEXTURE_2D); 2561 glEnable (GL_TEXTURE_2D);
2562 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2563 * but the nvidia driver (185.18.14) mishandles alpha textures
2564 * and takes the colour from god knows where instead of using
2565 * Cp. MODULATE results in the same colour, but slightly different
2566 * alpha, but atcually gives us the correct colour with nvidia.
2567 */
2345 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2346 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2347 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2348 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2349 2572
2350 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2354 2577
2355 if (m) 2578 if (m)
2356 { 2579 {
2357 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2358 2581
2359 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2360 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2361 2584
2362 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2363 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2364 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2365 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2366 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2367 } 2590 }
2375void 2598void
2376fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2599fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2377 PPCODE: 2600 PPCODE:
2378{ 2601{
2379 int x, y; 2602 int x, y;
2380 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2381 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2382 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2383 int sw34 = (sw * 3 + 3) & ~3; 2606 int sw3 = sw * 3;
2607 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2608 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2384 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2385 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2386 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2387 2611
2388 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2389 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2390 2614
2391 mx += self->x - 1; 2615 mx += self->x - 1;
2392 my += self->y - 1; 2616 my += self->y - 1;
2393
2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395 2617
2396 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2397 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2398 { 2620 {
2399 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2402 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2403 { 2625 {
2404 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2405 2627
2406 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2407 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2408 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2409 } 2631 }
2410 } 2632 }
2411 2633
2412 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2413 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2432 2654
2433 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2434 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2435 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2436 2658
2437 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2438 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2439 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2440 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2441 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2663 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2442 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2443 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2444 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2445 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2446 } 2668 }
2447 2669
2448 free (darkness1); 2670 free (darkness1);
2449 2671
2450 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2451 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2452 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2453 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2454} 2676}
2455 2677
2456SV * 2678SV *
2519 else 2741 else
2520 *data++ = 0; 2742 *data++ = 0;
2521 } 2743 }
2522 } 2744 }
2523 2745
2524 /* if size is w*h + 5 then no data has been found */ 2746 /* if size is w*h + 5 then no data has been found */
2525 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2526 { 2748 {
2527 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 } 2751 }
2530 2752
2531 RETVAL = data_sv; 2753 RETVAL = data_sv;
2532} 2754}
2533 OUTPUT: 2755 OUTPUT:
2534 RETVAL 2756 RETVAL
2535 2757
2536void 2758void
2543 STRLEN len; 2765 STRLEN len;
2544 uint8_t *data, *end; 2766 uint8_t *data, *end;
2545 2767
2546 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2547 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2549 end = data + len + 8; 2771 end = data + len + 8;
2550 2772
2551 if (len < 5) 2773 if (len < 5)
2552 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2553 2775
2614} 2836}
2615 2837
2616MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2617 2839
2618DC::RW 2840DC::RW
2619new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2620 CODE: 2842 CODE:
2621{ 2843{
2622 STRLEN datalen; 2844 STRLEN datalen;
2623 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2624 2846
2626} 2848}
2627 OUTPUT: 2849 OUTPUT:
2628 RETVAL 2850 RETVAL
2629 2851
2630DC::RW 2852DC::RW
2631new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2632 CODE: 2854 CODE:
2633 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2634 OUTPUT: 2856 OUTPUT:
2635 RETVAL 2857 RETVAL
2636 2858
2654 if (RETVAL < 0) 2876 if (RETVAL < 0)
2655 { 2877 {
2656 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2657 2879
2658 if (RETVAL < 0) 2880 if (RETVAL < 0)
2881 {
2882 // happens sometimes, maybe it just stopped playing(?)
2883 RETVAL = Mix_GroupAvailable (-1);
2884
2885 if (RETVAL < 0)
2659 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2660 2887 }
2888 else
2661 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2662 } 2890 }
2663 2891
2664 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2665 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2666} 2894}
2713void 2941void
2714set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2715 CODE: 2943 CODE:
2716{ 2944{
2717 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2945 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2718 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2946 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2719 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720} 2948}
2721 2949
2722void 2950void
2723set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2726 2954
2727MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728 2956
2729PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2730 2958
2959void
2960decoders ()
2961 PPCODE:
2962#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2963 int i, num = Mix_GetNumChunkDecoders ();
2964 EXTEND (SP, num);
2965 for (i = 0; i < num; ++i)
2966 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2967#else
2968 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2969#endif
2970
2731DC::MixChunk 2971DC::MixChunk
2732new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2733 CODE: 2973 CODE:
2734 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2735 OUTPUT: 2975 OUTPUT:
2736 RETVAL 2976 RETVAL
2737 2977
2767 OUTPUT: 3007 OUTPUT:
2768 RETVAL 3008 RETVAL
2769 3009
2770MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2771 3011
3012void
3013decoders ()
3014 PPCODE:
3015#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3016 int i, num = Mix_GetNumMusicDecoders ();
3017 EXTEND (SP, num);
3018 for (i = 0; i < num; ++i)
3019 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3020#else
3021 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3022#endif
3023
2772int 3024int
2773volume (int volume = -1) 3025volume (int volume = -1)
2774 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2775 CODE: 3027 CODE:
2776 if (items > 0) 3028 if (items > 0)
2787void 3039void
2788halt () 3040halt ()
2789 CODE: 3041 CODE:
2790 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2791 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2792DC::MixMusic 3051DC::MixMusic
2793new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2794 CODE: 3053 CODE:
2795 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2796 OUTPUT: 3055 OUTPUT:
2797 RETVAL 3056 RETVAL
2798 3057
2826 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2827# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2828 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2829 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2830 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2831 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2832 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2833 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2834 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2835 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2847 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2848 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2849 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2850 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2851 const_iv (GL_ONE_MINUS_DST_ALPHA), 3111 const_iv (GL_ONE_MINUS_DST_ALPHA),
3112 const_iv (GL_SRC_COLOR),
3113 const_iv (GL_DST_COLOR),
3114 const_iv (GL_ONE_MINUS_SRC_COLOR),
3115 const_iv (GL_ONE_MINUS_DST_COLOR),
2852 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2853 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2854 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2855 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2856 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2924 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2925 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2926 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2927 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2928 const_iv (GL_T2F_N3F_V3F), 3192 const_iv (GL_T2F_N3F_V3F),
3193 const_iv (GL_FUNC_ADD),
3194 const_iv (GL_FUNC_SUBTRACT),
3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2929# undef const_iv 3196# undef const_iv
2930 }; 3197 };
2931 3198
2932 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3199 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2933 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2934 3201
2935 texture_av = newAV (); 3202 texture_av = newAV ();
2936 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2937} 3204}
2938 3205
2940disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2941 CODE: 3208 CODE:
2942 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2943 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2944 3211
2945char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2946gl_vendor () 3216gl_vendor ()
2947 CODE: 3217 CODE:
2948 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2949 OUTPUT: 3219 OUTPUT:
2950 RETVAL 3220 RETVAL
2951 3221
2952char * 3222const char *
2953gl_version () 3223gl_version ()
2954 CODE: 3224 CODE:
2955 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2956 OUTPUT: 3226 OUTPUT:
2957 RETVAL 3227 RETVAL
2958 3228
2959char * 3229const char *
2960gl_extensions () 3230gl_extensions ()
2961 CODE: 3231 CODE:
2962 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2963 OUTPUT: 3233 OUTPUT:
2964 RETVAL 3234 RETVAL
2965 3235
2966const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2967 3241
2968GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2969 CODE: 3243 CODE:
2970 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2971 OUTPUT: 3245 OUTPUT:
2979 3253
2980int glGetError () 3254int glGetError ()
2981 3255
2982void glFinish () 3256void glFinish ()
2983 3257
3258void glFlush ()
3259
2984void glClear (int mask) 3260void glClear (int mask)
2985 3261
2986void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
2987 PROTOTYPE: @ 3263 PROTOTYPE: @
2988 3264
2997void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
2998 3274
2999void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3000 CODE: 3276 CODE:
3001 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
3002 3280
3003void glDepthMask (int flag) 3281void glDepthMask (int flag)
3004 3282
3005void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
3006 3284
3157 3435
3158void glEndList () 3436void glEndList ()
3159 3437
3160void glCallList (int list) 3438void glCallList (int list)
3161 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
3162MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163 3446
3164PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
3165 3448
3166void 3449void
3167find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3168 PPCODE: 3451 PPCODE:
3169{ 3452{
3170 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3171 XPUSHs (self); 3454 XPUSHs (self);
3172} 3455}
3173 3456
3174BOOT: 3457BOOT:
3175{ 3458{
3183 3466
3184void 3467void
3185draw (SV *self) 3468draw (SV *self)
3186 CODE: 3469 CODE:
3187{ 3470{
3188 HV *hv; 3471 HV *hv;
3189 SV **svp; 3472 SV **svp;
3190 NV x, y, w, h; 3473 NV x, y, w, h;
3191 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3192 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3193 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3194 SV *draw_h_sv = GvSV (draw_h_gv); 3477 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines