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.268 by root, Sun Jul 20 02:57:43 2008 UTC vs.
Revision 1.326 by root, Sun Nov 18 03:06:13 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>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
78 89
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
81#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
82 96
83#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
85 99
86#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
87 101
88/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
104
105#define KMOD_LRAM 0x10000 // our extension
106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
90 128
91static AV *texture_av; 129static AV *texture_av;
92 130
93static struct 131static struct
94{ 132{
151{ 189{
152 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
153 191
154 while (attrs) 192 while (attrs)
155 { 193 {
156 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 195
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 197 return 1;
160 198
161 attrs = attrs->next; 199 attrs = attrs->next;
162 } 200 }
163 201
164 return 0; 202 return 0;
165} 203}
166 204
167typedef struct cf_layout { 205struct cf_layout {
168 PangoLayout *pl; 206 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
170 int base_height; 208 int base_height;
171 DC__Font font; 209 DC__Font font;
172 rc_t *rc; 210 rc_t rc;
173} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
174 214
175static DC__Font default_font; 215static DC__Font default_font;
176static PangoContext *opengl_context; 216static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
178 218
179static void 219static void
180substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
181{ 221{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 225#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 227}
188 228
189static void 229static void
219} 259}
220 260
221typedef uint16_t tileid; 261typedef uint16_t tileid;
222typedef uint16_t faceid; 262typedef uint16_t faceid;
223 263
224typedef struct { 264struct maptex
265{
225 GLuint name; 266 GLuint name;
226 int w, h; 267 int w, h;
227 float s, t; 268 float s, t;
228 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
229 tileid smoothtile; 270 tileid smoothtile;
230 uint8_t smoothlevel; 271 uint8_t smoothlevel;
231} maptex; 272 uint8_t unused; /* set to zero on use */
273};
232 274
233typedef struct { 275struct mapcell
276{
234 uint32_t player; 277 uint32_t player;
235 tileid tile[3]; 278 tileid tile[3];
236 uint16_t darkness; 279 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 281};
239 282
240typedef struct { 283struct maprow
284{
241 int32_t c0, c1; 285 int32_t c0, c1;
242 mapcell *col; 286 mapcell *col;
243} maprow; 287};
244 288
245typedef struct map { 289struct mapgrid {
246 int x, y, w, h; 290 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
250 294
251 int32_t rows; 295 int32_t rows;
252 maprow *row; 296 maprow *row;
253} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
254 300
255static char * 301static char *
256prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
257{ 303{
258 char *p; 304 char *p;
276 322
277#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
278#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
279 325
280static void 326static void
281need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
282{ 328{
283 while (self->faces <= face) 329 while (self->faces <= face)
284 { 330 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 332 self->faces *= 2;
287 } 333 }
288} 334}
289 335
290static void 336static void
291need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
292{ 338{
293 while (self->texs <= texid) 339 while (self->texs <= texid)
294 { 340 {
295 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
296 self->texs *= 2; 342 self->texs *= 2;
297 } 343 }
298} 344}
299 345
300static maprow * 346static maprow *
301map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
302{ 348{
303 if (0 > y) 349 if (0 > y)
304 { 350 {
305 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
344 390
345 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
346} 392}
347 393
348static mapcell * 394static mapcell *
349map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
350{ 396{
351 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
352} 398}
353 399
354static void 400static void
355map_clear (DC__Map self) 401map_clear (mapgrid *self)
356{ 402{
357 int r; 403 int r;
358 404
359 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
378 (cell)->flags = 0; \ 424 (cell)->flags = 0; \
379 (cell)->player = 0; \ 425 (cell)->player = 0; \
380 } while (0) 426 } while (0)
381 427
382static void 428static void
383map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
384{ 430{
385 int x, y; 431 int x, y;
386 maprow *row; 432 maprow *row;
387 mapcell *cell; 433 mapcell *cell;
388 434
405 CELL_CLEAR (cell); 451 CELL_CLEAR (cell);
406 } 452 }
407 } 453 }
408} 454}
409 455
410typedef struct { 456struct smooth_key
457{
411 tileid tile; 458 tileid tile;
412 uint8_t x, y, level; 459 uint8_t x, y, level;
413} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
414 479
415static void 480static void
416smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
417{ 482{
418 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
419 484
420 if (SvIOK (*sv)) 485 if (it == h.end ())
421 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
422 else 487 else
423 sv_setiv (*sv, bits); 488 it->second |= bits;
424} 489}
425 490
426static void 491static void
427music_finished (void) 492music_finished (void)
428{ 493{
445 ev.code = 1; 510 ev.code = 1;
446 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
447 ev.data2 = 0; 512 ev.data2 = 0;
448 513
449 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
450} 522}
451 523
452static unsigned int 524static unsigned int
453minpot (unsigned int n) 525minpot (unsigned int n)
454{ 526{
521 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
522 return 0; 594 return 0;
523 595
524 return 1; 596 return 1;
525} 597}
598
599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
526 656
527MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
528 658
529PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
530 660
559 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
560 690
561 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
563 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
564 744
565 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
644 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
648 828
829 const_iv (KMOD_LRAM),
830
649 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
650 832
651 const_iv (SDL_INIT_TIMER), 833 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 834 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 835 const_iv (SDL_INIT_VIDEO),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO), 854 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES), 856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL), 857 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL) 858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
677# undef const_iv 861# undef const_iv
678 }; 862 };
679 863
680 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
681 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
682 866
683 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
684 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
685} 869}
686 870
702NV ceil (NV x) 886NV ceil (NV x)
703 887
704IV minpot (UV n) 888IV minpot (UV n)
705 889
706IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
707 897
708void 898void
709pango_init () 899pango_init ()
710 CODE: 900 CODE:
711{ 901{
719#endif 909#endif
720} 910}
721 911
722char *SDL_GetError () 912char *SDL_GetError ()
723 913
914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
916
724int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
725 918
726int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
727 920
728void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
729 922
730void SDL_Quit () 923void SDL_Quit ()
731 924
732int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
733 927
734int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
735 CODE: 929 CODE:
736 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
737 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
738 OUTPUT: 932 OUTPUT:
739 RETVAL 933 RETVAL
740 934
741void 935void
796 ); 990 );
797 991
798 if (RETVAL) 992 if (RETVAL)
799 { 993 {
800 av_clear (texture_av); 994 av_clear (texture_av);
801
802 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
803#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
804#include "glfunc.h" 996#include "glfunc.h"
805#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
806 } 1000 }
807} 1001}
808 OUTPUT: 1002 OUTPUT:
809 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
810 1007
811void 1008void
812SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
813 1010
814char * 1011char *
815SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
816 1014
817int 1015int
818SDL_GetAppState () 1016SDL_GetAppState ()
819 1017
820int 1018int
821SDL_GetModState () 1019SDL_GetModState ()
822 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
823void 1025void
1026SDL_PumpEvents ()
1027
1028void
824poll_events () 1029peep_events ()
825 PPCODE: 1030 PPCODE:
826{ 1031{
827 SDL_Event ev; 1032 SDL_Event ev;
828 1033
829 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
836 { 1041 {
837 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
838 case SDL_KEYUP: 1043 case SDL_KEYUP:
839 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
840 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
841 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
842 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
843 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
844 break; 1049 break;
845 1050
846 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
847 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
865 x = ev.motion.x; 1070 x = ev.motion.x;
866 y = ev.motion.y; 1071 y = ev.motion.y;
867 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
868 } 1073 }
869 1074
870 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
871 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
872 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
873 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
874 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
875 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
895 1100
896 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
897 } 1102 }
898} 1103}
899 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
900int 1118int
901Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
902 POSTCALL: 1120 POSTCALL:
903 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
904 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
905 1123
906void 1124void
907Mix_QuerySpec () 1125Mix_QuerySpec ()
966add_font (char *file) 1184add_font (char *file)
967 CODE: 1185 CODE:
968 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
969 OUTPUT: 1187 OUTPUT:
970 RETVAL 1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
971 1196
972void 1197void
973load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
974 ALIAS: 1199 ALIAS:
975 load_image_file = 1 1200 load_image_file = 1
1021 1246
1022 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1023 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1024 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1025 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1026 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1027 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1028 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1029 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1030 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1031 1256
1091#if DEBUG 1316#if DEBUG
1092 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1093#endif 1318#endif
1094} 1319}
1095 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1096MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1097 1329
1098PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1099 1331
1100DC::Font 1332DC::Font
1101new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1102 CODE: 1334 CODE:
1103{ 1335{
1104 int count; 1336 int count;
1105 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1106 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1135 PROTOTYPE: 1367 PROTOTYPE:
1136 CODE: 1368 CODE:
1137 tc_restore (); 1369 tc_restore ();
1138 1370
1139DC::Layout 1371DC::Layout
1140new (SV *class) 1372new (SV *klass)
1141 CODE: 1373 CODE:
1142 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1143 1375
1144 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1145 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1146 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1147 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1148 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1149 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1150 RETVAL->font = 0; 1382 RETVAL->font = 0;
1151 RETVAL->rc = rc_alloc ();
1152 1383
1153 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1154 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1155 OUTPUT: 1386 OUTPUT:
1156 RETVAL 1387 RETVAL
1157 1388
1158void 1389void
1159DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1160 CODE: 1391 CODE:
1161 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1162 rc_free (self->rc);
1163 Safefree (self); 1393 delete self;
1164 1394
1165void 1395void
1166set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1167 CODE: 1397 CODE:
1168{ 1398{
1294 1524
1295void 1525void
1296set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1297 CODE: 1527 CODE:
1298 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1299 { 1529 {
1300 self->base_height = base_height; 1530 self->base_height = base_height;
1301 layout_update_font (self); 1531 layout_update_font (self);
1302 } 1532 }
1303 1533
1304void 1534void
1422} 1652}
1423 1653
1424void 1654void
1425render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1426 CODE: 1656 CODE:
1427 rc_clear (self->rc); 1657 self->rc.clear ();
1428 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1429 self->pl, 1659 self->pl,
1430 self->rc, 1660 &self->rc,
1431 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1432 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1433 flags 1663 flags
1434 ); 1664 );
1435 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1446 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1447 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1448 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1449 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1450 1680
1451 rc_draw (self->rc); 1681 self->rc.draw ();
1452 1682
1453 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1454 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1455 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1456} 1686}
1531 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1532 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1533 } 1763 }
1534} 1764}
1535 1765
1766void
1767draw_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)
1768 PROTOTYPE: @
1769 CODE:
1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1773 glEnable (GL_TEXTURE_2D);
1774 glBindTexture (GL_TEXTURE_2D, name1);
1775
1776 glColor3f (intensity, intensity, intensity);
1777 glPushMatrix ();
1778 glScalef (1./3, 1./3, 1.);
1779
1780 if (blend > 0.f)
1781 {
1782 float dx3 = dx * -3.f / w;
1783 float dy3 = dy * -3.f / h;
1784 GLfloat env_color[4] = { 0., 0., 0., blend };
1785
1786 /* interpolate the two shadow textures */
1787 /* stage 0 == rgb(glcolor) + alpha(t0) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1791 gl.ActiveTexture (GL_TEXTURE1);
1792 glEnable (GL_TEXTURE_2D);
1793 glBindTexture (GL_TEXTURE_2D, name2);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1795
1796 /* rgb == rgb(glcolor) */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1800
1801 /* alpha = interpolate t0, t1 by env_alpha */
1802 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1812 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1813
1814 glBegin (GL_QUADS);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1819 glEnd ();
1820
1821 glDisable (GL_TEXTURE_2D);
1822 gl.ActiveTexture (GL_TEXTURE0);
1823 }
1824 else
1825 {
1826 /* simple blending of one texture, also opengl <1.3 path */
1827 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1828
1829 glBegin (GL_QUADS);
1830 glTexCoord2f (0, 0); glVertex2f (0, 0);
1831 glTexCoord2f (0, t); glVertex2f (0, h);
1832 glTexCoord2f (s, t); glVertex2f (w, h);
1833 glTexCoord2f (s, 0); glVertex2f (w, 0);
1834 glEnd ();
1835 }
1836
1837 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1838 {
1839 int x, y;
1840 int dx3 = dx * 3;
1841 int dy3 = dy * 3;
1842
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1844 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1845 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1846 glTranslatef (-1., -1., 0);
1847 glBegin (GL_QUADS);
1848
1849 for (y = 1; y < h; y += 3)
1850 {
1851 int y1 = y - dy3;
1852 int y1valid = y1 >= 0 && y1 < h;
1853
1854 for (x = 1; x < w; x += 3)
1855 {
1856 int x1 = x - dx3;
1857 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 uint8_t h2;
1859
1860 if (y1valid && x1 >= 0 && x1 < w)
1861 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1862 else
1863 h2 = 1; /* out of range == invisible */
1864
1865 if (h1 || h2)
1866 {
1867 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1868 glColor4f (1., 1., 1., alpha);
1869
1870 glTexCoord2f (0, 0.); glVertex2i (x , y );
1871 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1872 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1873 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1874 }
1875 }
1876 }
1877 }
1878
1879 glEnd ();
1880
1881 glPopMatrix ();
1882
1883 glDisable (GL_TEXTURE_2D);
1884 glDisable (GL_BLEND);
1885}
1886
1536IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1887IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1537 CODE: 1888 CODE:
1538{ 1889{
1539 GLint width; 1890 GLint width;
1540 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1891 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1547MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1548 1899
1549PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1550 1901
1551DC::Map 1902DC::Map
1552new (SV *class) 1903new (SV *klass)
1553 CODE: 1904 CODE:
1554 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1555 RETVAL->x = 0; 1906 RETVAL->x = 0;
1556 RETVAL->y = 0; 1907 RETVAL->y = 0;
1557 RETVAL->w = 0; 1908 RETVAL->w = 0;
1558 RETVAL->h = 0; 1909 RETVAL->h = 0;
1559 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1596 1947
1597void 1948void
1598set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1599 CODE: 1950 CODE:
1600{ 1951{
1601 tileid texid; 1952 tileid texid;
1602 maptex *tex; 1953 maptex *tex;
1603 1954
1604 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1605 return; 1956 return;
1606 1957
1607 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1608 return; 1959 return;
1609 1960
1610 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1611 1962
1612 if (!texid) 1963 if (!texid)
1613 return; 1964 return;
1614 1965
1615 tex = self->tex + texid; 1966 tex = self->tex + texid;
1644 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1995 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1645 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1646 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1647 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1648} 1999}
2000
2001void
2002expire_textures (DC::Map self, int texid, int count)
2003 PPCODE:
2004 for (; texid < self->texs && count; ++texid, --count)
2005 {
2006 maptex *tex = self->tex + texid;
2007
2008 if (tex->name)
2009 {
2010 if (tex->unused)
2011 {
2012 tex->name = 0;
2013 tex->unused = 0;
2014 XPUSHs (sv_2mortal (newSViv (texid)));
2015 }
2016 else
2017 tex->unused = 1;
2018 }
2019 }
1649 2020
1650int 2021int
1651ox (DC::Map self) 2022ox (DC::Map self)
1652 ALIAS: 2023 ALIAS:
1653 oy = 1 2024 oy = 1
1693 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1694 } 2065 }
1695} 2066}
1696 2067
1697SV * 2068SV *
1698map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1699 CODE: 2070 CODE:
1700{ 2071{
1701 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1702 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1703 mapcell *cell; 2074 mapcell *cell;
1724 2095
1725 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1726 2097
1727 if (flags & 8) 2098 if (flags & 8)
1728 { 2099 {
2100 uint8_t ext, cmd;
2101
1729 if (extmap) 2102 do
1730 { 2103 {
1731 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1732 2106
1733 do 2107 if (cmd < 4)
2108 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2109 else if (cmd == 5) // health
1734 { 2110 {
1735 ext = *data++;
1736 cmd = ext & 0x7f;
1737
1738 if (cmd < 4)
1739 cell->darkness = 255 - ext * 64 + 1;
1740 else if (cmd == 5) // health
1741 {
1742 cell->stat_width = 1; 2111 cell->stat_width = 1;
1743 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
1744 }
1745 else if (cmd == 6) // monster width
1746 cell->stat_width = *data++ + 1;
1747 else if (cmd == 0x47)
1748 {
1749 if (*data == 1) cell->player = data [1];
1750 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1751 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1752 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1753
1754 data += *data + 1;
1755 }
1756 else if (cmd == 8) // cell flags
1757 cell->flags = *data++;
1758 else if (ext & 0x40) // unknown, multibyte => skip
1759 data += *data + 1;
1760 else
1761 data++;
1762 } 2113 }
1763 while (ext & 0x80); 2114 else if (cmd == 6) // monster width
2115 cell->stat_width = *data++ + 1;
2116 else if (cmd == 0x47)
2117 {
2118 if (*data == 1) cell->player = data [1];
2119 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2120 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2121 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2122
2123 data += *data + 1;
2124 }
2125 else if (cmd == 8) // cell flags
2126 cell->flags = *data++;
2127 else if (ext & 0x40) // unknown, multibyte => skip
2128 data += *data + 1;
2129 else
2130 data++;
1764 } 2131 }
1765 else 2132 while (ext & 0x80);
1766 cell->darkness = *data++ + 1;
1767 } 2133 }
1768 2134
1769 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1770 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1771 { 2137 {
1774 cell->tile [z] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
1775 2141
1776 if (cell->tile [z]) 2142 if (cell->tile [z])
1777 { 2143 {
1778 maptex *tex = self->tex + cell->tile [z]; 2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
1779 if (!tex->name) 2146 if (!tex->name)
1780 av_push (missing, newSViv (cell->tile [z])); 2147 av_push (missing, newSViv (cell->tile [z]));
1781 2148
1782 if (tex->smoothtile) 2149 if (tex->smoothtile)
1783 { 2150 {
1784 maptex *smooth = self->tex + tex->smoothtile; 2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
1785 if (!smooth->name) 2153 if (!smooth->name)
1786 av_push (missing, newSViv (tex->smoothtile)); 2154 av_push (missing, newSViv (tex->smoothtile));
1787 } 2155 }
1788 } 2156 }
1789 } 2157 }
1817 ? self->row + y 2185 ? self->row + y
1818 : 0; 2186 : 0;
1819 2187
1820 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1821 { 2189 {
1822 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1823 2191
1824 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1825 { 2193 {
1826 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1827 2195
1829 { 2197 {
1830 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1831 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1832 int a1 = tex.a; 2200 int a1 = tex.a;
1833 2201
1834 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1835 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1836 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1837 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1838 } 2206 }
1839 } 2207 }
1840 2208
1841 *map++ = (r ) 2209 *map++ = (r )
1842 | (g << 8) 2210 | (g << 8)
1843 | (b << 16) 2211 | (b << 16)
1844 | (a << 24); 2212 | (a << 24);
1845 } 2213 }
1846 } 2214 }
1847 2215
1848 RETVAL = map_sv; 2216 RETVAL = map_sv;
1849} 2217}
1850 OUTPUT: 2218 OUTPUT:
1851 RETVAL 2219 RETVAL
1852 2220
1853void 2221void
1854draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2222draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1855 CODE: 2223 CODE:
1856{ 2224{
1857 int x, y, z; 2225 int x, y, z;
1858 2226
1859 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1860 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1861 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1862 smooth_key skey;
1863 int pl_x, pl_y; 2228 int pl_x, pl_y;
1864 maptex pl_tex; 2229 maptex pl_tex;
1865 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
1866 rc_key_t key; 2232 rc_key_t key;
1867 rc_array_t *arr; 2233 rc_t::array_t *arr;
1868 2234
1869 pl_tex.name = 0; 2235 pl_tex.name = 0;
1870 2236
1871 // thats current max. sorry. 2237 // that's current max. sorry.
1872 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1873 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1874
1875 // clear key, in case of extra padding
1876 memset (&skey, 0, sizeof (skey));
1877 2240
1878 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
1879 key.r = 255; 2242 key.r = 255;
1880 key.g = 255; 2243 key.g = 255;
1881 key.b = 255; 2244 key.b = 255;
1882 key.a = 255; 2245 key.a = 255;
1883 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
1884 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
1885 key.texname = -1;
1886 2248
1887 mx += self->x; 2249 mx += self->x;
1888 my += self->y; 2250 my += self->y;
1889 2251
1890 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
1891 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
1892 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
1893 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1894 2256
1895 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1896 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1897 { 2259 {
1898 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1913 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1914 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1915 2277
1916 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
1917 { 2279 {
1918 memset (smooth_level, 0, sizeof (smooth_level)); 2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2282 smooth_hash smooth;
2283 key.texname = -1;
1919 2284
1920 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
1921 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
1922 { 2287 {
1923 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
1929 tileid tile = cell->tile [z]; 2294 tileid tile = cell->tile [z];
1930 2295
1931 if (tile) 2296 if (tile)
1932 { 2297 {
1933 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
1934 int px = (x + 1) * T - tex.w; 2299 int px, py;
1935 int py = (y + 1) * T - tex.h;
1936 2300
1937 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
1938 { 2302 {
2303 self->tex [tile].unused = 0;
2304
1939 if (!tex.name) 2305 if (!tex.name)
1940 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1941 2307
1942 key.texname = tex.name; 2308 key.texname = tex.name;
1943 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
1944 } 2310 }
2311
2312 px = (x + 1) * Th - tex.w;
2313 py = (y + 1) * Tw - tex.h;
1945 2314
1946 if (expect_false (cell->player == player) && expect_false (z == 2)) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
1947 { 2316 {
1948 pl_x = px; 2317 pl_x = px;
1949 pl_y = py; 2318 pl_y = py;
1950 pl_tex = tex; 2319 pl_tex = tex;
1951 continue; 2320 continue;
1952 } 2321 }
1953 2322
1954 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
1955 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1956 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
1957 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1958
1959 if (expect_false (cell->flags) && expect_false (z == 2))
1960 {
1961 // overlays such as the speech bubble, probably more to come
1962 if (cell->flags & 1)
1963 {
1964 maptex tex = self->tex [1];
1965 int px = x * T + T * 2 / 32;
1966 int py = y * T - T * 6 / 32;
1967
1968 if (tex.name)
1969 {
1970 if (key.texname != tex.name)
1971 {
1972 key.texname = tex.name;
1973 arr = rc_array (rc, &key);
1974 }
1975
1976 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1977 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1978 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1979 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1980 }
1981 }
1982 }
1983 2327
1984 // update smooth hash 2328 // update smooth hash
1985 if (tex.smoothtile) 2329 if (tex.smoothtile)
1986 { 2330 {
1987 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
1988 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
1989 2333
1990 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
1991 2335
1992 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
1993 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
1994 2338
1995 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
2003 2347
2004 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2005 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
2006 2350
2007 // full tile 2351 // full tile
2008 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2352 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2009 2353
2010 // borders 2354 // borders
2011 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2355 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2012 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2356 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2013 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2357 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2014 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2358 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2015 2359
2016 // corners 2360 // corners
2017 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2361 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2018 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2362 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2019 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2363 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2020 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2364 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2365 }
2366 }
2367
2368 if (expect_false (z == 2) && expect_false (cell->flags))
2369 {
2370 // overlays such as the speech bubble, probably more to come
2371 if (cell->flags & 1)
2372 {
2373 rc_key_t key_ov = key;
2374 maptex tex = self->tex[TEXID_SPEECH];
2375 int px = x * Tw + Tw * 2 / 32;
2376 int py = y * Th - Th * 6 / 32;
2377
2378 key_ov.texname = tex.name;
2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2380
2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2021 } 2385 }
2022 } 2386 }
2023 } 2387 }
2024 } 2388 }
2025 2389
2026 rc_draw (rc); 2390 rc.draw ();
2027 rc_clear (rc); 2391 rc.clear ();
2028 2392
2029 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
2030 // this is basically counting sort 2394 // this is basically counting sort
2031 { 2395 {
2032 int w, b; 2396 int w, b;
2033 2397
2034 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2035 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2036 for (w = 0; w < 256 / 32; ++w) 2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2037 { 2403 {
2038 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2039 if (smask) 2405 IV bits = it->second;
2040 for (b = 0; b < 32; ++b) 2406
2041 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2042 { 2410 {
2043 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
2044 HE *he; 2419 if (tex.name)
2045
2046 hv_iterinit (smooth);
2047 while ((he = hv_iternext (smooth)))
2048 { 2420 {
2049 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2050 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2051 2423 if (key.texname != tex.name)
2052 if (!(bits & 0x1000)
2053 && skey->level == level
2054 && level > smooth_max [skey->x][skey->y])
2055 { 2424 {
2056 maptex tex = self->tex [skey->tile]; 2425 self->tex [skey.tile].unused = 0;
2057 int px = (((int)skey->x) - 1) * T;
2058 int py = (((int)skey->y) - 1) * T;
2059 int border = bits & 15;
2060 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2061 float dx = tex.s * .0625f; // 16 images/row
2062 float dy = tex.t * .5f ; // 2 images/column
2063 2426
2064 if (tex.name)
2065 {
2066 // this time avoiding texture state changes
2067 // save gobs of state changes.
2068 if (key.texname != tex.name)
2069 {
2070 glEnd (); 2427 glEnd ();
2071 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2072 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2073 } 2430 }
2074 2431
2075 if (border) 2432 if (border)
2076 { 2433 {
2077 float ox = border * dx; 2434 float ox = border * dx;
2078 2435
2079 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2080 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2081 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2082 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2083 } 2440 }
2084 2441
2085 if (corner) 2442 if (corner)
2086 { 2443 {
2087 float ox = corner * dx; 2444 float ox = corner * dx;
2088 2445
2089 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2090 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2091 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2092 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2093 }
2094 }
2095 } 2450 }
2096 } 2451 }
2097 } 2452 }
2098 } 2453 }
2099 2454
2100 glEnd (); 2455 glEnd ();
2101 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2102 key.texname = -1; 2457 key.texname = -1;
2103 } 2458 }
2104
2105 hv_clear (smooth);
2106 } 2459 }
2107 2460
2108 if (pl_tex.name) 2461 if (pl_tex.name)
2109 { 2462 {
2110 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2111 int px = pl_x + sdx; 2464 int px = pl_x + sdx;
2112 int py = pl_y + sdy; 2465 int py = pl_y + sdy;
2113 2466
2114 key.texname = tex.name; 2467 key.texname = tex.name;
2115 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2116 2469
2117 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2118 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2119 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2120 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2121 2474
2122 rc_draw (rc); 2475 rc.draw ();
2123 } 2476 }
2124 2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
2125 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2126 rc_free (rc);
2127 2482
2128 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2129 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2130 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2131 { 2486 {
2134 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2135 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2136 { 2491 {
2137 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2138 2493
2139 int px = x * T; 2494 int px = x * Tw;
2140 int py = y * T; 2495 int py = y * Th;
2496
2497 if (expect_false (cell->player == player))
2498 {
2499 px += sdx;
2500 py += sdy;
2501 }
2141 2502
2142 if (cell->stat_hp) 2503 if (cell->stat_hp)
2143 { 2504 {
2144 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2145 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2146 2507
2147 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2148 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2149 px + width - 1, py); 2510 px + width - 1, py);
2150 2511
2156 } 2517 }
2157 } 2518 }
2158} 2519}
2159 2520
2160void 2521void
2161draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2522draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2162 CODE: 2523 CODE:
2163{ 2524{
2164 static float color[16][3] = { 2525 static float color[16][3] = {
2165 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2166 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2167 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2168 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2169 2530
2170 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2171 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2172 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2173 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2174 2535
2175 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2176 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2177 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2178 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2179 2540
2180 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2181 2542
2182 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2183 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2184 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2185 }; 2546 };
2186 2547
2187 int x, y; 2548 int x, y;
2188 2549
2189 glEnable (GL_TEXTURE_2D); 2550 glEnable (GL_TEXTURE_2D);
2551 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2552 * but the nvidia driver (185.18.14) mishandles alpha textures
2553 * and takes the colour from god knows where instead of using
2554 * Cp. MODULATE results in the same colour, but slightly different
2555 * alpha, but atcually gives us the correct colour with nvidia.
2556 */
2190 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2191 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2192 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2193 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2194 2561
2195 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2199 2566
2200 if (m) 2567 if (m)
2201 { 2568 {
2202 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2203 2570
2204 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2205 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2206 2573
2207 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2208 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2209 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2210 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2211 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2212 } 2579 }
2220void 2587void
2221fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2588fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2222 PPCODE: 2589 PPCODE:
2223{ 2590{
2224 int x, y; 2591 int x, y;
2225 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2226 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2227 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2228 int sw34 = (sw * 3 + 3) & ~3; 2595 int sw3 = sw * 3;
2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2229 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2230 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2231 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2232 2600
2233 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2234 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2235 2603
2236 mx += self->x - 1; 2604 mx += self->x - 1;
2237 my += self->y - 1; 2605 my += self->y - 1;
2238
2239 memset (darkness1, 255, sw1 * sh1);
2240 2606
2241 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2242 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2243 { 2609 {
2244 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2247 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2248 { 2614 {
2249 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2250 2616
2251 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2252 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2253 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2254 } 2620 }
2255 } 2621 }
2256 2622
2257 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2258 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2277 2643
2278 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2279 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2280 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2281 2647
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2283 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2286 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2652 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2289 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2291 } 2657 }
2292 2658
2293 free (darkness1); 2659 free (darkness1);
2294 2660
2295 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2296 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2297 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2298 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2299} 2665}
2300 2666
2301SV * 2667SV *
2364 else 2730 else
2365 *data++ = 0; 2731 *data++ = 0;
2366 } 2732 }
2367 } 2733 }
2368 2734
2369 /* if size is w*h + 5 then no data has been found */ 2735 /* if size is w*h + 5 then no data has been found */
2370 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2371 { 2737 {
2372 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2373 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2374 } 2740 }
2375 2741
2376 RETVAL = data_sv; 2742 RETVAL = data_sv;
2377} 2743}
2378 OUTPUT: 2744 OUTPUT:
2379 RETVAL 2745 RETVAL
2380 2746
2381void 2747void
2388 STRLEN len; 2754 STRLEN len;
2389 uint8_t *data, *end; 2755 uint8_t *data, *end;
2390 2756
2391 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2392 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2393 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2394 end = data + len + 8; 2760 end = data + len + 8;
2395 2761
2396 if (len < 5) 2762 if (len < 5)
2397 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2398 2764
2459} 2825}
2460 2826
2461MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2462 2828
2463DC::RW 2829DC::RW
2464new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2465 CODE: 2831 CODE:
2466{ 2832{
2467 STRLEN datalen; 2833 STRLEN datalen;
2468 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2469 2835
2471} 2837}
2472 OUTPUT: 2838 OUTPUT:
2473 RETVAL 2839 RETVAL
2474 2840
2475DC::RW 2841DC::RW
2476new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2477 CODE: 2843 CODE:
2478 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2479 OUTPUT: 2845 OUTPUT:
2480 RETVAL 2846 RETVAL
2481 2847
2499 if (RETVAL < 0) 2865 if (RETVAL < 0)
2500 { 2866 {
2501 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2502 2868
2503 if (RETVAL < 0) 2869 if (RETVAL < 0)
2870 {
2871 // happens sometimes, maybe it just stopped playing(?)
2872 RETVAL = Mix_GroupAvailable (-1);
2873
2874 if (RETVAL < 0)
2504 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2505 2876 }
2877 else
2506 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2507 } 2879 }
2508 2880
2509 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2510 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2511} 2883}
2558void 2930void
2559set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2560 CODE: 2932 CODE:
2561{ 2933{
2562 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2934 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2563 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2935 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2564 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2565} 2937}
2566 2938
2567void 2939void
2568set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2571 2943
2572MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2573 2945
2574PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2575 2947
2948void
2949decoders ()
2950 PPCODE:
2951#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2952 int i, num = Mix_GetNumChunkDecoders ();
2953 EXTEND (SP, num);
2954 for (i = 0; i < num; ++i)
2955 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2956#else
2957 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2958#endif
2959
2576DC::MixChunk 2960DC::MixChunk
2577new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2578 CODE: 2962 CODE:
2579 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2580 OUTPUT: 2964 OUTPUT:
2581 RETVAL 2965 RETVAL
2582 2966
2612 OUTPUT: 2996 OUTPUT:
2613 RETVAL 2997 RETVAL
2614 2998
2615MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2616 3000
3001void
3002decoders ()
3003 PPCODE:
3004#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3005 int i, num = Mix_GetNumMusicDecoders ();
3006 EXTEND (SP, num);
3007 for (i = 0; i < num; ++i)
3008 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3009#else
3010 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3011#endif
3012
2617int 3013int
2618volume (int volume = -1) 3014volume (int volume = -1)
2619 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2620 CODE: 3016 CODE:
2621 if (items > 0) 3017 if (items > 0)
2632void 3028void
2633halt () 3029halt ()
2634 CODE: 3030 CODE:
2635 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2636 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2637DC::MixMusic 3040DC::MixMusic
2638new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2639 CODE: 3042 CODE:
2640 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2641 OUTPUT: 3044 OUTPUT:
2642 RETVAL 3045 RETVAL
2643 3046
2671 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2672# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2673 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2674 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2675 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2676 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2677 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2678 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2679 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2680 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2692 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2693 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2694 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2695 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2696 const_iv (GL_ONE_MINUS_DST_ALPHA), 3100 const_iv (GL_ONE_MINUS_DST_ALPHA),
3101 const_iv (GL_SRC_COLOR),
3102 const_iv (GL_DST_COLOR),
3103 const_iv (GL_ONE_MINUS_SRC_COLOR),
3104 const_iv (GL_ONE_MINUS_DST_COLOR),
2697 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2698 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2699 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2700 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2701 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2769 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2770 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2771 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2772 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2773 const_iv (GL_T2F_N3F_V3F), 3181 const_iv (GL_T2F_N3F_V3F),
3182 const_iv (GL_FUNC_ADD),
3183 const_iv (GL_FUNC_SUBTRACT),
3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2774# undef const_iv 3185# undef const_iv
2775 }; 3186 };
2776 3187
2777 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3188 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2778 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2779 3190
2780 texture_av = newAV (); 3191 texture_av = newAV ();
2781 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2782} 3193}
2783 3194
2785disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2786 CODE: 3197 CODE:
2787 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2788 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2789 3200
2790char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2791gl_vendor () 3205gl_vendor ()
2792 CODE: 3206 CODE:
2793 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2794 OUTPUT: 3208 OUTPUT:
2795 RETVAL 3209 RETVAL
2796 3210
2797char * 3211const char *
2798gl_version () 3212gl_version ()
2799 CODE: 3213 CODE:
2800 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2801 OUTPUT: 3215 OUTPUT:
2802 RETVAL 3216 RETVAL
2803 3217
2804char * 3218const char *
2805gl_extensions () 3219gl_extensions ()
2806 CODE: 3220 CODE:
2807 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2808 OUTPUT: 3222 OUTPUT:
2809 RETVAL 3223 RETVAL
2810 3224
2811const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2812 3230
2813GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2814 CODE: 3232 CODE:
2815 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2816 OUTPUT: 3234 OUTPUT:
2824 3242
2825int glGetError () 3243int glGetError ()
2826 3244
2827void glFinish () 3245void glFinish ()
2828 3246
3247void glFlush ()
3248
2829void glClear (int mask) 3249void glClear (int mask)
2830 3250
2831void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2832 PROTOTYPE: @ 3252 PROTOTYPE: @
2833 3253
2842void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2843 3263
2844void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2845 CODE: 3265 CODE:
2846 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2847 3269
2848void glDepthMask (int flag) 3270void glDepthMask (int flag)
2849 3271
2850void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2851 3273
2886void glRotate (float angle, float x, float y, float z) 3308void glRotate (float angle, float x, float y, float z)
2887 CODE: 3309 CODE:
2888 glRotatef (angle, x, y, z); 3310 glRotatef (angle, x, y, z);
2889 3311
2890void glColor (float r, float g, float b, float a = 1.0) 3312void glColor (float r, float g, float b, float a = 1.0)
3313 PROTOTYPE: @
2891 ALIAS: 3314 ALIAS:
2892 glColor_premultiply = 1 3315 glColor_premultiply = 1
2893 CODE: 3316 CODE:
2894 if (ix) 3317 if (ix)
2895 { 3318 {
3001 3424
3002void glEndList () 3425void glEndList ()
3003 3426
3004void glCallList (int list) 3427void glCallList (int list)
3005 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
3006MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3007 3435
3008PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
3009 3437
3010void 3438void
3011find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
3012 PPCODE: 3440 PPCODE:
3013{ 3441{
3014 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
3015 XPUSHs (self); 3443 XPUSHs (self);
3016} 3444}
3017 3445
3018BOOT: 3446BOOT:
3019{ 3447{
3027 3455
3028void 3456void
3029draw (SV *self) 3457draw (SV *self)
3030 CODE: 3458 CODE:
3031{ 3459{
3032 HV *hv; 3460 HV *hv;
3033 SV **svp; 3461 SV **svp;
3034 NV x, y, w, h; 3462 NV x, y, w, h;
3035 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3036 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3037 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3038 SV *draw_h_sv = GvSV (draw_h_gv); 3466 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines