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.256 by root, Mon Mar 24 00:24:46 2008 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 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
65# include <netinet/in.h> 76# include <netinet/in.h>
66# include <netinet/tcp.h> 77# include <netinet/tcp.h>
67# include <inttypes.h> 78# include <inttypes.h>
68#endif 79#endif
69 80
81#if __GNUC__ >= 4
82# define expect(expr,value) __builtin_expect ((expr),(value))
83#else
84# define expect(expr,value) (expr)
85#endif
86
87#define expect_false(expr) expect ((expr) != 0, 0)
88#define expect_true(expr) expect ((expr) != 0, 1)
89
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 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 */
72#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
73 96
74#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
76 99
77#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
78 101
79/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 104
82#if 0 105#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 106
84#else 107#define TEXID_SPEECH 1
85# define PARACHUTE 0 108#define TEXID_NOFACE 2
86#endif 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}
87 128
88static AV *texture_av; 129static AV *texture_av;
89 130
90static struct 131static struct
91{ 132{
148{ 189{
149 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
150 191
151 while (attrs) 192 while (attrs)
152 { 193 {
153 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
154 195
155 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
156 return 1; 197 return 1;
157 198
158 attrs = attrs->next; 199 attrs = attrs->next;
159 } 200 }
160 201
161 return 0; 202 return 0;
162} 203}
163 204
164typedef struct cf_layout { 205struct cf_layout {
165 PangoLayout *pl; 206 PangoLayout *pl;
166 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
167 int base_height; 208 int base_height;
168 DC__Font font; 209 DC__Font font;
169 rc_t *rc; 210 rc_t *rc;
170} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
171 214
172static DC__Font default_font; 215static DC__Font default_font;
173static PangoContext *opengl_context; 216static PangoContext *opengl_context;
174static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
175 218
176static void 219static void
177substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
178{ 221{
179 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
180#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
181 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
182#endif 225#endif
183 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
184} 227}
185 228
186static void 229static void
187layout_update_font (DC__Layout self) 230layout_update_font (DC__Layout self)
188{ 231{
189 /* use a random scale factor to account for unknown descenders, 0.8 works 232 /* use a random scale factor to account for unknown descenders, 0.8 works
190 * reasonably well with bitstream vera 233 * reasonably well with dejavu/bistream fonts
191 */ 234 */
192 PangoFontDescription *font = self->font ? self->font : default_font; 235 PangoFontDescription *font = self->font ? self->font : default_font;
193 236
194 pango_font_description_set_absolute_size (font, 237 pango_font_description_set_absolute_size (font,
195 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 238 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
216} 259}
217 260
218typedef uint16_t tileid; 261typedef uint16_t tileid;
219typedef uint16_t faceid; 262typedef uint16_t faceid;
220 263
221typedef struct { 264struct maptex
265{
222 GLuint name; 266 GLuint name;
223 int w, h; 267 int w, h;
224 float s, t; 268 float s, t;
225 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
226 tileid smoothtile; 270 tileid smoothtile;
227 uint8_t smoothlevel; 271 uint8_t smoothlevel;
228} maptex; 272 uint8_t unused; /* set to zero on use */
273};
229 274
230typedef struct { 275struct mapcell
276{
231 uint32_t player; 277 uint32_t player;
232 tileid tile[3]; 278 tileid tile[3];
233 uint16_t darkness; 279 uint16_t darkness;
234 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
235} mapcell; 281};
236 282
237typedef struct { 283struct maprow
284{
238 int32_t c0, c1; 285 int32_t c0, c1;
239 mapcell *col; 286 mapcell *col;
240} maprow; 287};
241 288
242typedef struct map { 289struct mapgrid {
243 int x, y, w, h; 290 int x, y, w, h;
244 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
245 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
246 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
247 294
248 int32_t rows; 295 int32_t rows;
249 maprow *row; 296 maprow *row;
250} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
251 300
252static char * 301static char *
253prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
254{ 303{
255 char *p; 304 char *p;
273 322
274#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))
275#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))
276 325
277static void 326static void
278need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
279{ 328{
280 while (self->faces <= face) 329 while (self->faces <= face)
281 { 330 {
282 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
283 self->faces *= 2; 332 self->faces *= 2;
284 } 333 }
285} 334}
286 335
287static void 336static void
288need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
289{ 338{
290 while (self->texs <= texid) 339 while (self->texs <= texid)
291 { 340 {
292 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
293 self->texs *= 2; 342 self->texs *= 2;
294 } 343 }
295} 344}
296 345
297static maprow * 346static maprow *
298map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
299{ 348{
300 if (0 > y) 349 if (0 > y)
301 { 350 {
302 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
303 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
341 390
342 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
343} 392}
344 393
345static mapcell * 394static mapcell *
346map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
347{ 396{
348 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
349} 398}
350 399
351static void 400static void
352map_clear (DC__Map self) 401map_clear (mapgrid *self)
353{ 402{
354 int r; 403 int r;
355 404
356 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
357 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
364 self->oy = 0; 413 self->oy = 0;
365 self->row = 0; 414 self->row = 0;
366 self->rows = 0; 415 self->rows = 0;
367} 416}
368 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
369static void 428static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
371{ 430{
372 int x, y; 431 int x, y;
373 maprow *row; 432 maprow *row;
374 mapcell *cell; 433 mapcell *cell;
375 434
387 if (x >= row->c1) 446 if (x >= row->c1)
388 break; 447 break;
389 448
390 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
391 450
392 cell->darkness = 0; 451 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 452 }
397 } 453 }
398} 454}
399 455
400typedef struct { 456struct smooth_key
457{
401 tileid tile; 458 tileid tile;
402 uint8_t x, y, level; 459 uint8_t x, y, level;
403} 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}
404 479
405static void 480static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
407{ 482{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
409 484
410 if (SvIOK (*sv)) 485 if (it == h.end ())
411 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
412 else 487 else
413 sv_setiv (*sv, bits); 488 it->second |= bits;
414} 489}
415 490
416static void 491static void
417music_finished (void) 492music_finished (void)
418{ 493{
435 ev.code = 1; 510 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 512 ev.data2 = 0;
438 513
439 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;
440} 522}
441 523
442static unsigned int 524static unsigned int
443minpot (unsigned int n) 525minpot (unsigned int n)
444{ 526{
511 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
512 return 0; 594 return 0;
513 595
514 return 1; 596 return 1;
515} 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
516 656
517MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
518 658
519PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
520 660
549 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
550 690
551 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
553 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),
554 744
555 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
634 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
638 828
829 const_iv (KMOD_LRAM),
830
639 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
832
833 const_iv (SDL_INIT_TIMER),
834 const_iv (SDL_INIT_AUDIO),
835 const_iv (SDL_INIT_VIDEO),
836 const_iv (SDL_INIT_CDROM),
837 const_iv (SDL_INIT_JOYSTICK),
838 const_iv (SDL_INIT_EVERYTHING),
839 const_iv (SDL_INIT_NOPARACHUTE),
840 const_iv (SDL_INIT_EVENTTHREAD),
841
842 const_iv (SDL_GL_RED_SIZE),
843 const_iv (SDL_GL_GREEN_SIZE),
844 const_iv (SDL_GL_BLUE_SIZE),
845 const_iv (SDL_GL_ALPHA_SIZE),
846 const_iv (SDL_GL_DOUBLEBUFFER),
847 const_iv (SDL_GL_BUFFER_SIZE),
848 const_iv (SDL_GL_DEPTH_SIZE),
849 const_iv (SDL_GL_STENCIL_SIZE),
850 const_iv (SDL_GL_ACCUM_RED_SIZE),
851 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
852 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
854 const_iv (SDL_GL_STEREO),
855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
857 const_iv (SDL_GL_ACCELERATED_VISUAL),
858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
640# undef const_iv 861# undef const_iv
641 }; 862 };
642 863
643 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--)
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
645 866
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
648} 869}
649 870
665NV ceil (NV x) 886NV ceil (NV x)
666 887
667IV minpot (UV n) 888IV minpot (UV n)
668 889
669IV 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
670 897
671void 898void
672pango_init () 899pango_init ()
673 CODE: 900 CODE:
674{ 901{
675 opengl_fontmap = pango_opengl_font_map_new (); 902 opengl_fontmap = pango_opengl_font_map_new ();
676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 903 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 904 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
905 /*pango_context_set_font_description (opengl_context, default_font);*/
678#if PANGO_VERSION_CHECK (1, 15, 2) 906#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 907 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 908 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif 909#endif
682} 910}
683 911
684char *
685SDL_GetError () 912char *SDL_GetError ()
686 913
687int 914void SDL_main_hack (SV *real_main)
688SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 915 PROTOTYPE: &
689 916
690void 917int SDL_Init (U32 flags)
918
919int SDL_InitSubSystem (U32 flags)
920
921void SDL_QuitSubSystem (U32 flags)
922
691SDL_Quit () 923void SDL_Quit ()
924
925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
927
928int SDL_GL_GetAttribute (int attr)
929 CODE:
930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
931 XSRETURN_UNDEF;
932 OUTPUT:
933 RETVAL
692 934
693void 935void
694SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
695 PPCODE: 937 PPCODE:
696{ 938{
708 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711 953
712 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
713#if SDL_VERSION_ATLEAST(1,2,10)
714 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
715 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716#endif
717 956
718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
719 958
720 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
721 while (*m) 960 while (*m)
722 { 961 {
723 if ((*m)->w >= 800 && (*m)->h >= 480) 962 if ((*m)->w >= 400 && (*m)->h >= 300)
724 { 963 {
725 AV *av = newAV (); 964 AV *av = newAV ();
726 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
727 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
728 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
751 ); 990 );
752 991
753 if (RETVAL) 992 if (RETVAL)
754 { 993 {
755 av_clear (texture_av); 994 av_clear (texture_av);
756
757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
758#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);
759#include "glfunc.h" 996#include "glfunc.h"
760#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
761 } 1000 }
762} 1001}
763 OUTPUT: 1002 OUTPUT:
764 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
765 1007
766void 1008void
767SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
768 1010
769char * 1011char *
770SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
771 1014
772int 1015int
773SDL_GetAppState () 1016SDL_GetAppState ()
774 1017
775int 1018int
776SDL_GetModState () 1019SDL_GetModState ()
777 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
778void 1025void
1026SDL_PumpEvents ()
1027
1028void
779poll_events () 1029peep_events ()
780 PPCODE: 1030 PPCODE:
781{ 1031{
782 SDL_Event ev; 1032 SDL_Event ev;
783 1033
784 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
791 { 1041 {
792 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
793 case SDL_KEYUP: 1043 case SDL_KEYUP:
794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
796 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);
797 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 */
798 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
799 break; 1049 break;
800 1050
801 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
820 x = ev.motion.x; 1070 x = ev.motion.x;
821 y = ev.motion.y; 1071 y = ev.motion.y;
822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
823 } 1073 }
824 1074
825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
826 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
827 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
828 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
829 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
830 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
850 1100
851 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))));
852 } 1102 }
853} 1103}
854 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
855int 1118int
856Mix_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)
857 POSTCALL: 1120 POSTCALL:
858 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
859 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
860 1123
861void 1124void
862Mix_QuerySpec () 1125Mix_QuerySpec ()
915 } 1178 }
916 } 1179 }
917#endif 1180#endif
918} 1181}
919 1182
920void 1183int
921add_font (char *file) 1184add_font (char *file)
922 CODE: 1185 CODE:
923 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1187 OUTPUT:
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)
924 1196
925void 1197void
926load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
927 ALIAS: 1199 ALIAS:
928 load_image_file = 1 1200 load_image_file = 1
974 1246
975 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
976 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
977 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
978 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
979 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
980 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)));
981 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
982 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
983 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
984 1256
1044#if DEBUG 1316#if DEBUG
1045 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1046#endif 1318#endif
1047} 1319}
1048 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1049MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1050 1329
1051PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1052 1331
1053DC::Font 1332DC::Font
1054new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1055 CODE: 1334 CODE:
1056{ 1335{
1057 int count; 1336 int count;
1058 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1059 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1088 PROTOTYPE: 1367 PROTOTYPE:
1089 CODE: 1368 CODE:
1090 tc_restore (); 1369 tc_restore ();
1091 1370
1092DC::Layout 1371DC::Layout
1093new (SV *class) 1372new (SV *klass)
1094 CODE: 1373 CODE:
1095 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1096 1375
1097 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1098 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1247 1526
1248void 1527void
1249set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1250 CODE: 1529 CODE:
1251 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1252 { 1531 {
1253 self->base_height = base_height; 1532 self->base_height = base_height;
1254 layout_update_font (self); 1533 layout_update_font (self);
1255 } 1534 }
1256 1535
1257void 1536void
1484 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1485 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1486 } 1765 }
1487} 1766}
1488 1767
1768void
1769draw_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)
1770 PROTOTYPE: @
1771 CODE:
1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1775 glEnable (GL_TEXTURE_2D);
1776 glBindTexture (GL_TEXTURE_2D, name1);
1777
1778 glColor3f (intensity, intensity, intensity);
1779 glPushMatrix ();
1780 glScalef (1./3, 1./3, 1.);
1781
1782 if (blend > 0.f)
1783 {
1784 float dx3 = dx * -3.f / w;
1785 float dy3 = dy * -3.f / h;
1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1787
1788 /* interpolate the two shadow textures */
1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1791
1792 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1793 gl.ActiveTexture (GL_TEXTURE1);
1794 glEnable (GL_TEXTURE_2D);
1795 glBindTexture (GL_TEXTURE_2D, name2);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1797
1798 /* rgb == rgb(glcolor) */
1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1802
1803 /* alpha = interpolate t0, t1 by env_alpha */
1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1805
1806 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1809
1810 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1815
1816 glBegin (GL_QUADS);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1821 glEnd ();
1822
1823 glDisable (GL_TEXTURE_2D);
1824 gl.ActiveTexture (GL_TEXTURE0);
1825 }
1826 else
1827 {
1828 /* simple blending of one texture, also opengl <1.3 path */
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1830
1831 glBegin (GL_QUADS);
1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1833 glTexCoord2f (0, t); glVertex2f (0, h);
1834 glTexCoord2f (s, t); glVertex2f (w, h);
1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1836 glEnd ();
1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1882
1883 glPopMatrix ();
1884
1885 glDisable (GL_TEXTURE_2D);
1886 glDisable (GL_BLEND);
1887}
1888
1489IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1889IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1490 CODE: 1890 CODE:
1491{ 1891{
1492 GLint width; 1892 GLint width;
1493 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1893 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1500MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1501 1901
1502PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1503 1903
1504DC::Map 1904DC::Map
1505new (SV *class) 1905new (SV *klass)
1506 CODE: 1906 CODE:
1507 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1508 RETVAL->x = 0; 1908 RETVAL->x = 0;
1509 RETVAL->y = 0; 1909 RETVAL->y = 0;
1510 RETVAL->w = 0; 1910 RETVAL->w = 0;
1511 RETVAL->h = 0; 1911 RETVAL->h = 0;
1512 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1549 1949
1550void 1950void
1551set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1552 CODE: 1952 CODE:
1553{ 1953{
1554 tileid texid; 1954 tileid texid;
1555 maptex *tex; 1955 maptex *tex;
1556 1956
1557 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1558 return; 1958 return;
1559 1959
1560 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1561 return; 1961 return;
1562 1962
1563 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1564 1964
1565 if (!texid) 1965 if (!texid)
1566 return; 1966 return;
1567 1967
1568 tex = self->tex + texid; 1968 tex = self->tex + texid;
1597 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1997 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1598 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1599 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1601} 2001}
2002
2003void
2004expire_textures (DC::Map self, int texid, int count)
2005 PPCODE:
2006 for (; texid < self->texs && count; ++texid, --count)
2007 {
2008 maptex *tex = self->tex + texid;
2009
2010 if (tex->name)
2011 {
2012 if (tex->unused)
2013 {
2014 tex->name = 0;
2015 tex->unused = 0;
2016 XPUSHs (sv_2mortal (newSViv (texid)));
2017 }
2018 else
2019 tex->unused = 1;
2020 }
2021 }
1602 2022
1603int 2023int
1604ox (DC::Map self) 2024ox (DC::Map self)
1605 ALIAS: 2025 ALIAS:
1606 oy = 1 2026 oy = 1
1646 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1647 } 2067 }
1648} 2068}
1649 2069
1650SV * 2070SV *
1651map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1652 CODE: 2072 CODE:
1653{ 2073{
1654 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1655 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1656 mapcell *cell; 2076 mapcell *cell;
1677 2097
1678 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1679 2099
1680 if (flags & 8) 2100 if (flags & 8)
1681 { 2101 {
2102 uint8_t ext, cmd;
2103
1682 if (extmap) 2104 do
1683 { 2105 {
1684 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1685 2108
1686 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
1687 { 2112 {
1688 ext = *data++;
1689 cmd = ext & 0x3f;
1690
1691 if (cmd < 4)
1692 cell->darkness = 255 - ext * 64 + 1;
1693 else if (cmd == 5) // health
1694 {
1695 cell->stat_width = 1; 2113 cell->stat_width = 1;
1696 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1697 }
1698 else if (cmd == 6) // monster width
1699 cell->stat_width = *data++ + 1;
1700 else if (cmd == 0x47)
1701 {
1702 if (*data == 4)
1703 ; // decode player count
1704
1705 data += *data + 1;
1706 }
1707 else if (cmd == 8) // cell flags
1708 cell->flags = *data++;
1709 else if (ext & 0x40) // unknown, multibyte => skip
1710 data += *data + 1;
1711 else
1712 data++;
1713 } 2115 }
1714 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
1715 } 2133 }
1716 else 2134 while (ext & 0x80);
1717 cell->darkness = *data++ + 1;
1718 } 2135 }
1719 2136
1720 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1721 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1722 { 2139 {
1725 cell->tile [z] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
1726 2143
1727 if (cell->tile [z]) 2144 if (cell->tile [z])
1728 { 2145 {
1729 maptex *tex = self->tex + cell->tile [z]; 2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
1730 if (!tex->name) 2148 if (!tex->name)
1731 av_push (missing, newSViv (cell->tile [z])); 2149 av_push (missing, newSViv (cell->tile [z]));
1732 2150
1733 if (tex->smoothtile) 2151 if (tex->smoothtile)
1734 { 2152 {
1735 maptex *smooth = self->tex + tex->smoothtile; 2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
1736 if (!smooth->name) 2155 if (!smooth->name)
1737 av_push (missing, newSViv (tex->smoothtile)); 2156 av_push (missing, newSViv (tex->smoothtile));
1738 } 2157 }
1739 } 2158 }
1740 } 2159 }
1741 } 2160 }
1742 else 2161 else
1743 cell->darkness = 0; 2162 CELL_CLEAR (cell);
1744 } 2163 }
1745} 2164}
1746 OUTPUT: 2165 OUTPUT:
1747 RETVAL 2166 RETVAL
1748 2167
1768 ? self->row + y 2187 ? self->row + y
1769 : 0; 2188 : 0;
1770 2189
1771 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1772 { 2191 {
1773 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1774 2193
1775 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1776 { 2195 {
1777 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1778 2197
1780 { 2199 {
1781 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1782 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1783 int a1 = tex.a; 2202 int a1 = tex.a;
1784 2203
1785 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1786 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1787 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1788 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1789 } 2208 }
1790 } 2209 }
1791 2210
1792 *map++ = (r ) 2211 *map++ = (r )
1793 | (g << 8) 2212 | (g << 8)
1794 | (b << 16) 2213 | (b << 16)
1795 | (a << 24); 2214 | (a << 24);
1796 } 2215 }
1797 } 2216 }
1798 2217
1799 RETVAL = map_sv; 2218 RETVAL = map_sv;
1800} 2219}
1801 OUTPUT: 2220 OUTPUT:
1802 RETVAL 2221 RETVAL
1803 2222
1804void 2223void
1805draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1806 CODE: 2225 CODE:
1807{ 2226{
1808 int x, y, z; 2227 int x, y, z;
1809 2228
1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1811 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1812 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1813 smooth_key skey; 2230 int pl_x, pl_y;
1814 2231 maptex pl_tex;
1815 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
1816 rc_key_t key; 2234 rc_key_t key;
1817 rc_array_t *arr; 2235 rc_array_t *arr;
1818 2236
2237 pl_tex.name = 0;
2238
1819 // thats current max. sorry. 2239 // that's current max. sorry.
1820 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1821 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1822
1823 // clear key, in case of extra padding
1824 memset (&skey, 0, sizeof (skey));
1825 2242
1826 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
1827 key.r = 255; 2244 key.r = 255;
1828 key.g = 255; 2245 key.g = 255;
1829 key.b = 255; 2246 key.b = 255;
1830 key.a = 255; 2247 key.a = 255;
1831 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
1832 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
1833 key.texname = -1;
1834 2250
1835 mx += self->x; 2251 mx += self->x;
1836 my += self->y; 2252 my += self->y;
1837 2253
1838 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1839 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1840 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1841 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1842 2258
1843 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1844 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1845 { 2261 {
1846 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1861 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1863 2279
1864 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1865 { 2281 {
2282 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
1866 memset (smooth_level, 0, sizeof (smooth_level)); 2285 memset (smooth_level, 0, sizeof (smooth_level));
2286 key.texname = -1;
1867 2287
1868 for (y = 0; y < sh; y++) 2288 for (y = 0; y < sh; y++)
1869 if (0 <= y + my && y + my < self->rows) 2289 if (0 <= y + my && y + my < self->rows)
1870 { 2290 {
1871 maprow *row = self->row + (y + my); 2291 maprow *row = self->row + (y + my);
1881 maptex tex = self->tex [tile]; 2301 maptex tex = self->tex [tile];
1882 int px, py; 2302 int px, py;
1883 2303
1884 if (key.texname != tex.name) 2304 if (key.texname != tex.name)
1885 { 2305 {
2306 self->tex [tile].unused = 0;
2307
1886 if (!tex.name) 2308 if (!tex.name)
1887 tex = self->tex [2]; /* missing, replace by noface */ 2309 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1888 2310
1889 key.texname = tex.name; 2311 key.texname = tex.name;
1890 arr = rc_array (rc, &key); 2312 arr = rc_array (rc, &key);
1891 } 2313 }
1892 2314
1893 px = (x + 1) * T - tex.w; 2315 px = (x + 1) * Th - tex.w;
1894 py = (y + 1) * T - tex.h; 2316 py = (y + 1) * Tw - tex.h;
2317
2318 if (expect_false (cell->player == player) && expect_false (z == 2))
2319 {
2320 pl_x = px;
2321 pl_y = py;
2322 pl_tex = tex;
2323 continue;
2324 }
1895 2325
1896 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2326 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1897 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2327 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1898 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2328 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1899 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2329 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1900
1901 if (cell->flags && z == 2)
1902 {
1903 // overlays such as the speech bubble, probably more to come
1904 if (cell->flags & 1)
1905 {
1906 maptex tex = self->tex [1];
1907 int px = x * T + T * 2 / 32;
1908 int py = y * T - T * 6 / 32;
1909
1910 if (tex.name)
1911 {
1912 if (key.texname != tex.name)
1913 {
1914 key.texname = tex.name;
1915 arr = rc_array (rc, &key);
1916 }
1917
1918 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1919 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1920 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1921 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1922 }
1923 }
1924 }
1925 2330
1926 // update smooth hash 2331 // update smooth hash
1927 if (tex.smoothtile) 2332 if (tex.smoothtile)
1928 { 2333 {
1929 skey.tile = tex.smoothtile; 2334 skey.tile = tex.smoothtile;
1945 2350
1946 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2351 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1947 // ·· ·· ·┏ ┓· 2352 // ·· ·· ·┏ ┓·
1948 2353
1949 // full tile 2354 // full tile
1950 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2355 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1951 2356
1952 // borders 2357 // borders
1953 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2358 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1954 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2359 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1955 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2360 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1956 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2361 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1957 2362
1958 // corners 2363 // corners
1959 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2364 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1960 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2365 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1961 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2366 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1962 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2367 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2368 }
2369 }
2370
2371 if (expect_false (z == 2) && expect_false (cell->flags))
2372 {
2373 // overlays such as the speech bubble, probably more to come
2374 if (cell->flags & 1)
2375 {
2376 rc_key_t key_ov = key;
2377 maptex tex = self->tex [TEXID_SPEECH];
2378 rc_array_t *arr;
2379 int px = x * Tw + Tw * 2 / 32;
2380 int py = y * Th - Th * 6 / 32;
2381
2382 key_ov.texname = tex.name;
2383 arr = rc_array (rc_ov, &key_ov);
2384
2385 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2386 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2388 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1963 } 2389 }
1964 } 2390 }
1965 } 2391 }
1966 } 2392 }
1967 2393
1983 if (smask & (((uint32_t)1) << b)) 2409 if (smask & (((uint32_t)1) << b))
1984 { 2410 {
1985 int level = (w << 5) | b; 2411 int level = (w << 5) | b;
1986 HE *he; 2412 HE *he;
1987 2413
1988 hv_iterinit (smooth); 2414 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1989 while ((he = hv_iternext (smooth)))
1990 { 2415 {
1991 smooth_key *skey = (smooth_key *)HeKEY (he); 2416 smooth_key &skey = it->first;
1992 IV bits = SvIVX (HeVAL (he)); 2417 IV bits = it->second;
1993 2418
1994 if (!(bits & 0x1000) 2419 if (!(bits & 0x1000)
1995 && skey->level == level 2420 && skey.level == level
1996 && level > smooth_max [skey->x][skey->y]) 2421 && level > smooth_max [skey.x][skey.y])
1997 { 2422 {
1998 maptex tex = self->tex [skey->tile]; 2423 maptex tex = self->tex [skey.tile];
1999 int px = (((int)skey->x) - 1) * T; 2424 int px = (((int)skey.x) - 1) * Tw;
2000 int py = (((int)skey->y) - 1) * T; 2425 int py = (((int)skey.y) - 1) * Th;
2001 int border = bits & 15; 2426 int border = bits & 15;
2002 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2427 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2003 float dx = tex.s * .0625f; // 16 images/row 2428 float dx = tex.s * .0625f; // 16 images/row
2004 float dy = tex.t * .5f ; // 2 images/column 2429 float dy = tex.t * .5f ; // 2 images/column
2005 2430
2007 { 2432 {
2008 // this time avoiding texture state changes 2433 // this time avoiding texture state changes
2009 // save gobs of state changes. 2434 // save gobs of state changes.
2010 if (key.texname != tex.name) 2435 if (key.texname != tex.name)
2011 { 2436 {
2437 self->tex [skey.tile].unused = 0;
2438
2012 glEnd (); 2439 glEnd ();
2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2440 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2014 glBegin (GL_QUADS); 2441 glBegin (GL_QUADS);
2015 } 2442 }
2016 2443
2017 if (border) 2444 if (border)
2018 { 2445 {
2019 float ox = border * dx; 2446 float ox = border * dx;
2020 2447
2021 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2448 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2022 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2023 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2450 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2024 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2451 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2025 } 2452 }
2026 2453
2027 if (corner) 2454 if (corner)
2028 { 2455 {
2029 float ox = corner * dx; 2456 float ox = corner * dx;
2030 2457
2031 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2458 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2032 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2459 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2033 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2460 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2034 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2461 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2035 } 2462 }
2036 } 2463 }
2037 } 2464 }
2038 } 2465 }
2039 } 2466 }
2041 2468
2042 glEnd (); 2469 glEnd ();
2043 glDisable (GL_TEXTURE_2D); 2470 glDisable (GL_TEXTURE_2D);
2044 key.texname = -1; 2471 key.texname = -1;
2045 } 2472 }
2046
2047 hv_clear (smooth);
2048 } 2473 }
2474
2475 if (pl_tex.name)
2476 {
2477 maptex tex = pl_tex;
2478 int px = pl_x + sdx;
2479 int py = pl_y + sdy;
2480
2481 key.texname = tex.name;
2482 arr = rc_array (rc, &key);
2483
2484 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2485 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2486 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2487 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2488
2489 rc_draw (rc);
2490 }
2491
2492 rc_draw (rc_ov);
2493 rc_clear (rc_ov);
2049 2494
2050 glDisable (GL_BLEND); 2495 glDisable (GL_BLEND);
2051 rc_free (rc); 2496 rc_free (rc);
2497 rc_free (rc_ov);
2052 2498
2053 // top layer: overlays such as the health bar 2499 // top layer: overlays such as the health bar
2054 for (y = 0; y < sh; y++) 2500 for (y = 0; y < sh; y++)
2055 if (0 <= y + my && y + my < self->rows) 2501 if (0 <= y + my && y + my < self->rows)
2056 { 2502 {
2059 for (x = 0; x < sw; x++) 2505 for (x = 0; x < sw; x++)
2060 if (row->c0 <= x + mx && x + mx < row->c1) 2506 if (row->c0 <= x + mx && x + mx < row->c1)
2061 { 2507 {
2062 mapcell *cell = row->col + (x + mx - row->c0); 2508 mapcell *cell = row->col + (x + mx - row->c0);
2063 2509
2064 int px = x * T; 2510 int px = x * Tw;
2065 int py = y * T; 2511 int py = y * Th;
2512
2513 if (expect_false (cell->player == player))
2514 {
2515 px += sdx;
2516 py += sdy;
2517 }
2066 2518
2067 if (cell->stat_hp) 2519 if (cell->stat_hp)
2068 { 2520 {
2069 int width = cell->stat_width * T; 2521 int width = cell->stat_width * Tw;
2070 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2522 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2071 2523
2072 glColor3ub (0, 0, 0); 2524 glColor3ub (0, 0, 0);
2073 glRectf (px + 1, py - thick - 2, 2525 glRectf (px + 1, py - thick - 2,
2074 px + width - 1, py); 2526 px + width - 1, py);
2075 2527
2081 } 2533 }
2082 } 2534 }
2083} 2535}
2084 2536
2085void 2537void
2086draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2538draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2087 CODE: 2539 CODE:
2088{ 2540{
2089 static float color[16][3] = { 2541 static float color[16][3] = {
2090 { 0.00F, 0.00F, 0.00F }, 2542 { 0.00f, 0.00f, 0.00f },
2091 { 1.00F, 1.00F, 1.00F }, 2543 { 1.00f, 1.00f, 1.00f },
2092 { 0.00F, 0.00F, 0.55F }, 2544 { 0.00f, 0.00f, 0.55f },
2093 { 1.00F, 0.00F, 0.00F }, 2545 { 1.00f, 0.00f, 0.00f },
2094 2546
2095 { 1.00F, 0.54F, 0.00F }, 2547 { 1.00f, 0.54f, 0.00f },
2096 { 0.11F, 0.56F, 1.00F }, 2548 { 0.11f, 0.56f, 1.00f },
2097 { 0.93F, 0.46F, 0.00F }, 2549 { 0.93f, 0.46f, 0.00f },
2098 { 0.18F, 0.54F, 0.34F }, 2550 { 0.18f, 0.54f, 0.34f },
2099 2551
2100 { 0.56F, 0.73F, 0.56F }, 2552 { 0.56f, 0.73f, 0.56f },
2101 { 0.80F, 0.80F, 0.80F }, 2553 { 0.80f, 0.80f, 0.80f },
2102 { 0.55F, 0.41F, 0.13F }, 2554 { 0.55f, 0.41f, 0.13f },
2103 { 0.99F, 0.77F, 0.26F }, 2555 { 0.99f, 0.77f, 0.26f },
2104 2556
2105 { 0.74F, 0.65F, 0.41F }, 2557 { 0.74f, 0.65f, 0.41f },
2106 2558
2107 { 0.00F, 1.00F, 1.00F }, 2559 { 0.00f, 1.00f, 1.00f },
2108 { 1.00F, 0.00F, 1.00F }, 2560 { 1.00f, 0.00f, 1.00f },
2109 { 1.00F, 1.00F, 0.00F }, 2561 { 1.00f, 1.00f, 0.00f },
2110 }; 2562 };
2111 2563
2112 int x, y; 2564 int x, y;
2113 2565
2114 glEnable (GL_TEXTURE_2D); 2566 glEnable (GL_TEXTURE_2D);
2567 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2568 * but the nvidia driver (185.18.14) mishandles alpha textures
2569 * and takes the colour from god knows where instead of using
2570 * Cp. MODULATE results in the same colour, but slightly different
2571 * alpha, but atcually gives us the correct colour with nvidia.
2572 */
2115 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2573 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2116 glEnable (GL_BLEND); 2574 glEnable (GL_BLEND);
2117 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2575 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2118 glBegin (GL_QUADS); 2576 glBegin (GL_QUADS);
2119 2577
2120 for (y = 0; y < h; y++) 2578 for (y = 0; y < h; y++)
2124 2582
2125 if (m) 2583 if (m)
2126 { 2584 {
2127 float *c = color [m & 15]; 2585 float *c = color [m & 15];
2128 2586
2129 float tx1 = m & 0x40 ? 0.5 : 0.; 2587 float tx1 = m & 0x40 ? 0.5f : 0.f;
2130 float tx2 = tx1 + 0.5; 2588 float tx2 = tx1 + 0.5f;
2131 2589
2132 glColor4f (c[0], c[1], c[2], 0.75); 2590 glColor4f (c[0], c[1], c[2], 1);
2133 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2591 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2134 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2592 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2135 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2593 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2136 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2594 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2137 } 2595 }
2145void 2603void
2146fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2604fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2147 PPCODE: 2605 PPCODE:
2148{ 2606{
2149 int x, y; 2607 int x, y;
2150 int sw1 = sw + 2; 2608 int sw1 = sw + 2;
2151 int sh1 = sh + 2; 2609 int sh1 = sh + 2;
2152 int sh3 = sh * 3; 2610 int sh3 = sh * 3;
2153 int sw34 = (sw * 3 + 3) & ~3; 2611 int sw3 = sw * 3;
2612 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2613 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2154 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2614 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2155 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2615 memset (darkness1, 0, sw1*sh1);
2156 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2157 2616
2158 SvPOK_only (darkness3_sv); 2617 SvPOK_only (darkness3_sv);
2159 SvCUR_set (darkness3_sv, sw34 * sh3); 2618 SvCUR_set (darkness3_sv, sw3 * sh3);
2160 2619
2161 mx += self->x - 1; 2620 mx += self->x - 1;
2162 my += self->y - 1; 2621 my += self->y - 1;
2163
2164 memset (darkness1, 255, sw1 * sh1);
2165 2622
2166 for (y = 0; y < sh1; y++) 2623 for (y = 0; y < sh1; y++)
2167 if (0 <= y + my && y + my < self->rows) 2624 if (0 <= y + my && y + my < self->rows)
2168 { 2625 {
2169 maprow *row = self->row + (y + my); 2626 maprow *row = self->row + (y + my);
2172 if (row->c0 <= x + mx && x + mx < row->c1) 2629 if (row->c0 <= x + mx && x + mx < row->c1)
2173 { 2630 {
2174 mapcell *cell = row->col + (x + mx - row->c0); 2631 mapcell *cell = row->col + (x + mx - row->c0);
2175 2632
2176 darkness1 [y * sw1 + x] = cell->darkness 2633 darkness1 [y * sw1 + x] = cell->darkness
2177 ? 255 - (cell->darkness - 1) 2634 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2178 : 255 - FOW_DARKNESS; 2635 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2179 } 2636 }
2180 } 2637 }
2181 2638
2182 for (y = 0; y < sh; ++y) 2639 for (y = 0; y < sh; ++y)
2183 for (x = 0; x < sw; ++x) 2640 for (x = 0; x < sw; ++x)
2202 2659
2203 uint8_t r13 = (d13 + d23 + d12) / 3; 2660 uint8_t r13 = (d13 + d23 + d12) / 3;
2204 uint8_t r23 = d23; 2661 uint8_t r23 = d23;
2205 uint8_t r33 = (d23 + d33 + d32) / 3; 2662 uint8_t r33 = (d23 + d33 + d32) / 3;
2206 2663
2207 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2664 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2208 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2665 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2209 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2666 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2210 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2667 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2211 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2668 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2212 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2669 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2213 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2670 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2214 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2671 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2215 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2672 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2216 } 2673 }
2217 2674
2218 free (darkness1); 2675 free (darkness1);
2219 2676
2220 EXTEND (SP, 3); 2677 EXTEND (SP, 3);
2221 PUSHs (sv_2mortal (newSViv (sw34))); 2678 PUSHs (sv_2mortal (newSViv (sw3)));
2222 PUSHs (sv_2mortal (newSViv (sh3))); 2679 PUSHs (sv_2mortal (newSViv (sh3)));
2223 PUSHs (darkness3_sv); 2680 PUSHs (darkness3_sv);
2224} 2681}
2225 2682
2226SV * 2683SV *
2289 else 2746 else
2290 *data++ = 0; 2747 *data++ = 0;
2291 } 2748 }
2292 } 2749 }
2293 2750
2751 /* if size is w*h + 5 then no data has been found */
2752 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2753 {
2294 SvPOK_only (data_sv); 2754 SvPOK_only (data_sv);
2295 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2755 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2756 }
2757
2296 RETVAL = data_sv; 2758 RETVAL = data_sv;
2297} 2759}
2298 OUTPUT: 2760 OUTPUT:
2299 RETVAL 2761 RETVAL
2300 2762
2301void 2763void
2302set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2764set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2303 PPCODE: 2765 PPCODE:
2304{ 2766{
2305 int x, y, z; 2767 int x, y, z;
2306 int w, h; 2768 int w, h;
2307 int x1, y1; 2769 int x1, y1;
2770 STRLEN len;
2771 uint8_t *data, *end;
2772
2773 len = SvLEN (data_sv);
2774 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2775 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2776 end = data + len + 8;
2777
2778 if (len < 5)
2779 XSRETURN_EMPTY;
2308 2780
2309 if (*data++ != 0) 2781 if (*data++ != 0)
2310 XSRETURN_EMPTY; /* version mismatch */ 2782 XSRETURN_EMPTY; /* version mismatch */
2311 2783
2312 w = *data++ << 8; w |= *data++; 2784 w = *data++ << 8; w |= *data++;
2327 { 2799 {
2328 maprow *row = map_get_row (self, y); 2800 maprow *row = map_get_row (self, y);
2329 2801
2330 for (x = x0; x < x1; x++) 2802 for (x = x0; x < x1; x++)
2331 { 2803 {
2804 uint8_t flags;
2805
2806 if (data + 7 >= end)
2807 XSRETURN_EMPTY;
2808
2332 uint8_t flags = *data++; 2809 flags = *data++;
2333 2810
2334 if (flags) 2811 if (flags)
2335 { 2812 {
2336 mapcell *cell = row_get_cell (row, x); 2813 mapcell *cell = row_get_cell (row, x);
2337 tileid tile[3] = { 0, 0, 0 }; 2814 tileid tile[3] = { 0, 0, 0 };
2340 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2817 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2341 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2818 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2342 2819
2343 if (cell->darkness == 0) 2820 if (cell->darkness == 0)
2344 { 2821 {
2345 cell->darkness = 0; 2822 /*cell->darkness = 0;*/
2823 EXTEND (SP, 3);
2346 2824
2347 for (z = 0; z <= 2; z++) 2825 for (z = 0; z <= 2; z++)
2348 { 2826 {
2349 tileid t = tile [z]; 2827 tileid t = tile [z];
2350 2828
2351 if (t >= self->texs || (t && !self->tex [t].name)) 2829 if (t >= self->texs || (t && !self->tex [t].name))
2352 { 2830 {
2353 XPUSHs (sv_2mortal (newSViv (t))); 2831 PUSHs (sv_2mortal (newSViv (t)));
2354 need_texid (self, t); 2832 need_texid (self, t);
2355 } 2833 }
2356 2834
2357 cell->tile [z] = t; 2835 cell->tile [z] = t;
2358 } 2836 }
2363} 2841}
2364 2842
2365MODULE = Deliantra::Client PACKAGE = DC::RW 2843MODULE = Deliantra::Client PACKAGE = DC::RW
2366 2844
2367DC::RW 2845DC::RW
2368new (SV *class, SV *data_sv) 2846new (SV *klass, SV *data_sv)
2369 CODE: 2847 CODE:
2370{ 2848{
2371 STRLEN datalen; 2849 STRLEN datalen;
2372 char *data = SvPVbyte (data_sv, datalen); 2850 char *data = SvPVbyte (data_sv, datalen);
2373 2851
2375} 2853}
2376 OUTPUT: 2854 OUTPUT:
2377 RETVAL 2855 RETVAL
2378 2856
2379DC::RW 2857DC::RW
2380new_from_file (SV *class, const char *path, const char *mode = "rb") 2858new_from_file (SV *klass, const char *path, const char *mode = "rb")
2381 CODE: 2859 CODE:
2382 RETVAL = SDL_RWFromFile (path, mode); 2860 RETVAL = SDL_RWFromFile (path, mode);
2383 OUTPUT: 2861 OUTPUT:
2384 RETVAL 2862 RETVAL
2385 2863
2403 if (RETVAL < 0) 2881 if (RETVAL < 0)
2404 { 2882 {
2405 RETVAL = Mix_GroupOldest (-1); 2883 RETVAL = Mix_GroupOldest (-1);
2406 2884
2407 if (RETVAL < 0) 2885 if (RETVAL < 0)
2886 {
2887 // happens sometimes, maybe it just stopped playing(?)
2888 RETVAL = Mix_GroupAvailable (-1);
2889
2890 if (RETVAL < 0)
2408 XSRETURN_UNDEF; 2891 XSRETURN_UNDEF;
2409 2892 }
2893 else
2410 Mix_HaltChannel (RETVAL); 2894 Mix_HaltChannel (RETVAL);
2411 } 2895 }
2412 2896
2413 Mix_UnregisterAllEffects (RETVAL); 2897 Mix_UnregisterAllEffects (RETVAL);
2414 Mix_Volume (RETVAL, 128); 2898 Mix_Volume (RETVAL, 128);
2415} 2899}
2462void 2946void
2463set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2947set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2464 CODE: 2948 CODE:
2465{ 2949{
2466 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2950 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2467 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2951 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2468 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2952 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2469} 2953}
2470 2954
2471void 2955void
2472set_reverse_stereo (DC::Channel self, int flip) 2956set_reverse_stereo (DC::Channel self, int flip)
2475 2959
2476MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2960MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2477 2961
2478PROTOTYPES: DISABLE 2962PROTOTYPES: DISABLE
2479 2963
2964void
2965decoders ()
2966 PPCODE:
2967#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2968 int i, num = Mix_GetNumChunkDecoders ();
2969 EXTEND (SP, num);
2970 for (i = 0; i < num; ++i)
2971 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2972#else
2973 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2974#endif
2975
2480DC::MixChunk 2976DC::MixChunk
2481new (SV *class, DC::RW rwops) 2977new (SV *klass, DC::RW rwops)
2482 CODE: 2978 CODE:
2483 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2979 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2484 OUTPUT: 2980 OUTPUT:
2485 RETVAL 2981 RETVAL
2486 2982
2516 OUTPUT: 3012 OUTPUT:
2517 RETVAL 3013 RETVAL
2518 3014
2519MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3015MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2520 3016
3017void
3018decoders ()
3019 PPCODE:
3020#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3021 int i, num = Mix_GetNumMusicDecoders ();
3022 EXTEND (SP, num);
3023 for (i = 0; i < num; ++i)
3024 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3025#else
3026 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3027#endif
3028
2521int 3029int
2522volume (int volume = -1) 3030volume (int volume = -1)
2523 PROTOTYPE: ;$ 3031 PROTOTYPE: ;$
2524 CODE: 3032 CODE:
2525 if (items > 0) 3033 if (items > 0)
2536void 3044void
2537halt () 3045halt ()
2538 CODE: 3046 CODE:
2539 Mix_HaltMusic (); 3047 Mix_HaltMusic ();
2540 3048
3049int
3050playing ()
3051 CODE:
3052 RETVAL = Mix_PlayingMusic ();
3053 OUTPUT:
3054 RETVAL
3055
2541DC::MixMusic 3056DC::MixMusic
2542new (SV *class, DC::RW rwops) 3057new (SV *klass, DC::RW rwops)
2543 CODE: 3058 CODE:
2544 RETVAL = Mix_LoadMUS_RW (rwops); 3059 RETVAL = Mix_LoadMUS_RW (rwops);
2545 OUTPUT: 3060 OUTPUT:
2546 RETVAL 3061 RETVAL
2547 3062
2575 } *civ, const_iv[] = { 3090 } *civ, const_iv[] = {
2576# define const_iv(name) { # name, (IV)name } 3091# define const_iv(name) { # name, (IV)name }
2577 const_iv (GL_VENDOR), 3092 const_iv (GL_VENDOR),
2578 const_iv (GL_VERSION), 3093 const_iv (GL_VERSION),
2579 const_iv (GL_EXTENSIONS), 3094 const_iv (GL_EXTENSIONS),
3095 const_iv (GL_MAX_TEXTURE_UNITS),
2580 const_iv (GL_COLOR_MATERIAL), 3096 const_iv (GL_COLOR_MATERIAL),
2581 const_iv (GL_SMOOTH), 3097 const_iv (GL_SMOOTH),
2582 const_iv (GL_FLAT), 3098 const_iv (GL_FLAT),
2583 const_iv (GL_DITHER), 3099 const_iv (GL_DITHER),
2584 const_iv (GL_BLEND), 3100 const_iv (GL_BLEND),
2596 const_iv (GL_ZERO), 3112 const_iv (GL_ZERO),
2597 const_iv (GL_SRC_ALPHA), 3113 const_iv (GL_SRC_ALPHA),
2598 const_iv (GL_DST_ALPHA), 3114 const_iv (GL_DST_ALPHA),
2599 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3115 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2600 const_iv (GL_ONE_MINUS_DST_ALPHA), 3116 const_iv (GL_ONE_MINUS_DST_ALPHA),
3117 const_iv (GL_SRC_COLOR),
3118 const_iv (GL_DST_COLOR),
3119 const_iv (GL_ONE_MINUS_SRC_COLOR),
3120 const_iv (GL_ONE_MINUS_DST_COLOR),
2601 const_iv (GL_SRC_ALPHA_SATURATE), 3121 const_iv (GL_SRC_ALPHA_SATURATE),
2602 const_iv (GL_RGB), 3122 const_iv (GL_RGB),
2603 const_iv (GL_RGBA), 3123 const_iv (GL_RGBA),
2604 const_iv (GL_RGBA4), 3124 const_iv (GL_RGBA4),
2605 const_iv (GL_RGBA8), 3125 const_iv (GL_RGBA8),
2673 const_iv (GL_NICEST), 3193 const_iv (GL_NICEST),
2674 const_iv (GL_V2F), 3194 const_iv (GL_V2F),
2675 const_iv (GL_V3F), 3195 const_iv (GL_V3F),
2676 const_iv (GL_T2F_V3F), 3196 const_iv (GL_T2F_V3F),
2677 const_iv (GL_T2F_N3F_V3F), 3197 const_iv (GL_T2F_N3F_V3F),
3198 const_iv (GL_FUNC_ADD),
3199 const_iv (GL_FUNC_SUBTRACT),
3200 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2678# undef const_iv 3201# undef const_iv
2679 }; 3202 };
2680 3203
2681 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3204 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2682 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3205 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2683 3206
2684 texture_av = newAV (); 3207 texture_av = newAV ();
2685 AvREAL_off (texture_av); 3208 AvREAL_off (texture_av);
2686} 3209}
2687 3210
2689disable_GL_EXT_blend_func_separate () 3212disable_GL_EXT_blend_func_separate ()
2690 CODE: 3213 CODE:
2691 gl.BlendFuncSeparate = 0; 3214 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0; 3215 gl.BlendFuncSeparateEXT = 0;
2693 3216
2694char * 3217void
3218apple_nvidia_bug (int enable)
3219
3220const char *
2695gl_vendor () 3221gl_vendor ()
2696 CODE: 3222 CODE:
2697 RETVAL = (char *)glGetString (GL_VENDOR); 3223 RETVAL = (const char *)glGetString (GL_VENDOR);
2698 OUTPUT: 3224 OUTPUT:
2699 RETVAL 3225 RETVAL
2700 3226
2701char * 3227const char *
2702gl_version () 3228gl_version ()
2703 CODE: 3229 CODE:
2704 RETVAL = (char *)glGetString (GL_VERSION); 3230 RETVAL = (const char *)glGetString (GL_VERSION);
2705 OUTPUT: 3231 OUTPUT:
2706 RETVAL 3232 RETVAL
2707 3233
2708char * 3234const char *
2709gl_extensions () 3235gl_extensions ()
2710 CODE: 3236 CODE:
2711 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3237 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2712 OUTPUT: 3238 OUTPUT:
2713 RETVAL 3239 RETVAL
2714 3240
2715const char *glGetString (GLenum pname) 3241const char *glGetString (GLenum pname)
3242 CODE:
3243 RETVAL = (const char *)glGetString (pname);
3244 OUTPUT:
3245 RETVAL
2716 3246
2717GLint glGetInteger (GLenum pname) 3247GLint glGetInteger (GLenum pname)
2718 CODE: 3248 CODE:
2719 glGetIntegerv (pname, &RETVAL); 3249 glGetIntegerv (pname, &RETVAL);
2720 OUTPUT: 3250 OUTPUT:
2728 3258
2729int glGetError () 3259int glGetError ()
2730 3260
2731void glFinish () 3261void glFinish ()
2732 3262
3263void glFlush ()
3264
2733void glClear (int mask) 3265void glClear (int mask)
2734 3266
2735void glClearColor (float r, float g, float b, float a = 1.0) 3267void glClearColor (float r, float g, float b, float a = 1.0)
2736 PROTOTYPE: @ 3268 PROTOTYPE: @
2737 3269
2746void glBlendFunc (int sfactor, int dfactor) 3278void glBlendFunc (int sfactor, int dfactor)
2747 3279
2748void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3280void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2749 CODE: 3281 CODE:
2750 gl_BlendFuncSeparate (sa, da, saa, daa); 3282 gl_BlendFuncSeparate (sa, da, saa, daa);
3283
3284# void glBlendEquation (int se)
2751 3285
2752void glDepthMask (int flag) 3286void glDepthMask (int flag)
2753 3287
2754void glLogicOp (int opcode) 3288void glLogicOp (int opcode)
2755 3289
2790void glRotate (float angle, float x, float y, float z) 3324void glRotate (float angle, float x, float y, float z)
2791 CODE: 3325 CODE:
2792 glRotatef (angle, x, y, z); 3326 glRotatef (angle, x, y, z);
2793 3327
2794void glColor (float r, float g, float b, float a = 1.0) 3328void glColor (float r, float g, float b, float a = 1.0)
3329 PROTOTYPE: @
2795 ALIAS: 3330 ALIAS:
2796 glColor_premultiply = 1 3331 glColor_premultiply = 1
2797 CODE: 3332 CODE:
2798 if (ix) 3333 if (ix)
2799 { 3334 {
2905 3440
2906void glEndList () 3441void glEndList ()
2907 3442
2908void glCallList (int list) 3443void glCallList (int list)
2909 3444
3445void c_init ()
3446 CODE:
3447 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3448 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3449
2910MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3450MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2911 3451
2912PROTOTYPES: DISABLE 3452PROTOTYPES: DISABLE
2913 3453
2914void 3454void
2915find_widget (SV *self, NV x, NV y) 3455find_widget (SV *self, NV x, NV y)
2916 PPCODE: 3456 PPCODE:
2917{ 3457{
2918 if (within_widget (self, x, y)) 3458 if (within_widget (self, x, y))
2919 XPUSHs (self); 3459 XPUSHs (self);
2920} 3460}
2921 3461
2922BOOT: 3462BOOT:
2923{ 3463{
2931 3471
2932void 3472void
2933draw (SV *self) 3473draw (SV *self)
2934 CODE: 3474 CODE:
2935{ 3475{
2936 HV *hv; 3476 HV *hv;
2937 SV **svp; 3477 SV **svp;
2938 NV x, y, w, h; 3478 NV x, y, w, h;
2939 SV *draw_x_sv = GvSV (draw_x_gv); 3479 SV *draw_x_sv = GvSV (draw_x_gv);
2940 SV *draw_y_sv = GvSV (draw_y_gv); 3480 SV *draw_y_sv = GvSV (draw_y_gv);
2941 SV *draw_w_sv = GvSV (draw_w_gv); 3481 SV *draw_w_sv = GvSV (draw_w_gv);
2942 SV *draw_h_sv = GvSV (draw_h_gv); 3482 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines