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.294 by root, Sat Dec 19 05:06:56 2009 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 64 93#define FOW_DARKNESS 50
87#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 94#define DARKNESS_ADJUST(n) (n)
88 95
89#define MAP_EXTEND_X 32 96#define MAP_EXTEND_X 32
90#define MAP_EXTEND_Y 512 97#define MAP_EXTEND_Y 512
91 98
92#define MIN_FONT_HEIGHT 10 99#define MIN_FONT_HEIGHT 10
96 103
97#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
98 105
99#define TEXID_SPEECH 1 106#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2 107#define TEXID_NOFACE 2
101#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}
102 127
103static AV *texture_av; 128static AV *texture_av;
104 129
105static struct 130static struct
106{ 131{
163{ 188{
164 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
165 190
166 while (attrs) 191 while (attrs)
167 { 192 {
168 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
169 194
170 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
171 return 1; 196 return 1;
172 197
173 attrs = attrs->next; 198 attrs = attrs->next;
191static void 216static void
192substitute_func (FcPattern *pattern, gpointer data) 217substitute_func (FcPattern *pattern, gpointer data)
193{ 218{
194 FcPatternAddBool (pattern, FC_HINTING, 1); 219 FcPatternAddBool (pattern, FC_HINTING, 1);
195#ifdef FC_HINT_STYLE 220#ifdef FC_HINT_STYLE
196 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 221 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
197#endif 222#endif
198 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 223 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
199} 224}
200 225
201static void 226static void
418 CELL_CLEAR (cell); 443 CELL_CLEAR (cell);
419 } 444 }
420 } 445 }
421} 446}
422 447
423typedef struct { 448struct smooth_key
449{
424 tileid tile; 450 tileid tile;
425 uint8_t x, y, level; 451 uint8_t x, y, level;
426} 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}
427 471
428static void 472static void
429smooth_or_bits (HV *hv, smooth_key *key, IV bits) 473smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
430{ 474{
431 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 475 auto &&it = h.find (key);
432 476
433 if (SvIOK (*sv)) 477 if (it == h.end ())
434 SvIV_set (*sv, SvIVX (*sv) | bits); 478 h.insert (std::make_pair (key, bits));
435 else 479 else
436 sv_setiv (*sv, bits); 480 it->second |= bits;
437} 481}
438 482
439static void 483static void
440music_finished (void) 484music_finished (void)
441{ 485{
458 ev.code = 1; 502 ev.code = 1;
459 ev.data1 = (void *)(long)channel; 503 ev.data1 = (void *)(long)channel;
460 ev.data2 = 0; 504 ev.data2 = 0;
461 505
462 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;
463} 514}
464 515
465static unsigned int 516static unsigned int
466minpot (unsigned int n) 517minpot (unsigned int n)
467{ 518{
550 601
551 return mod; 602 return mod;
552} 603}
553 604
554static void 605static void
555deliantra_main () 606deliantra_main (SV *real_main)
556{ 607{
557 char *argv[] = { 0 }; 608 dSP;
558 call_argv ("::main", G_DISCARD | G_VOID, argv); 609
610 PUSHMARK (SP);
611 call_sv (real_main, G_DISCARD | G_VOID);
559} 612}
560 613
561#ifdef __MACOSX__ 614#ifdef __MACOSX__
615 static SV *real_main;
616
562 /* to due surprising braindamage on the side of SDL design, we 617 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main() 618 * do some mind-boggling hack here: SDL requires a custom main()
564 * 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,
565 * 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,
566 * and which calls our main (== SDL_main) back. 621 * and which calls our main (== SDL_main) back.
567 */ 622 */
568 extern C_LINKAGE int 623 extern C_LINKAGE int
569 main (int argc, char *argv[]) 624 main (int argc, char *argv[])
570 { 625 {
571 deliantra_main (); 626 deliantra_main (real_main);
572 } 627 }
573 628
574 #undef main 629 #undef main
575 630
576 extern C_LINKAGE int main (int argc, char *argv[]); 631 extern C_LINKAGE int main (int argc, char *argv[]);
577 632
578 static void 633 static void
579 SDL_braino (void) 634 SDL_main_hack (SV *real_main_)
580 { 635 {
636 real_main = real_main_;
637
581 char *argv[] = { "deliantra client", 0 }; 638 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv); 639 (main) (1, argv);
583 } 640 }
584#else 641#else
585 static void 642 static void
586 SDL_braino (void) 643 SDL_main_hack (SV *real_main)
587 { 644 {
588 deliantra_main (); 645 deliantra_main (real_main);
589 } 646 }
590#endif 647#endif
591 648
592MODULE = Deliantra::Client PACKAGE = DC 649MODULE = Deliantra::Client PACKAGE = DC
593 650
794 851
795 const_iv (FOW_DARKNESS) 852 const_iv (FOW_DARKNESS)
796# undef const_iv 853# undef const_iv
797 }; 854 };
798 855
799 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--)
800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 857 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801 858
802 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 859 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 860 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804} 861}
805 862
821NV ceil (NV x) 878NV ceil (NV x)
822 879
823IV minpot (UV n) 880IV minpot (UV n)
824 881
825IV 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
826 889
827void 890void
828pango_init () 891pango_init ()
829 CODE: 892 CODE:
830{ 893{
838#endif 901#endif
839} 902}
840 903
841char *SDL_GetError () 904char *SDL_GetError ()
842 905
843void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
844 908
845int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
846 910
847int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
848 912
849void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
850 914
851void SDL_Quit () 915void SDL_Quit ()
852 916
853int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
854 919
855int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
856 CODE: 921 CODE:
857 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
858 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
859 OUTPUT: 924 OUTPUT:
860 RETVAL 925 RETVAL
861 926
862void 927void
917 ); 982 );
918 983
919 if (RETVAL) 984 if (RETVAL)
920 { 985 {
921 av_clear (texture_av); 986 av_clear (texture_av);
922
923 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
924#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);
925#include "glfunc.h" 988#include "glfunc.h"
926#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
927 } 992 }
928} 993}
929 OUTPUT: 994 OUTPUT:
930 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
931 999
932void 1000void
933SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
934 1002
935char * 1003char *
936SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
937 1006
938int 1007int
939SDL_GetAppState () 1008SDL_GetAppState ()
940 1009
941int 1010int
942SDL_GetModState () 1011SDL_GetModState ()
943 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
944void 1017void
1018SDL_PumpEvents ()
1019
1020void
945poll_events () 1021peep_events ()
946 PPCODE: 1022 PPCODE:
947{ 1023{
948 SDL_Event ev; 1024 SDL_Event ev;
949 1025
950 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
1016 1092
1017 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))));
1018 } 1094 }
1019} 1095}
1020 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
1021int 1110int
1022Mix_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)
1023 POSTCALL: 1112 POSTCALL:
1024 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1025 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1026 1115
1027void 1116void
1028Mix_QuerySpec () 1117Mix_QuerySpec ()
1087add_font (char *file) 1176add_font (char *file)
1088 CODE: 1177 CODE:
1089 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090 OUTPUT: 1179 OUTPUT:
1091 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)
1092 1188
1093void 1189void
1094load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1095 ALIAS: 1191 ALIAS:
1096 load_image_file = 1 1192 load_image_file = 1
1142 1238
1143 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1144 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1145 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1146 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1147 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1148 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)));
1149 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1150 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1151 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1152 1248
1224MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1225 1321
1226PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1227 1323
1228DC::Font 1324DC::Font
1229new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1230 CODE: 1326 CODE:
1231{ 1327{
1232 int count; 1328 int count;
1233 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1234 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1263 PROTOTYPE: 1359 PROTOTYPE:
1264 CODE: 1360 CODE:
1265 tc_restore (); 1361 tc_restore ();
1266 1362
1267DC::Layout 1363DC::Layout
1268new (SV *class) 1364new (SV *klass)
1269 CODE: 1365 CODE:
1270 New (0, RETVAL, 1, struct cf_layout); 1366 New (0, RETVAL, 1, struct cf_layout);
1271 1367
1272 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1273 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1422 1518
1423void 1519void
1424set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1425 CODE: 1521 CODE:
1426 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1427 { 1523 {
1428 self->base_height = base_height; 1524 self->base_height = base_height;
1429 layout_update_font (self); 1525 layout_update_font (self);
1430 } 1526 }
1431 1527
1432void 1528void
1660 glDisable (GL_BLEND); 1756 glDisable (GL_BLEND);
1661 } 1757 }
1662} 1758}
1663 1759
1664void 1760void
1665draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f) 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)
1666 PROTOTYPE: @ 1762 PROTOTYPE: @
1667 CODE: 1763 CODE:
1668{ 1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1669 glEnable (GL_TEXTURE_2D); 1767 glEnable (GL_TEXTURE_2D);
1670 glEnable (GL_BLEND);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 glBindTexture (GL_TEXTURE_2D, name1); 1768 glBindTexture (GL_TEXTURE_2D, name1);
1673 1769
1674 glColor3f (intensity, intensity, intensity); 1770 glColor3f (intensity, intensity, intensity);
1675 glPushMatrix (); 1771 glPushMatrix ();
1676 glScalef (1./3, 1./3, 1.); 1772 glScalef (1./3, 1./3, 1.);
1677 1773
1678 if (blend > 0.f) 1774 if (blend > 0.f)
1679 { 1775 {
1680 float S2, T2; /* 0. 0. for texture 2 */ 1776 float dx3 = dx * -3.f / w;
1681 float w = w1 > w2 ? w1 : w2; 1777 float dy3 = dy * -3.f / h;
1682 float h = h1 > h2 ? h1 : h2;
1683 GLfloat env_color[4] = { 0., 0., 0., blend }; 1778 GLfloat env_color[4] = { 0., 0., 0., blend };
1684 1779
1685 /* interpolate the two shadow textures */ 1780 /* interpolate the two shadow textures */
1686 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1781 /* stage 0 == rgb(glcolor) + alpha(t0) */
1687 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1782 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1692 glBindTexture (GL_TEXTURE_2D, name2); 1787 glBindTexture (GL_TEXTURE_2D, name2);
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694 1789
1695 /* rgb == rgb(glcolor) */ 1790 /* rgb == rgb(glcolor) */
1696 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699 1794
1700 /* alpha = interpolate t0, t1 by env_alpha */ 1795 /* alpha = interpolate t0, t1 by env_alpha */
1701 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702 1797
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1803 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709 1804
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712 1807
1713 s1 *= w / w1;
1714 t1 *= h / h1;
1715
1716 dx *= -3.f / w2;
1717 dy *= -3.f / h2;
1718 dx *= w / w2;
1719 dy *= h / h2;
1720
1721 s2 *= w / w2;
1722 t2 *= h / h2;
1723
1724 glBegin (GL_QUADS); 1808 glBegin (GL_QUADS);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1809 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1); 1810 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1); 1811 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1728 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0); 1812 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1729 glEnd (); 1813 glEnd ();
1730 1814
1731 glDisable (GL_TEXTURE_2D); 1815 glDisable (GL_TEXTURE_2D);
1732 gl.ActiveTexture (GL_TEXTURE0); 1816 gl.ActiveTexture (GL_TEXTURE0);
1733 } 1817 }
1735 { 1819 {
1736 /* simple blending of one texture, also opengl <1.3 path */ 1820 /* simple blending of one texture, also opengl <1.3 path */
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1821 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738 1822
1739 glBegin (GL_QUADS); 1823 glBegin (GL_QUADS);
1740 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1824 glTexCoord2f (0, 0); glVertex2f (0, 0);
1741 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1825 glTexCoord2f (0, t); glVertex2f (0, h);
1742 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1826 glTexCoord2f (s, t); glVertex2f (w, h);
1743 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1827 glTexCoord2f (s, 0); glVertex2f (w, 0);
1744 glEnd (); 1828 glEnd ();
1745 } 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 ();
1746 1874
1747 glPopMatrix (); 1875 glPopMatrix ();
1748 1876
1749 glDisable (GL_TEXTURE_2D); 1877 glDisable (GL_TEXTURE_2D);
1750 glDisable (GL_BLEND); 1878 glDisable (GL_BLEND);
1764MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1765 1893
1766PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1767 1895
1768DC::Map 1896DC::Map
1769new (SV *class) 1897new (SV *klass)
1770 CODE: 1898 CODE:
1771 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, struct map);
1772 RETVAL->x = 0; 1900 RETVAL->x = 0;
1773 RETVAL->y = 0; 1901 RETVAL->y = 0;
1774 RETVAL->w = 0; 1902 RETVAL->w = 0;
1813 1941
1814void 1942void
1815set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1816 CODE: 1944 CODE:
1817{ 1945{
1818 tileid texid; 1946 tileid texid;
1819 maptex *tex; 1947 maptex *tex;
1820 1948
1821 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1822 return; 1950 return;
1823 1951
1824 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1825 return; 1953 return;
1826 1954
1827 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1828 1956
1829 if (!texid) 1957 if (!texid)
1830 return; 1958 return;
1831 1959
1832 tex = self->tex + texid; 1960 tex = self->tex + texid;
1865} 1993}
1866 1994
1867void 1995void
1868expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1869 PPCODE: 1997 PPCODE:
1870 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1871 { 1999 {
1872 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1873 2001
1874 if (tex->name) 2002 if (tex->name)
1875 { 2003 {
1930 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1931 } 2059 }
1932} 2060}
1933 2061
1934SV * 2062SV *
1935map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1936 CODE: 2064 CODE:
1937{ 2065{
1938 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1939 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1940 mapcell *cell; 2068 mapcell *cell;
1961 2089
1962 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
1963 2091
1964 if (flags & 8) 2092 if (flags & 8)
1965 { 2093 {
2094 uint8_t ext, cmd;
2095
1966 if (extmap) 2096 do
1967 { 2097 {
1968 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
1969 2100
1970 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
1971 { 2104 {
1972 ext = *data++;
1973 cmd = ext & 0x7f;
1974
1975 if (cmd < 4)
1976 cell->darkness = 255 - ext * 64 + 1;
1977 else if (cmd == 5) // health
1978 {
1979 cell->stat_width = 1; 2105 cell->stat_width = 1;
1980 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
1981 }
1982 else if (cmd == 6) // monster width
1983 cell->stat_width = *data++ + 1;
1984 else if (cmd == 0x47)
1985 {
1986 if (*data == 1) cell->player = data [1];
1987 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1988 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1989 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1990
1991 data += *data + 1;
1992 }
1993 else if (cmd == 8) // cell flags
1994 cell->flags = *data++;
1995 else if (ext & 0x40) // unknown, multibyte => skip
1996 data += *data + 1;
1997 else
1998 data++;
1999 } 2107 }
2000 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++;
2001 } 2125 }
2002 else 2126 while (ext & 0x80);
2003 cell->darkness = *data++ + 1;
2004 } 2127 }
2005 2128
2006 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
2007 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
2008 { 2131 {
2056 ? self->row + y 2179 ? self->row + y
2057 : 0; 2180 : 0;
2058 2181
2059 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
2060 { 2183 {
2061 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
2062 2185
2063 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
2064 { 2187 {
2065 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
2066 2189
2068 { 2191 {
2069 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
2070 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
2071 int a1 = tex.a; 2194 int a1 = tex.a;
2072 2195
2073 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
2074 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
2075 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
2076 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
2077 } 2200 }
2078 } 2201 }
2079 2202
2080 *map++ = (r ) 2203 *map++ = (r )
2081 | (g << 8) 2204 | (g << 8)
2082 | (b << 16) 2205 | (b << 16)
2083 | (a << 24); 2206 | (a << 24);
2084 } 2207 }
2085 } 2208 }
2086 2209
2087 RETVAL = map_sv; 2210 RETVAL = map_sv;
2088} 2211}
2089 OUTPUT: 2212 OUTPUT:
2090 RETVAL 2213 RETVAL
2091 2214
2092void 2215void
2093draw (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)
2094 CODE: 2217 CODE:
2095{ 2218{
2096 int x, y, z; 2219 int x, y, z;
2097 2220
2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2099 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
2100 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)
2101 smooth_key skey; 2223 smooth_key skey;
2102 int pl_x, pl_y; 2224 int pl_x, pl_y;
2103 maptex pl_tex; 2225 maptex pl_tex;
2104 rc_t *rc = rc_alloc (); 2226 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc (); 2227 rc_t *rc_ov = rc_alloc ();
2106 rc_key_t key; 2228 rc_key_t key;
2107 rc_array_t *arr, *arr_hidden; 2229 rc_array_t *arr;
2108 2230
2109 pl_tex.name = 0; 2231 pl_tex.name = 0;
2110 2232
2111 // that's current max. sorry. 2233 // that's current max. sorry.
2112 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
2150 2272
2151 glEnable (GL_BLEND); 2273 glEnable (GL_BLEND);
2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2274 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2275 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2154 2276
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157
2158 for (z = 0; z <= 2; z++) 2277 for (z = 0; z <= 2; z++)
2159 { 2278 {
2279 smooth_hash smooth;
2160 memset (smooth_level, 0, sizeof (smooth_level)); 2280 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1; 2281 key.texname = -1;
2162 2282
2163 for (y = 0; y < sh; y++) 2283 for (y = 0; y < sh; y++)
2164 if (0 <= y + my && y + my < self->rows) 2284 if (0 <= y + my && y + my < self->rows)
2185 2305
2186 key.texname = tex.name; 2306 key.texname = tex.name;
2187 arr = rc_array (rc, &key); 2307 arr = rc_array (rc, &key);
2188 } 2308 }
2189 2309
2190 px = (x + 1) * T - tex.w; 2310 px = (x + 1) * Th - tex.w;
2191 py = (y + 1) * T - tex.h; 2311 py = (y + 1) * Tw - tex.h;
2192 2312
2193 if (expect_false (cell->player == player) && expect_false (z == 2)) 2313 if (expect_false (cell->player == player) && expect_false (z == 2))
2194 { 2314 {
2195 pl_x = px; 2315 pl_x = px;
2196 pl_y = py; 2316 pl_y = py;
2225 2345
2226 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2346 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2227 // ·· ·· ·┏ ┓· 2347 // ·· ·· ·┏ ┓·
2228 2348
2229 // full tile 2349 // full tile
2230 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);
2231 2351
2232 // borders 2352 // borders
2233 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);
2234 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);
2235 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);
2236 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);
2237 2357
2238 // corners 2358 // corners
2239 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);
2240 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);
2241 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);
2242 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);
2243 } 2363 }
2244 } 2364 }
2245 2365
2246 if (expect_false (z == 2)) 2366 if (expect_false (z == 2) && expect_false (cell->flags))
2247 { 2367 {
2248 /* draw question marks on top of hidden spaces */ 2368 // overlays such as the speech bubble, probably more to come
2249 if (!cell->darkness) 2369 if (cell->flags & 1)
2250 { 2370 {
2251 maptex tex = self->tex [TEXID_HIDDEN];
2252 int px = (x + 1) * T - tex.w;
2253 int py = (y + 1) * T - tex.h;
2254
2255 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259 }
2260
2261 if (expect_false (cell->flags))
2262 {
2263 // overlays such as the speech bubble, probably more to come
2264 if (cell->flags & 1)
2265 {
2266 rc_key_t key_ov = key; 2371 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH]; 2372 maptex tex = self->tex [TEXID_SPEECH];
2268 rc_array_t *arr; 2373 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32; 2374 int px = x * Tw + Tw * 2 / 32;
2270 int py = y * T - T * 6 / 32; 2375 int py = y * Th - Th * 6 / 32;
2271 2376
2272 key_ov.texname = tex.name; 2377 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov); 2378 arr = rc_array (rc_ov, &key_ov);
2274 2379
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2380 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2381 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2277 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);
2278 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2383 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2279 }
2280 } 2384 }
2281 } 2385 }
2282 } 2386 }
2283 } 2387 }
2284 2388
2300 if (smask & (((uint32_t)1) << b)) 2404 if (smask & (((uint32_t)1) << b))
2301 { 2405 {
2302 int level = (w << 5) | b; 2406 int level = (w << 5) | b;
2303 HE *he; 2407 HE *he;
2304 2408
2305 hv_iterinit (smooth); 2409 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2306 while ((he = hv_iternext (smooth)))
2307 { 2410 {
2308 smooth_key *skey = (smooth_key *)HeKEY (he); 2411 smooth_key &skey = it->first;
2309 IV bits = SvIVX (HeVAL (he)); 2412 IV bits = it->second;
2310 2413
2311 if (!(bits & 0x1000) 2414 if (!(bits & 0x1000)
2312 && skey->level == level 2415 && skey.level == level
2313 && level > smooth_max [skey->x][skey->y]) 2416 && level > smooth_max [skey.x][skey.y])
2314 { 2417 {
2315 maptex tex = self->tex [skey->tile]; 2418 maptex tex = self->tex [skey.tile];
2316 int px = (((int)skey->x) - 1) * T; 2419 int px = (((int)skey.x) - 1) * Tw;
2317 int py = (((int)skey->y) - 1) * T; 2420 int py = (((int)skey.y) - 1) * Th;
2318 int border = bits & 15; 2421 int border = bits & 15;
2319 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2422 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2320 float dx = tex.s * .0625f; // 16 images/row 2423 float dx = tex.s * .0625f; // 16 images/row
2321 float dy = tex.t * .5f ; // 2 images/column 2424 float dy = tex.t * .5f ; // 2 images/column
2322 2425
2324 { 2427 {
2325 // this time avoiding texture state changes 2428 // this time avoiding texture state changes
2326 // save gobs of state changes. 2429 // save gobs of state changes.
2327 if (key.texname != tex.name) 2430 if (key.texname != tex.name)
2328 { 2431 {
2329 self->tex [skey->tile].unused = 0; 2432 self->tex [skey.tile].unused = 0;
2330 2433
2331 glEnd (); 2434 glEnd ();
2332 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2435 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2333 glBegin (GL_QUADS); 2436 glBegin (GL_QUADS);
2334 } 2437 }
2335 2438
2336 if (border) 2439 if (border)
2337 { 2440 {
2338 float ox = border * dx; 2441 float ox = border * dx;
2339 2442
2340 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2443 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2341 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2444 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2342 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2343 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2446 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2344 } 2447 }
2345 2448
2346 if (corner) 2449 if (corner)
2347 { 2450 {
2348 float ox = corner * dx; 2451 float ox = corner * dx;
2349 2452
2350 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2453 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2351 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2454 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2352 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2455 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2353 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2456 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2354 } 2457 }
2355 } 2458 }
2356 } 2459 }
2357 } 2460 }
2358 } 2461 }
2360 2463
2361 glEnd (); 2464 glEnd ();
2362 glDisable (GL_TEXTURE_2D); 2465 glDisable (GL_TEXTURE_2D);
2363 key.texname = -1; 2466 key.texname = -1;
2364 } 2467 }
2365
2366 hv_clear (smooth);
2367 } 2468 }
2368 2469
2369 if (pl_tex.name) 2470 if (pl_tex.name)
2370 { 2471 {
2371 maptex tex = pl_tex; 2472 maptex tex = pl_tex;
2399 for (x = 0; x < sw; x++) 2500 for (x = 0; x < sw; x++)
2400 if (row->c0 <= x + mx && x + mx < row->c1) 2501 if (row->c0 <= x + mx && x + mx < row->c1)
2401 { 2502 {
2402 mapcell *cell = row->col + (x + mx - row->c0); 2503 mapcell *cell = row->col + (x + mx - row->c0);
2403 2504
2404 int px = x * T; 2505 int px = x * Tw;
2405 int py = y * T; 2506 int py = y * Th;
2406 2507
2407 if (expect_false (cell->player == player)) 2508 if (expect_false (cell->player == player))
2408 { 2509 {
2409 px += sdx; 2510 px += sdx;
2410 py += sdy; 2511 py += sdy;
2411 } 2512 }
2412 2513
2413 if (cell->stat_hp) 2514 if (cell->stat_hp)
2414 { 2515 {
2415 int width = cell->stat_width * T; 2516 int width = cell->stat_width * Tw;
2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2517 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2417 2518
2418 glColor3ub (0, 0, 0); 2519 glColor3ub (0, 0, 0);
2419 glRectf (px + 1, py - thick - 2, 2520 glRectf (px + 1, py - thick - 2,
2420 px + width - 1, py); 2521 px + width - 1, py);
2421 2522
2427 } 2528 }
2428 } 2529 }
2429} 2530}
2430 2531
2431void 2532void
2432draw_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)
2433 CODE: 2534 CODE:
2434{ 2535{
2435 static float color[16][3] = { 2536 static float color[16][3] = {
2436 { 0.00F, 0.00F, 0.00F }, 2537 { 0.00f, 0.00f, 0.00f },
2437 { 1.00F, 1.00F, 1.00F }, 2538 { 1.00f, 1.00f, 1.00f },
2438 { 0.00F, 0.00F, 0.55F }, 2539 { 0.00f, 0.00f, 0.55f },
2439 { 1.00F, 0.00F, 0.00F }, 2540 { 1.00f, 0.00f, 0.00f },
2440 2541
2441 { 1.00F, 0.54F, 0.00F }, 2542 { 1.00f, 0.54f, 0.00f },
2442 { 0.11F, 0.56F, 1.00F }, 2543 { 0.11f, 0.56f, 1.00f },
2443 { 0.93F, 0.46F, 0.00F }, 2544 { 0.93f, 0.46f, 0.00f },
2444 { 0.18F, 0.54F, 0.34F }, 2545 { 0.18f, 0.54f, 0.34f },
2445 2546
2446 { 0.56F, 0.73F, 0.56F }, 2547 { 0.56f, 0.73f, 0.56f },
2447 { 0.80F, 0.80F, 0.80F }, 2548 { 0.80f, 0.80f, 0.80f },
2448 { 0.55F, 0.41F, 0.13F }, 2549 { 0.55f, 0.41f, 0.13f },
2449 { 0.99F, 0.77F, 0.26F }, 2550 { 0.99f, 0.77f, 0.26f },
2450 2551
2451 { 0.74F, 0.65F, 0.41F }, 2552 { 0.74f, 0.65f, 0.41f },
2452 2553
2453 { 0.00F, 1.00F, 1.00F }, 2554 { 0.00f, 1.00f, 1.00f },
2454 { 1.00F, 0.00F, 1.00F }, 2555 { 1.00f, 0.00f, 1.00f },
2455 { 1.00F, 1.00F, 0.00F }, 2556 { 1.00f, 1.00f, 0.00f },
2456 }; 2557 };
2457 2558
2458 int x, y; 2559 int x, y;
2459 2560
2460 glEnable (GL_TEXTURE_2D); 2561 glEnable (GL_TEXTURE_2D);
2461 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2562 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462 * but the nvidia driver (185.18.14) mishandles alpha textures 2563 * but the nvidia driver (185.18.14) mishandles alpha textures
2463 * ansd takes the colour from god knows where instead of using 2564 * and takes the colour from god knows where instead of using
2464 * Cp. MODULATE results in the same colour, but slightly different 2565 * Cp. MODULATE results in the same colour, but slightly different
2465 * alpha, but atcually gives us the correct colour with nvidia. 2566 * alpha, but atcually gives us the correct colour with nvidia.
2466 */ 2567 */
2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2568 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2468 glEnable (GL_BLEND); 2569 glEnable (GL_BLEND);
2476 2577
2477 if (m) 2578 if (m)
2478 { 2579 {
2479 float *c = color [m & 15]; 2580 float *c = color [m & 15];
2480 2581
2481 float tx1 = m & 0x40 ? 0.5 : 0.; 2582 float tx1 = m & 0x40 ? 0.5f : 0.f;
2482 float tx2 = tx1 + 0.5; 2583 float tx2 = tx1 + 0.5f;
2483 2584
2484 glColor4f (c[0], c[1], c[2], 1); 2585 glColor4f (c[0], c[1], c[2], 1);
2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2586 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2587 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2588 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2497void 2598void
2498fow_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)
2499 PPCODE: 2600 PPCODE:
2500{ 2601{
2501 int x, y; 2602 int x, y;
2502 int sw1 = sw + 2; 2603 int sw1 = sw + 2;
2503 int sh1 = sh + 2; 2604 int sh1 = sh + 2;
2504 int sh3 = sh * 3; 2605 int sh3 = sh * 3;
2505 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);
2506 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2609 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2507 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2610 memset (darkness1, 0, sw1*sh1);
2508 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2509 2611
2510 SvPOK_only (darkness3_sv); 2612 SvPOK_only (darkness3_sv);
2511 SvCUR_set (darkness3_sv, sw34 * sh3); 2613 SvCUR_set (darkness3_sv, sw3 * sh3);
2512 2614
2513 mx += self->x - 1; 2615 mx += self->x - 1;
2514 my += self->y - 1; 2616 my += self->y - 1;
2515
2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517 2617
2518 for (y = 0; y < sh1; y++) 2618 for (y = 0; y < sh1; y++)
2519 if (0 <= y + my && y + my < self->rows) 2619 if (0 <= y + my && y + my < self->rows)
2520 { 2620 {
2521 maprow *row = self->row + (y + my); 2621 maprow *row = self->row + (y + my);
2554 2654
2555 uint8_t r13 = (d13 + d23 + d12) / 3; 2655 uint8_t r13 = (d13 + d23 + d12) / 3;
2556 uint8_t r23 = d23; 2656 uint8_t r23 = d23;
2557 uint8_t r33 = (d23 + d33 + d32) / 3; 2657 uint8_t r33 = (d23 + d33 + d32) / 3;
2558 2658
2559 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2659 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2560 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2660 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2561 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2661 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2562 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2662 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2563 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 */
2564 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2664 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2565 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2665 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2566 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2666 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2567 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2667 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2568 } 2668 }
2569 2669
2570 free (darkness1); 2670 free (darkness1);
2571 2671
2572 EXTEND (SP, 3); 2672 EXTEND (SP, 3);
2573 PUSHs (sv_2mortal (newSViv (sw34))); 2673 PUSHs (sv_2mortal (newSViv (sw3)));
2574 PUSHs (sv_2mortal (newSViv (sh3))); 2674 PUSHs (sv_2mortal (newSViv (sh3)));
2575 PUSHs (darkness3_sv); 2675 PUSHs (darkness3_sv);
2576} 2676}
2577 2677
2578SV * 2678SV *
2641 else 2741 else
2642 *data++ = 0; 2742 *data++ = 0;
2643 } 2743 }
2644 } 2744 }
2645 2745
2646 /* 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 */
2647 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2747 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2648 { 2748 {
2649 SvPOK_only (data_sv); 2749 SvPOK_only (data_sv);
2650 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2750 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2651 } 2751 }
2652 2752
2653 RETVAL = data_sv; 2753 RETVAL = data_sv;
2654} 2754}
2655 OUTPUT: 2755 OUTPUT:
2656 RETVAL 2756 RETVAL
2657 2757
2658void 2758void
2665 STRLEN len; 2765 STRLEN len;
2666 uint8_t *data, *end; 2766 uint8_t *data, *end;
2667 2767
2668 len = SvLEN (data_sv); 2768 len = SvLEN (data_sv);
2669 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2769 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2670 data = SvPVbyte_nolen (data_sv); 2770 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2671 end = data + len + 8; 2771 end = data + len + 8;
2672 2772
2673 if (len < 5) 2773 if (len < 5)
2674 XSRETURN_EMPTY; 2774 XSRETURN_EMPTY;
2675 2775
2736} 2836}
2737 2837
2738MODULE = Deliantra::Client PACKAGE = DC::RW 2838MODULE = Deliantra::Client PACKAGE = DC::RW
2739 2839
2740DC::RW 2840DC::RW
2741new (SV *class, SV *data_sv) 2841new (SV *klass, SV *data_sv)
2742 CODE: 2842 CODE:
2743{ 2843{
2744 STRLEN datalen; 2844 STRLEN datalen;
2745 char *data = SvPVbyte (data_sv, datalen); 2845 char *data = SvPVbyte (data_sv, datalen);
2746 2846
2748} 2848}
2749 OUTPUT: 2849 OUTPUT:
2750 RETVAL 2850 RETVAL
2751 2851
2752DC::RW 2852DC::RW
2753new_from_file (SV *class, const char *path, const char *mode = "rb") 2853new_from_file (SV *klass, const char *path, const char *mode = "rb")
2754 CODE: 2854 CODE:
2755 RETVAL = SDL_RWFromFile (path, mode); 2855 RETVAL = SDL_RWFromFile (path, mode);
2756 OUTPUT: 2856 OUTPUT:
2757 RETVAL 2857 RETVAL
2758 2858
2776 if (RETVAL < 0) 2876 if (RETVAL < 0)
2777 { 2877 {
2778 RETVAL = Mix_GroupOldest (-1); 2878 RETVAL = Mix_GroupOldest (-1);
2779 2879
2780 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)
2781 XSRETURN_UNDEF; 2886 XSRETURN_UNDEF;
2782 2887 }
2888 else
2783 Mix_HaltChannel (RETVAL); 2889 Mix_HaltChannel (RETVAL);
2784 } 2890 }
2785 2891
2786 Mix_UnregisterAllEffects (RETVAL); 2892 Mix_UnregisterAllEffects (RETVAL);
2787 Mix_Volume (RETVAL, 128); 2893 Mix_Volume (RETVAL, 128);
2788} 2894}
2835void 2941void
2836set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2942set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2837 CODE: 2943 CODE:
2838{ 2944{
2839 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));
2840 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;
2841 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2947 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842} 2948}
2843 2949
2844void 2950void
2845set_reverse_stereo (DC::Channel self, int flip) 2951set_reverse_stereo (DC::Channel self, int flip)
2848 2954
2849MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2955MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850 2956
2851PROTOTYPES: DISABLE 2957PROTOTYPES: DISABLE
2852 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
2853DC::MixChunk 2971DC::MixChunk
2854new (SV *class, DC::RW rwops) 2972new (SV *klass, DC::RW rwops)
2855 CODE: 2973 CODE:
2856 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2974 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2857 OUTPUT: 2975 OUTPUT:
2858 RETVAL 2976 RETVAL
2859 2977
2889 OUTPUT: 3007 OUTPUT:
2890 RETVAL 3008 RETVAL
2891 3009
2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3010MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2893 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
2894int 3024int
2895volume (int volume = -1) 3025volume (int volume = -1)
2896 PROTOTYPE: ;$ 3026 PROTOTYPE: ;$
2897 CODE: 3027 CODE:
2898 if (items > 0) 3028 if (items > 0)
2909void 3039void
2910halt () 3040halt ()
2911 CODE: 3041 CODE:
2912 Mix_HaltMusic (); 3042 Mix_HaltMusic ();
2913 3043
3044int
3045playing ()
3046 CODE:
3047 RETVAL = Mix_PlayingMusic ();
3048 OUTPUT:
3049 RETVAL
3050
2914DC::MixMusic 3051DC::MixMusic
2915new (SV *class, DC::RW rwops) 3052new (SV *klass, DC::RW rwops)
2916 CODE: 3053 CODE:
2917 RETVAL = Mix_LoadMUS_RW (rwops); 3054 RETVAL = Mix_LoadMUS_RW (rwops);
2918 OUTPUT: 3055 OUTPUT:
2919 RETVAL 3056 RETVAL
2920 3057
3057 const_iv (GL_FUNC_SUBTRACT), 3194 const_iv (GL_FUNC_SUBTRACT),
3058 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3195 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3059# undef const_iv 3196# undef const_iv
3060 }; 3197 };
3061 3198
3062 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--)
3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3200 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3064 3201
3065 texture_av = newAV (); 3202 texture_av = newAV ();
3066 AvREAL_off (texture_av); 3203 AvREAL_off (texture_av);
3067} 3204}
3068 3205
3073 gl.BlendFuncSeparateEXT = 0; 3210 gl.BlendFuncSeparateEXT = 0;
3074 3211
3075void 3212void
3076apple_nvidia_bug (int enable) 3213apple_nvidia_bug (int enable)
3077 3214
3078char * 3215const char *
3079gl_vendor () 3216gl_vendor ()
3080 CODE: 3217 CODE:
3081 RETVAL = (char *)glGetString (GL_VENDOR); 3218 RETVAL = (const char *)glGetString (GL_VENDOR);
3082 OUTPUT: 3219 OUTPUT:
3083 RETVAL 3220 RETVAL
3084 3221
3085char * 3222const char *
3086gl_version () 3223gl_version ()
3087 CODE: 3224 CODE:
3088 RETVAL = (char *)glGetString (GL_VERSION); 3225 RETVAL = (const char *)glGetString (GL_VERSION);
3089 OUTPUT: 3226 OUTPUT:
3090 RETVAL 3227 RETVAL
3091 3228
3092char * 3229const char *
3093gl_extensions () 3230gl_extensions ()
3094 CODE: 3231 CODE:
3095 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3232 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3096 OUTPUT: 3233 OUTPUT:
3097 RETVAL 3234 RETVAL
3098 3235
3099const char *glGetString (GLenum pname) 3236const char *glGetString (GLenum pname)
3237 CODE:
3238 RETVAL = (const char *)glGetString (pname);
3239 OUTPUT:
3240 RETVAL
3100 3241
3101GLint glGetInteger (GLenum pname) 3242GLint glGetInteger (GLenum pname)
3102 CODE: 3243 CODE:
3103 glGetIntegerv (pname, &RETVAL); 3244 glGetIntegerv (pname, &RETVAL);
3104 OUTPUT: 3245 OUTPUT:
3111 RETVAL 3252 RETVAL
3112 3253
3113int glGetError () 3254int glGetError ()
3114 3255
3115void glFinish () 3256void glFinish ()
3257
3258void glFlush ()
3116 3259
3117void glClear (int mask) 3260void glClear (int mask)
3118 3261
3119void glClearColor (float r, float g, float b, float a = 1.0) 3262void glClearColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @ 3263 PROTOTYPE: @
3292 3435
3293void glEndList () 3436void glEndList ()
3294 3437
3295void glCallList (int list) 3438void glCallList (int list)
3296 3439
3440void c_init ()
3441 CODE:
3442 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3443 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3444
3297MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3445MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3298 3446
3299PROTOTYPES: DISABLE 3447PROTOTYPES: DISABLE
3300 3448
3301void 3449void
3302find_widget (SV *self, NV x, NV y) 3450find_widget (SV *self, NV x, NV y)
3303 PPCODE: 3451 PPCODE:
3304{ 3452{
3305 if (within_widget (self, x, y)) 3453 if (within_widget (self, x, y))
3306 XPUSHs (self); 3454 XPUSHs (self);
3307} 3455}
3308 3456
3309BOOT: 3457BOOT:
3310{ 3458{
3318 3466
3319void 3467void
3320draw (SV *self) 3468draw (SV *self)
3321 CODE: 3469 CODE:
3322{ 3470{
3323 HV *hv; 3471 HV *hv;
3324 SV **svp; 3472 SV **svp;
3325 NV x, y, w, h; 3473 NV x, y, w, h;
3326 SV *draw_x_sv = GvSV (draw_x_gv); 3474 SV *draw_x_sv = GvSV (draw_x_gv);
3327 SV *draw_y_sv = GvSV (draw_y_gv); 3475 SV *draw_y_sv = GvSV (draw_y_gv);
3328 SV *draw_w_sv = GvSV (draw_w_gv); 3476 SV *draw_w_sv = GvSV (draw_w_gv);
3329 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