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.259 by root, Tue May 20 02:47:21 2008 UTC vs.
Revision 1.328 by root, Sun Nov 18 12:47:55 2018 UTC

15 15
16#include "EXTERN.h" 16#include "EXTERN.h"
17#include "perl.h" 17#include "perl.h"
18#include "XSUB.h" 18#include "XSUB.h"
19 19
20#include "flat_hash_map.hpp"
21
20#ifdef _WIN32 22#ifdef _WIN32
21# undef pipe 23# undef pipe
22// microsoft vs. C 24// microsoft vs. C
23# define sqrtf(x) sqrt(x) 25# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
50typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
51typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
52typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
65# include <netinet/in.h> 76# include <netinet/in.h>
66# include <netinet/tcp.h> 77# include <netinet/tcp.h>
67# include <inttypes.h> 78# include <inttypes.h>
68#endif 79#endif
69 80
81#if __GNUC__ >= 4
82# define expect(expr,value) __builtin_expect ((expr),(value))
83#else
84# define expect(expr,value) (expr)
85#endif
86
87#define expect_false(expr) expect ((expr) != 0, 0)
88#define expect_true(expr) expect ((expr) != 0, 1)
89
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
72#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
73 96
74#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
76 99
77#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
78 101
79/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81 104
82#if 0 105#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE 106
84#else 107#define TEXID_SPEECH 1
85# define PARACHUTE 0 108#define TEXID_NOFACE 2
86#endif 109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
87 128
88static AV *texture_av; 129static AV *texture_av;
89 130
90static struct 131static struct
91{ 132{
148{ 189{
149 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
150 191
151 while (attrs) 192 while (attrs)
152 { 193 {
153 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
154 195
155 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
156 return 1; 197 return 1;
157 198
158 attrs = attrs->next; 199 attrs = attrs->next;
159 } 200 }
160 201
161 return 0; 202 return 0;
162} 203}
163 204
164typedef struct cf_layout { 205struct cf_layout {
165 PangoLayout *pl; 206 PangoLayout *pl;
166 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
167 int base_height; 208 int base_height;
168 DC__Font font; 209 DC__Font font;
169 rc_t *rc; 210 rc_t rc;
170} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
171 214
172static DC__Font default_font; 215static DC__Font default_font;
173static PangoContext *opengl_context; 216static PangoContext *opengl_context;
174static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
175 218
176static void 219static void
177substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
178{ 221{
179 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
180#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
181 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
182#endif 225#endif
183 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
184} 227}
185 228
186static void 229static void
216} 259}
217 260
218typedef uint16_t tileid; 261typedef uint16_t tileid;
219typedef uint16_t faceid; 262typedef uint16_t faceid;
220 263
221typedef struct { 264struct maptex
265{
222 GLuint name; 266 GLuint name;
223 int w, h; 267 int w, h;
224 float s, t; 268 float s, t;
225 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
226 tileid smoothtile; 270 tileid smoothtile;
227 uint8_t smoothlevel; 271 uint8_t smoothlevel;
228} maptex; 272 uint8_t unused; /* set to zero on use */
273};
229 274
230typedef struct { 275struct mapcell
276{
231 uint32_t player; 277 uint32_t player;
232 tileid tile[3]; 278 tileid tile[3];
233 uint16_t darkness; 279 uint16_t darkness;
234 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
235} mapcell; 281};
236 282
237typedef struct { 283struct maprow
284{
238 int32_t c0, c1; 285 int32_t c0, c1;
239 mapcell *col; 286 mapcell *col;
240} maprow; 287};
241 288
242typedef struct map { 289struct mapgrid {
243 int x, y, w, h; 290 int x, y, w, h;
244 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
245 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
246 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
247 294
248 int32_t rows; 295 int32_t rows;
249 maprow *row; 296 maprow *row;
250} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
251 300
252static char * 301static char *
253prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
254{ 303{
255 char *p; 304 char *p;
273 322
274#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
275#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
276 325
277static void 326static void
278need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
279{ 328{
280 while (self->faces <= face) 329 while (self->faces <= face)
281 { 330 {
282 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
283 self->faces *= 2; 332 self->faces *= 2;
284 } 333 }
285} 334}
286 335
287static void 336static void
288need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
289{ 338{
290 while (self->texs <= texid) 339 while (self->texs <= texid)
291 { 340 {
292 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
293 self->texs *= 2; 342 self->texs *= 2;
294 } 343 }
295} 344}
296 345
297static maprow * 346static maprow *
298map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
299{ 348{
300 if (0 > y) 349 if (0 > y)
301 { 350 {
302 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
303 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
341 390
342 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
343} 392}
344 393
345static mapcell * 394static mapcell *
346map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
347{ 396{
348 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
349} 398}
350 399
351static void 400static void
352map_clear (DC__Map self) 401map_clear (mapgrid *self)
353{ 402{
354 int r; 403 int r;
355 404
356 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
357 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
364 self->oy = 0; 413 self->oy = 0;
365 self->row = 0; 414 self->row = 0;
366 self->rows = 0; 415 self->rows = 0;
367} 416}
368 417
418#define CELL_CLEAR(cell) \
419 do { \
420 if ((cell)->player) \
421 (cell)->tile [2] = 0; \
422 (cell)->darkness = 0; \
423 (cell)->stat_hp = 0; \
424 (cell)->flags = 0; \
425 (cell)->player = 0; \
426 } while (0)
427
369static void 428static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
371{ 430{
372 int x, y; 431 int x, y;
373 maprow *row; 432 maprow *row;
374 mapcell *cell; 433 mapcell *cell;
375 434
387 if (x >= row->c1) 446 if (x >= row->c1)
388 break; 447 break;
389 448
390 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
391 450
392 cell->darkness = 0; 451 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 452 }
397 } 453 }
398} 454}
399 455
400typedef struct { 456struct smooth_key
457{
401 tileid tile; 458 tileid tile;
402 uint8_t x, y, level; 459 uint8_t x, y, level;
403} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
404 479
405static void 480static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
407{ 482{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
409 484
410 if (SvIOK (*sv)) 485 if (it == h.end ())
411 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
412 else 487 else
413 sv_setiv (*sv, bits); 488 it->second |= bits;
414} 489}
415 490
416static void 491static void
417music_finished (void) 492music_finished (void)
418{ 493{
435 ev.code = 1; 510 ev.code = 1;
436 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
437 ev.data2 = 0; 512 ev.data2 = 0;
438 513
439 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
440} 522}
441 523
442static unsigned int 524static unsigned int
443minpot (unsigned int n) 525minpot (unsigned int n)
444{ 526{
511 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
512 return 0; 594 return 0;
513 595
514 return 1; 596 return 1;
515} 597}
598
599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
516 656
517MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
518 658
519PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
520 660
549 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
550 690
551 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
554 744
555 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
634 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
638 828
829 const_iv (KMOD_LRAM),
830
639 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
832
833 const_iv (SDL_INIT_TIMER),
834 const_iv (SDL_INIT_AUDIO),
835 const_iv (SDL_INIT_VIDEO),
836 const_iv (SDL_INIT_CDROM),
837 const_iv (SDL_INIT_JOYSTICK),
838 const_iv (SDL_INIT_EVERYTHING),
839 const_iv (SDL_INIT_NOPARACHUTE),
840 const_iv (SDL_INIT_EVENTTHREAD),
841
842 const_iv (SDL_GL_RED_SIZE),
843 const_iv (SDL_GL_GREEN_SIZE),
844 const_iv (SDL_GL_BLUE_SIZE),
845 const_iv (SDL_GL_ALPHA_SIZE),
846 const_iv (SDL_GL_DOUBLEBUFFER),
847 const_iv (SDL_GL_BUFFER_SIZE),
848 const_iv (SDL_GL_DEPTH_SIZE),
849 const_iv (SDL_GL_STENCIL_SIZE),
850 const_iv (SDL_GL_ACCUM_RED_SIZE),
851 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
852 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
854 const_iv (SDL_GL_STEREO),
855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
857 const_iv (SDL_GL_ACCELERATED_VISUAL),
858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
640# undef const_iv 861# undef const_iv
641 }; 862 };
642 863
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
645 866
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
648} 869}
649 870
665NV ceil (NV x) 886NV ceil (NV x)
666 887
667IV minpot (UV n) 888IV minpot (UV n)
668 889
669IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
670 897
671void 898void
672pango_init () 899pango_init ()
673 CODE: 900 CODE:
674{ 901{
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 907 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 908 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 909#endif
683} 910}
684 911
685char *
686SDL_GetError () 912char *SDL_GetError ()
687 913
688int 914void SDL_main_hack (SV *real_main)
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 915 PROTOTYPE: &
690 916
691void 917int SDL_Init (U32 flags)
918
919int SDL_InitSubSystem (U32 flags)
920
921void SDL_QuitSubSystem (U32 flags)
922
692SDL_Quit () 923void SDL_Quit ()
924
925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
927
928int SDL_GL_GetAttribute (int attr)
929 CODE:
930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
931 XSRETURN_UNDEF;
932 OUTPUT:
933 RETVAL
693 934
694void 935void
695SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
696 PPCODE: 937 PPCODE:
697{ 938{
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 953
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714#if SDL_VERSION_ATLEAST(1,2,10)
715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 956
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 958
721 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
722 while (*m) 960 while (*m)
723 { 961 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 962 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 963 {
726 AV *av = newAV (); 964 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
752 ); 990 );
753 991
754 if (RETVAL) 992 if (RETVAL)
755 { 993 {
756 av_clear (texture_av); 994 av_clear (texture_av);
757
758 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
759#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
760#include "glfunc.h" 996#include "glfunc.h"
761#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
762 } 1000 }
763} 1001}
764 OUTPUT: 1002 OUTPUT:
765 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
766 1007
767void 1008void
768SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
769 1010
770char * 1011char *
771SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
772 1014
773int 1015int
774SDL_GetAppState () 1016SDL_GetAppState ()
775 1017
776int 1018int
777SDL_GetModState () 1019SDL_GetModState ()
778 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
779void 1025void
1026SDL_PumpEvents ()
1027
1028void
780poll_events () 1029peep_events ()
781 PPCODE: 1030 PPCODE:
782{ 1031{
783 SDL_Event ev; 1032 SDL_Event ev;
784 1033
785 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
792 { 1041 {
793 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
794 case SDL_KEYUP: 1043 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
797 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
798 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 1049 break;
801 1050
802 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
821 x = ev.motion.x; 1070 x = ev.motion.x;
822 y = ev.motion.y; 1071 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 1073 }
825 1074
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
851 1100
852 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
853 } 1102 }
854} 1103}
855 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
856int 1118int
857Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
858 POSTCALL: 1120 POSTCALL:
859 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
860 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
861 1123
862void 1124void
863Mix_QuerySpec () 1125Mix_QuerySpec ()
922add_font (char *file) 1184add_font (char *file)
923 CODE: 1185 CODE:
924 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
925 OUTPUT: 1187 OUTPUT:
926 RETVAL 1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
927 1196
928void 1197void
929load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
930 ALIAS: 1199 ALIAS:
931 load_image_file = 1 1200 load_image_file = 1
977 1246
978 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
979 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
980 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
981 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
982 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
983 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
984 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
985 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
986 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
987 1256
1047#if DEBUG 1316#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1049#endif 1318#endif
1050} 1319}
1051 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1329
1054PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1055 1331
1056DC::Font 1332DC::Font
1057new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1058 CODE: 1334 CODE:
1059{ 1335{
1060 int count; 1336 int count;
1061 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1062 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1091 PROTOTYPE: 1367 PROTOTYPE:
1092 CODE: 1368 CODE:
1093 tc_restore (); 1369 tc_restore ();
1094 1370
1095DC::Layout 1371DC::Layout
1096new (SV *class) 1372new (SV *klass)
1097 CODE: 1373 CODE:
1098 New (0, RETVAL, 1, struct cf_layout); 1374 RETVAL = new cf_layout;
1099 1375
1100 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1101 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1102 RETVAL->g = 1.; 1378 RETVAL->g = 1.;
1103 RETVAL->b = 1.; 1379 RETVAL->b = 1.;
1104 RETVAL->a = 1.; 1380 RETVAL->a = 1.;
1105 RETVAL->base_height = MIN_FONT_HEIGHT; 1381 RETVAL->base_height = MIN_FONT_HEIGHT;
1106 RETVAL->font = 0; 1382 RETVAL->font = 0;
1107 RETVAL->rc = rc_alloc ();
1108 1383
1109 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1384 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1110 layout_update_font (RETVAL); 1385 layout_update_font (RETVAL);
1111 OUTPUT: 1386 OUTPUT:
1112 RETVAL 1387 RETVAL
1113 1388
1114void 1389void
1115DESTROY (DC::Layout self) 1390DESTROY (DC::Layout self)
1116 CODE: 1391 CODE:
1117 g_object_unref (self->pl); 1392 g_object_unref (self->pl);
1118 rc_free (self->rc);
1119 Safefree (self); 1393 delete self;
1120 1394
1121void 1395void
1122set_text (DC::Layout self, SV *text_) 1396set_text (DC::Layout self, SV *text_)
1123 CODE: 1397 CODE:
1124{ 1398{
1250 1524
1251void 1525void
1252set_height (DC::Layout self, int base_height) 1526set_height (DC::Layout self, int base_height)
1253 CODE: 1527 CODE:
1254 if (self->base_height != base_height) 1528 if (self->base_height != base_height)
1255 { 1529 {
1256 self->base_height = base_height; 1530 self->base_height = base_height;
1257 layout_update_font (self); 1531 layout_update_font (self);
1258 } 1532 }
1259 1533
1260void 1534void
1378} 1652}
1379 1653
1380void 1654void
1381render (DC::Layout self, float x, float y, int flags = 0) 1655render (DC::Layout self, float x, float y, int flags = 0)
1382 CODE: 1656 CODE:
1383 rc_clear (self->rc); 1657 self->rc.clear ();
1384 pango_opengl_render_layout_subpixel ( 1658 pango_opengl_render_layout_subpixel (
1385 self->pl, 1659 self->pl,
1386 self->rc, 1660 &self->rc,
1387 x * PANGO_SCALE, y * PANGO_SCALE, 1661 x * PANGO_SCALE, y * PANGO_SCALE,
1388 self->r, self->g, self->b, self->a, 1662 self->r, self->g, self->b, self->a,
1389 flags 1663 flags
1390 ); 1664 );
1391 // we assume that context_change actually clears/frees stuff 1665 // we assume that context_change actually clears/frees stuff
1402 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1676 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1403 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1677 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1404 glEnable (GL_ALPHA_TEST); 1678 glEnable (GL_ALPHA_TEST);
1405 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1679 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1406 1680
1407 rc_draw (self->rc); 1681 self->rc.draw ();
1408 1682
1409 glDisable (GL_ALPHA_TEST); 1683 glDisable (GL_ALPHA_TEST);
1410 glDisable (GL_BLEND); 1684 glDisable (GL_BLEND);
1411 glDisable (GL_TEXTURE_2D); 1685 glDisable (GL_TEXTURE_2D);
1412} 1686}
1487 glDisable (GL_ALPHA_TEST); 1761 glDisable (GL_ALPHA_TEST);
1488 glDisable (GL_BLEND); 1762 glDisable (GL_BLEND);
1489 } 1763 }
1490} 1764}
1491 1765
1766void
1767draw_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)
1768 PROTOTYPE: @
1769 CODE:
1770{
1771 glEnable (GL_BLEND);
1772 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1773 glEnable (GL_TEXTURE_2D);
1774 glBindTexture (GL_TEXTURE_2D, name1);
1775
1776 glColor3f (intensity, intensity, intensity);
1777 glPushMatrix ();
1778 glScalef (1./3, 1./3, 1.);
1779
1780 if (blend > 0.f)
1781 {
1782 float dx3 = dx * -3.f / w;
1783 float dy3 = dy * -3.f / h;
1784 GLfloat env_color[4] = { 0., 0., 0., blend };
1785
1786 /* interpolate the two shadow textures */
1787 /* stage 0 == rgb(glcolor) + alpha(t0) */
1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1789
1790 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1791 gl.ActiveTexture (GL_TEXTURE1);
1792 glEnable (GL_TEXTURE_2D);
1793 glBindTexture (GL_TEXTURE_2D, name2);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1795
1796 /* rgb == rgb(glcolor) */
1797 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1799 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1800
1801 /* alpha = interpolate t0, t1 by env_alpha */
1802 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1806 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1807
1808 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1809 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1812 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1813
1814 glBegin (GL_QUADS);
1815 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1816 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1819 glEnd ();
1820
1821 glDisable (GL_TEXTURE_2D);
1822 gl.ActiveTexture (GL_TEXTURE0);
1823 }
1824 else
1825 {
1826 /* simple blending of one texture, also opengl <1.3 path */
1827 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1828
1829 glBegin (GL_QUADS);
1830 glTexCoord2f (0, 0); glVertex2f (0, 0);
1831 glTexCoord2f (0, t); glVertex2f (0, h);
1832 glTexCoord2f (s, t); glVertex2f (w, h);
1833 glTexCoord2f (s, 0); glVertex2f (w, 0);
1834 glEnd ();
1835 }
1836
1837 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1838 {
1839 int x, y;
1840 int dx3 = dx * 3;
1841 int dy3 = dy * 3;
1842
1843 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1844 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1845 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1846 glTranslatef (-1., -1., 0);
1847 glBegin (GL_QUADS);
1848
1849 for (y = 1; y < h; y += 3)
1850 {
1851 int y1 = y - dy3;
1852 int y1valid = y1 >= 0 && y1 < h;
1853
1854 for (x = 1; x < w; x += 3)
1855 {
1856 int x1 = x - dx3;
1857 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 uint8_t h2;
1859
1860 if (y1valid && x1 >= 0 && x1 < w)
1861 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1862 else
1863 h2 = 1; /* out of range == invisible */
1864
1865 if (h1 || h2)
1866 {
1867 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1868 glColor4f (1., 1., 1., alpha);
1869
1870 glTexCoord2f (0, 0.); glVertex2i (x , y );
1871 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1872 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1873 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1874 }
1875 }
1876 }
1877 }
1878
1879 glEnd ();
1880
1881 glPopMatrix ();
1882
1883 glDisable (GL_TEXTURE_2D);
1884 glDisable (GL_BLEND);
1885}
1886
1492IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1887IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1493 CODE: 1888 CODE:
1494{ 1889{
1495 GLint width; 1890 GLint width;
1496 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1891 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1503MODULE = Deliantra::Client PACKAGE = DC::Map 1898MODULE = Deliantra::Client PACKAGE = DC::Map
1504 1899
1505PROTOTYPES: DISABLE 1900PROTOTYPES: DISABLE
1506 1901
1507DC::Map 1902DC::Map
1508new (SV *class) 1903new (SV *klass)
1509 CODE: 1904 CODE:
1510 New (0, RETVAL, 1, struct map); 1905 New (0, RETVAL, 1, mapgrid);
1511 RETVAL->x = 0; 1906 RETVAL->x = 0;
1512 RETVAL->y = 0; 1907 RETVAL->y = 0;
1513 RETVAL->w = 0; 1908 RETVAL->w = 0;
1514 RETVAL->h = 0; 1909 RETVAL->h = 0;
1515 RETVAL->ox = 0; 1910 RETVAL->ox = 0;
1552 1947
1553void 1948void
1554set_smooth (DC::Map self, int face, int smooth, int level) 1949set_smooth (DC::Map self, int face, int smooth, int level)
1555 CODE: 1950 CODE:
1556{ 1951{
1557 tileid texid; 1952 tileid texid;
1558 maptex *tex; 1953 maptex *tex;
1559 1954
1560 if (face < 0 || face >= self->faces) 1955 if (face < 0 || face >= self->faces)
1561 return; 1956 return;
1562 1957
1563 if (smooth < 0 || smooth >= self->faces) 1958 if (smooth < 0 || smooth >= self->faces)
1564 return; 1959 return;
1565 1960
1566 texid = self->face2tile [face]; 1961 texid = self->face2tile [face];
1567 1962
1568 if (!texid) 1963 if (!texid)
1569 return; 1964 return;
1570 1965
1571 tex = self->tex + texid; 1966 tex = self->tex + texid;
1600 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1995 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1601 // use uglier nearest interpolation because linear suffers 1996 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1997 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1998 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 1999}
2000
2001void
2002expire_textures (DC::Map self, int texid, int count)
2003 PPCODE:
2004 for (; texid < self->texs && count; ++texid, --count)
2005 {
2006 maptex *tex = self->tex + texid;
2007
2008 if (tex->name)
2009 {
2010 if (tex->unused)
2011 {
2012 tex->name = 0;
2013 tex->unused = 0;
2014 XPUSHs (sv_2mortal (newSViv (texid)));
2015 }
2016 else
2017 tex->unused = 1;
2018 }
2019 }
1605 2020
1606int 2021int
1607ox (DC::Map self) 2022ox (DC::Map self)
1608 ALIAS: 2023 ALIAS:
1609 oy = 1 2024 oy = 1
1649 self->y += MAP_EXTEND_Y; 2064 self->y += MAP_EXTEND_Y;
1650 } 2065 }
1651} 2066}
1652 2067
1653SV * 2068SV *
1654map1a_update (DC::Map self, SV *data_, int extmap) 2069map1a_update (DC::Map self, SV *data_)
1655 CODE: 2070 CODE:
1656{ 2071{
1657 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2072 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1658 uint8_t *data_end = (uint8_t *)SvEND (data_); 2073 uint8_t *data_end = (uint8_t *)SvEND (data_);
1659 mapcell *cell; 2074 mapcell *cell;
1680 2095
1681 //TODO: don't trust server data to be in-range(!) 2096 //TODO: don't trust server data to be in-range(!)
1682 2097
1683 if (flags & 8) 2098 if (flags & 8)
1684 { 2099 {
2100 uint8_t ext, cmd;
2101
1685 if (extmap) 2102 do
1686 { 2103 {
1687 uint8_t ext, cmd; 2104 ext = *data++;
2105 cmd = ext & 0x7f;
1688 2106
1689 do 2107 if (cmd < 4)
2108 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2109 else if (cmd == 5) // health
1690 { 2110 {
1691 ext = *data++;
1692 cmd = ext & 0x3f;
1693
1694 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health
1697 {
1698 cell->stat_width = 1; 2111 cell->stat_width = 1;
1699 cell->stat_hp = *data++; 2112 cell->stat_hp = *data++;
1700 }
1701 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47)
1704 {
1705 if (*data == 4)
1706 ; // decode player count
1707
1708 data += *data + 1;
1709 }
1710 else if (cmd == 8) // cell flags
1711 cell->flags = *data++;
1712 else if (ext & 0x40) // unknown, multibyte => skip
1713 data += *data + 1;
1714 else
1715 data++;
1716 } 2113 }
1717 while (ext & 0x80); 2114 else if (cmd == 6) // monster width
2115 cell->stat_width = *data++ + 1;
2116 else if (cmd == 0x47)
2117 {
2118 if (*data == 1) cell->player = data [1];
2119 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2120 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2121 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2122
2123 data += *data + 1;
2124 }
2125 else if (cmd == 8) // cell flags
2126 cell->flags = *data++;
2127 else if (ext & 0x40) // unknown, multibyte => skip
2128 data += *data + 1;
2129 else
2130 data++;
1718 } 2131 }
1719 else 2132 while (ext & 0x80);
1720 cell->darkness = *data++ + 1;
1721 } 2133 }
1722 2134
1723 for (z = 0; z <= 2; ++z) 2135 for (z = 0; z <= 2; ++z)
1724 if (flags & (4 >> z)) 2136 if (flags & (4 >> z))
1725 { 2137 {
1728 cell->tile [z] = self->face2tile [face]; 2140 cell->tile [z] = self->face2tile [face];
1729 2141
1730 if (cell->tile [z]) 2142 if (cell->tile [z])
1731 { 2143 {
1732 maptex *tex = self->tex + cell->tile [z]; 2144 maptex *tex = self->tex + cell->tile [z];
2145 tex->unused = 0;
1733 if (!tex->name) 2146 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 2147 av_push (missing, newSViv (cell->tile [z]));
1735 2148
1736 if (tex->smoothtile) 2149 if (tex->smoothtile)
1737 { 2150 {
1738 maptex *smooth = self->tex + tex->smoothtile; 2151 maptex *smooth = self->tex + tex->smoothtile;
2152 smooth->unused = 0;
1739 if (!smooth->name) 2153 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 2154 av_push (missing, newSViv (tex->smoothtile));
1741 } 2155 }
1742 } 2156 }
1743 } 2157 }
1744 } 2158 }
1745 else 2159 else
1746 cell->darkness = 0; 2160 CELL_CLEAR (cell);
1747 } 2161 }
1748} 2162}
1749 OUTPUT: 2163 OUTPUT:
1750 RETVAL 2164 RETVAL
1751 2165
1771 ? self->row + y 2185 ? self->row + y
1772 : 0; 2186 : 0;
1773 2187
1774 for (x = x0; x < x1; x++) 2188 for (x = x0; x < x1; x++)
1775 { 2189 {
1776 int r = 32, g = 32, b = 32, a = 192; 2190 unsigned int r = 32, g = 32, b = 32, a = 192;
1777 2191
1778 if (row && row->c0 <= x && x < row->c1) 2192 if (row && row->c0 <= x && x < row->c1)
1779 { 2193 {
1780 mapcell *cell = row->col + (x - row->c0); 2194 mapcell *cell = row->col + (x - row->c0);
1781 2195
1783 { 2197 {
1784 maptex tex = self->tex [cell->tile [z]]; 2198 maptex tex = self->tex [cell->tile [z]];
1785 int a0 = 255 - tex.a; 2199 int a0 = 255 - tex.a;
1786 int a1 = tex.a; 2200 int a1 = tex.a;
1787 2201
1788 r = (r * a0 + tex.r * a1) / 255; 2202 r = div255 (r * a0 + tex.r * a1);
1789 g = (g * a0 + tex.g * a1) / 255; 2203 g = div255 (g * a0 + tex.g * a1);
1790 b = (b * a0 + tex.b * a1) / 255; 2204 b = div255 (b * a0 + tex.b * a1);
1791 a = (a * a0 + tex.a * a1) / 255; 2205 a = div255 (a * a0 + tex.a * a1);
1792 } 2206 }
1793 } 2207 }
1794 2208
1795 *map++ = (r ) 2209 *map++ = (r )
1796 | (g << 8) 2210 | (g << 8)
1797 | (b << 16) 2211 | (b << 16)
1798 | (a << 24); 2212 | (a << 24);
1799 } 2213 }
1800 } 2214 }
1801 2215
1802 RETVAL = map_sv; 2216 RETVAL = map_sv;
1803} 2217}
1804 OUTPUT: 2218 OUTPUT:
1805 RETVAL 2219 RETVAL
1806 2220
1807void 2221void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2222draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 2223 CODE:
1810{ 2224{
1811 int x, y, z; 2225 int x, y, z;
1812 2226
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2227 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1816 smooth_key skey; 2228 int pl_x, pl_y;
1817 2229 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2230 rc_t rc;
2231 rc_t rc_ov;
1819 rc_key_t key; 2232 rc_key_t key;
1820 rc_array_t *arr; 2233 rc_t::array_t *arr;
1821 2234
2235 pl_tex.name = 0;
2236
1822 // thats current max. sorry. 2237 // that's current max. sorry.
1823 if (sw > 255) sw = 255; 2238 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2239 if (sh > 255) sh = 255;
1825
1826 // clear key, in case of extra padding
1827 memset (&skey, 0, sizeof (skey));
1828 2240
1829 memset (&key, 0, sizeof (key)); 2241 memset (&key, 0, sizeof (key));
1830 key.r = 255; 2242 key.r = 255;
1831 key.g = 255; 2243 key.g = 255;
1832 key.b = 255; 2244 key.b = 255;
1833 key.a = 255; 2245 key.a = 255;
1834 key.mode = GL_QUADS; 2246 key.mode = GL_QUADS;
1835 key.format = GL_T2F_V3F; 2247 key.format = GL_T2F_V3F;
1836 key.texname = -1;
1837 2248
1838 mx += self->x; 2249 mx += self->x;
1839 my += self->y; 2250 my += self->y;
1840 2251
1841 // first pass: determine smooth_max 2252 // first pass: determine smooth_max
1842 // rather ugly, if you ask me 2253 // rather ugly, if you ask me
1843 // could also be stored inside mapcell and updated on change 2254 // could also be stored inside mapcell and updated on change
1844 memset (smooth_max, 0, sizeof (smooth_max)); 2255 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1845 2256
1846 for (y = 0; y < sh; y++) 2257 for (y = 0; y < sh; y++)
1847 if (0 <= y + my && y + my < self->rows) 2258 if (0 <= y + my && y + my < self->rows)
1848 { 2259 {
1849 maprow *row = self->row + (y + my); 2260 maprow *row = self->row + (y + my);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2275 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2276 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1866 2277
1867 for (z = 0; z <= 2; z++) 2278 for (z = 0; z <= 2; z++)
1868 { 2279 {
1869 memset (smooth_level, 0, sizeof (smooth_level)); 2280 std::bitset<256> smooth_level; // one bit for every possible smooth level
2281 smooth_key skey;
2282 smooth_hash smooth;
2283 key.texname = -1;
1870 2284
1871 for (y = 0; y < sh; y++) 2285 for (y = 0; y < sh; y++)
1872 if (0 <= y + my && y + my < self->rows) 2286 if (0 <= y + my && y + my < self->rows)
1873 { 2287 {
1874 maprow *row = self->row + (y + my); 2288 maprow *row = self->row + (y + my);
1884 maptex tex = self->tex [tile]; 2298 maptex tex = self->tex [tile];
1885 int px, py; 2299 int px, py;
1886 2300
1887 if (key.texname != tex.name) 2301 if (key.texname != tex.name)
1888 { 2302 {
2303 self->tex [tile].unused = 0;
2304
1889 if (!tex.name) 2305 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2306 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1891 2307
1892 key.texname = tex.name; 2308 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2309 arr = &rc.array (key);
1894 } 2310 }
1895 2311
1896 px = (x + 1) * T - tex.w; 2312 px = (x + 1) * Th - tex.w;
1897 py = (y + 1) * T - tex.h; 2313 py = (y + 1) * Tw - tex.h;
1898 2314
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2315 if (expect_false (cell->player == player) && expect_false (z == 2))
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903
1904 if (cell->flags && z == 2)
1905 { 2316 {
1906 // overlays such as the speech bubble, probably more to come 2317 pl_x = px;
1907 if (cell->flags & 1) 2318 pl_y = py;
2319 pl_tex = tex;
1908 { 2320 continue;
1909 maptex tex = self->tex [1];
1910 int px = x * T + T * 2 / 32;
1911 int py = y * T - T * 6 / 32;
1912
1913 if (tex.name)
1914 {
1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1925 }
1926 }
1927 } 2321 }
2322
2323 arr->t2f_v3f (0 , 0 , px , py , 0);
2324 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2325 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2326 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1928 2327
1929 // update smooth hash 2328 // update smooth hash
1930 if (tex.smoothtile) 2329 if (tex.smoothtile)
1931 { 2330 {
1932 skey.tile = tex.smoothtile; 2331 skey.tile = tex.smoothtile;
1933 skey.level = tex.smoothlevel; 2332 skey.level = tex.smoothlevel;
1934 2333
1935 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2334 smooth_level[tex.smoothlevel] = 1;
1936 2335
1937 // add bits to current tile and all neighbours. skey.x|y is 2336 // add bits to current tile and all neighbours. skey.x|y is
1938 // shifted +1|+1 so we always stay positive. 2337 // shifted +1|+1 so we always stay positive.
1939 2338
1940 // bits is ___n cccc CCCC bbbb 2339 // bits is ___n cccc CCCC bbbb
1948 2347
1949 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2348 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1950 // ·· ·· ·┏ ┓· 2349 // ·· ·· ·┏ ┓·
1951 2350
1952 // full tile 2351 // full tile
1953 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2352 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1954 2353
1955 // borders 2354 // borders
1956 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2355 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1957 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2356 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1958 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2357 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1959 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2358 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1960 2359
1961 // corners 2360 // corners
1962 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2361 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1963 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2362 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1964 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2363 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1965 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2364 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2365 }
2366 }
2367
2368 if (expect_false (z == 2) && expect_false (cell->flags))
2369 {
2370 // overlays such as the speech bubble, probably more to come
2371 if (cell->flags & 1)
2372 {
2373 rc_key_t key_ov = key;
2374 maptex tex = self->tex[TEXID_SPEECH];
2375 int px = x * Tw + Tw * 2 / 32;
2376 int py = y * Th - Th * 6 / 32;
2377
2378 key_ov.texname = tex.name;
2379 rc_t::array_t &arr = rc_ov.array (key_ov);
2380
2381 arr.t2f_v3f (0 , 0 , px , py , 0);
2382 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2383 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2384 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
1966 } 2385 }
1967 } 2386 }
1968 } 2387 }
1969 } 2388 }
1970 2389
1971 rc_draw (rc); 2390 rc.draw ();
1972 rc_clear (rc); 2391 rc.clear ();
1973 2392
1974 // go through all smoothlevels, lowest to highest, then draw. 2393 // go through all smoothlevels, lowest to highest, then draw.
1975 // this is basically counting sort 2394 // this is basically counting sort
1976 { 2395 {
1977 int w, b; 2396 int w, b;
1978 2397
1979 glEnable (GL_TEXTURE_2D); 2398 glEnable (GL_TEXTURE_2D);
1980 glBegin (GL_QUADS); 2399 glBegin (GL_QUADS);
1981 for (w = 0; w < 256 / 32; ++w) 2400 for (int level = 0; level < smooth_level.size (); ++level)
2401 if (smooth_level[level])
2402 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
1982 { 2403 {
1983 uint32_t smask = smooth_level [w]; 2404 smooth_key &skey = it->first;
1984 if (smask) 2405 IV bits = it->second;
1985 for (b = 0; b < 32; ++b) 2406
1986 if (smask & (((uint32_t)1) << b)) 2407 if (!(bits & 0x1000)
2408 && skey.level == level
2409 && level > smooth_max [skey.x][skey.y])
1987 { 2410 {
1988 int level = (w << 5) | b; 2411 maptex tex = self->tex [skey.tile];
2412 int px = (((int)skey.x) - 1) * Tw;
2413 int py = (((int)skey.y) - 1) * Th;
2414 int border = bits & 15;
2415 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2416 float dx = tex.s * .0625f; // 16 images/row
2417 float dy = tex.t * .5f ; // 2 images/column
2418
1989 HE *he; 2419 if (tex.name)
1990
1991 hv_iterinit (smooth);
1992 while ((he = hv_iternext (smooth)))
1993 { 2420 {
1994 smooth_key *skey = (smooth_key *)HeKEY (he); 2421 // this time avoiding texture state changes
1995 IV bits = SvIVX (HeVAL (he)); 2422 // save gobs of state changes.
1996 2423 if (key.texname != tex.name)
1997 if (!(bits & 0x1000)
1998 && skey->level == level
1999 && level > smooth_max [skey->x][skey->y])
2000 { 2424 {
2001 maptex tex = self->tex [skey->tile]; 2425 self->tex [skey.tile].unused = 0;
2002 int px = (((int)skey->x) - 1) * T;
2003 int py = (((int)skey->y) - 1) * T;
2004 int border = bits & 15;
2005 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2006 float dx = tex.s * .0625f; // 16 images/row
2007 float dy = tex.t * .5f ; // 2 images/column
2008 2426
2009 if (tex.name)
2010 {
2011 // this time avoiding texture state changes
2012 // save gobs of state changes.
2013 if (key.texname != tex.name)
2014 {
2015 glEnd (); 2427 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2428 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2429 glBegin (GL_QUADS);
2018 } 2430 }
2019 2431
2020 if (border) 2432 if (border)
2021 { 2433 {
2022 float ox = border * dx; 2434 float ox = border * dx;
2023 2435
2024 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2436 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2025 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2437 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2026 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2438 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2027 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2439 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2028 } 2440 }
2029 2441
2030 if (corner) 2442 if (corner)
2031 { 2443 {
2032 float ox = corner * dx; 2444 float ox = corner * dx;
2033 2445
2034 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2446 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2035 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2447 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2036 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2448 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2037 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2449 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2038 }
2039 }
2040 } 2450 }
2041 } 2451 }
2042 } 2452 }
2043 } 2453 }
2044 2454
2045 glEnd (); 2455 glEnd ();
2046 glDisable (GL_TEXTURE_2D); 2456 glDisable (GL_TEXTURE_2D);
2047 key.texname = -1; 2457 key.texname = -1;
2048 } 2458 }
2049
2050 hv_clear (smooth);
2051 } 2459 }
2052 2460
2461 if (pl_tex.name)
2462 {
2463 maptex tex = pl_tex;
2464 int px = pl_x + sdx;
2465 int py = pl_y + sdy;
2466
2467 key.texname = tex.name;
2468 rc_t::array_t &arr = rc.array (key);
2469
2470 arr.t2f_v3f (0 , 0 , px , py , 0);
2471 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2472 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2473 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2474
2475 rc.draw ();
2476 }
2477
2478 rc_ov.draw ();
2479 rc_ov.clear ();
2480
2053 glDisable (GL_BLEND); 2481 glDisable (GL_BLEND);
2054 rc_free (rc);
2055 2482
2056 // top layer: overlays such as the health bar 2483 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2484 for (y = 0; y < sh; y++)
2058 if (0 <= y + my && y + my < self->rows) 2485 if (0 <= y + my && y + my < self->rows)
2059 { 2486 {
2062 for (x = 0; x < sw; x++) 2489 for (x = 0; x < sw; x++)
2063 if (row->c0 <= x + mx && x + mx < row->c1) 2490 if (row->c0 <= x + mx && x + mx < row->c1)
2064 { 2491 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2492 mapcell *cell = row->col + (x + mx - row->c0);
2066 2493
2067 int px = x * T; 2494 int px = x * Tw;
2068 int py = y * T; 2495 int py = y * Th;
2496
2497 if (expect_false (cell->player == player))
2498 {
2499 px += sdx;
2500 py += sdy;
2501 }
2069 2502
2070 if (cell->stat_hp) 2503 if (cell->stat_hp)
2071 { 2504 {
2072 int width = cell->stat_width * T; 2505 int width = cell->stat_width * Tw;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2506 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2074 2507
2075 glColor3ub (0, 0, 0); 2508 glColor3ub (0, 0, 0);
2076 glRectf (px + 1, py - thick - 2, 2509 glRectf (px + 1, py - thick - 2,
2077 px + width - 1, py); 2510 px + width - 1, py);
2078 2511
2084 } 2517 }
2085 } 2518 }
2086} 2519}
2087 2520
2088void 2521void
2089draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2522draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2090 CODE: 2523 CODE:
2091{ 2524{
2092 static float color[16][3] = { 2525 static float color[16][3] = {
2093 { 0.00F, 0.00F, 0.00F }, 2526 { 0.00f, 0.00f, 0.00f },
2094 { 1.00F, 1.00F, 1.00F }, 2527 { 1.00f, 1.00f, 1.00f },
2095 { 0.00F, 0.00F, 0.55F }, 2528 { 0.00f, 0.00f, 0.55f },
2096 { 1.00F, 0.00F, 0.00F }, 2529 { 1.00f, 0.00f, 0.00f },
2097 2530
2098 { 1.00F, 0.54F, 0.00F }, 2531 { 1.00f, 0.54f, 0.00f },
2099 { 0.11F, 0.56F, 1.00F }, 2532 { 0.11f, 0.56f, 1.00f },
2100 { 0.93F, 0.46F, 0.00F }, 2533 { 0.93f, 0.46f, 0.00f },
2101 { 0.18F, 0.54F, 0.34F }, 2534 { 0.18f, 0.54f, 0.34f },
2102 2535
2103 { 0.56F, 0.73F, 0.56F }, 2536 { 0.56f, 0.73f, 0.56f },
2104 { 0.80F, 0.80F, 0.80F }, 2537 { 0.80f, 0.80f, 0.80f },
2105 { 0.55F, 0.41F, 0.13F }, 2538 { 0.55f, 0.41f, 0.13f },
2106 { 0.99F, 0.77F, 0.26F }, 2539 { 0.99f, 0.77f, 0.26f },
2107 2540
2108 { 0.74F, 0.65F, 0.41F }, 2541 { 0.74f, 0.65f, 0.41f },
2109 2542
2110 { 0.00F, 1.00F, 1.00F }, 2543 { 0.00f, 1.00f, 1.00f },
2111 { 1.00F, 0.00F, 1.00F }, 2544 { 1.00f, 0.00f, 1.00f },
2112 { 1.00F, 1.00F, 0.00F }, 2545 { 1.00f, 1.00f, 0.00f },
2113 }; 2546 };
2114 2547
2115 int x, y; 2548 int x, y;
2116 2549
2117 glEnable (GL_TEXTURE_2D); 2550 glEnable (GL_TEXTURE_2D);
2551 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2552 * but the nvidia driver (185.18.14) mishandles alpha textures
2553 * and takes the colour from god knows where instead of using
2554 * Cp. MODULATE results in the same colour, but slightly different
2555 * alpha, but atcually gives us the correct colour with nvidia.
2556 */
2118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2557 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2119 glEnable (GL_BLEND); 2558 glEnable (GL_BLEND);
2120 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2559 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2121 glBegin (GL_QUADS); 2560 glBegin (GL_QUADS);
2122 2561
2123 for (y = 0; y < h; y++) 2562 for (y = 0; y < h; y++)
2127 2566
2128 if (m) 2567 if (m)
2129 { 2568 {
2130 float *c = color [m & 15]; 2569 float *c = color [m & 15];
2131 2570
2132 float tx1 = m & 0x40 ? 0.5 : 0.; 2571 float tx1 = m & 0x40 ? 0.5f : 0.f;
2133 float tx2 = tx1 + 0.5; 2572 float tx2 = tx1 + 0.5f;
2134 2573
2135 glColor4f (c[0], c[1], c[2], 0.75); 2574 glColor4f (c[0], c[1], c[2], 1);
2136 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2575 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2137 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2576 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2138 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2577 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2139 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2578 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2140 } 2579 }
2148void 2587void
2149fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2588fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2150 PPCODE: 2589 PPCODE:
2151{ 2590{
2152 int x, y; 2591 int x, y;
2153 int sw1 = sw + 2; 2592 int sw1 = sw + 2;
2154 int sh1 = sh + 2; 2593 int sh1 = sh + 2;
2155 int sh3 = sh * 3; 2594 int sh3 = sh * 3;
2156 int sw34 = (sw * 3 + 3) & ~3; 2595 int sw3 = sw * 3;
2596 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2597 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2157 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2598 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2158 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2599 memset (darkness1, 0, sw1*sh1);
2159 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2160 2600
2161 SvPOK_only (darkness3_sv); 2601 SvPOK_only (darkness3_sv);
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2602 SvCUR_set (darkness3_sv, sw3 * sh3);
2163 2603
2164 mx += self->x - 1; 2604 mx += self->x - 1;
2165 my += self->y - 1; 2605 my += self->y - 1;
2166
2167 memset (darkness1, 255, sw1 * sh1);
2168 2606
2169 for (y = 0; y < sh1; y++) 2607 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2608 if (0 <= y + my && y + my < self->rows)
2171 { 2609 {
2172 maprow *row = self->row + (y + my); 2610 maprow *row = self->row + (y + my);
2175 if (row->c0 <= x + mx && x + mx < row->c1) 2613 if (row->c0 <= x + mx && x + mx < row->c1)
2176 { 2614 {
2177 mapcell *cell = row->col + (x + mx - row->c0); 2615 mapcell *cell = row->col + (x + mx - row->c0);
2178 2616
2179 darkness1 [y * sw1 + x] = cell->darkness 2617 darkness1 [y * sw1 + x] = cell->darkness
2180 ? 255 - (cell->darkness - 1) 2618 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2181 : 255 - FOW_DARKNESS; 2619 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2182 } 2620 }
2183 } 2621 }
2184 2622
2185 for (y = 0; y < sh; ++y) 2623 for (y = 0; y < sh; ++y)
2186 for (x = 0; x < sw; ++x) 2624 for (x = 0; x < sw; ++x)
2205 2643
2206 uint8_t r13 = (d13 + d23 + d12) / 3; 2644 uint8_t r13 = (d13 + d23 + d12) / 3;
2207 uint8_t r23 = d23; 2645 uint8_t r23 = d23;
2208 uint8_t r33 = (d23 + d33 + d32) / 3; 2646 uint8_t r33 = (d23 + d33 + d32) / 3;
2209 2647
2210 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2648 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2211 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2649 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2212 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2650 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2213 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2651 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2214 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2652 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2215 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2653 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2216 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2654 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2217 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2655 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2218 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2656 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2219 } 2657 }
2220 2658
2221 free (darkness1); 2659 free (darkness1);
2222 2660
2223 EXTEND (SP, 3); 2661 EXTEND (SP, 3);
2224 PUSHs (sv_2mortal (newSViv (sw34))); 2662 PUSHs (sv_2mortal (newSViv (sw3)));
2225 PUSHs (sv_2mortal (newSViv (sh3))); 2663 PUSHs (sv_2mortal (newSViv (sh3)));
2226 PUSHs (darkness3_sv); 2664 PUSHs (darkness3_sv);
2227} 2665}
2228 2666
2229SV * 2667SV *
2292 else 2730 else
2293 *data++ = 0; 2731 *data++ = 0;
2294 } 2732 }
2295 } 2733 }
2296 2734
2735 /* if size is w*h + 5 then no data has been found */
2297 if (data - (uint8_t *)SvPVX (data_sv) == w * h + 5) 2736 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2298 {
2299 SvREFCNT_dec (data_sv);
2300 RETVAL = &PL_sv_undef;
2301 }
2302 else
2303 { 2737 {
2304 SvPOK_only (data_sv); 2738 SvPOK_only (data_sv);
2305 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2739 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2306 RETVAL = data_sv;
2307 } 2740 }
2741
2742 RETVAL = data_sv;
2308} 2743}
2309 OUTPUT: 2744 OUTPUT:
2310 RETVAL 2745 RETVAL
2311 2746
2312void 2747void
2318 int x1, y1; 2753 int x1, y1;
2319 STRLEN len; 2754 STRLEN len;
2320 uint8_t *data, *end; 2755 uint8_t *data, *end;
2321 2756
2322 len = SvLEN (data_sv); 2757 len = SvLEN (data_sv);
2323 SvGROW (data_sv, len + 7); // reserve at least 7+ bytes more 2758 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2324 data = SvPVbyte_nolen (data_sv); 2759 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2325 end = data + len + 7; 2760 end = data + len + 8;
2326 2761
2327 if (len < 5) 2762 if (len < 5)
2328 XSRETURN_EMPTY; 2763 XSRETURN_EMPTY;
2329 2764
2330 if (*data++ != 0) 2765 if (*data++ != 0)
2366 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2801 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2367 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2802 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2368 2803
2369 if (cell->darkness == 0) 2804 if (cell->darkness == 0)
2370 { 2805 {
2371 cell->darkness = 0; 2806 /*cell->darkness = 0;*/
2807 EXTEND (SP, 3);
2372 2808
2373 for (z = 0; z <= 2; z++) 2809 for (z = 0; z <= 2; z++)
2374 { 2810 {
2375 tileid t = tile [z]; 2811 tileid t = tile [z];
2376 2812
2377 if (t >= self->texs || (t && !self->tex [t].name)) 2813 if (t >= self->texs || (t && !self->tex [t].name))
2378 { 2814 {
2379 XPUSHs (sv_2mortal (newSViv (t))); 2815 PUSHs (sv_2mortal (newSViv (t)));
2380 need_texid (self, t); 2816 need_texid (self, t);
2381 } 2817 }
2382 2818
2383 cell->tile [z] = t; 2819 cell->tile [z] = t;
2384 } 2820 }
2389} 2825}
2390 2826
2391MODULE = Deliantra::Client PACKAGE = DC::RW 2827MODULE = Deliantra::Client PACKAGE = DC::RW
2392 2828
2393DC::RW 2829DC::RW
2394new (SV *class, SV *data_sv) 2830new (SV *klass, SV *data_sv)
2395 CODE: 2831 CODE:
2396{ 2832{
2397 STRLEN datalen; 2833 STRLEN datalen;
2398 char *data = SvPVbyte (data_sv, datalen); 2834 char *data = SvPVbyte (data_sv, datalen);
2399 2835
2401} 2837}
2402 OUTPUT: 2838 OUTPUT:
2403 RETVAL 2839 RETVAL
2404 2840
2405DC::RW 2841DC::RW
2406new_from_file (SV *class, const char *path, const char *mode = "rb") 2842new_from_file (SV *klass, const char *path, const char *mode = "rb")
2407 CODE: 2843 CODE:
2408 RETVAL = SDL_RWFromFile (path, mode); 2844 RETVAL = SDL_RWFromFile (path, mode);
2409 OUTPUT: 2845 OUTPUT:
2410 RETVAL 2846 RETVAL
2411 2847
2429 if (RETVAL < 0) 2865 if (RETVAL < 0)
2430 { 2866 {
2431 RETVAL = Mix_GroupOldest (-1); 2867 RETVAL = Mix_GroupOldest (-1);
2432 2868
2433 if (RETVAL < 0) 2869 if (RETVAL < 0)
2870 {
2871 // happens sometimes, maybe it just stopped playing(?)
2872 RETVAL = Mix_GroupAvailable (-1);
2873
2874 if (RETVAL < 0)
2434 XSRETURN_UNDEF; 2875 XSRETURN_UNDEF;
2435 2876 }
2877 else
2436 Mix_HaltChannel (RETVAL); 2878 Mix_HaltChannel (RETVAL);
2437 } 2879 }
2438 2880
2439 Mix_UnregisterAllEffects (RETVAL); 2881 Mix_UnregisterAllEffects (RETVAL);
2440 Mix_Volume (RETVAL, 128); 2882 Mix_Volume (RETVAL, 128);
2441} 2883}
2488void 2930void
2489set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2931set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2490 CODE: 2932 CODE:
2491{ 2933{
2492 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2934 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2493 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2935 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2494 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2936 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2495} 2937}
2496 2938
2497void 2939void
2498set_reverse_stereo (DC::Channel self, int flip) 2940set_reverse_stereo (DC::Channel self, int flip)
2501 2943
2502MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2944MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2503 2945
2504PROTOTYPES: DISABLE 2946PROTOTYPES: DISABLE
2505 2947
2948void
2949decoders ()
2950 PPCODE:
2951#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2952 int i, num = Mix_GetNumChunkDecoders ();
2953 EXTEND (SP, num);
2954 for (i = 0; i < num; ++i)
2955 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2956#else
2957 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2958#endif
2959
2506DC::MixChunk 2960DC::MixChunk
2507new (SV *class, DC::RW rwops) 2961new (SV *klass, DC::RW rwops)
2508 CODE: 2962 CODE:
2509 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2963 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2510 OUTPUT: 2964 OUTPUT:
2511 RETVAL 2965 RETVAL
2512 2966
2542 OUTPUT: 2996 OUTPUT:
2543 RETVAL 2997 RETVAL
2544 2998
2545MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2999MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2546 3000
3001void
3002decoders ()
3003 PPCODE:
3004#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3005 int i, num = Mix_GetNumMusicDecoders ();
3006 EXTEND (SP, num);
3007 for (i = 0; i < num; ++i)
3008 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3009#else
3010 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3011#endif
3012
2547int 3013int
2548volume (int volume = -1) 3014volume (int volume = -1)
2549 PROTOTYPE: ;$ 3015 PROTOTYPE: ;$
2550 CODE: 3016 CODE:
2551 if (items > 0) 3017 if (items > 0)
2562void 3028void
2563halt () 3029halt ()
2564 CODE: 3030 CODE:
2565 Mix_HaltMusic (); 3031 Mix_HaltMusic ();
2566 3032
3033int
3034playing ()
3035 CODE:
3036 RETVAL = Mix_PlayingMusic ();
3037 OUTPUT:
3038 RETVAL
3039
2567DC::MixMusic 3040DC::MixMusic
2568new (SV *class, DC::RW rwops) 3041new (SV *klass, DC::RW rwops)
2569 CODE: 3042 CODE:
2570 RETVAL = Mix_LoadMUS_RW (rwops); 3043 RETVAL = Mix_LoadMUS_RW (rwops);
2571 OUTPUT: 3044 OUTPUT:
2572 RETVAL 3045 RETVAL
2573 3046
2601 } *civ, const_iv[] = { 3074 } *civ, const_iv[] = {
2602# define const_iv(name) { # name, (IV)name } 3075# define const_iv(name) { # name, (IV)name }
2603 const_iv (GL_VENDOR), 3076 const_iv (GL_VENDOR),
2604 const_iv (GL_VERSION), 3077 const_iv (GL_VERSION),
2605 const_iv (GL_EXTENSIONS), 3078 const_iv (GL_EXTENSIONS),
3079 const_iv (GL_MAX_TEXTURE_UNITS),
2606 const_iv (GL_COLOR_MATERIAL), 3080 const_iv (GL_COLOR_MATERIAL),
2607 const_iv (GL_SMOOTH), 3081 const_iv (GL_SMOOTH),
2608 const_iv (GL_FLAT), 3082 const_iv (GL_FLAT),
2609 const_iv (GL_DITHER), 3083 const_iv (GL_DITHER),
2610 const_iv (GL_BLEND), 3084 const_iv (GL_BLEND),
2622 const_iv (GL_ZERO), 3096 const_iv (GL_ZERO),
2623 const_iv (GL_SRC_ALPHA), 3097 const_iv (GL_SRC_ALPHA),
2624 const_iv (GL_DST_ALPHA), 3098 const_iv (GL_DST_ALPHA),
2625 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3099 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2626 const_iv (GL_ONE_MINUS_DST_ALPHA), 3100 const_iv (GL_ONE_MINUS_DST_ALPHA),
3101 const_iv (GL_SRC_COLOR),
3102 const_iv (GL_DST_COLOR),
3103 const_iv (GL_ONE_MINUS_SRC_COLOR),
3104 const_iv (GL_ONE_MINUS_DST_COLOR),
2627 const_iv (GL_SRC_ALPHA_SATURATE), 3105 const_iv (GL_SRC_ALPHA_SATURATE),
2628 const_iv (GL_RGB), 3106 const_iv (GL_RGB),
2629 const_iv (GL_RGBA), 3107 const_iv (GL_RGBA),
2630 const_iv (GL_RGBA4), 3108 const_iv (GL_RGBA4),
2631 const_iv (GL_RGBA8), 3109 const_iv (GL_RGBA8),
2699 const_iv (GL_NICEST), 3177 const_iv (GL_NICEST),
2700 const_iv (GL_V2F), 3178 const_iv (GL_V2F),
2701 const_iv (GL_V3F), 3179 const_iv (GL_V3F),
2702 const_iv (GL_T2F_V3F), 3180 const_iv (GL_T2F_V3F),
2703 const_iv (GL_T2F_N3F_V3F), 3181 const_iv (GL_T2F_N3F_V3F),
3182 const_iv (GL_FUNC_ADD),
3183 const_iv (GL_FUNC_SUBTRACT),
3184 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2704# undef const_iv 3185# undef const_iv
2705 }; 3186 };
2706 3187
2707 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3188 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2708 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3189 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2709 3190
2710 texture_av = newAV (); 3191 texture_av = newAV ();
2711 AvREAL_off (texture_av); 3192 AvREAL_off (texture_av);
2712} 3193}
2713 3194
2715disable_GL_EXT_blend_func_separate () 3196disable_GL_EXT_blend_func_separate ()
2716 CODE: 3197 CODE:
2717 gl.BlendFuncSeparate = 0; 3198 gl.BlendFuncSeparate = 0;
2718 gl.BlendFuncSeparateEXT = 0; 3199 gl.BlendFuncSeparateEXT = 0;
2719 3200
2720char * 3201void
3202apple_nvidia_bug (int enable)
3203
3204const char *
2721gl_vendor () 3205gl_vendor ()
2722 CODE: 3206 CODE:
2723 RETVAL = (char *)glGetString (GL_VENDOR); 3207 RETVAL = (const char *)glGetString (GL_VENDOR);
2724 OUTPUT: 3208 OUTPUT:
2725 RETVAL 3209 RETVAL
2726 3210
2727char * 3211const char *
2728gl_version () 3212gl_version ()
2729 CODE: 3213 CODE:
2730 RETVAL = (char *)glGetString (GL_VERSION); 3214 RETVAL = (const char *)glGetString (GL_VERSION);
2731 OUTPUT: 3215 OUTPUT:
2732 RETVAL 3216 RETVAL
2733 3217
2734char * 3218const char *
2735gl_extensions () 3219gl_extensions ()
2736 CODE: 3220 CODE:
2737 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3221 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2738 OUTPUT: 3222 OUTPUT:
2739 RETVAL 3223 RETVAL
2740 3224
2741const char *glGetString (GLenum pname) 3225const char *glGetString (GLenum pname)
3226 CODE:
3227 RETVAL = (const char *)glGetString (pname);
3228 OUTPUT:
3229 RETVAL
2742 3230
2743GLint glGetInteger (GLenum pname) 3231GLint glGetInteger (GLenum pname)
2744 CODE: 3232 CODE:
2745 glGetIntegerv (pname, &RETVAL); 3233 glGetIntegerv (pname, &RETVAL);
2746 OUTPUT: 3234 OUTPUT:
2754 3242
2755int glGetError () 3243int glGetError ()
2756 3244
2757void glFinish () 3245void glFinish ()
2758 3246
3247void glFlush ()
3248
2759void glClear (int mask) 3249void glClear (int mask)
2760 3250
2761void glClearColor (float r, float g, float b, float a = 1.0) 3251void glClearColor (float r, float g, float b, float a = 1.0)
2762 PROTOTYPE: @ 3252 PROTOTYPE: @
2763 3253
2772void glBlendFunc (int sfactor, int dfactor) 3262void glBlendFunc (int sfactor, int dfactor)
2773 3263
2774void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3264void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2775 CODE: 3265 CODE:
2776 gl_BlendFuncSeparate (sa, da, saa, daa); 3266 gl_BlendFuncSeparate (sa, da, saa, daa);
3267
3268# void glBlendEquation (int se)
2777 3269
2778void glDepthMask (int flag) 3270void glDepthMask (int flag)
2779 3271
2780void glLogicOp (int opcode) 3272void glLogicOp (int opcode)
2781 3273
2816void glRotate (float angle, float x, float y, float z) 3308void glRotate (float angle, float x, float y, float z)
2817 CODE: 3309 CODE:
2818 glRotatef (angle, x, y, z); 3310 glRotatef (angle, x, y, z);
2819 3311
2820void glColor (float r, float g, float b, float a = 1.0) 3312void glColor (float r, float g, float b, float a = 1.0)
3313 PROTOTYPE: @
2821 ALIAS: 3314 ALIAS:
2822 glColor_premultiply = 1 3315 glColor_premultiply = 1
2823 CODE: 3316 CODE:
2824 if (ix) 3317 if (ix)
2825 { 3318 {
2931 3424
2932void glEndList () 3425void glEndList ()
2933 3426
2934void glCallList (int list) 3427void glCallList (int list)
2935 3428
3429void c_init ()
3430 CODE:
3431 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3432 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3433
2936MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3434MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2937 3435
2938PROTOTYPES: DISABLE 3436PROTOTYPES: DISABLE
2939 3437
2940void 3438void
2941find_widget (SV *self, NV x, NV y) 3439find_widget (SV *self, NV x, NV y)
2942 PPCODE: 3440 PPCODE:
2943{ 3441{
2944 if (within_widget (self, x, y)) 3442 if (within_widget (self, x, y))
2945 XPUSHs (self); 3443 XPUSHs (self);
2946} 3444}
2947 3445
2948BOOT: 3446BOOT:
2949{ 3447{
2957 3455
2958void 3456void
2959draw (SV *self) 3457draw (SV *self)
2960 CODE: 3458 CODE:
2961{ 3459{
2962 HV *hv; 3460 HV *hv;
2963 SV **svp; 3461 SV **svp;
2964 NV x, y, w, h; 3462 NV x, y, w, h;
2965 SV *draw_x_sv = GvSV (draw_x_gv); 3463 SV *draw_x_sv = GvSV (draw_x_gv);
2966 SV *draw_y_sv = GvSV (draw_y_gv); 3464 SV *draw_y_sv = GvSV (draw_y_gv);
2967 SV *draw_w_sv = GvSV (draw_w_gv); 3465 SV *draw_w_sv = GvSV (draw_w_gv);
2968 SV *draw_h_sv = GvSV (draw_h_gv); 3466 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines