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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines