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.286 by root, Sun Dec 21 21:30:47 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 32 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
95 103
96#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
97 105
98#define TEXID_SPEECH 1 106#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 107#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3 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}
101 127
102static AV *texture_av; 128static AV *texture_av;
103 129
104static struct 130static struct
105{ 131{
162{ 188{
163 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
164 190
165 while (attrs) 191 while (attrs)
166 { 192 {
167 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
168 194
169 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
170 return 1; 196 return 1;
171 197
172 attrs = attrs->next; 198 attrs = attrs->next;
190static void 216static void
191substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
192{ 218{
193 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
194#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
195 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196#endif 222#endif
197 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198} 224}
199 225
200static void 226static void
417 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
418 } 444 }
419 } 445 }
420} 446}
421 447
422typedef struct { 448struct smooth_key
449{
423 tileid tile; 450 tileid tile;
424 uint8_t x, y, level; 451 uint8_t x, y, level;
425} 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}
426 471
427static void 472static void
428smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429{ 474{
430 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
431 476
432 if (SvIOK (*sv)) 477 if (it == h.end ())
433 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
434 else 479 else
435 sv_setiv (*sv, bits); 480 it->second |= bits;
436} 481}
437 482
438static void 483static void
439music_finished (void) 484music_finished (void)
440{ 485{
457 ev.code = 1; 502 ev.code = 1;
458 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
459 ev.data2 = 0; 504 ev.data2 = 0;
460 505
461 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;
462} 514}
463 515
464static unsigned int 516static unsigned int
465minpot (unsigned int n) 517minpot (unsigned int n)
466{ 518{
549 601
550 return mod; 602 return mod;
551} 603}
552 604
553static void 605static void
554deliantra_main () 606deliantra_main (SV *real_main)
555{ 607{
556 char *argv[] = { 0 }; 608 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
558} 612}
559 613
560#ifdef __MACOSX__ 614#ifdef __MACOSX__
615 static SV *real_main;
616
561 /* to due surprising braindamage on the side of SDL design, we 617 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 618 * do some mind-boggling hack here: SDL requires a custom main()
563 * 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,
564 * 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,
565 * and which calls our main (== SDL_main) back. 621 * and which calls our main (== SDL_main) back.
566 */ 622 */
567 extern C_LINKAGE int 623 extern C_LINKAGE int
568 main (int argc, char *argv[]) 624 main (int argc, char *argv[])
569 { 625 {
570 deliantra_main (); 626 deliantra_main (real_main);
571 } 627 }
572 628
573 #undef main 629 #undef main
574 630
575 extern C_LINKAGE int main (int argc, char *argv[]); 631 extern C_LINKAGE int main (int argc, char *argv[]);
576 632
577 static void 633 static void
578 SDL_braino (void) 634 SDL_main_hack (SV *real_main_)
579 { 635 {
636 real_main = real_main_;
637
580 char *argv[] = { "deliantra client", 0 }; 638 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 639 (main) (1, argv);
582 } 640 }
583#else 641#else
584 static void 642 static void
585 SDL_braino (void) 643 SDL_main_hack (SV *real_main)
586 { 644 {
587 deliantra_main (); 645 deliantra_main (real_main);
588 } 646 }
589#endif 647#endif
590 648
591MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
592 650
793 851
794 const_iv (FOW_DARKNESS) 852 const_iv (FOW_DARKNESS)
795# undef const_iv 853# undef const_iv
796 }; 854 };
797 855
798 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--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 858
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 861}
804 862
820NV ceil (NV x) 878NV ceil (NV x)
821 879
822IV minpot (UV n) 880IV minpot (UV n)
823 881
824IV 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
825 889
826void 890void
827pango_init () 891pango_init ()
828 CODE: 892 CODE:
829{ 893{
837#endif 901#endif
838} 902}
839 903
840char *SDL_GetError () 904char *SDL_GetError ()
841 905
842void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
843 908
844int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
845 910
846int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
847 912
848void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
849 914
850void SDL_Quit () 915void SDL_Quit ()
851 916
852int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
853 919
854int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
855 CODE: 921 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
858 OUTPUT: 924 OUTPUT:
859 RETVAL 925 RETVAL
860 926
861void 927void
916 ); 982 );
917 983
918 if (RETVAL) 984 if (RETVAL)
919 { 985 {
920 av_clear (texture_av); 986 av_clear (texture_av);
921
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923#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);
924#include "glfunc.h" 988#include "glfunc.h"
925#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 992 }
927} 993}
928 OUTPUT: 994 OUTPUT:
929 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
930 999
931void 1000void
932SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
933 1002
934char * 1003char *
935SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
936 1006
937int 1007int
938SDL_GetAppState () 1008SDL_GetAppState ()
939 1009
940int 1010int
941SDL_GetModState () 1011SDL_GetModState ()
942 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
943void 1017void
1018SDL_PumpEvents ()
1019
1020void
944poll_events () 1021peep_events ()
945 PPCODE: 1022 PPCODE:
946{ 1023{
947 SDL_Event ev; 1024 SDL_Event ev;
948 1025
949 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
1015 1092
1016 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))));
1017 } 1094 }
1018} 1095}
1019 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
1020int 1110int
1021Mix_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)
1022 POSTCALL: 1112 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1025 1115
1026void 1116void
1027Mix_QuerySpec () 1117Mix_QuerySpec ()
1086add_font (char *file) 1176add_font (char *file)
1087 CODE: 1177 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1179 OUTPUT:
1090 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)
1091 1188
1092void 1189void
1093load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1094 ALIAS: 1191 ALIAS:
1095 load_image_file = 1 1192 load_image_file = 1
1141 1238
1142 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1143 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1144 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1145 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1146 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1147 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)));
1148 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1151 1248
1223MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1224 1321
1225PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1226 1323
1227DC::Font 1324DC::Font
1228new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1229 CODE: 1326 CODE:
1230{ 1327{
1231 int count; 1328 int count;
1232 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1233 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1262 PROTOTYPE: 1359 PROTOTYPE:
1263 CODE: 1360 CODE:
1264 tc_restore (); 1361 tc_restore ();
1265 1362
1266DC::Layout 1363DC::Layout
1267new (SV *class) 1364new (SV *klass)
1268 CODE: 1365 CODE:
1269 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1270 1367
1271 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1272 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1421 1518
1422void 1519void
1423set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1424 CODE: 1521 CODE:
1425 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1426 { 1523 {
1427 self->base_height = base_height; 1524 self->base_height = base_height;
1428 layout_update_font (self); 1525 layout_update_font (self);
1429 } 1526 }
1430 1527
1431void 1528void
1658 glDisable (GL_ALPHA_TEST); 1755 glDisable (GL_ALPHA_TEST);
1659 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1660 } 1757 }
1661} 1758}
1662 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
1663IV 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)
1664 CODE: 1882 CODE:
1665{ 1883{
1666 GLint width; 1884 GLint width;
1667 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);
1674MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1675 1893
1676PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1677 1895
1678DC::Map 1896DC::Map
1679new (SV *class) 1897new (SV *klass)
1680 CODE: 1898 CODE:
1681 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1682 RETVAL->x = 0; 1900 RETVAL->x = 0;
1683 RETVAL->y = 0; 1901 RETVAL->y = 0;
1684 RETVAL->w = 0; 1902 RETVAL->w = 0;
1723 1941
1724void 1942void
1725set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1726 CODE: 1944 CODE:
1727{ 1945{
1728 tileid texid; 1946 tileid texid;
1729 maptex *tex; 1947 maptex *tex;
1730 1948
1731 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1732 return; 1950 return;
1733 1951
1734 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1735 return; 1953 return;
1736 1954
1737 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1738 1956
1739 if (!texid) 1957 if (!texid)
1740 return; 1958 return;
1741 1959
1742 tex = self->tex + texid; 1960 tex = self->tex + texid;
1775} 1993}
1776 1994
1777void 1995void
1778expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1779 PPCODE: 1997 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1781 { 1999 {
1782 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1783 2001
1784 if (tex->name) 2002 if (tex->name)
1785 { 2003 {
1840 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1841 } 2059 }
1842} 2060}
1843 2061
1844SV * 2062SV *
1845map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1846 CODE: 2064 CODE:
1847{ 2065{
1848 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1849 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1850 mapcell *cell; 2068 mapcell *cell;
1871 2089
1872 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1873 2091
1874 if (flags & 8) 2092 if (flags & 8)
1875 { 2093 {
2094 uint8_t ext, cmd;
2095
1876 if (extmap) 2096 do
1877 { 2097 {
1878 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1879 2100
1880 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
1881 { 2104 {
1882 ext = *data++;
1883 cmd = ext & 0x7f;
1884
1885 if (cmd < 4)
1886 cell->darkness = 255 - ext * 64 + 1;
1887 else if (cmd == 5) // health
1888 {
1889 cell->stat_width = 1; 2105 cell->stat_width = 1;
1890 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1891 }
1892 else if (cmd == 6) // monster width
1893 cell->stat_width = *data++ + 1;
1894 else if (cmd == 0x47)
1895 {
1896 if (*data == 1) cell->player = data [1];
1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1900
1901 data += *data + 1;
1902 }
1903 else if (cmd == 8) // cell flags
1904 cell->flags = *data++;
1905 else if (ext & 0x40) // unknown, multibyte => skip
1906 data += *data + 1;
1907 else
1908 data++;
1909 } 2107 }
1910 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++;
1911 } 2125 }
1912 else 2126 while (ext & 0x80);
1913 cell->darkness = *data++ + 1;
1914 } 2127 }
1915 2128
1916 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
1917 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
1918 { 2131 {
1966 ? self->row + y 2179 ? self->row + y
1967 : 0; 2180 : 0;
1968 2181
1969 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
1970 { 2183 {
1971 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
1972 2185
1973 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
1974 { 2187 {
1975 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
1976 2189
1978 { 2191 {
1979 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
1980 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
1981 int a1 = tex.a; 2194 int a1 = tex.a;
1982 2195
1983 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
1984 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
1985 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
1986 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
1987 } 2200 }
1988 } 2201 }
1989 2202
1990 *map++ = (r ) 2203 *map++ = (r )
1991 | (g << 8) 2204 | (g << 8)
1992 | (b << 16) 2205 | (b << 16)
1993 | (a << 24); 2206 | (a << 24);
1994 } 2207 }
1995 } 2208 }
1996 2209
1997 RETVAL = map_sv; 2210 RETVAL = map_sv;
1998} 2211}
1999 OUTPUT: 2212 OUTPUT:
2000 RETVAL 2213 RETVAL
2001 2214
2002void 2215void
2003draw (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)
2004 CODE: 2217 CODE:
2005{ 2218{
2006 int x, y, z; 2219 int x, y, z;
2007 2220
2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2009 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
2010 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)
2011 smooth_key skey; 2223 smooth_key skey;
2012 int pl_x, pl_y; 2224 int pl_x, pl_y;
2013 maptex pl_tex; 2225 maptex pl_tex;
2014 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc (); 2227 rc_t *rc_ov = rc_alloc ();
2016 rc_key_t key; 2228 rc_key_t key;
2017 rc_array_t *arr, *arr_hidden; 2229 rc_array_t *arr;
2018 2230
2019 pl_tex.name = 0; 2231 pl_tex.name = 0;
2020 2232
2021 // thats current max. sorry. 2233 // that's current max. sorry.
2022 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
2023 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
2024 2236
2025 // clear key, in case of extra padding 2237 // clear key, in case of extra padding
2026 memset (&skey, 0, sizeof (skey)); 2238 memset (&skey, 0, sizeof (skey));
2060 2272
2061 glEnable (GL_BLEND); 2273 glEnable (GL_BLEND);
2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064 2276
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
2068 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
2069 { 2278 {
2279 smooth_hash smooth;
2070 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1; 2281 key.texname = -1;
2072 2282
2073 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
2074 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
2095 2305
2096 key.texname = tex.name; 2306 key.texname = tex.name;
2097 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
2098 } 2308 }
2099 2309
2100 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
2101 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
2102 2312
2103 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2104 { 2314 {
2105 pl_x = px; 2315 pl_x = px;
2106 pl_y = py; 2316 pl_y = py;
2135 2345
2136 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2137 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2138 2348
2139 // full tile 2349 // full tile
2140 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);
2141 2351
2142 // borders 2352 // borders
2143 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);
2144 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);
2145 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);
2146 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);
2147 2357
2148 // corners 2358 // corners
2149 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);
2150 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);
2151 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);
2152 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);
2153 } 2363 }
2154 } 2364 }
2155 2365
2156 if (expect_false (z == 2)) 2366 if (expect_false (z == 2) && expect_false (cell->flags))
2157 { 2367 {
2158 /* draw question marks on top of hidden spaces */ 2368 // overlays such as the speech bubble, probably more to come
2159 if (!cell->darkness) 2369 if (cell->flags & 1)
2160 { 2370 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key; 2371 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH]; 2372 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr; 2373 rc_array_t *arr;
2374 int px = x * Tw + Tw * 2 / 32;
2375 int py = y * Th - Th * 6 / 32;
2179 2376
2180 key_ov.texname = tex.name; 2377 key_ov.texname = tex.name;
2181 arr = rc_array (rc_ov, &key_ov); 2378 arr = rc_array (rc_ov, &key_ov);
2182 2379
2183 int px = x * T + T * 2 / 32;
2184 int py = y * T - T * 6 / 32;
2185
2186 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2187 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2188 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2382 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2189 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2190 }
2191 } 2384 }
2192 } 2385 }
2193 } 2386 }
2194 } 2387 }
2195 2388
2211 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2212 { 2405 {
2213 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2214 HE *he; 2407 HE *he;
2215 2408
2216 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2217 while ((he = hv_iternext (smooth)))
2218 { 2410 {
2219 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2220 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2221 2413
2222 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2223 && skey->level == level 2415 && skey.level == level
2224 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2225 { 2417 {
2226 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2227 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2228 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2229 int border = bits & 15; 2421 int border = bits & 15;
2230 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2231 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2232 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2233 2425
2235 { 2427 {
2236 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2237 // save gobs of state changes. 2429 // save gobs of state changes.
2238 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2239 { 2431 {
2240 self->tex [skey->tile].unused = 0; 2432 self->tex [skey.tile].unused = 0;
2241 2433
2242 glEnd (); 2434 glEnd ();
2243 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2244 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2245 } 2437 }
2246 2438
2247 if (border) 2439 if (border)
2248 { 2440 {
2249 float ox = border * dx; 2441 float ox = border * dx;
2250 2442
2251 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2252 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2253 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2254 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2255 } 2447 }
2256 2448
2257 if (corner) 2449 if (corner)
2258 { 2450 {
2259 float ox = corner * dx; 2451 float ox = corner * dx;
2260 2452
2261 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2262 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2263 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2264 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2265 } 2457 }
2266 } 2458 }
2267 } 2459 }
2268 } 2460 }
2269 } 2461 }
2271 2463
2272 glEnd (); 2464 glEnd ();
2273 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2274 key.texname = -1; 2466 key.texname = -1;
2275 } 2467 }
2276
2277 hv_clear (smooth);
2278 } 2468 }
2279 2469
2280 if (pl_tex.name) 2470 if (pl_tex.name)
2281 { 2471 {
2282 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2310 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2311 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2312 { 2502 {
2313 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2314 2504
2315 int px = x * T; 2505 int px = x * Tw;
2316 int py = y * T; 2506 int py = y * Th;
2317 2507
2318 if (expect_false (cell->player == player)) 2508 if (expect_false (cell->player == player))
2319 { 2509 {
2320 px += sdx; 2510 px += sdx;
2321 py += sdy; 2511 py += sdy;
2322 } 2512 }
2323 2513
2324 if (cell->stat_hp) 2514 if (cell->stat_hp)
2325 { 2515 {
2326 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2327 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2328 2518
2329 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2330 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2331 px + width - 1, py); 2521 px + width - 1, py);
2332 2522
2338 } 2528 }
2339 } 2529 }
2340} 2530}
2341 2531
2342void 2532void
2343draw_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)
2344 CODE: 2534 CODE:
2345{ 2535{
2346 static float color[16][3] = { 2536 static float color[16][3] = {
2347 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2348 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2349 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2350 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2351 2541
2352 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2353 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2354 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2355 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2356 2546
2357 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2358 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2359 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2360 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2361 2551
2362 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2363 2553
2364 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2365 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2366 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2367 }; 2557 };
2368 2558
2369 int x, y; 2559 int x, y;
2370 2560
2371 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 */
2372 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2373 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2374 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2570 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2375 glBegin (GL_QUADS); 2571 glBegin (GL_QUADS);
2376 2572
2377 for (y = 0; y < h; y++) 2573 for (y = 0; y < h; y++)
2381 2577
2382 if (m) 2578 if (m)
2383 { 2579 {
2384 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2385 2581
2386 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2387 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2388 2584
2389 glColor4f (c[0], c[1], c[2], 0.75); 2585 glColor4f (c[0], c[1], c[2], 1);
2390 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2391 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2392 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2393 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2589 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2394 } 2590 }
2402void 2598void
2403fow_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)
2404 PPCODE: 2600 PPCODE:
2405{ 2601{
2406 int x, y; 2602 int x, y;
2407 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2408 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2409 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2410 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);
2411 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2412 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2413 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2414 2611
2415 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2416 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2417 2614
2418 mx += self->x - 1; 2615 mx += self->x - 1;
2419 my += self->y - 1; 2616 my += self->y - 1;
2420
2421 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2422 2617
2423 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2424 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2425 { 2620 {
2426 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2429 if (row->c0 <= x + mx && x + mx < row->c1) 2624 if (row->c0 <= x + mx && x + mx < row->c1)
2430 { 2625 {
2431 mapcell *cell = row->col + (x + mx - row->c0); 2626 mapcell *cell = row->col + (x + mx - row->c0);
2432 2627
2433 darkness1 [y * sw1 + x] = cell->darkness 2628 darkness1 [y * sw1 + x] = cell->darkness
2434 ? 255 - (cell->darkness - 1) 2629 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2435 : 255 - FOW_DARKNESS; 2630 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2436 } 2631 }
2437 } 2632 }
2438 2633
2439 for (y = 0; y < sh; ++y) 2634 for (y = 0; y < sh; ++y)
2440 for (x = 0; x < sw; ++x) 2635 for (x = 0; x < sw; ++x)
2459 2654
2460 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2461 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2462 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2463 2658
2464 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2465 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2466 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2467 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2468 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 */
2469 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2470 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2471 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2472 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2473 } 2668 }
2474 2669
2475 free (darkness1); 2670 free (darkness1);
2476 2671
2477 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2478 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2479 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2480 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2481} 2676}
2482 2677
2483SV * 2678SV *
2546 else 2741 else
2547 *data++ = 0; 2742 *data++ = 0;
2548 } 2743 }
2549 } 2744 }
2550 2745
2551 /* 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 */
2552 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2553 { 2748 {
2554 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2555 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2556 } 2751 }
2557 2752
2558 RETVAL = data_sv; 2753 RETVAL = data_sv;
2559} 2754}
2560 OUTPUT: 2755 OUTPUT:
2561 RETVAL 2756 RETVAL
2562 2757
2563void 2758void
2570 STRLEN len; 2765 STRLEN len;
2571 uint8_t *data, *end; 2766 uint8_t *data, *end;
2572 2767
2573 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2574 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2575 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2576 end = data + len + 8; 2771 end = data + len + 8;
2577 2772
2578 if (len < 5) 2773 if (len < 5)
2579 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2580 2775
2641} 2836}
2642 2837
2643MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2644 2839
2645DC::RW 2840DC::RW
2646new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2647 CODE: 2842 CODE:
2648{ 2843{
2649 STRLEN datalen; 2844 STRLEN datalen;
2650 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2651 2846
2653} 2848}
2654 OUTPUT: 2849 OUTPUT:
2655 RETVAL 2850 RETVAL
2656 2851
2657DC::RW 2852DC::RW
2658new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2659 CODE: 2854 CODE:
2660 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2661 OUTPUT: 2856 OUTPUT:
2662 RETVAL 2857 RETVAL
2663 2858
2681 if (RETVAL < 0) 2876 if (RETVAL < 0)
2682 { 2877 {
2683 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2684 2879
2685 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)
2686 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2687 2887 }
2888 else
2688 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2689 } 2890 }
2690 2891
2691 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2692 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2693} 2894}
2740void 2941void
2741set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2742 CODE: 2943 CODE:
2743{ 2944{
2744 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));
2745 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;
2746 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2747} 2948}
2748 2949
2749void 2950void
2750set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2753 2954
2754MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2755 2956
2756PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2757 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
2758DC::MixChunk 2971DC::MixChunk
2759new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2760 CODE: 2973 CODE:
2761 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2762 OUTPUT: 2975 OUTPUT:
2763 RETVAL 2976 RETVAL
2764 2977
2794 OUTPUT: 3007 OUTPUT:
2795 RETVAL 3008 RETVAL
2796 3009
2797MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2798 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
2799int 3024int
2800volume (int volume = -1) 3025volume (int volume = -1)
2801 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2802 CODE: 3027 CODE:
2803 if (items > 0) 3028 if (items > 0)
2814void 3039void
2815halt () 3040halt ()
2816 CODE: 3041 CODE:
2817 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2818 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2819DC::MixMusic 3051DC::MixMusic
2820new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2821 CODE: 3053 CODE:
2822 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2823 OUTPUT: 3055 OUTPUT:
2824 RETVAL 3056 RETVAL
2825 3057
2853 } *civ, const_iv[] = { 3085 } *civ, const_iv[] = {
2854# define const_iv(name) { # name, (IV)name } 3086# define const_iv(name) { # name, (IV)name }
2855 const_iv (GL_VENDOR), 3087 const_iv (GL_VENDOR),
2856 const_iv (GL_VERSION), 3088 const_iv (GL_VERSION),
2857 const_iv (GL_EXTENSIONS), 3089 const_iv (GL_EXTENSIONS),
3090 const_iv (GL_MAX_TEXTURE_UNITS),
2858 const_iv (GL_COLOR_MATERIAL), 3091 const_iv (GL_COLOR_MATERIAL),
2859 const_iv (GL_SMOOTH), 3092 const_iv (GL_SMOOTH),
2860 const_iv (GL_FLAT), 3093 const_iv (GL_FLAT),
2861 const_iv (GL_DITHER), 3094 const_iv (GL_DITHER),
2862 const_iv (GL_BLEND), 3095 const_iv (GL_BLEND),
2874 const_iv (GL_ZERO), 3107 const_iv (GL_ZERO),
2875 const_iv (GL_SRC_ALPHA), 3108 const_iv (GL_SRC_ALPHA),
2876 const_iv (GL_DST_ALPHA), 3109 const_iv (GL_DST_ALPHA),
2877 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3110 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2878 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),
2879 const_iv (GL_SRC_ALPHA_SATURATE), 3116 const_iv (GL_SRC_ALPHA_SATURATE),
2880 const_iv (GL_RGB), 3117 const_iv (GL_RGB),
2881 const_iv (GL_RGBA), 3118 const_iv (GL_RGBA),
2882 const_iv (GL_RGBA4), 3119 const_iv (GL_RGBA4),
2883 const_iv (GL_RGBA8), 3120 const_iv (GL_RGBA8),
2951 const_iv (GL_NICEST), 3188 const_iv (GL_NICEST),
2952 const_iv (GL_V2F), 3189 const_iv (GL_V2F),
2953 const_iv (GL_V3F), 3190 const_iv (GL_V3F),
2954 const_iv (GL_T2F_V3F), 3191 const_iv (GL_T2F_V3F),
2955 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),
2956# undef const_iv 3196# undef const_iv
2957 }; 3197 };
2958 3198
2959 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--)
2960 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2961 3201
2962 texture_av = newAV (); 3202 texture_av = newAV ();
2963 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
2964} 3204}
2965 3205
2967disable_GL_EXT_blend_func_separate () 3207disable_GL_EXT_blend_func_separate ()
2968 CODE: 3208 CODE:
2969 gl.BlendFuncSeparate = 0; 3209 gl.BlendFuncSeparate = 0;
2970 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
2971 3211
2972char * 3212void
3213apple_nvidia_bug (int enable)
3214
3215const char *
2973gl_vendor () 3216gl_vendor ()
2974 CODE: 3217 CODE:
2975 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
2976 OUTPUT: 3219 OUTPUT:
2977 RETVAL 3220 RETVAL
2978 3221
2979char * 3222const char *
2980gl_version () 3223gl_version ()
2981 CODE: 3224 CODE:
2982 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
2983 OUTPUT: 3226 OUTPUT:
2984 RETVAL 3227 RETVAL
2985 3228
2986char * 3229const char *
2987gl_extensions () 3230gl_extensions ()
2988 CODE: 3231 CODE:
2989 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2990 OUTPUT: 3233 OUTPUT:
2991 RETVAL 3234 RETVAL
2992 3235
2993const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
2994 3241
2995GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
2996 CODE: 3243 CODE:
2997 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
2998 OUTPUT: 3245 OUTPUT:
3006 3253
3007int glGetError () 3254int glGetError ()
3008 3255
3009void glFinish () 3256void glFinish ()
3010 3257
3258void glFlush ()
3259
3011void glClear (int mask) 3260void glClear (int mask)
3012 3261
3013void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
3014 PROTOTYPE: @ 3263 PROTOTYPE: @
3015 3264
3024void glBlendFunc (int sfactor, int dfactor) 3273void glBlendFunc (int sfactor, int dfactor)
3025 3274
3026void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3275void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3027 CODE: 3276 CODE:
3028 gl_BlendFuncSeparate (sa, da, saa, daa); 3277 gl_BlendFuncSeparate (sa, da, saa, daa);
3278
3279# void glBlendEquation (int se)
3029 3280
3030void glDepthMask (int flag) 3281void glDepthMask (int flag)
3031 3282
3032void glLogicOp (int opcode) 3283void glLogicOp (int opcode)
3033 3284
3184 3435
3185void glEndList () 3436void glEndList ()
3186 3437
3187void glCallList (int list) 3438void glCallList (int list)
3188 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
3189MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3190 3446
3191PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
3192 3448
3193void 3449void
3194find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3195 PPCODE: 3451 PPCODE:
3196{ 3452{
3197 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3198 XPUSHs (self); 3454 XPUSHs (self);
3199} 3455}
3200 3456
3201BOOT: 3457BOOT:
3202{ 3458{
3210 3466
3211void 3467void
3212draw (SV *self) 3468draw (SV *self)
3213 CODE: 3469 CODE:
3214{ 3470{
3215 HV *hv; 3471 HV *hv;
3216 SV **svp; 3472 SV **svp;
3217 NV x, y, w, h; 3473 NV x, y, w, h;
3218 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3219 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3220 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3221 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