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.264 by root, Fri Jul 18 22:32:54 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);
367 self->oy = 0; 413 self->oy = 0;
368 self->row = 0; 414 self->row = 0;
369 self->rows = 0; 415 self->rows = 0;
370} 416}
371 417
418#define CELL_CLEAR(cell) \
419 do { \
420 if ((cell)->player) \
421 (cell)->tile [2] = 0; \
422 (cell)->darkness = 0; \
423 (cell)->stat_hp = 0; \
424 (cell)->flags = 0; \
425 (cell)->player = 0; \
426 } while (0)
427
372static void 428static void
373map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
374{ 430{
375 int x, y; 431 int x, y;
376 maprow *row; 432 maprow *row;
377 mapcell *cell; 433 mapcell *cell;
378 434
390 if (x >= row->c1) 446 if (x >= row->c1)
391 break; 447 break;
392 448
393 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
394 450
395 cell->darkness = 0; 451 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 452 }
400 } 453 }
401} 454}
402 455
403typedef struct { 456struct smooth_key
457{
404 tileid tile; 458 tileid tile;
405 uint8_t x, y, level; 459 uint8_t x, y, level;
406} 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}
407 479
408static void 480static void
409smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
410{ 482{
411 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
412 484
413 if (SvIOK (*sv)) 485 if (it == h.end ())
414 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
415 else 487 else
416 sv_setiv (*sv, bits); 488 it->second |= bits;
417} 489}
418 490
419static void 491static void
420music_finished (void) 492music_finished (void)
421{ 493{
438 ev.code = 1; 510 ev.code = 1;
439 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
440 ev.data2 = 0; 512 ev.data2 = 0;
441 513
442 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;
443} 522}
444 523
445static unsigned int 524static unsigned int
446minpot (unsigned int n) 525minpot (unsigned int n)
447{ 526{
514 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
515 return 0; 594 return 0;
516 595
517 return 1; 596 return 1;
518} 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
519 656
520MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
521 658
522PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
523 660
552 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
553 690
554 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
556 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),
557 744
558 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
637 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
641 828
829 const_iv (KMOD_LRAM),
830
642 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
643 832
644 const_iv (SDL_INIT_TIMER), 833 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 834 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 835 const_iv (SDL_INIT_VIDEO),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 854 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 857 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
670# undef const_iv 861# undef const_iv
671 }; 862 };
672 863
673 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--)
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
675 866
676 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
677 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
678} 869}
679 870
695NV ceil (NV x) 886NV ceil (NV x)
696 887
697IV minpot (UV n) 888IV minpot (UV n)
698 889
699IV 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
700 897
701void 898void
702pango_init () 899pango_init ()
703 CODE: 900 CODE:
704{ 901{
712#endif 909#endif
713} 910}
714 911
715char *SDL_GetError () 912char *SDL_GetError ()
716 913
914void SDL_main_hack (SV *real_main)
915 PROTOTYPE: &
916
717int SDL_Init (U32 flags) 917int SDL_Init (U32 flags)
718 918
719int SDL_InitSubSystem (U32 flags) 919int SDL_InitSubSystem (U32 flags)
720 920
721void SDL_QuitSubSystem (U32 flags) 921void SDL_QuitSubSystem (U32 flags)
722 922
723void SDL_Quit () 923void SDL_Quit ()
724 924
725int SDL_GL_SetAttribute (int attr, int value) 925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
726 927
727int SDL_GL_GetAttribute (int attr) 928int SDL_GL_GetAttribute (int attr)
728 CODE: 929 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL)) 930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
730 XSRETURN_UNDEF; 931 XSRETURN_UNDEF;
731 OUTPUT: 932 OUTPUT:
732 RETVAL 933 RETVAL
733 934
734void 935void
756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
757 958
758 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
759 while (*m) 960 while (*m)
760 { 961 {
962 if ((*m)->w >= 400 && (*m)->h >= 300)
963 {
761 AV *av = newAV (); 964 AV *av = newAV ();
762 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
763 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
764 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
765 av_push (av, newSViv (alpha)); 968 av_push (av, newSViv (alpha));
766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 969 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
970 }
767 971
768 ++m; 972 ++m;
769 } 973 }
770} 974}
771 975
786 ); 990 );
787 991
788 if (RETVAL) 992 if (RETVAL)
789 { 993 {
790 av_clear (texture_av); 994 av_clear (texture_av);
791
792 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
793#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);
794#include "glfunc.h" 996#include "glfunc.h"
795#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
796 } 1000 }
797} 1001}
798 OUTPUT: 1002 OUTPUT:
799 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
800 1007
801void 1008void
802SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
803 1010
804char * 1011char *
805SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
806 1014
807int 1015int
808SDL_GetAppState () 1016SDL_GetAppState ()
809 1017
810int 1018int
811SDL_GetModState () 1019SDL_GetModState ()
812 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
813void 1025void
1026SDL_PumpEvents ()
1027
1028void
814poll_events () 1029peep_events ()
815 PPCODE: 1030 PPCODE:
816{ 1031{
817 SDL_Event ev; 1032 SDL_Event ev;
818 1033
819 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
826 { 1041 {
827 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
828 case SDL_KEYUP: 1043 case SDL_KEYUP:
829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
831 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);
832 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 */
833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
834 break; 1049 break;
835 1050
836 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
855 x = ev.motion.x; 1070 x = ev.motion.x;
856 y = ev.motion.y; 1071 y = ev.motion.y;
857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
858 } 1073 }
859 1074
860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
861 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
862 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
863 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
864 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
865 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
885 1100
886 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))));
887 } 1102 }
888} 1103}
889 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
890int 1118int
891Mix_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)
892 POSTCALL: 1120 POSTCALL:
893 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
894 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
895 1123
896void 1124void
897Mix_QuerySpec () 1125Mix_QuerySpec ()
956add_font (char *file) 1184add_font (char *file)
957 CODE: 1185 CODE:
958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT: 1187 OUTPUT:
960 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)
961 1196
962void 1197void
963load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
964 ALIAS: 1199 ALIAS:
965 load_image_file = 1 1200 load_image_file = 1
1011 1246
1012 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
1013 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
1014 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
1015 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
1016 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1017 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)));
1018 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1019 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1020 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
1021 1256
1081#if DEBUG 1316#if DEBUG
1082 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1083#endif 1318#endif
1084} 1319}
1085 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1086MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1087 1329
1088PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1089 1331
1090DC::Font 1332DC::Font
1091new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1092 CODE: 1334 CODE:
1093{ 1335{
1094 int count; 1336 int count;
1095 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1096 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1125 PROTOTYPE: 1367 PROTOTYPE:
1126 CODE: 1368 CODE:
1127 tc_restore (); 1369 tc_restore ();
1128 1370
1129DC::Layout 1371DC::Layout
1130new (SV *class) 1372new (SV *klass)
1131 CODE: 1373 CODE:
1132 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1133 1375
1134 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1135 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1136 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1137 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1138 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1139 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1140 RETVAL->font = 0; 1382 RETVAL->font = 0;
1141 RETVAL->rc = rc_alloc ();
1142 1383
1143 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1144 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1145 OUTPUT: 1386 OUTPUT:
1146 RETVAL 1387 RETVAL
1147 1388
1148void 1389void
1149DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1150 CODE: 1391 CODE:
1151 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1152 rc_free (self->rc);
1153 Safefree (self); 1393 delete self;
1154 1394
1155void 1395void
1156set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1157 CODE: 1397 CODE:
1158{ 1398{
1284 1524
1285void 1525void
1286set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1287 CODE: 1527 CODE:
1288 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1289 { 1529 {
1290 self->base_height = base_height; 1530 self->base_height = base_height;
1291 layout_update_font (self); 1531 layout_update_font (self);
1292 } 1532 }
1293 1533
1294void 1534void
1412} 1652}
1413 1653
1414void 1654void
1415render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1416 CODE: 1656 CODE:
1417 rc_clear (self->rc); 1657 self->rc.clear ();
1418 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1419 self->pl, 1659 self->pl,
1420 self->rc, 1660 &self->rc,
1421 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1422 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1423 flags 1663 flags
1424 ); 1664 );
1425 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1436 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1437 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1438 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1439 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1440 1680
1441 rc_draw (self->rc); 1681 self->rc.draw ();
1442 1682
1443 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1444 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1445 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1446} 1686}
1521 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1522 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1523 } 1763 }
1524} 1764}
1525 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
1526IV 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)
1527 CODE: 1888 CODE:
1528{ 1889{
1529 GLint width; 1890 GLint width;
1530 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);
1537MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1538 1899
1539PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1540 1901
1541DC::Map 1902DC::Map
1542new (SV *class) 1903new (SV *klass)
1543 CODE: 1904 CODE:
1544 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1545 RETVAL->x = 0; 1906 RETVAL->x = 0;
1546 RETVAL->y = 0; 1907 RETVAL->y = 0;
1547 RETVAL->w = 0; 1908 RETVAL->w = 0;
1548 RETVAL->h = 0; 1909 RETVAL->h = 0;
1549 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1586 1947
1587void 1948void
1588set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1589 CODE: 1950 CODE:
1590{ 1951{
1591 tileid texid; 1952 tileid texid;
1592 maptex *tex; 1953 maptex *tex;
1593 1954
1594 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1595 return; 1956 return;
1596 1957
1597 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1598 return; 1959 return;
1599 1960
1600 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1601 1962
1602 if (!texid) 1963 if (!texid)
1603 return; 1964 return;
1604 1965
1605 tex = self->tex + texid; 1966 tex = self->tex + texid;
1634 //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);
1635 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1636 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1637 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1638} 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 }
1639 2020
1640int 2021int
1641ox (DC::Map self) 2022ox (DC::Map self)
1642 ALIAS: 2023 ALIAS:
1643 oy = 1 2024 oy = 1
1683 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1684 } 2065 }
1685} 2066}
1686 2067
1687SV * 2068SV *
1688map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1689 CODE: 2070 CODE:
1690{ 2071{
1691 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1692 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1693 mapcell *cell; 2074 mapcell *cell;
1714 2095
1715 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1716 2097
1717 if (flags & 8) 2098 if (flags & 8)
1718 { 2099 {
2100 uint8_t ext, cmd;
2101
1719 if (extmap) 2102 do
1720 { 2103 {
1721 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1722 2106
1723 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
1724 { 2110 {
1725 ext = *data++;
1726 cmd = ext & 0x7f;
1727
1728 if (cmd < 4)
1729 cell->darkness = 255 - ext * 64 + 1;
1730 else if (cmd == 5) // health
1731 {
1732 cell->stat_width = 1; 2111 cell->stat_width = 1;
1733 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
1734 }
1735 else if (cmd == 6) // monster width
1736 cell->stat_width = *data++ + 1;
1737 else if (cmd == 0x47)
1738 {
1739 if (*data == 1) cell->player = data [1];
1740 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1741 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1742 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1743
1744 data += *data + 1;
1745 }
1746 else if (cmd == 8) // cell flags
1747 cell->flags = *data++;
1748 else if (ext & 0x40) // unknown, multibyte => skip
1749 data += *data + 1;
1750 else
1751 data++;
1752 } 2113 }
1753 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++;
1754 } 2131 }
1755 else 2132 while (ext & 0x80);
1756 cell->darkness = *data++ + 1;
1757 } 2133 }
1758 2134
1759 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1760 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1761 { 2137 {
1764 cell->tile [z] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
1765 2141
1766 if (cell->tile [z]) 2142 if (cell->tile [z])
1767 { 2143 {
1768 maptex *tex = self->tex + cell->tile [z]; 2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
1769 if (!tex->name) 2146 if (!tex->name)
1770 av_push (missing, newSViv (cell->tile [z])); 2147 av_push (missing, newSViv (cell->tile [z]));
1771 2148
1772 if (tex->smoothtile) 2149 if (tex->smoothtile)
1773 { 2150 {
1774 maptex *smooth = self->tex + tex->smoothtile; 2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
1775 if (!smooth->name) 2153 if (!smooth->name)
1776 av_push (missing, newSViv (tex->smoothtile)); 2154 av_push (missing, newSViv (tex->smoothtile));
1777 } 2155 }
1778 } 2156 }
1779 } 2157 }
1780 } 2158 }
1781 else 2159 else
1782 cell->darkness = 0; 2160 CELL_CLEAR (cell);
1783 } 2161 }
1784} 2162}
1785 OUTPUT: 2163 OUTPUT:
1786 RETVAL 2164 RETVAL
1787 2165
1807 ? self->row + y 2185 ? self->row + y
1808 : 0; 2186 : 0;
1809 2187
1810 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1811 { 2189 {
1812 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1813 2191
1814 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1815 { 2193 {
1816 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1817 2195
1819 { 2197 {
1820 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1821 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1822 int a1 = tex.a; 2200 int a1 = tex.a;
1823 2201
1824 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1825 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1826 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1827 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1828 } 2206 }
1829 } 2207 }
1830 2208
1831 *map++ = (r ) 2209 *map++ = (r )
1832 | (g << 8) 2210 | (g << 8)
1833 | (b << 16) 2211 | (b << 16)
1834 | (a << 24); 2212 | (a << 24);
1835 } 2213 }
1836 } 2214 }
1837 2215
1838 RETVAL = map_sv; 2216 RETVAL = map_sv;
1839} 2217}
1840 OUTPUT: 2218 OUTPUT:
1841 RETVAL 2219 RETVAL
1842 2220
1843void 2221void
1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 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)
1845 CODE: 2223 CODE:
1846{ 2224{
1847 int x, y, z; 2225 int x, y, z;
1848 2226
1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1850 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1851 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!
1852 smooth_key skey;
1853 int pl_x, pl_y; 2228 int pl_x, pl_y;
1854 maptex pl_tex; 2229 maptex pl_tex;
1855 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
1856 rc_key_t key; 2232 rc_key_t key;
1857 rc_array_t *arr; 2233 rc_t::array_t *arr;
1858 2234
1859 pl_tex.name = 0; 2235 pl_tex.name = 0;
1860 2236
1861 // thats current max. sorry. 2237 // that's current max. sorry.
1862 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1863 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1864
1865 // clear key, in case of extra padding
1866 memset (&skey, 0, sizeof (skey));
1867 2240
1868 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
1869 key.r = 255; 2242 key.r = 255;
1870 key.g = 255; 2243 key.g = 255;
1871 key.b = 255; 2244 key.b = 255;
1872 key.a = 255; 2245 key.a = 255;
1873 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
1874 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
1875 key.texname = -1;
1876 2248
1877 mx += self->x; 2249 mx += self->x;
1878 my += self->y; 2250 my += self->y;
1879 2251
1880 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
1881 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
1882 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
1883 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1884 2256
1885 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1886 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1887 { 2259 {
1888 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1903 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1904 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1905 2277
1906 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
1907 { 2279 {
1908 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;
1909 2284
1910 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
1911 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
1912 { 2287 {
1913 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
1919 tileid tile = cell->tile [z]; 2294 tileid tile = cell->tile [z];
1920 2295
1921 if (tile) 2296 if (tile)
1922 { 2297 {
1923 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
1924 int px = (x + 1) * T - tex.w; 2299 int px, py;
1925 int py = (y + 1) * T - tex.h;
1926 2300
1927 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
1928 { 2302 {
2303 self->tex [tile].unused = 0;
2304
1929 if (!tex.name) 2305 if (!tex.name)
1930 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1931 2307
1932 key.texname = tex.name; 2308 key.texname = tex.name;
1933 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
1934 } 2310 }
2311
2312 px = (x + 1) * Th - tex.w;
2313 py = (y + 1) * Tw - tex.h;
1935 2314
1936 if (expect_false (cell->player == player) && expect_false (z == 2)) 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
1937 { 2316 {
1938 pl_x = px; 2317 pl_x = px;
1939 pl_y = py; 2318 pl_y = py;
1940 pl_tex = tex; 2319 pl_tex = tex;
1941 continue; 2320 continue;
1942 } 2321 }
1943 2322
1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2323 arr->t2f_v3f (0 , 0 , px , py , 0);
1945 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1946 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);
1947 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1948
1949 if (expect_false (cell->flags) && expect_false (z == 2))
1950 {
1951 // overlays such as the speech bubble, probably more to come
1952 if (cell->flags & 1)
1953 {
1954 maptex tex = self->tex [1];
1955 int px = x * T + T * 2 / 32;
1956 int py = y * T - T * 6 / 32;
1957
1958 if (tex.name)
1959 {
1960 if (key.texname != tex.name)
1961 {
1962 key.texname = tex.name;
1963 arr = rc_array (rc, &key);
1964 }
1965
1966 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1967 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1968 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1969 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1970 }
1971 }
1972 }
1973 2327
1974 // update smooth hash 2328 // update smooth hash
1975 if (tex.smoothtile) 2329 if (tex.smoothtile)
1976 { 2330 {
1977 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
1978 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
1979 2333
1980 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
1981 2335
1982 // 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
1983 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
1984 2338
1985 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
1993 2347
1994 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1995 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
1996 2350
1997 // full tile 2351 // full tile
1998 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);
1999 2353
2000 // borders 2354 // borders
2001 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);
2002 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);
2003 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);
2004 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);
2005 2359
2006 // corners 2360 // corners
2007 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);
2008 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);
2009 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);
2010 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);
2011 } 2385 }
2012 } 2386 }
2013 } 2387 }
2014 } 2388 }
2015 2389
2016 rc_draw (rc); 2390 rc.draw ();
2017 rc_clear (rc); 2391 rc.clear ();
2018 2392
2019 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
2020 // this is basically counting sort 2394 // this is basically counting sort
2021 { 2395 {
2022 int w, b; 2396 int w, b;
2023 2397
2024 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
2025 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
2026 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)
2027 { 2403 {
2028 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
2029 if (smask) 2405 IV bits = it->second;
2030 for (b = 0; b < 32; ++b) 2406
2031 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
2032 { 2410 {
2033 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
2034 HE *he; 2419 if (tex.name)
2035
2036 hv_iterinit (smooth);
2037 while ((he = hv_iternext (smooth)))
2038 { 2420 {
2039 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
2040 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
2041 2423 if (key.texname != tex.name)
2042 if (!(bits & 0x1000)
2043 && skey->level == level
2044 && level > smooth_max [skey->x][skey->y])
2045 { 2424 {
2046 maptex tex = self->tex [skey->tile]; 2425 self->tex [skey.tile].unused = 0;
2047 int px = (((int)skey->x) - 1) * T;
2048 int py = (((int)skey->y) - 1) * T;
2049 int border = bits & 15;
2050 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2051 float dx = tex.s * .0625f; // 16 images/row
2052 float dy = tex.t * .5f ; // 2 images/column
2053 2426
2054 if (tex.name)
2055 {
2056 // this time avoiding texture state changes
2057 // save gobs of state changes.
2058 if (key.texname != tex.name)
2059 {
2060 glEnd (); 2427 glEnd ();
2061 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2062 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2063 } 2430 }
2064 2431
2065 if (border) 2432 if (border)
2066 { 2433 {
2067 float ox = border * dx; 2434 float ox = border * dx;
2068 2435
2069 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2070 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2071 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2072 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2073 } 2440 }
2074 2441
2075 if (corner) 2442 if (corner)
2076 { 2443 {
2077 float ox = corner * dx; 2444 float ox = corner * dx;
2078 2445
2079 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2080 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2081 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2082 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2083 }
2084 }
2085 } 2450 }
2086 } 2451 }
2087 } 2452 }
2088 } 2453 }
2089 2454
2090 glEnd (); 2455 glEnd ();
2091 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2092 key.texname = -1; 2457 key.texname = -1;
2093 } 2458 }
2094
2095 hv_clear (smooth);
2096 } 2459 }
2097 2460
2098 if (pl_tex.name) 2461 if (pl_tex.name)
2099 { 2462 {
2100 maptex tex = pl_tex; 2463 maptex tex = pl_tex;
2101 int px = pl_x + pdx; 2464 int px = pl_x + sdx;
2102 int py = pl_y + pdy; 2465 int py = pl_y + sdy;
2103 2466
2104 key.texname = tex.name; 2467 key.texname = tex.name;
2105 arr = rc_array (rc, &key); 2468 rc_t::array_t &arr = rc.array (key);
2106 2469
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2108 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2109 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);
2110 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2111 2474
2112 rc_draw (rc); 2475 rc.draw ();
2113 } 2476 }
2114 2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
2115 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2116 rc_free (rc);
2117 2482
2118 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2119 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2120 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2121 { 2486 {
2124 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2125 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2126 { 2491 {
2127 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2128 2493
2129 int px = x * T; 2494 int px = x * Tw;
2130 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 }
2131 2502
2132 if (cell->stat_hp) 2503 if (cell->stat_hp)
2133 { 2504 {
2134 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2135 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2136 2507
2137 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2138 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2139 px + width - 1, py); 2510 px + width - 1, py);
2140 2511
2146 } 2517 }
2147 } 2518 }
2148} 2519}
2149 2520
2150void 2521void
2151draw_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)
2152 CODE: 2523 CODE:
2153{ 2524{
2154 static float color[16][3] = { 2525 static float color[16][3] = {
2155 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2156 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2157 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2158 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2159 2530
2160 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2161 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2162 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2163 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2164 2535
2165 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2166 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2167 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2168 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2169 2540
2170 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2171 2542
2172 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2173 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2174 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2175 }; 2546 };
2176 2547
2177 int x, y; 2548 int x, y;
2178 2549
2179 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 */
2180 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2181 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2182 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2183 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2184 2561
2185 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2189 2566
2190 if (m) 2567 if (m)
2191 { 2568 {
2192 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2193 2570
2194 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2195 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2196 2573
2197 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2198 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2199 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2200 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2201 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2202 } 2579 }
2210void 2587void
2211fow_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)
2212 PPCODE: 2589 PPCODE:
2213{ 2590{
2214 int x, y; 2591 int x, y;
2215 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2216 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2217 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2218 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);
2219 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2220 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2221 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2222 2600
2223 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2224 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2225 2603
2226 mx += self->x - 1; 2604 mx += self->x - 1;
2227 my += self->y - 1; 2605 my += self->y - 1;
2228
2229 memset (darkness1, 255, sw1 * sh1);
2230 2606
2231 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2232 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2233 { 2609 {
2234 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2237 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2238 { 2614 {
2239 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2240 2616
2241 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2242 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2243 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2244 } 2620 }
2245 } 2621 }
2246 2622
2247 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2248 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2267 2643
2268 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2269 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2270 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2271 2647
2272 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2273 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2274 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2275 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2276 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 */
2277 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2278 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2279 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2280 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2281 } 2657 }
2282 2658
2283 free (darkness1); 2659 free (darkness1);
2284 2660
2285 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2286 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2287 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2288 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2289} 2665}
2290 2666
2291SV * 2667SV *
2354 else 2730 else
2355 *data++ = 0; 2731 *data++ = 0;
2356 } 2732 }
2357 } 2733 }
2358 2734
2359 /* 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 */
2360 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2361 { 2737 {
2362 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 } 2740 }
2365 2741
2366 RETVAL = data_sv; 2742 RETVAL = data_sv;
2367} 2743}
2368 OUTPUT: 2744 OUTPUT:
2369 RETVAL 2745 RETVAL
2370 2746
2371void 2747void
2378 STRLEN len; 2754 STRLEN len;
2379 uint8_t *data, *end; 2755 uint8_t *data, *end;
2380 2756
2381 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2382 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2383 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2384 end = data + len + 8; 2760 end = data + len + 8;
2385 2761
2386 if (len < 5) 2762 if (len < 5)
2387 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2388 2764
2449} 2825}
2450 2826
2451MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2452 2828
2453DC::RW 2829DC::RW
2454new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2455 CODE: 2831 CODE:
2456{ 2832{
2457 STRLEN datalen; 2833 STRLEN datalen;
2458 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2459 2835
2461} 2837}
2462 OUTPUT: 2838 OUTPUT:
2463 RETVAL 2839 RETVAL
2464 2840
2465DC::RW 2841DC::RW
2466new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2467 CODE: 2843 CODE:
2468 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2469 OUTPUT: 2845 OUTPUT:
2470 RETVAL 2846 RETVAL
2471 2847
2489 if (RETVAL < 0) 2865 if (RETVAL < 0)
2490 { 2866 {
2491 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2492 2868
2493 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)
2494 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2495 2876 }
2877 else
2496 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2497 } 2879 }
2498 2880
2499 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2500 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2501} 2883}
2548void 2930void
2549set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2550 CODE: 2932 CODE:
2551{ 2933{
2552 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));
2553 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;
2554 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2555} 2937}
2556 2938
2557void 2939void
2558set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2561 2943
2562MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2563 2945
2564PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2565 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
2566DC::MixChunk 2960DC::MixChunk
2567new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2568 CODE: 2962 CODE:
2569 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2570 OUTPUT: 2964 OUTPUT:
2571 RETVAL 2965 RETVAL
2572 2966
2602 OUTPUT: 2996 OUTPUT:
2603 RETVAL 2997 RETVAL
2604 2998
2605MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2606 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
2607int 3013int
2608volume (int volume = -1) 3014volume (int volume = -1)
2609 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2610 CODE: 3016 CODE:
2611 if (items > 0) 3017 if (items > 0)
2622void 3028void
2623halt () 3029halt ()
2624 CODE: 3030 CODE:
2625 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2626 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2627DC::MixMusic 3040DC::MixMusic
2628new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2629 CODE: 3042 CODE:
2630 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2631 OUTPUT: 3044 OUTPUT:
2632 RETVAL 3045 RETVAL
2633 3046
2661 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2662# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2663 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2664 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2665 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2666 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2667 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2668 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2669 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2670 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2682 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2683 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2684 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2685 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2686 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),
2687 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2688 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2689 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2690 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2691 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2759 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2760 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2761 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2762 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2763 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),
2764# undef const_iv 3185# undef const_iv
2765 }; 3186 };
2766 3187
2767 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--)
2768 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2769 3190
2770 texture_av = newAV (); 3191 texture_av = newAV ();
2771 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2772} 3193}
2773 3194
2775disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2776 CODE: 3197 CODE:
2777 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2778 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2779 3200
2780char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2781gl_vendor () 3205gl_vendor ()
2782 CODE: 3206 CODE:
2783 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2784 OUTPUT: 3208 OUTPUT:
2785 RETVAL 3209 RETVAL
2786 3210
2787char * 3211const char *
2788gl_version () 3212gl_version ()
2789 CODE: 3213 CODE:
2790 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2791 OUTPUT: 3215 OUTPUT:
2792 RETVAL 3216 RETVAL
2793 3217
2794char * 3218const char *
2795gl_extensions () 3219gl_extensions ()
2796 CODE: 3220 CODE:
2797 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2798 OUTPUT: 3222 OUTPUT:
2799 RETVAL 3223 RETVAL
2800 3224
2801const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2802 3230
2803GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2804 CODE: 3232 CODE:
2805 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2806 OUTPUT: 3234 OUTPUT:
2814 3242
2815int glGetError () 3243int glGetError ()
2816 3244
2817void glFinish () 3245void glFinish ()
2818 3246
3247void glFlush ()
3248
2819void glClear (int mask) 3249void glClear (int mask)
2820 3250
2821void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2822 PROTOTYPE: @ 3252 PROTOTYPE: @
2823 3253
2832void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2833 3263
2834void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2835 CODE: 3265 CODE:
2836 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2837 3269
2838void glDepthMask (int flag) 3270void glDepthMask (int flag)
2839 3271
2840void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2841 3273
2876void glRotate (float angle, float x, float y, float z) 3308void glRotate (float angle, float x, float y, float z)
2877 CODE: 3309 CODE:
2878 glRotatef (angle, x, y, z); 3310 glRotatef (angle, x, y, z);
2879 3311
2880void 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: @
2881 ALIAS: 3314 ALIAS:
2882 glColor_premultiply = 1 3315 glColor_premultiply = 1
2883 CODE: 3316 CODE:
2884 if (ix) 3317 if (ix)
2885 { 3318 {
2991 3424
2992void glEndList () 3425void glEndList ()
2993 3426
2994void glCallList (int list) 3427void glCallList (int list)
2995 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
2996MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2997 3435
2998PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
2999 3437
3000void 3438void
3001find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
3002 PPCODE: 3440 PPCODE:
3003{ 3441{
3004 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
3005 XPUSHs (self); 3443 XPUSHs (self);
3006} 3444}
3007 3445
3008BOOT: 3446BOOT:
3009{ 3447{
3017 3455
3018void 3456void
3019draw (SV *self) 3457draw (SV *self)
3020 CODE: 3458 CODE:
3021{ 3459{
3022 HV *hv; 3460 HV *hv;
3023 SV **svp; 3461 SV **svp;
3024 NV x, y, w, h; 3462 NV x, y, w, h;
3025 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
3026 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
3027 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
3028 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