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.270 by root, Sun Jul 20 15:05:13 2008 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 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 std::vector<tileid> tile;
249 int texs; maptex *tex; // [tileid] 293 std::vector<maptex> tex;
250 294
251 int32_t rows; 295 int32_t rows;
252 maprow *row; 296 maprow *row;
253} *DC__Map; 297
298 ~mapgrid ()
299 {
300 clear_cells ();
301 }
302
303 void clear_cells ();
304};
305
306typedef mapgrid *DC__Map;
254 307
255static char * 308static char *
256prepend (char *ptr, int sze, int inc) 309prepend (char *ptr, int sze, int inc)
257{ 310{
258 char *p; 311 char *p;
275} 328}
276 329
277#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 330#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)) 331#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
279 332
280static void
281need_facenum (struct map *self, faceid face)
282{
283 while (self->faces <= face)
284 {
285 Append (tileid, self->face2tile, self->faces, self->faces);
286 self->faces *= 2;
287 }
288}
289
290static void
291need_texid (struct map *self, int texid)
292{
293 while (self->texs <= texid)
294 {
295 Append (maptex, self->tex, self->texs, self->texs);
296 self->texs *= 2;
297 }
298}
299
300static maprow * 333static maprow *
301map_get_row (DC__Map self, int y) 334map_get_row (mapgrid *self, int y)
302{ 335{
303 if (0 > y) 336 if (0 > y)
304 { 337 {
305 int extend = - y + MAP_EXTEND_Y; 338 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 339 Prepend (maprow, self->row, self->rows, extend);
344 377
345 return row->col + (x - row->c0); 378 return row->col + (x - row->c0);
346} 379}
347 380
348static mapcell * 381static mapcell *
349map_get_cell (DC__Map self, int x, int y) 382map_get_cell (mapgrid *self, int x, int y)
350{ 383{
351 return row_get_cell (map_get_row (self, y), x); 384 return row_get_cell (map_get_row (self, y), x);
352} 385}
353 386
354static void 387void mapgrid::clear_cells ()
355map_clear (DC__Map self)
356{ 388{
357 int r; 389 int r;
358 390
359 for (r = 0; r < self->rows; r++) 391 for (r = 0; r < rows; r++)
360 Safefree (self->row[r].col); 392 Safefree (row[r].col);
361 393
362 Safefree (self->row); 394 Safefree (row);
363 395
364 self->x = 0; 396 x = 0;
365 self->y = 0; 397 y = 0;
366 self->ox = 0; 398 ox = 0;
367 self->oy = 0; 399 oy = 0;
368 self->row = 0; 400 row = 0;
369 self->rows = 0; 401 rows = 0;
370} 402}
371 403
372#define CELL_CLEAR(cell) \ 404#define CELL_CLEAR(cell) \
373 do { \ 405 do { \
374 if ((cell)->player) \ 406 if ((cell)->player) \
378 (cell)->flags = 0; \ 410 (cell)->flags = 0; \
379 (cell)->player = 0; \ 411 (cell)->player = 0; \
380 } while (0) 412 } while (0)
381 413
382static void 414static void
383map_blank (DC__Map self, int x0, int y0, int w, int h) 415map_blank (mapgrid *self, int x0, int y0, int w, int h)
384{ 416{
385 int x, y; 417 int x, y;
386 maprow *row; 418 maprow *row;
387 mapcell *cell; 419 mapcell *cell;
388 420
405 CELL_CLEAR (cell); 437 CELL_CLEAR (cell);
406 } 438 }
407 } 439 }
408} 440}
409 441
410typedef struct { 442struct smooth_key
443{
411 tileid tile; 444 tileid tile;
412 uint8_t x, y, level; 445 uint8_t x, y, level;
413} smooth_key; 446
447 bool operator == (const smooth_key &o) const
448 {
449 return tile == o.tile && x == o.x && y == o.y && level == o.level;
450 }
451};
452
453typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
454
455namespace std {
456 template <>
457 struct hash<smooth_key>
458 {
459 size_t operator () (const smooth_key &v) const
460 {
461 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
462 }
463 };
464}
414 465
415static void 466static void
416smooth_or_bits (HV *hv, smooth_key *key, IV bits) 467smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
417{ 468{
418 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 469 auto &&it = h.find (key);
419 470
420 if (SvIOK (*sv)) 471 if (it == h.end ())
421 SvIV_set (*sv, SvIVX (*sv) | bits); 472 h.insert (std::make_pair (key, bits));
422 else 473 else
423 sv_setiv (*sv, bits); 474 it->second |= bits;
424} 475}
425 476
426static void 477static void
427music_finished (void) 478music_finished (void)
428{ 479{
445 ev.code = 1; 496 ev.code = 1;
446 ev.data1 = (void *)(long)channel; 497 ev.data1 = (void *)(long)channel;
447 ev.data2 = 0; 498 ev.data2 = 0;
448 499
449 SDL_PushEvent ((SDL_Event *)&ev); 500 SDL_PushEvent ((SDL_Event *)&ev);
501}
502
503// approximately divide by 255
504static unsigned int
505div255 (unsigned int n)
506{
507 return (n + (n >> 8)) >> 8;
450} 508}
451 509
452static unsigned int 510static unsigned int
453minpot (unsigned int n) 511minpot (unsigned int n)
454{ 512{
521 if (!svp || !SvTRUE (*svp)) 579 if (!svp || !SvTRUE (*svp))
522 return 0; 580 return 0;
523 581
524 return 1; 582 return 1;
525} 583}
584
585/******************************************************************************/
586
587/* process keyboard modifiers */
588static int
589mod_munge (int mod)
590{
591 mod &= MOD_MASK;
592
593 if (mod & (KMOD_META | KMOD_ALT))
594 mod |= KMOD_LRAM;
595
596 return mod;
597}
598
599static void
600deliantra_main (SV *real_main)
601{
602 dSP;
603
604 PUSHMARK (SP);
605 call_sv (real_main, G_DISCARD | G_VOID);
606}
607
608#ifdef __MACOSX__
609 static SV *real_main;
610
611 /* to due surprising braindamage on the side of SDL design, we
612 * do some mind-boggling hack here: SDL requires a custom main()
613 * on OS X, so... we provide one and call the original main(), which,
614 * due to shared library magic, calls -lSDLmain's main, not perl's main,
615 * and which calls our main (== SDL_main) back.
616 */
617 extern C_LINKAGE int
618 main (int argc, char *argv[])
619 {
620 deliantra_main (real_main);
621 }
622
623 #undef main
624
625 extern C_LINKAGE int main (int argc, char *argv[]);
626
627 static void
628 SDL_main_hack (SV *real_main_)
629 {
630 real_main = real_main_;
631
632 char *argv[] = { "deliantra client", 0 };
633 (main) (1, argv);
634 }
635#else
636 static void
637 SDL_main_hack (SV *real_main)
638 {
639 deliantra_main (real_main);
640 }
641#endif
526 642
527MODULE = Deliantra::Client PACKAGE = DC 643MODULE = Deliantra::Client PACKAGE = DC
528 644
529PROTOTYPES: ENABLE 645PROTOTYPES: ENABLE
530 646
559 const_iv (SDL_USEREVENT), 675 const_iv (SDL_USEREVENT),
560 676
561 const_iv (SDL_APPINPUTFOCUS), 677 const_iv (SDL_APPINPUTFOCUS),
562 const_iv (SDL_APPMOUSEFOCUS), 678 const_iv (SDL_APPMOUSEFOCUS),
563 const_iv (SDL_APPACTIVE), 679 const_iv (SDL_APPACTIVE),
680
681
682 const_iv (SDLK_UNKNOWN),
683 const_iv (SDLK_FIRST),
684 const_iv (SDLK_BACKSPACE),
685 const_iv (SDLK_TAB),
686 const_iv (SDLK_CLEAR),
687 const_iv (SDLK_RETURN),
688 const_iv (SDLK_PAUSE),
689 const_iv (SDLK_ESCAPE),
690 const_iv (SDLK_SPACE),
691 const_iv (SDLK_EXCLAIM),
692 const_iv (SDLK_QUOTEDBL),
693 const_iv (SDLK_HASH),
694 const_iv (SDLK_DOLLAR),
695 const_iv (SDLK_AMPERSAND),
696 const_iv (SDLK_QUOTE),
697 const_iv (SDLK_LEFTPAREN),
698 const_iv (SDLK_RIGHTPAREN),
699 const_iv (SDLK_ASTERISK),
700 const_iv (SDLK_PLUS),
701 const_iv (SDLK_COMMA),
702 const_iv (SDLK_MINUS),
703 const_iv (SDLK_PERIOD),
704 const_iv (SDLK_SLASH),
705 const_iv (SDLK_0),
706 const_iv (SDLK_1),
707 const_iv (SDLK_2),
708 const_iv (SDLK_3),
709 const_iv (SDLK_4),
710 const_iv (SDLK_5),
711 const_iv (SDLK_6),
712 const_iv (SDLK_7),
713 const_iv (SDLK_8),
714 const_iv (SDLK_9),
715 const_iv (SDLK_COLON),
716 const_iv (SDLK_SEMICOLON),
717 const_iv (SDLK_LESS),
718 const_iv (SDLK_EQUALS),
719 const_iv (SDLK_GREATER),
720 const_iv (SDLK_QUESTION),
721 const_iv (SDLK_AT),
722
723 const_iv (SDLK_LEFTBRACKET),
724 const_iv (SDLK_BACKSLASH),
725 const_iv (SDLK_RIGHTBRACKET),
726 const_iv (SDLK_CARET),
727 const_iv (SDLK_UNDERSCORE),
728 const_iv (SDLK_BACKQUOTE),
729 const_iv (SDLK_DELETE),
564 730
565 const_iv (SDLK_FIRST), 731 const_iv (SDLK_FIRST),
566 const_iv (SDLK_LAST), 732 const_iv (SDLK_LAST),
567 const_iv (SDLK_KP0), 733 const_iv (SDLK_KP0),
568 const_iv (SDLK_KP1), 734 const_iv (SDLK_KP1),
644 const_iv (KMOD_RMETA), 810 const_iv (KMOD_RMETA),
645 const_iv (KMOD_NUM), 811 const_iv (KMOD_NUM),
646 const_iv (KMOD_CAPS), 812 const_iv (KMOD_CAPS),
647 const_iv (KMOD_MODE), 813 const_iv (KMOD_MODE),
648 814
815 const_iv (KMOD_LRAM),
816
649 const_iv (MIX_DEFAULT_FORMAT), 817 const_iv (MIX_DEFAULT_FORMAT),
650 818
651 const_iv (SDL_INIT_TIMER), 819 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO), 820 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO), 821 const_iv (SDL_INIT_VIDEO),
677 845
678 const_iv (FOW_DARKNESS) 846 const_iv (FOW_DARKNESS)
679# undef const_iv 847# undef const_iv
680 }; 848 };
681 849
682 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 850 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 851 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
684 852
685 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 853 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
686 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 854 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
687} 855}
688 856
701 869
702NV floor (NV x) 870NV floor (NV x)
703 871
704NV ceil (NV x) 872NV ceil (NV x)
705 873
706NV ceilabs (NV x) 874IV minpot (UV n)
875
876IV popcount (UV n)
877
878NV distance (NV dx, NV dy)
707 CODE: 879 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x); 880 RETVAL = pow (dx * dx + dy * dy, 0.5);
709 OUTPUT: 881 OUTPUT:
710 RETVAL 882 RETVAL
711
712IV minpot (UV n)
713
714IV popcount (UV n)
715 883
716void 884void
717pango_init () 885pango_init ()
718 CODE: 886 CODE:
719{ 887{
727#endif 895#endif
728} 896}
729 897
730char *SDL_GetError () 898char *SDL_GetError ()
731 899
900void SDL_main_hack (SV *real_main)
901 PROTOTYPE: &
902
732int SDL_Init (U32 flags) 903int SDL_Init (U32 flags)
733 904
734int SDL_InitSubSystem (U32 flags) 905int SDL_InitSubSystem (U32 flags)
735 906
736void SDL_QuitSubSystem (U32 flags) 907void SDL_QuitSubSystem (U32 flags)
737 908
738void SDL_Quit () 909void SDL_Quit ()
739 910
740int SDL_GL_SetAttribute (int attr, int value) 911int SDL_GL_SetAttribute (int attr, int value)
912 C_ARGS: (SDL_GLattr)attr, value
741 913
742int SDL_GL_GetAttribute (int attr) 914int SDL_GL_GetAttribute (int attr)
743 CODE: 915 CODE:
744 if (SDL_GL_GetAttribute (attr, &RETVAL)) 916 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
745 XSRETURN_UNDEF; 917 XSRETURN_UNDEF;
746 OUTPUT: 918 OUTPUT:
747 RETVAL 919 RETVAL
748 920
749void 921void
804 ); 976 );
805 977
806 if (RETVAL) 978 if (RETVAL)
807 { 979 {
808 av_clear (texture_av); 980 av_clear (texture_av);
809
810 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
811#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 981#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
812#include "glfunc.h" 982#include "glfunc.h"
813#undef GL_FUNC 983#undef GL_FUNC
984 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
985 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
814 } 986 }
815} 987}
816 OUTPUT: 988 OUTPUT:
817 RETVAL 989 RETVAL
990
991void
992SDL_WM_SetCaption (const char *title, const char *icon)
818 993
819void 994void
820SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
821 996
822char * 997char *
823SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
824 1000
825int 1001int
826SDL_GetAppState () 1002SDL_GetAppState ()
827 1003
828int 1004int
829SDL_GetModState () 1005SDL_GetModState ()
830 1006
1007int
1008SDL_WaitEvent ()
1009 C_ARGS: 0
1010
831void 1011void
1012SDL_PumpEvents ()
1013
1014void
832poll_events () 1015peep_events ()
833 PPCODE: 1016 PPCODE:
834{ 1017{
835 SDL_Event ev; 1018 SDL_Event ev;
836 1019
837 SDL_PumpEvents (); 1020 SDL_PumpEvents ();
844 { 1027 {
845 case SDL_KEYDOWN: 1028 case SDL_KEYDOWN:
846 case SDL_KEYUP: 1029 case SDL_KEYUP:
847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1030 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1031 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
849 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1032 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
850 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1033 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1034 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
852 break; 1035 break;
853 1036
854 case SDL_ACTIVEEVENT: 1037 case SDL_ACTIVEEVENT:
855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1038 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
873 x = ev.motion.x; 1056 x = ev.motion.x;
874 y = ev.motion.y; 1057 y = ev.motion.y;
875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1058 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
876 } 1059 }
877 1060
878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1061 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
879 hv_store (hv, "state", 5, newSViv (state), 0); 1062 hv_store (hv, "state", 5, newSViv (state), 0);
880 hv_store (hv, "x", 1, newSViv (x), 0); 1063 hv_store (hv, "x", 1, newSViv (x), 0);
881 hv_store (hv, "y", 1, newSViv (y), 0); 1064 hv_store (hv, "y", 1, newSViv (y), 0);
882 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1065 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
883 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1066 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
903 1086
904 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1087 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
905 } 1088 }
906} 1089}
907 1090
1091char *
1092SDL_AudioDriverName ()
1093 CODE:
1094{
1095 char buf [256];
1096 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1097 XSRETURN_UNDEF;
1098
1099 RETVAL = buf;
1100}
1101 OUTPUT:
1102 RETVAL
1103
908int 1104int
909Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1105Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
910 POSTCALL: 1106 POSTCALL:
911 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
912 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
913 1109
914void 1110void
915Mix_QuerySpec () 1111Mix_QuerySpec ()
974add_font (char *file) 1170add_font (char *file)
975 CODE: 1171 CODE:
976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1172 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT: 1173 OUTPUT:
978 RETVAL 1174 RETVAL
1175
1176void
1177IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1178
1179# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1180void
1181Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
979 1182
980void 1183void
981load_image_inline (SV *image_) 1184load_image_inline (SV *image_)
982 ALIAS: 1185 ALIAS:
983 load_image_file = 1 1186 load_image_file = 1
1029 1232
1030 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
1031 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
1032 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
1033 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
1034 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1035 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1238 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1036 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1037 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1038 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
1039 1242
1099#if DEBUG 1302#if DEBUG
1100 VALGRIND_DO_LEAK_CHECK; 1303 VALGRIND_DO_LEAK_CHECK;
1101#endif 1304#endif
1102} 1305}
1103 1306
1307int
1308SvREFCNT (SV *sv)
1309 CODE:
1310 RETVAL = SvREFCNT (sv);
1311 OUTPUT:
1312 RETVAL
1313
1104MODULE = Deliantra::Client PACKAGE = DC::Font 1314MODULE = Deliantra::Client PACKAGE = DC::Font
1105 1315
1106PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1107 1317
1108DC::Font 1318DC::Font
1109new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
1110 CODE: 1320 CODE:
1111{ 1321{
1112 int count; 1322 int count;
1113 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1114 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1143 PROTOTYPE: 1353 PROTOTYPE:
1144 CODE: 1354 CODE:
1145 tc_restore (); 1355 tc_restore ();
1146 1356
1147DC::Layout 1357DC::Layout
1148new (SV *class) 1358new (SV *klass)
1149 CODE: 1359 CODE:
1150 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
1151 1361
1152 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
1153 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
1154 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
1155 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
1156 RETVAL->a = 1.; 1366 RETVAL->a = 1.;
1157 RETVAL->base_height = MIN_FONT_HEIGHT; 1367 RETVAL->base_height = MIN_FONT_HEIGHT;
1158 RETVAL->font = 0; 1368 RETVAL->font = 0;
1159 RETVAL->rc = rc_alloc ();
1160 1369
1161 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1370 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1162 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
1163 OUTPUT: 1372 OUTPUT:
1164 RETVAL 1373 RETVAL
1165 1374
1166void 1375void
1167DESTROY (DC::Layout self) 1376DESTROY (DC::Layout self)
1168 CODE: 1377 CODE:
1169 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
1170 rc_free (self->rc);
1171 Safefree (self); 1379 delete self;
1172 1380
1173void 1381void
1174set_text (DC::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
1175 CODE: 1383 CODE:
1176{ 1384{
1302 1510
1303void 1511void
1304set_height (DC::Layout self, int base_height) 1512set_height (DC::Layout self, int base_height)
1305 CODE: 1513 CODE:
1306 if (self->base_height != base_height) 1514 if (self->base_height != base_height)
1307 { 1515 {
1308 self->base_height = base_height; 1516 self->base_height = base_height;
1309 layout_update_font (self); 1517 layout_update_font (self);
1310 } 1518 }
1311 1519
1312void 1520void
1430} 1638}
1431 1639
1432void 1640void
1433render (DC::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1434 CODE: 1642 CODE:
1435 rc_clear (self->rc); 1643 self->rc.clear ();
1436 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1437 self->pl, 1645 self->pl,
1438 self->rc, 1646 &self->rc,
1439 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1440 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1441 flags 1649 flags
1442 ); 1650 );
1443 // we assume that context_change actually clears/frees stuff 1651 // we assume that context_change actually clears/frees stuff
1454 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1662 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1455 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1663 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1456 glEnable (GL_ALPHA_TEST); 1664 glEnable (GL_ALPHA_TEST);
1457 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1665 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1458 1666
1459 rc_draw (self->rc); 1667 self->rc.draw ();
1460 1668
1461 glDisable (GL_ALPHA_TEST); 1669 glDisable (GL_ALPHA_TEST);
1462 glDisable (GL_BLEND); 1670 glDisable (GL_BLEND);
1463 glDisable (GL_TEXTURE_2D); 1671 glDisable (GL_TEXTURE_2D);
1464} 1672}
1539 glDisable (GL_ALPHA_TEST); 1747 glDisable (GL_ALPHA_TEST);
1540 glDisable (GL_BLEND); 1748 glDisable (GL_BLEND);
1541 } 1749 }
1542} 1750}
1543 1751
1752void
1753draw_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)
1754 PROTOTYPE: @
1755 CODE:
1756{
1757 glEnable (GL_BLEND);
1758 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1759 glEnable (GL_TEXTURE_2D);
1760 glBindTexture (GL_TEXTURE_2D, name1);
1761
1762 glColor3f (intensity, intensity, intensity);
1763 glPushMatrix ();
1764 glScalef (1./3, 1./3, 1.);
1765
1766 if (blend > 0.f)
1767 {
1768 float dx3 = dx * -3.f / w;
1769 float dy3 = dy * -3.f / h;
1770 GLfloat env_color[4] = { 0., 0., 0., blend };
1771
1772 /* interpolate the two shadow textures */
1773 /* stage 0 == rgb(glcolor) + alpha(t0) */
1774 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1775
1776 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1777 gl.ActiveTexture (GL_TEXTURE1);
1778 glEnable (GL_TEXTURE_2D);
1779 glBindTexture (GL_TEXTURE_2D, name2);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1781
1782 /* rgb == rgb(glcolor) */
1783 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1784 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1786
1787 /* alpha = interpolate t0, t1 by env_alpha */
1788 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1789
1790 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1793
1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1796
1797 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1799
1800 glBegin (GL_QUADS);
1801 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1802 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1803 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1804 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1805 glEnd ();
1806
1807 glDisable (GL_TEXTURE_2D);
1808 gl.ActiveTexture (GL_TEXTURE0);
1809 }
1810 else
1811 {
1812 /* simple blending of one texture, also opengl <1.3 path */
1813 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1814
1815 glBegin (GL_QUADS);
1816 glTexCoord2f (0, 0); glVertex2f (0, 0);
1817 glTexCoord2f (0, t); glVertex2f (0, h);
1818 glTexCoord2f (s, t); glVertex2f (w, h);
1819 glTexCoord2f (s, 0); glVertex2f (w, 0);
1820 glEnd ();
1821 }
1822
1823 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1824 {
1825 int x, y;
1826 int dx3 = dx * 3;
1827 int dy3 = dy * 3;
1828
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1830 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1831 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1832 glTranslatef (-1., -1., 0);
1833 glBegin (GL_QUADS);
1834
1835 for (y = 1; y < h; y += 3)
1836 {
1837 int y1 = y - dy3;
1838 int y1valid = y1 >= 0 && y1 < h;
1839
1840 for (x = 1; x < w; x += 3)
1841 {
1842 int x1 = x - dx3;
1843 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1844 uint8_t h2;
1845
1846 if (y1valid && x1 >= 0 && x1 < w)
1847 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1848 else
1849 h2 = 1; /* out of range == invisible */
1850
1851 if (h1 || h2)
1852 {
1853 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1854 glColor4f (1., 1., 1., alpha);
1855
1856 glTexCoord2f (0, 0.); glVertex2i (x , y );
1857 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1858 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1859 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1860 }
1861 }
1862 }
1863 }
1864
1865 glEnd ();
1866
1867 glPopMatrix ();
1868
1869 glDisable (GL_TEXTURE_2D);
1870 glDisable (GL_BLEND);
1871}
1872
1544IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1873IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1545 CODE: 1874 CODE:
1546{ 1875{
1547 GLint width; 1876 GLint width;
1548 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1877 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1555MODULE = Deliantra::Client PACKAGE = DC::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1556 1885
1557PROTOTYPES: DISABLE 1886PROTOTYPES: DISABLE
1558 1887
1559DC::Map 1888DC::Map
1560new (SV *class) 1889new (SV *klass)
1561 CODE: 1890 CODE:
1562 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1563 RETVAL->x = 0; 1892 RETVAL->x = 0;
1564 RETVAL->y = 0; 1893 RETVAL->y = 0;
1565 RETVAL->w = 0; 1894 RETVAL->w = 0;
1566 RETVAL->h = 0; 1895 RETVAL->h = 0;
1567 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1568 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1569 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1570 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1571 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1572 RETVAL->row = 0; 1899 RETVAL->row = 0;
1573 OUTPUT: 1900 OUTPUT:
1574 RETVAL 1901 RETVAL
1575 1902
1576void 1903void
1577DESTROY (DC::Map self) 1904DESTROY (DC::Map self)
1578 CODE: 1905 CODE:
1579{ 1906{
1580 map_clear (self);
1581 Safefree (self->face2tile);
1582 Safefree (self->tex);
1583 Safefree (self); 1907 delete self;
1584} 1908}
1585 1909
1586void 1910void
1587resize (DC::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1588 CODE: 1912 CODE:
1590 self->h = map_height; 1914 self->h = map_height;
1591 1915
1592void 1916void
1593clear (DC::Map self) 1917clear (DC::Map self)
1594 CODE: 1918 CODE:
1595 map_clear (self); 1919 self->clear_cells ();
1596 1920
1597void 1921void
1598set_tileid (DC::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1599 CODE: 1923 CODE:
1600{ 1924{
1601 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1602 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1603} 1928}
1604 1929
1605void 1930void
1606set_smooth (DC::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1607 CODE: 1932 CODE:
1608{ 1933{
1609 tileid texid;
1610 maptex *tex;
1611
1612 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1613 return; 1935 return;
1614 1936
1615 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1616 return; 1938 return;
1617 1939
1618 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1619 1941
1620 if (!texid) 1942 if (!texid)
1621 return; 1943 return;
1622 1944
1623 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1624 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1625 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1626} 1948}
1627 1949
1628void 1950void
1629set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1951set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1630 CODE: 1952 CODE:
1631{ 1953{
1632 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1633 1955
1634 { 1956 {
1635 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1636 1958
1637 tex->name = name; 1959 tex.name = name;
1638 tex->w = w; 1960 tex.w = w;
1639 tex->h = h; 1961 tex.h = h;
1640 tex->s = s; 1962 tex.s = s;
1641 tex->t = t; 1963 tex.t = t;
1642 tex->r = r; 1964 tex.r = r;
1643 tex->g = g; 1965 tex.g = g;
1644 tex->b = b; 1966 tex.b = b;
1645 tex->a = a; 1967 tex.a = a;
1646 } 1968 }
1647 1969
1648 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1649 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1650 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
1652 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1974 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1653 // use uglier nearest interpolation because linear suffers 1975 // use uglier nearest interpolation because linear suffers
1654 // from transparent color bleeding and ugly wrapping effects. 1976 // from transparent color bleeding and ugly wrapping effects.
1655 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1977 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1656} 1978}
1979
1980void
1981expire_textures (DC::Map self, int texid, int count)
1982 PPCODE:
1983 for (; texid < self->tex.size () && count; ++texid, --count)
1984 {
1985 maptex &tex = self->tex[texid];
1986
1987 if (tex.name)
1988 {
1989 if (tex.unused)
1990 {
1991 tex.name = 0;
1992 tex.unused = 0;
1993 XPUSHs (sv_2mortal (newSViv (texid)));
1994 }
1995 else
1996 tex.unused = 1;
1997 }
1998 }
1657 1999
1658int 2000int
1659ox (DC::Map self) 2001ox (DC::Map self)
1660 ALIAS: 2002 ALIAS:
1661 oy = 1 2003 oy = 1
1701 self->y += MAP_EXTEND_Y; 2043 self->y += MAP_EXTEND_Y;
1702 } 2044 }
1703} 2045}
1704 2046
1705SV * 2047SV *
1706map1a_update (DC::Map self, SV *data_, int extmap) 2048map1a_update (DC::Map self, SV *data_)
1707 CODE: 2049 CODE:
1708{ 2050{
1709 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2051 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1710 uint8_t *data_end = (uint8_t *)SvEND (data_); 2052 uint8_t *data_end = (uint8_t *)SvEND (data_);
1711 mapcell *cell; 2053 mapcell *cell;
1732 2074
1733 //TODO: don't trust server data to be in-range(!) 2075 //TODO: don't trust server data to be in-range(!)
1734 2076
1735 if (flags & 8) 2077 if (flags & 8)
1736 { 2078 {
2079 uint8_t ext, cmd;
2080
1737 if (extmap) 2081 do
1738 { 2082 {
1739 uint8_t ext, cmd; 2083 ext = *data++;
2084 cmd = ext & 0x7f;
1740 2085
1741 do 2086 if (cmd < 4)
2087 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2088 else if (cmd == 5) // health
1742 { 2089 {
1743 ext = *data++;
1744 cmd = ext & 0x7f;
1745
1746 if (cmd < 4)
1747 cell->darkness = 255 - ext * 64 + 1;
1748 else if (cmd == 5) // health
1749 {
1750 cell->stat_width = 1; 2090 cell->stat_width = 1;
1751 cell->stat_hp = *data++; 2091 cell->stat_hp = *data++;
1752 }
1753 else if (cmd == 6) // monster width
1754 cell->stat_width = *data++ + 1;
1755 else if (cmd == 0x47)
1756 {
1757 if (*data == 1) cell->player = data [1];
1758 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1761
1762 data += *data + 1;
1763 }
1764 else if (cmd == 8) // cell flags
1765 cell->flags = *data++;
1766 else if (ext & 0x40) // unknown, multibyte => skip
1767 data += *data + 1;
1768 else
1769 data++;
1770 } 2092 }
1771 while (ext & 0x80); 2093 else if (cmd == 6) // monster width
2094 cell->stat_width = *data++ + 1;
2095 else if (cmd == 0x47)
2096 {
2097 if (*data == 1) cell->player = data [1];
2098 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2099 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2100 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2101
2102 data += *data + 1;
2103 }
2104 else if (cmd == 8) // cell flags
2105 cell->flags = *data++;
2106 else if (ext & 0x40) // unknown, multibyte => skip
2107 data += *data + 1;
2108 else
2109 data++;
1772 } 2110 }
1773 else 2111 while (ext & 0x80);
1774 cell->darkness = *data++ + 1;
1775 } 2112 }
1776 2113
1777 for (z = 0; z <= 2; ++z) 2114 for (z = 0; z <= 2; ++z)
1778 if (flags & (4 >> z)) 2115 if (flags & (4 >> z))
1779 { 2116 {
1780 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
1781 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
1782 cell->tile [z] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
1783 2120
1784 if (cell->tile [z]) 2121 if (cell->tile[z])
1785 { 2122 {
1786 maptex *tex = self->tex + cell->tile [z]; 2123 maptex &tex = self->tex[cell->tile[z]];
2124 tex.unused = 0;
1787 if (!tex->name) 2125 if (!tex.name)
1788 av_push (missing, newSViv (cell->tile [z])); 2126 av_push (missing, newSViv (cell->tile [z]));
1789 2127
1790 if (tex->smoothtile) 2128 if (tex.smoothtile)
1791 { 2129 {
1792 maptex *smooth = self->tex + tex->smoothtile; 2130 maptex &smooth = self->tex[tex.smoothtile];
2131 smooth.unused = 0;
1793 if (!smooth->name) 2132 if (!smooth.name)
1794 av_push (missing, newSViv (tex->smoothtile)); 2133 av_push (missing, newSViv (tex.smoothtile));
1795 } 2134 }
1796 } 2135 }
1797 } 2136 }
1798 } 2137 }
1799 else 2138 else
1825 ? self->row + y 2164 ? self->row + y
1826 : 0; 2165 : 0;
1827 2166
1828 for (x = x0; x < x1; x++) 2167 for (x = x0; x < x1; x++)
1829 { 2168 {
1830 int r = 32, g = 32, b = 32, a = 192; 2169 unsigned int r = 32, g = 32, b = 32, a = 192;
1831 2170
1832 if (row && row->c0 <= x && x < row->c1) 2171 if (row && row->c0 <= x && x < row->c1)
1833 { 2172 {
1834 mapcell *cell = row->col + (x - row->c0); 2173 mapcell *cell = row->col + (x - row->c0);
1835 2174
1837 { 2176 {
1838 maptex tex = self->tex [cell->tile [z]]; 2177 maptex tex = self->tex [cell->tile [z]];
1839 int a0 = 255 - tex.a; 2178 int a0 = 255 - tex.a;
1840 int a1 = tex.a; 2179 int a1 = tex.a;
1841 2180
1842 r = (r * a0 + tex.r * a1) / 255; 2181 r = div255 (r * a0 + tex.r * a1);
1843 g = (g * a0 + tex.g * a1) / 255; 2182 g = div255 (g * a0 + tex.g * a1);
1844 b = (b * a0 + tex.b * a1) / 255; 2183 b = div255 (b * a0 + tex.b * a1);
1845 a = (a * a0 + tex.a * a1) / 255; 2184 a = div255 (a * a0 + tex.a * a1);
1846 } 2185 }
1847 } 2186 }
1848 2187
1849 *map++ = (r ) 2188 *map++ = (r )
1850 | (g << 8) 2189 | (g << 8)
1851 | (b << 16) 2190 | (b << 16)
1852 | (a << 24); 2191 | (a << 24);
1853 } 2192 }
1854 } 2193 }
1855 2194
1856 RETVAL = map_sv; 2195 RETVAL = map_sv;
1857} 2196}
1858 OUTPUT: 2197 OUTPUT:
1859 RETVAL 2198 RETVAL
1860 2199
1861void 2200void
1862draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2201draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1863 CODE: 2202 CODE:
1864{ 2203{
1865 int x, y, z; 2204 int x, y, z;
1866 2205
1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1868 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1869 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2206 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1870 smooth_key skey;
1871 int pl_x, pl_y; 2207 int pl_x, pl_y;
1872 maptex pl_tex; 2208 maptex pl_tex;
1873 rc_t *rc = rc_alloc (); 2209 rc_t rc;
2210 rc_t rc_ov;
1874 rc_key_t key; 2211 rc_key_t key;
1875 rc_array_t *arr; 2212 rc_t::array_t *arr;
1876 2213
1877 pl_tex.name = 0; 2214 pl_tex.name = 0;
1878 2215
1879 // thats current max. sorry. 2216 // that's current max. sorry.
1880 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
1881 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
1882
1883 // clear key, in case of extra padding
1884 memset (&skey, 0, sizeof (skey));
1885 2219
1886 memset (&key, 0, sizeof (key)); 2220 memset (&key, 0, sizeof (key));
1887 key.r = 255; 2221 key.r = 255;
1888 key.g = 255; 2222 key.g = 255;
1889 key.b = 255; 2223 key.b = 255;
1890 key.a = 255; 2224 key.a = 255;
1891 key.mode = GL_QUADS; 2225 key.mode = GL_QUADS;
1892 key.format = GL_T2F_V3F; 2226 key.format = GL_T2F_V3F;
1893 key.texname = -1;
1894 2227
1895 mx += self->x; 2228 mx += self->x;
1896 my += self->y; 2229 my += self->y;
1897 2230
1898 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
1899 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
1900 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
1901 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1902 2235
1903 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
1904 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
1905 { 2238 {
1906 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
1921 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1922 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1923 2256
1924 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
1925 { 2258 {
1926 memset (smooth_level, 0, sizeof (smooth_level)); 2259 std::bitset<256> smooth_level; // one bit for every possible smooth level
2260 smooth_key skey;
2261 smooth_hash smooth;
2262 key.texname = -1;
1927 2263
1928 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
1929 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
1930 { 2266 {
1931 maprow *row = self->row + (y + my); 2267 maprow *row = self->row + (y + my);
1937 tileid tile = cell->tile [z]; 2273 tileid tile = cell->tile [z];
1938 2274
1939 if (tile) 2275 if (tile)
1940 { 2276 {
1941 maptex tex = self->tex [tile]; 2277 maptex tex = self->tex [tile];
1942 int px = (x + 1) * T - tex.w; 2278 int px, py;
1943 int py = (y + 1) * T - tex.h;
1944 2279
1945 if (key.texname != tex.name) 2280 if (key.texname != tex.name)
1946 { 2281 {
2282 self->tex [tile].unused = 0;
2283
1947 if (!tex.name) 2284 if (!tex.name)
1948 tex = self->tex [2]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1949 2286
1950 key.texname = tex.name; 2287 key.texname = tex.name;
1951 arr = rc_array (rc, &key); 2288 arr = &rc.array (key);
1952 } 2289 }
2290
2291 px = (x + 1) * Th - tex.w;
2292 py = (y + 1) * Tw - tex.h;
1953 2293
1954 if (expect_false (cell->player == player) && expect_false (z == 2)) 2294 if (expect_false (cell->player == player) && expect_false (z == 2))
1955 { 2295 {
1956 pl_x = px; 2296 pl_x = px;
1957 pl_y = py; 2297 pl_y = py;
1958 pl_tex = tex; 2298 pl_tex = tex;
1959 continue; 2299 continue;
1960 } 2300 }
1961 2301
1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2302 arr->t2f_v3f (0 , 0 , px , py , 0);
1963 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2303 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1964 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2304 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2305 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1966
1967 if (expect_false (cell->flags) && expect_false (z == 2))
1968 {
1969 // overlays such as the speech bubble, probably more to come
1970 if (cell->flags & 1)
1971 {
1972 maptex tex = self->tex [1];
1973 int px = x * T + T * 2 / 32;
1974 int py = y * T - T * 6 / 32;
1975
1976 if (tex.name)
1977 {
1978 if (key.texname != tex.name)
1979 {
1980 key.texname = tex.name;
1981 arr = rc_array (rc, &key);
1982 }
1983
1984 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1985 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1986 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1987 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1988 }
1989 }
1990 }
1991 2306
1992 // update smooth hash 2307 // update smooth hash
1993 if (tex.smoothtile) 2308 if (tex.smoothtile)
1994 { 2309 {
1995 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
1996 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
1997 2312
1998 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
1999 2314
2000 // add bits to current tile and all neighbours. skey.x|y is 2315 // add bits to current tile and all neighbours. skey.x|y is
2001 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
2002 2317
2003 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
2011 2326
2012 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2013 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
2014 2329
2015 // full tile 2330 // full tile
2016 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2331 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2017 2332
2018 // borders 2333 // borders
2019 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2334 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2020 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2335 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2021 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2336 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2022 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2337 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2023 2338
2024 // corners 2339 // corners
2025 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2340 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2026 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2341 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2027 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2342 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2028 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2343 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2344 }
2345 }
2346
2347 if (expect_false (z == 2) && expect_false (cell->flags))
2348 {
2349 // overlays such as the speech bubble, probably more to come
2350 if (cell->flags & 1)
2351 {
2352 rc_key_t key_ov = key;
2353 maptex tex = self->tex[TEXID_SPEECH];
2354 int px = x * Tw + Tw * 2 / 32;
2355 int py = y * Th - Th * 6 / 32;
2356
2357 key_ov.texname = tex.name;
2358 rc_t::array_t &arr = rc_ov.array (key_ov);
2359
2360 arr.t2f_v3f (0 , 0 , px , py , 0);
2361 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2362 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2363 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2029 } 2364 }
2030 } 2365 }
2031 } 2366 }
2032 } 2367 }
2033 2368
2034 rc_draw (rc); 2369 rc.draw ();
2035 rc_clear (rc); 2370 rc.clear ();
2036 2371
2037 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
2038 // this is basically counting sort 2373 // this is basically counting sort
2039 { 2374 {
2040 int w, b; 2375 int w, b;
2041 2376
2042 glEnable (GL_TEXTURE_2D); 2377 glEnable (GL_TEXTURE_2D);
2043 glBegin (GL_QUADS); 2378 glBegin (GL_QUADS);
2044 for (w = 0; w < 256 / 32; ++w) 2379 for (int level = 0; level < smooth_level.size (); ++level)
2380 if (smooth_level[level])
2381 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2045 { 2382 {
2046 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
2047 if (smask) 2384 IV bits = it->second;
2048 for (b = 0; b < 32; ++b) 2385
2049 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
2050 { 2389 {
2051 int level = (w << 5) | b; 2390 maptex tex = self->tex [skey.tile];
2391 int px = (((int)skey.x) - 1) * Tw;
2392 int py = (((int)skey.y) - 1) * Th;
2393 int border = bits & 15;
2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2395 float dx = tex.s * .0625f; // 16 images/row
2396 float dy = tex.t * .5f ; // 2 images/column
2397
2052 HE *he; 2398 if (tex.name)
2053
2054 hv_iterinit (smooth);
2055 while ((he = hv_iternext (smooth)))
2056 { 2399 {
2057 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
2058 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
2059 2402 if (key.texname != tex.name)
2060 if (!(bits & 0x1000)
2061 && skey->level == level
2062 && level > smooth_max [skey->x][skey->y])
2063 { 2403 {
2064 maptex tex = self->tex [skey->tile]; 2404 self->tex [skey.tile].unused = 0;
2065 int px = (((int)skey->x) - 1) * T;
2066 int py = (((int)skey->y) - 1) * T;
2067 int border = bits & 15;
2068 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2069 float dx = tex.s * .0625f; // 16 images/row
2070 float dy = tex.t * .5f ; // 2 images/column
2071 2405
2072 if (tex.name)
2073 {
2074 // this time avoiding texture state changes
2075 // save gobs of state changes.
2076 if (key.texname != tex.name)
2077 {
2078 glEnd (); 2406 glEnd ();
2079 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2080 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2081 } 2409 }
2082 2410
2083 if (border) 2411 if (border)
2084 { 2412 {
2085 float ox = border * dx; 2413 float ox = border * dx;
2086 2414
2087 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2089 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2090 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2091 } 2419 }
2092 2420
2093 if (corner) 2421 if (corner)
2094 { 2422 {
2095 float ox = corner * dx; 2423 float ox = corner * dx;
2096 2424
2097 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2098 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2099 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2100 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2101 }
2102 }
2103 } 2429 }
2104 } 2430 }
2105 } 2431 }
2106 } 2432 }
2107 2433
2108 glEnd (); 2434 glEnd ();
2109 glDisable (GL_TEXTURE_2D); 2435 glDisable (GL_TEXTURE_2D);
2110 key.texname = -1; 2436 key.texname = -1;
2111 } 2437 }
2112
2113 hv_clear (smooth);
2114 } 2438 }
2115 2439
2116 if (pl_tex.name) 2440 if (pl_tex.name)
2117 { 2441 {
2118 maptex tex = pl_tex; 2442 maptex tex = pl_tex;
2119 int px = pl_x + sdx; 2443 int px = pl_x + sdx;
2120 int py = pl_y + sdy; 2444 int py = pl_y + sdy;
2121 2445
2122 key.texname = tex.name; 2446 key.texname = tex.name;
2123 arr = rc_array (rc, &key); 2447 rc_t::array_t &arr = rc.array (key);
2124 2448
2125 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2449 arr.t2f_v3f (0 , 0 , px , py , 0);
2126 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2450 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2127 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2451 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2452 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2129 2453
2130 rc_draw (rc); 2454 rc.draw ();
2131 } 2455 }
2132 2456
2457 rc_ov.draw ();
2458 rc_ov.clear ();
2459
2133 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
2134 rc_free (rc);
2135 2461
2136 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
2137 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
2138 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
2139 { 2465 {
2142 for (x = 0; x < sw; x++) 2468 for (x = 0; x < sw; x++)
2143 if (row->c0 <= x + mx && x + mx < row->c1) 2469 if (row->c0 <= x + mx && x + mx < row->c1)
2144 { 2470 {
2145 mapcell *cell = row->col + (x + mx - row->c0); 2471 mapcell *cell = row->col + (x + mx - row->c0);
2146 2472
2147 int px = x * T; 2473 int px = x * Tw;
2148 int py = y * T; 2474 int py = y * Th;
2475
2476 if (expect_false (cell->player == player))
2477 {
2478 px += sdx;
2479 py += sdy;
2480 }
2149 2481
2150 if (cell->stat_hp) 2482 if (cell->stat_hp)
2151 { 2483 {
2152 int width = cell->stat_width * T; 2484 int width = cell->stat_width * Tw;
2153 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2485 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2154 2486
2155 glColor3ub (0, 0, 0); 2487 glColor3ub (0, 0, 0);
2156 glRectf (px + 1, py - thick - 2, 2488 glRectf (px + 1, py - thick - 2,
2157 px + width - 1, py); 2489 px + width - 1, py);
2158 2490
2164 } 2496 }
2165 } 2497 }
2166} 2498}
2167 2499
2168void 2500void
2169draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2501draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2170 CODE: 2502 CODE:
2171{ 2503{
2172 static float color[16][3] = { 2504 static float color[16][3] = {
2173 { 0.00F, 0.00F, 0.00F }, 2505 { 0.00f, 0.00f, 0.00f },
2174 { 1.00F, 1.00F, 1.00F }, 2506 { 1.00f, 1.00f, 1.00f },
2175 { 0.00F, 0.00F, 0.55F }, 2507 { 0.00f, 0.00f, 0.55f },
2176 { 1.00F, 0.00F, 0.00F }, 2508 { 1.00f, 0.00f, 0.00f },
2177 2509
2178 { 1.00F, 0.54F, 0.00F }, 2510 { 1.00f, 0.54f, 0.00f },
2179 { 0.11F, 0.56F, 1.00F }, 2511 { 0.11f, 0.56f, 1.00f },
2180 { 0.93F, 0.46F, 0.00F }, 2512 { 0.93f, 0.46f, 0.00f },
2181 { 0.18F, 0.54F, 0.34F }, 2513 { 0.18f, 0.54f, 0.34f },
2182 2514
2183 { 0.56F, 0.73F, 0.56F }, 2515 { 0.56f, 0.73f, 0.56f },
2184 { 0.80F, 0.80F, 0.80F }, 2516 { 0.80f, 0.80f, 0.80f },
2185 { 0.55F, 0.41F, 0.13F }, 2517 { 0.55f, 0.41f, 0.13f },
2186 { 0.99F, 0.77F, 0.26F }, 2518 { 0.99f, 0.77f, 0.26f },
2187 2519
2188 { 0.74F, 0.65F, 0.41F }, 2520 { 0.74f, 0.65f, 0.41f },
2189 2521
2190 { 0.00F, 1.00F, 1.00F }, 2522 { 0.00f, 1.00f, 1.00f },
2191 { 1.00F, 0.00F, 1.00F }, 2523 { 1.00f, 0.00f, 1.00f },
2192 { 1.00F, 1.00F, 0.00F }, 2524 { 1.00f, 1.00f, 0.00f },
2193 }; 2525 };
2194 2526
2195 int x, y; 2527 int x, y;
2196 2528
2197 glEnable (GL_TEXTURE_2D); 2529 glEnable (GL_TEXTURE_2D);
2530 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2531 * but the nvidia driver (185.18.14) mishandles alpha textures
2532 * and takes the colour from god knows where instead of using
2533 * Cp. MODULATE results in the same colour, but slightly different
2534 * alpha, but atcually gives us the correct colour with nvidia.
2535 */
2198 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2536 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2199 glEnable (GL_BLEND); 2537 glEnable (GL_BLEND);
2200 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2538 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2201 glBegin (GL_QUADS); 2539 glBegin (GL_QUADS);
2202 2540
2203 for (y = 0; y < h; y++) 2541 for (y = 0; y < h; y++)
2207 2545
2208 if (m) 2546 if (m)
2209 { 2547 {
2210 float *c = color [m & 15]; 2548 float *c = color [m & 15];
2211 2549
2212 float tx1 = m & 0x40 ? 0.5 : 0.; 2550 float tx1 = m & 0x40 ? 0.5f : 0.f;
2213 float tx2 = tx1 + 0.5; 2551 float tx2 = tx1 + 0.5f;
2214 2552
2215 glColor4f (c[0], c[1], c[2], 0.75); 2553 glColor4f (c[0], c[1], c[2], 1);
2216 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2554 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2217 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2555 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2218 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2556 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2219 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2557 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2220 } 2558 }
2228void 2566void
2229fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2567fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2230 PPCODE: 2568 PPCODE:
2231{ 2569{
2232 int x, y; 2570 int x, y;
2233 int sw1 = sw + 2; 2571 int sw1 = sw + 2;
2234 int sh1 = sh + 2; 2572 int sh1 = sh + 2;
2235 int sh3 = sh * 3; 2573 int sh3 = sh * 3;
2236 int sw34 = (sw * 3 + 3) & ~3; 2574 int sw3 = sw * 3;
2575 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2576 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2237 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2577 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2238 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2578 memset (darkness1, 0, sw1*sh1);
2239 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2240 2579
2241 SvPOK_only (darkness3_sv); 2580 SvPOK_only (darkness3_sv);
2242 SvCUR_set (darkness3_sv, sw34 * sh3); 2581 SvCUR_set (darkness3_sv, sw3 * sh3);
2243 2582
2244 mx += self->x - 1; 2583 mx += self->x - 1;
2245 my += self->y - 1; 2584 my += self->y - 1;
2246
2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2248 2585
2249 for (y = 0; y < sh1; y++) 2586 for (y = 0; y < sh1; y++)
2250 if (0 <= y + my && y + my < self->rows) 2587 if (0 <= y + my && y + my < self->rows)
2251 { 2588 {
2252 maprow *row = self->row + (y + my); 2589 maprow *row = self->row + (y + my);
2255 if (row->c0 <= x + mx && x + mx < row->c1) 2592 if (row->c0 <= x + mx && x + mx < row->c1)
2256 { 2593 {
2257 mapcell *cell = row->col + (x + mx - row->c0); 2594 mapcell *cell = row->col + (x + mx - row->c0);
2258 2595
2259 darkness1 [y * sw1 + x] = cell->darkness 2596 darkness1 [y * sw1 + x] = cell->darkness
2260 ? 255 - (cell->darkness - 1) 2597 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2261 : 255 - FOW_DARKNESS; 2598 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2262 } 2599 }
2263 } 2600 }
2264 2601
2265 for (y = 0; y < sh; ++y) 2602 for (y = 0; y < sh; ++y)
2266 for (x = 0; x < sw; ++x) 2603 for (x = 0; x < sw; ++x)
2285 2622
2286 uint8_t r13 = (d13 + d23 + d12) / 3; 2623 uint8_t r13 = (d13 + d23 + d12) / 3;
2287 uint8_t r23 = d23; 2624 uint8_t r23 = d23;
2288 uint8_t r33 = (d23 + d33 + d32) / 3; 2625 uint8_t r33 = (d23 + d33 + d32) / 3;
2289 2626
2290 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2291 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2292 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2629 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2293 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2630 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2294 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2631 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2295 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2632 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2296 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2297 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2298 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2635 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2299 } 2636 }
2300 2637
2301 free (darkness1); 2638 free (darkness1);
2302 2639
2303 EXTEND (SP, 3); 2640 EXTEND (SP, 3);
2304 PUSHs (sv_2mortal (newSViv (sw34))); 2641 PUSHs (sv_2mortal (newSViv (sw3)));
2305 PUSHs (sv_2mortal (newSViv (sh3))); 2642 PUSHs (sv_2mortal (newSViv (sh3)));
2306 PUSHs (darkness3_sv); 2643 PUSHs (darkness3_sv);
2307} 2644}
2308 2645
2309SV * 2646SV *
2372 else 2709 else
2373 *data++ = 0; 2710 *data++ = 0;
2374 } 2711 }
2375 } 2712 }
2376 2713
2377 /* if size is w*h + 5 then no data has been found */ 2714 /* if size is w*h + 5 then no data has been found */
2378 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2715 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379 { 2716 {
2380 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 } 2719 }
2383 2720
2384 RETVAL = data_sv; 2721 RETVAL = data_sv;
2385} 2722}
2386 OUTPUT: 2723 OUTPUT:
2387 RETVAL 2724 RETVAL
2388 2725
2389void 2726void
2396 STRLEN len; 2733 STRLEN len;
2397 uint8_t *data, *end; 2734 uint8_t *data, *end;
2398 2735
2399 len = SvLEN (data_sv); 2736 len = SvLEN (data_sv);
2400 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2737 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401 data = SvPVbyte_nolen (data_sv); 2738 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2402 end = data + len + 8; 2739 end = data + len + 8;
2403 2740
2404 if (len < 5) 2741 if (len < 5)
2405 XSRETURN_EMPTY; 2742 XSRETURN_EMPTY;
2406 2743
2450 2787
2451 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2452 { 2789 {
2453 tileid t = tile [z]; 2790 tileid t = tile [z];
2454 2791
2455 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2456 { 2793 {
2457 PUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2458 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2459 } 2796 }
2460 2797
2461 cell->tile [z] = t; 2798 cell->tile[z] = t;
2462 } 2799 }
2463 } 2800 }
2464 } 2801 }
2465 } 2802 }
2466 } 2803 }
2467} 2804}
2468 2805
2469MODULE = Deliantra::Client PACKAGE = DC::RW 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2470 2807
2471DC::RW 2808DC::RW
2472new (SV *class, SV *data_sv) 2809new (SV *klass, SV *data_sv)
2473 CODE: 2810 CODE:
2474{ 2811{
2475 STRLEN datalen; 2812 STRLEN datalen;
2476 char *data = SvPVbyte (data_sv, datalen); 2813 char *data = SvPVbyte (data_sv, datalen);
2477 2814
2479} 2816}
2480 OUTPUT: 2817 OUTPUT:
2481 RETVAL 2818 RETVAL
2482 2819
2483DC::RW 2820DC::RW
2484new_from_file (SV *class, const char *path, const char *mode = "rb") 2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2485 CODE: 2822 CODE:
2486 RETVAL = SDL_RWFromFile (path, mode); 2823 RETVAL = SDL_RWFromFile (path, mode);
2487 OUTPUT: 2824 OUTPUT:
2488 RETVAL 2825 RETVAL
2489 2826
2507 if (RETVAL < 0) 2844 if (RETVAL < 0)
2508 { 2845 {
2509 RETVAL = Mix_GroupOldest (-1); 2846 RETVAL = Mix_GroupOldest (-1);
2510 2847
2511 if (RETVAL < 0) 2848 if (RETVAL < 0)
2849 {
2850 // happens sometimes, maybe it just stopped playing(?)
2851 RETVAL = Mix_GroupAvailable (-1);
2852
2853 if (RETVAL < 0)
2512 XSRETURN_UNDEF; 2854 XSRETURN_UNDEF;
2513 2855 }
2856 else
2514 Mix_HaltChannel (RETVAL); 2857 Mix_HaltChannel (RETVAL);
2515 } 2858 }
2516 2859
2517 Mix_UnregisterAllEffects (RETVAL); 2860 Mix_UnregisterAllEffects (RETVAL);
2518 Mix_Volume (RETVAL, 128); 2861 Mix_Volume (RETVAL, 128);
2519} 2862}
2566void 2909void
2567set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2910set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2568 CODE: 2911 CODE:
2569{ 2912{
2570 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2913 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2571 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2914 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2572 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2915 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2573} 2916}
2574 2917
2575void 2918void
2576set_reverse_stereo (DC::Channel self, int flip) 2919set_reverse_stereo (DC::Channel self, int flip)
2579 2922
2580MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2923MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2581 2924
2582PROTOTYPES: DISABLE 2925PROTOTYPES: DISABLE
2583 2926
2927void
2928decoders ()
2929 PPCODE:
2930#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2931 int i, num = Mix_GetNumChunkDecoders ();
2932 EXTEND (SP, num);
2933 for (i = 0; i < num; ++i)
2934 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2935#else
2936 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2937#endif
2938
2584DC::MixChunk 2939DC::MixChunk
2585new (SV *class, DC::RW rwops) 2940new (SV *klass, DC::RW rwops)
2586 CODE: 2941 CODE:
2587 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2588 OUTPUT: 2943 OUTPUT:
2589 RETVAL 2944 RETVAL
2590 2945
2620 OUTPUT: 2975 OUTPUT:
2621 RETVAL 2976 RETVAL
2622 2977
2623MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2978MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2624 2979
2980void
2981decoders ()
2982 PPCODE:
2983#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2984 int i, num = Mix_GetNumMusicDecoders ();
2985 EXTEND (SP, num);
2986 for (i = 0; i < num; ++i)
2987 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2988#else
2989 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2990#endif
2991
2625int 2992int
2626volume (int volume = -1) 2993volume (int volume = -1)
2627 PROTOTYPE: ;$ 2994 PROTOTYPE: ;$
2628 CODE: 2995 CODE:
2629 if (items > 0) 2996 if (items > 0)
2640void 3007void
2641halt () 3008halt ()
2642 CODE: 3009 CODE:
2643 Mix_HaltMusic (); 3010 Mix_HaltMusic ();
2644 3011
3012int
3013playing ()
3014 CODE:
3015 RETVAL = Mix_PlayingMusic ();
3016 OUTPUT:
3017 RETVAL
3018
2645DC::MixMusic 3019DC::MixMusic
2646new (SV *class, DC::RW rwops) 3020new (SV *klass, DC::RW rwops)
2647 CODE: 3021 CODE:
2648 RETVAL = Mix_LoadMUS_RW (rwops); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
2649 OUTPUT: 3023 OUTPUT:
2650 RETVAL 3024 RETVAL
2651 3025
2679 } *civ, const_iv[] = { 3053 } *civ, const_iv[] = {
2680# define const_iv(name) { # name, (IV)name } 3054# define const_iv(name) { # name, (IV)name }
2681 const_iv (GL_VENDOR), 3055 const_iv (GL_VENDOR),
2682 const_iv (GL_VERSION), 3056 const_iv (GL_VERSION),
2683 const_iv (GL_EXTENSIONS), 3057 const_iv (GL_EXTENSIONS),
3058 const_iv (GL_MAX_TEXTURE_UNITS),
2684 const_iv (GL_COLOR_MATERIAL), 3059 const_iv (GL_COLOR_MATERIAL),
2685 const_iv (GL_SMOOTH), 3060 const_iv (GL_SMOOTH),
2686 const_iv (GL_FLAT), 3061 const_iv (GL_FLAT),
2687 const_iv (GL_DITHER), 3062 const_iv (GL_DITHER),
2688 const_iv (GL_BLEND), 3063 const_iv (GL_BLEND),
2700 const_iv (GL_ZERO), 3075 const_iv (GL_ZERO),
2701 const_iv (GL_SRC_ALPHA), 3076 const_iv (GL_SRC_ALPHA),
2702 const_iv (GL_DST_ALPHA), 3077 const_iv (GL_DST_ALPHA),
2703 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3078 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2704 const_iv (GL_ONE_MINUS_DST_ALPHA), 3079 const_iv (GL_ONE_MINUS_DST_ALPHA),
3080 const_iv (GL_SRC_COLOR),
3081 const_iv (GL_DST_COLOR),
3082 const_iv (GL_ONE_MINUS_SRC_COLOR),
3083 const_iv (GL_ONE_MINUS_DST_COLOR),
2705 const_iv (GL_SRC_ALPHA_SATURATE), 3084 const_iv (GL_SRC_ALPHA_SATURATE),
2706 const_iv (GL_RGB), 3085 const_iv (GL_RGB),
2707 const_iv (GL_RGBA), 3086 const_iv (GL_RGBA),
2708 const_iv (GL_RGBA4), 3087 const_iv (GL_RGBA4),
2709 const_iv (GL_RGBA8), 3088 const_iv (GL_RGBA8),
2777 const_iv (GL_NICEST), 3156 const_iv (GL_NICEST),
2778 const_iv (GL_V2F), 3157 const_iv (GL_V2F),
2779 const_iv (GL_V3F), 3158 const_iv (GL_V3F),
2780 const_iv (GL_T2F_V3F), 3159 const_iv (GL_T2F_V3F),
2781 const_iv (GL_T2F_N3F_V3F), 3160 const_iv (GL_T2F_N3F_V3F),
3161 const_iv (GL_FUNC_ADD),
3162 const_iv (GL_FUNC_SUBTRACT),
3163 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2782# undef const_iv 3164# undef const_iv
2783 }; 3165 };
2784 3166
2785 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3167 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2786 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3168 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2787 3169
2788 texture_av = newAV (); 3170 texture_av = newAV ();
2789 AvREAL_off (texture_av); 3171 AvREAL_off (texture_av);
2790} 3172}
2791 3173
2793disable_GL_EXT_blend_func_separate () 3175disable_GL_EXT_blend_func_separate ()
2794 CODE: 3176 CODE:
2795 gl.BlendFuncSeparate = 0; 3177 gl.BlendFuncSeparate = 0;
2796 gl.BlendFuncSeparateEXT = 0; 3178 gl.BlendFuncSeparateEXT = 0;
2797 3179
2798char * 3180void
3181apple_nvidia_bug (int enable)
3182
3183const char *
2799gl_vendor () 3184gl_vendor ()
2800 CODE: 3185 CODE:
2801 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
2802 OUTPUT: 3187 OUTPUT:
2803 RETVAL 3188 RETVAL
2804 3189
2805char * 3190const char *
2806gl_version () 3191gl_version ()
2807 CODE: 3192 CODE:
2808 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
2809 OUTPUT: 3194 OUTPUT:
2810 RETVAL 3195 RETVAL
2811 3196
2812char * 3197const char *
2813gl_extensions () 3198gl_extensions ()
2814 CODE: 3199 CODE:
2815 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2816 OUTPUT: 3201 OUTPUT:
2817 RETVAL 3202 RETVAL
2818 3203
2819const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
2820 3209
2821GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
2822 CODE: 3211 CODE:
2823 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
2824 OUTPUT: 3213 OUTPUT:
2832 3221
2833int glGetError () 3222int glGetError ()
2834 3223
2835void glFinish () 3224void glFinish ()
2836 3225
3226void glFlush ()
3227
2837void glClear (int mask) 3228void glClear (int mask)
2838 3229
2839void glClearColor (float r, float g, float b, float a = 1.0) 3230void glClearColor (float r, float g, float b, float a = 1.0)
2840 PROTOTYPE: @ 3231 PROTOTYPE: @
2841 3232
2850void glBlendFunc (int sfactor, int dfactor) 3241void glBlendFunc (int sfactor, int dfactor)
2851 3242
2852void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3243void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2853 CODE: 3244 CODE:
2854 gl_BlendFuncSeparate (sa, da, saa, daa); 3245 gl_BlendFuncSeparate (sa, da, saa, daa);
3246
3247# void glBlendEquation (int se)
2855 3248
2856void glDepthMask (int flag) 3249void glDepthMask (int flag)
2857 3250
2858void glLogicOp (int opcode) 3251void glLogicOp (int opcode)
2859 3252
2894void glRotate (float angle, float x, float y, float z) 3287void glRotate (float angle, float x, float y, float z)
2895 CODE: 3288 CODE:
2896 glRotatef (angle, x, y, z); 3289 glRotatef (angle, x, y, z);
2897 3290
2898void glColor (float r, float g, float b, float a = 1.0) 3291void glColor (float r, float g, float b, float a = 1.0)
3292 PROTOTYPE: @
2899 ALIAS: 3293 ALIAS:
2900 glColor_premultiply = 1 3294 glColor_premultiply = 1
2901 CODE: 3295 CODE:
2902 if (ix) 3296 if (ix)
2903 { 3297 {
3009 3403
3010void glEndList () 3404void glEndList ()
3011 3405
3012void glCallList (int list) 3406void glCallList (int list)
3013 3407
3408void c_init ()
3409 CODE:
3410 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3411 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3412
3014MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3413MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3015 3414
3016PROTOTYPES: DISABLE 3415PROTOTYPES: DISABLE
3017 3416
3018void 3417void
3019find_widget (SV *self, NV x, NV y) 3418find_widget (SV *self, NV x, NV y)
3020 PPCODE: 3419 PPCODE:
3021{ 3420{
3022 if (within_widget (self, x, y)) 3421 if (within_widget (self, x, y))
3023 XPUSHs (self); 3422 XPUSHs (self);
3024} 3423}
3025 3424
3026BOOT: 3425BOOT:
3027{ 3426{
3035 3434
3036void 3435void
3037draw (SV *self) 3436draw (SV *self)
3038 CODE: 3437 CODE:
3039{ 3438{
3040 HV *hv; 3439 HV *hv;
3041 SV **svp; 3440 SV **svp;
3042 NV x, y, w, h; 3441 NV x, y, w, h;
3043 SV *draw_x_sv = GvSV (draw_x_gv); 3442 SV *draw_x_sv = GvSV (draw_x_gv);
3044 SV *draw_y_sv = GvSV (draw_y_gv); 3443 SV *draw_y_sv = GvSV (draw_y_gv);
3045 SV *draw_w_sv = GvSV (draw_w_gv); 3444 SV *draw_w_sv = GvSV (draw_w_gv);
3046 SV *draw_h_sv = GvSV (draw_h_gv); 3445 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines