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.271 by root, Sun Jul 20 15:09:29 2008 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines