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.323 by root, Sun Nov 18 01:48:39 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines