ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines