ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.269 by root, Sun Jul 20 03:46:02 2008 UTC vs.
Revision 1.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
704NV ceil (NV x) 872NV ceil (NV x)
705 873
706IV minpot (UV n) 874IV minpot (UV n)
707 875
708IV popcount (UV n) 876IV popcount (UV n)
877
878NV distance (NV dx, NV dy)
879 CODE:
880 RETVAL = pow (dx * dx + dy * dy, 0.5);
881 OUTPUT:
882 RETVAL
709 883
710void 884void
711pango_init () 885pango_init ()
712 CODE: 886 CODE:
713{ 887{
721#endif 895#endif
722} 896}
723 897
724char *SDL_GetError () 898char *SDL_GetError ()
725 899
900void SDL_main_hack (SV *real_main)
901 PROTOTYPE: &
902
726int SDL_Init (U32 flags) 903int SDL_Init (U32 flags)
727 904
728int SDL_InitSubSystem (U32 flags) 905int SDL_InitSubSystem (U32 flags)
729 906
730void SDL_QuitSubSystem (U32 flags) 907void SDL_QuitSubSystem (U32 flags)
731 908
732void SDL_Quit () 909void SDL_Quit ()
733 910
734int SDL_GL_SetAttribute (int attr, int value) 911int SDL_GL_SetAttribute (int attr, int value)
912 C_ARGS: (SDL_GLattr)attr, value
735 913
736int SDL_GL_GetAttribute (int attr) 914int SDL_GL_GetAttribute (int attr)
737 CODE: 915 CODE:
738 if (SDL_GL_GetAttribute (attr, &RETVAL)) 916 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
739 XSRETURN_UNDEF; 917 XSRETURN_UNDEF;
740 OUTPUT: 918 OUTPUT:
741 RETVAL 919 RETVAL
742 920
743void 921void
798 ); 976 );
799 977
800 if (RETVAL) 978 if (RETVAL)
801 { 979 {
802 av_clear (texture_av); 980 av_clear (texture_av);
803
804 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
805#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 981#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
806#include "glfunc.h" 982#include "glfunc.h"
807#undef GL_FUNC 983#undef GL_FUNC
984 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
985 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
808 } 986 }
809} 987}
810 OUTPUT: 988 OUTPUT:
811 RETVAL 989 RETVAL
990
991void
992SDL_WM_SetCaption (const char *title, const char *icon)
812 993
813void 994void
814SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
815 996
816char * 997char *
817SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
818 1000
819int 1001int
820SDL_GetAppState () 1002SDL_GetAppState ()
821 1003
822int 1004int
823SDL_GetModState () 1005SDL_GetModState ()
824 1006
1007int
1008SDL_WaitEvent ()
1009 C_ARGS: 0
1010
825void 1011void
1012SDL_PumpEvents ()
1013
1014void
826poll_events () 1015peep_events ()
827 PPCODE: 1016 PPCODE:
828{ 1017{
829 SDL_Event ev; 1018 SDL_Event ev;
830 1019
831 SDL_PumpEvents (); 1020 SDL_PumpEvents ();
838 { 1027 {
839 case SDL_KEYDOWN: 1028 case SDL_KEYDOWN:
840 case SDL_KEYUP: 1029 case SDL_KEYUP:
841 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1030 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
842 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1031 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
843 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1032 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
844 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1033 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
845 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1034 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
846 break; 1035 break;
847 1036
848 case SDL_ACTIVEEVENT: 1037 case SDL_ACTIVEEVENT:
849 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1038 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
867 x = ev.motion.x; 1056 x = ev.motion.x;
868 y = ev.motion.y; 1057 y = ev.motion.y;
869 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1058 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
870 } 1059 }
871 1060
872 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1061 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
873 hv_store (hv, "state", 5, newSViv (state), 0); 1062 hv_store (hv, "state", 5, newSViv (state), 0);
874 hv_store (hv, "x", 1, newSViv (x), 0); 1063 hv_store (hv, "x", 1, newSViv (x), 0);
875 hv_store (hv, "y", 1, newSViv (y), 0); 1064 hv_store (hv, "y", 1, newSViv (y), 0);
876 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1065 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
877 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1066 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
897 1086
898 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))));
899 } 1088 }
900} 1089}
901 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
902int 1104int
903Mix_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)
904 POSTCALL: 1106 POSTCALL:
905 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
906 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
907 1109
908void 1110void
909Mix_QuerySpec () 1111Mix_QuerySpec ()
968add_font (char *file) 1170add_font (char *file)
969 CODE: 1171 CODE:
970 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1172 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
971 OUTPUT: 1173 OUTPUT:
972 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)
973 1182
974void 1183void
975load_image_inline (SV *image_) 1184load_image_inline (SV *image_)
976 ALIAS: 1185 ALIAS:
977 load_image_file = 1 1186 load_image_file = 1
1023 1232
1024 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
1025 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
1026 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
1027 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
1028 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1029 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1238 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1030 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1031 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1032 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
1033 1242
1093#if DEBUG 1302#if DEBUG
1094 VALGRIND_DO_LEAK_CHECK; 1303 VALGRIND_DO_LEAK_CHECK;
1095#endif 1304#endif
1096} 1305}
1097 1306
1307int
1308SvREFCNT (SV *sv)
1309 CODE:
1310 RETVAL = SvREFCNT (sv);
1311 OUTPUT:
1312 RETVAL
1313
1098MODULE = Deliantra::Client PACKAGE = DC::Font 1314MODULE = Deliantra::Client PACKAGE = DC::Font
1099 1315
1100PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1101 1317
1102DC::Font 1318DC::Font
1103new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
1104 CODE: 1320 CODE:
1105{ 1321{
1106 int count; 1322 int count;
1107 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1108 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1137 PROTOTYPE: 1353 PROTOTYPE:
1138 CODE: 1354 CODE:
1139 tc_restore (); 1355 tc_restore ();
1140 1356
1141DC::Layout 1357DC::Layout
1142new (SV *class) 1358new (SV *klass)
1143 CODE: 1359 CODE:
1144 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
1145 1361
1146 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
1147 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
1148 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
1149 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
1150 RETVAL->a = 1.; 1366 RETVAL->a = 1.;
1151 RETVAL->base_height = MIN_FONT_HEIGHT; 1367 RETVAL->base_height = MIN_FONT_HEIGHT;
1152 RETVAL->font = 0; 1368 RETVAL->font = 0;
1153 RETVAL->rc = rc_alloc ();
1154 1369
1155 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1370 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1156 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
1157 OUTPUT: 1372 OUTPUT:
1158 RETVAL 1373 RETVAL
1159 1374
1160void 1375void
1161DESTROY (DC::Layout self) 1376DESTROY (DC::Layout self)
1162 CODE: 1377 CODE:
1163 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
1164 rc_free (self->rc);
1165 Safefree (self); 1379 delete self;
1166 1380
1167void 1381void
1168set_text (DC::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
1169 CODE: 1383 CODE:
1170{ 1384{
1296 1510
1297void 1511void
1298set_height (DC::Layout self, int base_height) 1512set_height (DC::Layout self, int base_height)
1299 CODE: 1513 CODE:
1300 if (self->base_height != base_height) 1514 if (self->base_height != base_height)
1301 { 1515 {
1302 self->base_height = base_height; 1516 self->base_height = base_height;
1303 layout_update_font (self); 1517 layout_update_font (self);
1304 } 1518 }
1305 1519
1306void 1520void
1424} 1638}
1425 1639
1426void 1640void
1427render (DC::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1428 CODE: 1642 CODE:
1429 rc_clear (self->rc); 1643 self->rc.clear ();
1430 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1431 self->pl, 1645 self->pl,
1432 self->rc, 1646 &self->rc,
1433 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1434 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1435 flags 1649 flags
1436 ); 1650 );
1437 // we assume that context_change actually clears/frees stuff 1651 // we assume that context_change actually clears/frees stuff
1448 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1662 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1449 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1663 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1450 glEnable (GL_ALPHA_TEST); 1664 glEnable (GL_ALPHA_TEST);
1451 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1665 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1452 1666
1453 rc_draw (self->rc); 1667 self->rc.draw ();
1454 1668
1455 glDisable (GL_ALPHA_TEST); 1669 glDisable (GL_ALPHA_TEST);
1456 glDisable (GL_BLEND); 1670 glDisable (GL_BLEND);
1457 glDisable (GL_TEXTURE_2D); 1671 glDisable (GL_TEXTURE_2D);
1458} 1672}
1533 glDisable (GL_ALPHA_TEST); 1747 glDisable (GL_ALPHA_TEST);
1534 glDisable (GL_BLEND); 1748 glDisable (GL_BLEND);
1535 } 1749 }
1536} 1750}
1537 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
1538IV 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)
1539 CODE: 1874 CODE:
1540{ 1875{
1541 GLint width; 1876 GLint width;
1542 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);
1549MODULE = Deliantra::Client PACKAGE = DC::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1550 1885
1551PROTOTYPES: DISABLE 1886PROTOTYPES: DISABLE
1552 1887
1553DC::Map 1888DC::Map
1554new (SV *class) 1889new (SV *klass)
1555 CODE: 1890 CODE:
1556 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1557 RETVAL->x = 0; 1892 RETVAL->x = 0;
1558 RETVAL->y = 0; 1893 RETVAL->y = 0;
1559 RETVAL->w = 0; 1894 RETVAL->w = 0;
1560 RETVAL->h = 0; 1895 RETVAL->h = 0;
1561 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1562 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1563 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1564 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1565 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1566 RETVAL->row = 0; 1899 RETVAL->row = 0;
1567 OUTPUT: 1900 OUTPUT:
1568 RETVAL 1901 RETVAL
1569 1902
1570void 1903void
1571DESTROY (DC::Map self) 1904DESTROY (DC::Map self)
1572 CODE: 1905 CODE:
1573{ 1906{
1574 map_clear (self);
1575 Safefree (self->face2tile);
1576 Safefree (self->tex);
1577 Safefree (self); 1907 delete self;
1578} 1908}
1579 1909
1580void 1910void
1581resize (DC::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1582 CODE: 1912 CODE:
1584 self->h = map_height; 1914 self->h = map_height;
1585 1915
1586void 1916void
1587clear (DC::Map self) 1917clear (DC::Map self)
1588 CODE: 1918 CODE:
1589 map_clear (self); 1919 self->clear_cells ();
1590 1920
1591void 1921void
1592set_tileid (DC::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1593 CODE: 1923 CODE:
1594{ 1924{
1595 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1596 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1597} 1928}
1598 1929
1599void 1930void
1600set_smooth (DC::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1601 CODE: 1932 CODE:
1602{ 1933{
1603 tileid texid;
1604 maptex *tex;
1605
1606 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1607 return; 1935 return;
1608 1936
1609 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1610 return; 1938 return;
1611 1939
1612 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1613 1941
1614 if (!texid) 1942 if (!texid)
1615 return; 1943 return;
1616 1944
1617 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1618 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1619 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1620} 1948}
1621 1949
1622void 1950void
1623set_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)
1624 CODE: 1952 CODE:
1625{ 1953{
1626 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1627 1955
1628 { 1956 {
1629 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1630 1958
1631 tex->name = name; 1959 tex.name = name;
1632 tex->w = w; 1960 tex.w = w;
1633 tex->h = h; 1961 tex.h = h;
1634 tex->s = s; 1962 tex.s = s;
1635 tex->t = t; 1963 tex.t = t;
1636 tex->r = r; 1964 tex.r = r;
1637 tex->g = g; 1965 tex.g = g;
1638 tex->b = b; 1966 tex.b = b;
1639 tex->a = a; 1967 tex.a = a;
1640 } 1968 }
1641 1969
1642 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1643 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1644 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
1646 //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);
1647 // use uglier nearest interpolation because linear suffers 1975 // use uglier nearest interpolation because linear suffers
1648 // from transparent color bleeding and ugly wrapping effects. 1976 // from transparent color bleeding and ugly wrapping effects.
1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1977 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1650} 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 }
1651 1999
1652int 2000int
1653ox (DC::Map self) 2001ox (DC::Map self)
1654 ALIAS: 2002 ALIAS:
1655 oy = 1 2003 oy = 1
1695 self->y += MAP_EXTEND_Y; 2043 self->y += MAP_EXTEND_Y;
1696 } 2044 }
1697} 2045}
1698 2046
1699SV * 2047SV *
1700map1a_update (DC::Map self, SV *data_, int extmap) 2048map1a_update (DC::Map self, SV *data_)
1701 CODE: 2049 CODE:
1702{ 2050{
1703 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2051 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1704 uint8_t *data_end = (uint8_t *)SvEND (data_); 2052 uint8_t *data_end = (uint8_t *)SvEND (data_);
1705 mapcell *cell; 2053 mapcell *cell;
1726 2074
1727 //TODO: don't trust server data to be in-range(!) 2075 //TODO: don't trust server data to be in-range(!)
1728 2076
1729 if (flags & 8) 2077 if (flags & 8)
1730 { 2078 {
2079 uint8_t ext, cmd;
2080
1731 if (extmap) 2081 do
1732 { 2082 {
1733 uint8_t ext, cmd; 2083 ext = *data++;
2084 cmd = ext & 0x7f;
1734 2085
1735 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
1736 { 2089 {
1737 ext = *data++;
1738 cmd = ext & 0x7f;
1739
1740 if (cmd < 4)
1741 cell->darkness = 255 - ext * 64 + 1;
1742 else if (cmd == 5) // health
1743 {
1744 cell->stat_width = 1; 2090 cell->stat_width = 1;
1745 cell->stat_hp = *data++; 2091 cell->stat_hp = *data++;
1746 }
1747 else if (cmd == 6) // monster width
1748 cell->stat_width = *data++ + 1;
1749 else if (cmd == 0x47)
1750 {
1751 if (*data == 1) cell->player = data [1];
1752 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1753 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1754 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1755
1756 data += *data + 1;
1757 }
1758 else if (cmd == 8) // cell flags
1759 cell->flags = *data++;
1760 else if (ext & 0x40) // unknown, multibyte => skip
1761 data += *data + 1;
1762 else
1763 data++;
1764 } 2092 }
1765 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++;
1766 } 2110 }
1767 else 2111 while (ext & 0x80);
1768 cell->darkness = *data++ + 1;
1769 } 2112 }
1770 2113
1771 for (z = 0; z <= 2; ++z) 2114 for (z = 0; z <= 2; ++z)
1772 if (flags & (4 >> z)) 2115 if (flags & (4 >> z))
1773 { 2116 {
1774 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
1775 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
1776 cell->tile [z] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
1777 2120
1778 if (cell->tile [z]) 2121 if (cell->tile[z])
1779 { 2122 {
1780 maptex *tex = self->tex + cell->tile [z]; 2123 maptex &tex = self->tex[cell->tile[z]];
2124 tex.unused = 0;
1781 if (!tex->name) 2125 if (!tex.name)
1782 av_push (missing, newSViv (cell->tile [z])); 2126 av_push (missing, newSViv (cell->tile [z]));
1783 2127
1784 if (tex->smoothtile) 2128 if (tex.smoothtile)
1785 { 2129 {
1786 maptex *smooth = self->tex + tex->smoothtile; 2130 maptex &smooth = self->tex[tex.smoothtile];
2131 smooth.unused = 0;
1787 if (!smooth->name) 2132 if (!smooth.name)
1788 av_push (missing, newSViv (tex->smoothtile)); 2133 av_push (missing, newSViv (tex.smoothtile));
1789 } 2134 }
1790 } 2135 }
1791 } 2136 }
1792 } 2137 }
1793 else 2138 else
1819 ? self->row + y 2164 ? self->row + y
1820 : 0; 2165 : 0;
1821 2166
1822 for (x = x0; x < x1; x++) 2167 for (x = x0; x < x1; x++)
1823 { 2168 {
1824 int r = 32, g = 32, b = 32, a = 192; 2169 unsigned int r = 32, g = 32, b = 32, a = 192;
1825 2170
1826 if (row && row->c0 <= x && x < row->c1) 2171 if (row && row->c0 <= x && x < row->c1)
1827 { 2172 {
1828 mapcell *cell = row->col + (x - row->c0); 2173 mapcell *cell = row->col + (x - row->c0);
1829 2174
1831 { 2176 {
1832 maptex tex = self->tex [cell->tile [z]]; 2177 maptex tex = self->tex [cell->tile [z]];
1833 int a0 = 255 - tex.a; 2178 int a0 = 255 - tex.a;
1834 int a1 = tex.a; 2179 int a1 = tex.a;
1835 2180
1836 r = (r * a0 + tex.r * a1) / 255; 2181 r = div255 (r * a0 + tex.r * a1);
1837 g = (g * a0 + tex.g * a1) / 255; 2182 g = div255 (g * a0 + tex.g * a1);
1838 b = (b * a0 + tex.b * a1) / 255; 2183 b = div255 (b * a0 + tex.b * a1);
1839 a = (a * a0 + tex.a * a1) / 255; 2184 a = div255 (a * a0 + tex.a * a1);
1840 } 2185 }
1841 } 2186 }
1842 2187
1843 *map++ = (r ) 2188 *map++ = (r )
1844 | (g << 8) 2189 | (g << 8)
1845 | (b << 16) 2190 | (b << 16)
1846 | (a << 24); 2191 | (a << 24);
1847 } 2192 }
1848 } 2193 }
1849 2194
1850 RETVAL = map_sv; 2195 RETVAL = map_sv;
1851} 2196}
1852 OUTPUT: 2197 OUTPUT:
1853 RETVAL 2198 RETVAL
1854 2199
1855void 2200void
1856draw (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)
1857 CODE: 2202 CODE:
1858{ 2203{
1859 int x, y, z; 2204 int x, y, z;
1860 2205
1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1862 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1863 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2206 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1864 smooth_key skey;
1865 int pl_x, pl_y; 2207 int pl_x, pl_y;
1866 maptex pl_tex; 2208 maptex pl_tex;
1867 rc_t *rc = rc_alloc (); 2209 rc_t rc;
2210 rc_t rc_ov;
1868 rc_key_t key; 2211 rc_key_t key;
1869 rc_array_t *arr; 2212 rc_t::array_t *arr;
1870 2213
1871 pl_tex.name = 0; 2214 pl_tex.name = 0;
1872 2215
1873 // thats current max. sorry. 2216 // that's current max. sorry.
1874 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
1875 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
1876
1877 // clear key, in case of extra padding
1878 memset (&skey, 0, sizeof (skey));
1879 2219
1880 memset (&key, 0, sizeof (key)); 2220 memset (&key, 0, sizeof (key));
1881 key.r = 255; 2221 key.r = 255;
1882 key.g = 255; 2222 key.g = 255;
1883 key.b = 255; 2223 key.b = 255;
1884 key.a = 255; 2224 key.a = 255;
1885 key.mode = GL_QUADS; 2225 key.mode = GL_QUADS;
1886 key.format = GL_T2F_V3F; 2226 key.format = GL_T2F_V3F;
1887 key.texname = -1;
1888 2227
1889 mx += self->x; 2228 mx += self->x;
1890 my += self->y; 2229 my += self->y;
1891 2230
1892 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
1893 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
1894 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
1895 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1896 2235
1897 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
1898 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
1899 { 2238 {
1900 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
1915 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1916 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1917 2256
1918 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
1919 { 2258 {
1920 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;
1921 2263
1922 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
1923 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
1924 { 2266 {
1925 maprow *row = self->row + (y + my); 2267 maprow *row = self->row + (y + my);
1931 tileid tile = cell->tile [z]; 2273 tileid tile = cell->tile [z];
1932 2274
1933 if (tile) 2275 if (tile)
1934 { 2276 {
1935 maptex tex = self->tex [tile]; 2277 maptex tex = self->tex [tile];
1936 int px = (x + 1) * T - tex.w; 2278 int px, py;
1937 int py = (y + 1) * T - tex.h;
1938 2279
1939 if (key.texname != tex.name) 2280 if (key.texname != tex.name)
1940 { 2281 {
2282 self->tex [tile].unused = 0;
2283
1941 if (!tex.name) 2284 if (!tex.name)
1942 tex = self->tex [2]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1943 2286
1944 key.texname = tex.name; 2287 key.texname = tex.name;
1945 arr = rc_array (rc, &key); 2288 arr = &rc.array (key);
1946 } 2289 }
2290
2291 px = (x + 1) * Th - tex.w;
2292 py = (y + 1) * Tw - tex.h;
1947 2293
1948 if (expect_false (cell->player == player) && expect_false (z == 2)) 2294 if (expect_false (cell->player == player) && expect_false (z == 2))
1949 { 2295 {
1950 pl_x = px; 2296 pl_x = px;
1951 pl_y = py; 2297 pl_y = py;
1952 pl_tex = tex; 2298 pl_tex = tex;
1953 continue; 2299 continue;
1954 } 2300 }
1955 2301
1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2302 arr->t2f_v3f (0 , 0 , px , py , 0);
1957 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2303 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1958 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2304 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
1959 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2305 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1960
1961 if (expect_false (cell->flags) && expect_false (z == 2))
1962 {
1963 // overlays such as the speech bubble, probably more to come
1964 if (cell->flags & 1)
1965 {
1966 maptex tex = self->tex [1];
1967 int px = x * T + T * 2 / 32;
1968 int py = y * T - T * 6 / 32;
1969
1970 if (tex.name)
1971 {
1972 if (key.texname != tex.name)
1973 {
1974 key.texname = tex.name;
1975 arr = rc_array (rc, &key);
1976 }
1977
1978 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1979 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1980 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1981 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1982 }
1983 }
1984 }
1985 2306
1986 // update smooth hash 2307 // update smooth hash
1987 if (tex.smoothtile) 2308 if (tex.smoothtile)
1988 { 2309 {
1989 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
1990 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
1991 2312
1992 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
1993 2314
1994 // 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
1995 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
1996 2317
1997 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
2005 2326
2006 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2007 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
2008 2329
2009 // full tile 2330 // full tile
2010 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);
2011 2332
2012 // borders 2333 // borders
2013 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);
2014 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);
2015 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);
2016 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);
2017 2338
2018 // corners 2339 // corners
2019 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);
2020 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);
2021 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);
2022 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);
2023 } 2364 }
2024 } 2365 }
2025 } 2366 }
2026 } 2367 }
2027 2368
2028 rc_draw (rc); 2369 rc.draw ();
2029 rc_clear (rc); 2370 rc.clear ();
2030 2371
2031 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
2032 // this is basically counting sort 2373 // this is basically counting sort
2033 { 2374 {
2034 int w, b; 2375 int w, b;
2035 2376
2036 glEnable (GL_TEXTURE_2D); 2377 glEnable (GL_TEXTURE_2D);
2037 glBegin (GL_QUADS); 2378 glBegin (GL_QUADS);
2038 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)
2039 { 2382 {
2040 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
2041 if (smask) 2384 IV bits = it->second;
2042 for (b = 0; b < 32; ++b) 2385
2043 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
2044 { 2389 {
2045 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
2046 HE *he; 2398 if (tex.name)
2047
2048 hv_iterinit (smooth);
2049 while ((he = hv_iternext (smooth)))
2050 { 2399 {
2051 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
2052 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
2053 2402 if (key.texname != tex.name)
2054 if (!(bits & 0x1000)
2055 && skey->level == level
2056 && level > smooth_max [skey->x][skey->y])
2057 { 2403 {
2058 maptex tex = self->tex [skey->tile]; 2404 self->tex [skey.tile].unused = 0;
2059 int px = (((int)skey->x) - 1) * T;
2060 int py = (((int)skey->y) - 1) * T;
2061 int border = bits & 15;
2062 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2063 float dx = tex.s * .0625f; // 16 images/row
2064 float dy = tex.t * .5f ; // 2 images/column
2065 2405
2066 if (tex.name)
2067 {
2068 // this time avoiding texture state changes
2069 // save gobs of state changes.
2070 if (key.texname != tex.name)
2071 {
2072 glEnd (); 2406 glEnd ();
2073 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2074 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2075 } 2409 }
2076 2410
2077 if (border) 2411 if (border)
2078 { 2412 {
2079 float ox = border * dx; 2413 float ox = border * dx;
2080 2414
2081 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2082 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2083 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2084 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2085 } 2419 }
2086 2420
2087 if (corner) 2421 if (corner)
2088 { 2422 {
2089 float ox = corner * dx; 2423 float ox = corner * dx;
2090 2424
2091 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2092 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2093 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2094 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2095 }
2096 }
2097 } 2429 }
2098 } 2430 }
2099 } 2431 }
2100 } 2432 }
2101 2433
2102 glEnd (); 2434 glEnd ();
2103 glDisable (GL_TEXTURE_2D); 2435 glDisable (GL_TEXTURE_2D);
2104 key.texname = -1; 2436 key.texname = -1;
2105 } 2437 }
2106
2107 hv_clear (smooth);
2108 } 2438 }
2109 2439
2110 if (pl_tex.name) 2440 if (pl_tex.name)
2111 { 2441 {
2112 maptex tex = pl_tex; 2442 maptex tex = pl_tex;
2113 int px = pl_x + sdx; 2443 int px = pl_x + sdx;
2114 int py = pl_y + sdy; 2444 int py = pl_y + sdy;
2115 2445
2116 key.texname = tex.name; 2446 key.texname = tex.name;
2117 arr = rc_array (rc, &key); 2447 rc_t::array_t &arr = rc.array (key);
2118 2448
2119 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2449 arr.t2f_v3f (0 , 0 , px , py , 0);
2120 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2450 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2121 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2451 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2122 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2452 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2123 2453
2124 rc_draw (rc); 2454 rc.draw ();
2125 } 2455 }
2126 2456
2457 rc_ov.draw ();
2458 rc_ov.clear ();
2459
2127 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
2128 rc_free (rc);
2129 2461
2130 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
2131 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
2132 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
2133 { 2465 {
2136 for (x = 0; x < sw; x++) 2468 for (x = 0; x < sw; x++)
2137 if (row->c0 <= x + mx && x + mx < row->c1) 2469 if (row->c0 <= x + mx && x + mx < row->c1)
2138 { 2470 {
2139 mapcell *cell = row->col + (x + mx - row->c0); 2471 mapcell *cell = row->col + (x + mx - row->c0);
2140 2472
2141 int px = x * T; 2473 int px = x * Tw;
2142 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 }
2143 2481
2144 if (cell->stat_hp) 2482 if (cell->stat_hp)
2145 { 2483 {
2146 int width = cell->stat_width * T; 2484 int width = cell->stat_width * Tw;
2147 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2485 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2148 2486
2149 glColor3ub (0, 0, 0); 2487 glColor3ub (0, 0, 0);
2150 glRectf (px + 1, py - thick - 2, 2488 glRectf (px + 1, py - thick - 2,
2151 px + width - 1, py); 2489 px + width - 1, py);
2152 2490
2158 } 2496 }
2159 } 2497 }
2160} 2498}
2161 2499
2162void 2500void
2163draw_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)
2164 CODE: 2502 CODE:
2165{ 2503{
2166 static float color[16][3] = { 2504 static float color[16][3] = {
2167 { 0.00F, 0.00F, 0.00F }, 2505 { 0.00f, 0.00f, 0.00f },
2168 { 1.00F, 1.00F, 1.00F }, 2506 { 1.00f, 1.00f, 1.00f },
2169 { 0.00F, 0.00F, 0.55F }, 2507 { 0.00f, 0.00f, 0.55f },
2170 { 1.00F, 0.00F, 0.00F }, 2508 { 1.00f, 0.00f, 0.00f },
2171 2509
2172 { 1.00F, 0.54F, 0.00F }, 2510 { 1.00f, 0.54f, 0.00f },
2173 { 0.11F, 0.56F, 1.00F }, 2511 { 0.11f, 0.56f, 1.00f },
2174 { 0.93F, 0.46F, 0.00F }, 2512 { 0.93f, 0.46f, 0.00f },
2175 { 0.18F, 0.54F, 0.34F }, 2513 { 0.18f, 0.54f, 0.34f },
2176 2514
2177 { 0.56F, 0.73F, 0.56F }, 2515 { 0.56f, 0.73f, 0.56f },
2178 { 0.80F, 0.80F, 0.80F }, 2516 { 0.80f, 0.80f, 0.80f },
2179 { 0.55F, 0.41F, 0.13F }, 2517 { 0.55f, 0.41f, 0.13f },
2180 { 0.99F, 0.77F, 0.26F }, 2518 { 0.99f, 0.77f, 0.26f },
2181 2519
2182 { 0.74F, 0.65F, 0.41F }, 2520 { 0.74f, 0.65f, 0.41f },
2183 2521
2184 { 0.00F, 1.00F, 1.00F }, 2522 { 0.00f, 1.00f, 1.00f },
2185 { 1.00F, 0.00F, 1.00F }, 2523 { 1.00f, 0.00f, 1.00f },
2186 { 1.00F, 1.00F, 0.00F }, 2524 { 1.00f, 1.00f, 0.00f },
2187 }; 2525 };
2188 2526
2189 int x, y; 2527 int x, y;
2190 2528
2191 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 */
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2536 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2193 glEnable (GL_BLEND); 2537 glEnable (GL_BLEND);
2194 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2538 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2195 glBegin (GL_QUADS); 2539 glBegin (GL_QUADS);
2196 2540
2197 for (y = 0; y < h; y++) 2541 for (y = 0; y < h; y++)
2201 2545
2202 if (m) 2546 if (m)
2203 { 2547 {
2204 float *c = color [m & 15]; 2548 float *c = color [m & 15];
2205 2549
2206 float tx1 = m & 0x40 ? 0.5 : 0.; 2550 float tx1 = m & 0x40 ? 0.5f : 0.f;
2207 float tx2 = tx1 + 0.5; 2551 float tx2 = tx1 + 0.5f;
2208 2552
2209 glColor4f (c[0], c[1], c[2], 0.75); 2553 glColor4f (c[0], c[1], c[2], 1);
2210 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2554 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2211 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2555 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2212 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2556 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2213 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2557 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2214 } 2558 }
2222void 2566void
2223fow_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)
2224 PPCODE: 2568 PPCODE:
2225{ 2569{
2226 int x, y; 2570 int x, y;
2227 int sw1 = sw + 2; 2571 int sw1 = sw + 2;
2228 int sh1 = sh + 2; 2572 int sh1 = sh + 2;
2229 int sh3 = sh * 3; 2573 int sh3 = sh * 3;
2230 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);
2231 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2577 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2232 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2578 memset (darkness1, 0, sw1*sh1);
2233 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2234 2579
2235 SvPOK_only (darkness3_sv); 2580 SvPOK_only (darkness3_sv);
2236 SvCUR_set (darkness3_sv, sw34 * sh3); 2581 SvCUR_set (darkness3_sv, sw3 * sh3);
2237 2582
2238 mx += self->x - 1; 2583 mx += self->x - 1;
2239 my += self->y - 1; 2584 my += self->y - 1;
2240
2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2242 2585
2243 for (y = 0; y < sh1; y++) 2586 for (y = 0; y < sh1; y++)
2244 if (0 <= y + my && y + my < self->rows) 2587 if (0 <= y + my && y + my < self->rows)
2245 { 2588 {
2246 maprow *row = self->row + (y + my); 2589 maprow *row = self->row + (y + my);
2249 if (row->c0 <= x + mx && x + mx < row->c1) 2592 if (row->c0 <= x + mx && x + mx < row->c1)
2250 { 2593 {
2251 mapcell *cell = row->col + (x + mx - row->c0); 2594 mapcell *cell = row->col + (x + mx - row->c0);
2252 2595
2253 darkness1 [y * sw1 + x] = cell->darkness 2596 darkness1 [y * sw1 + x] = cell->darkness
2254 ? 255 - (cell->darkness - 1) 2597 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2255 : 255 - FOW_DARKNESS; 2598 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2256 } 2599 }
2257 } 2600 }
2258 2601
2259 for (y = 0; y < sh; ++y) 2602 for (y = 0; y < sh; ++y)
2260 for (x = 0; x < sw; ++x) 2603 for (x = 0; x < sw; ++x)
2279 2622
2280 uint8_t r13 = (d13 + d23 + d12) / 3; 2623 uint8_t r13 = (d13 + d23 + d12) / 3;
2281 uint8_t r23 = d23; 2624 uint8_t r23 = d23;
2282 uint8_t r33 = (d23 + d33 + d32) / 3; 2625 uint8_t r33 = (d23 + d33 + d32) / 3;
2283 2626
2284 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2285 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2286 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2629 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2287 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2630 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2288 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 */
2289 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2632 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2290 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2291 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2292 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2635 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2293 } 2636 }
2294 2637
2295 free (darkness1); 2638 free (darkness1);
2296 2639
2297 EXTEND (SP, 3); 2640 EXTEND (SP, 3);
2298 PUSHs (sv_2mortal (newSViv (sw34))); 2641 PUSHs (sv_2mortal (newSViv (sw3)));
2299 PUSHs (sv_2mortal (newSViv (sh3))); 2642 PUSHs (sv_2mortal (newSViv (sh3)));
2300 PUSHs (darkness3_sv); 2643 PUSHs (darkness3_sv);
2301} 2644}
2302 2645
2303SV * 2646SV *
2366 else 2709 else
2367 *data++ = 0; 2710 *data++ = 0;
2368 } 2711 }
2369 } 2712 }
2370 2713
2371 /* 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 */
2372 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2715 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2373 { 2716 {
2374 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2375 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2376 } 2719 }
2377 2720
2378 RETVAL = data_sv; 2721 RETVAL = data_sv;
2379} 2722}
2380 OUTPUT: 2723 OUTPUT:
2381 RETVAL 2724 RETVAL
2382 2725
2383void 2726void
2390 STRLEN len; 2733 STRLEN len;
2391 uint8_t *data, *end; 2734 uint8_t *data, *end;
2392 2735
2393 len = SvLEN (data_sv); 2736 len = SvLEN (data_sv);
2394 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2737 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2395 data = SvPVbyte_nolen (data_sv); 2738 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2396 end = data + len + 8; 2739 end = data + len + 8;
2397 2740
2398 if (len < 5) 2741 if (len < 5)
2399 XSRETURN_EMPTY; 2742 XSRETURN_EMPTY;
2400 2743
2444 2787
2445 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2446 { 2789 {
2447 tileid t = tile [z]; 2790 tileid t = tile [z];
2448 2791
2449 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2450 { 2793 {
2451 PUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2452 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2453 } 2796 }
2454 2797
2455 cell->tile [z] = t; 2798 cell->tile[z] = t;
2456 } 2799 }
2457 } 2800 }
2458 } 2801 }
2459 } 2802 }
2460 } 2803 }
2461} 2804}
2462 2805
2463MODULE = Deliantra::Client PACKAGE = DC::RW 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2464 2807
2465DC::RW 2808DC::RW
2466new (SV *class, SV *data_sv) 2809new (SV *klass, SV *data_sv)
2467 CODE: 2810 CODE:
2468{ 2811{
2469 STRLEN datalen; 2812 STRLEN datalen;
2470 char *data = SvPVbyte (data_sv, datalen); 2813 char *data = SvPVbyte (data_sv, datalen);
2471 2814
2473} 2816}
2474 OUTPUT: 2817 OUTPUT:
2475 RETVAL 2818 RETVAL
2476 2819
2477DC::RW 2820DC::RW
2478new_from_file (SV *class, const char *path, const char *mode = "rb") 2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2479 CODE: 2822 CODE:
2480 RETVAL = SDL_RWFromFile (path, mode); 2823 RETVAL = SDL_RWFromFile (path, mode);
2481 OUTPUT: 2824 OUTPUT:
2482 RETVAL 2825 RETVAL
2483 2826
2501 if (RETVAL < 0) 2844 if (RETVAL < 0)
2502 { 2845 {
2503 RETVAL = Mix_GroupOldest (-1); 2846 RETVAL = Mix_GroupOldest (-1);
2504 2847
2505 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)
2506 XSRETURN_UNDEF; 2854 XSRETURN_UNDEF;
2507 2855 }
2856 else
2508 Mix_HaltChannel (RETVAL); 2857 Mix_HaltChannel (RETVAL);
2509 } 2858 }
2510 2859
2511 Mix_UnregisterAllEffects (RETVAL); 2860 Mix_UnregisterAllEffects (RETVAL);
2512 Mix_Volume (RETVAL, 128); 2861 Mix_Volume (RETVAL, 128);
2513} 2862}
2560void 2909void
2561set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2910set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2562 CODE: 2911 CODE:
2563{ 2912{
2564 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));
2565 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;
2566 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2915 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2567} 2916}
2568 2917
2569void 2918void
2570set_reverse_stereo (DC::Channel self, int flip) 2919set_reverse_stereo (DC::Channel self, int flip)
2573 2922
2574MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2923MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2575 2924
2576PROTOTYPES: DISABLE 2925PROTOTYPES: DISABLE
2577 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
2578DC::MixChunk 2939DC::MixChunk
2579new (SV *class, DC::RW rwops) 2940new (SV *klass, DC::RW rwops)
2580 CODE: 2941 CODE:
2581 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2582 OUTPUT: 2943 OUTPUT:
2583 RETVAL 2944 RETVAL
2584 2945
2614 OUTPUT: 2975 OUTPUT:
2615 RETVAL 2976 RETVAL
2616 2977
2617MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2978MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2618 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
2619int 2992int
2620volume (int volume = -1) 2993volume (int volume = -1)
2621 PROTOTYPE: ;$ 2994 PROTOTYPE: ;$
2622 CODE: 2995 CODE:
2623 if (items > 0) 2996 if (items > 0)
2634void 3007void
2635halt () 3008halt ()
2636 CODE: 3009 CODE:
2637 Mix_HaltMusic (); 3010 Mix_HaltMusic ();
2638 3011
3012int
3013playing ()
3014 CODE:
3015 RETVAL = Mix_PlayingMusic ();
3016 OUTPUT:
3017 RETVAL
3018
2639DC::MixMusic 3019DC::MixMusic
2640new (SV *class, DC::RW rwops) 3020new (SV *klass, DC::RW rwops)
2641 CODE: 3021 CODE:
2642 RETVAL = Mix_LoadMUS_RW (rwops); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
2643 OUTPUT: 3023 OUTPUT:
2644 RETVAL 3024 RETVAL
2645 3025
2673 } *civ, const_iv[] = { 3053 } *civ, const_iv[] = {
2674# define const_iv(name) { # name, (IV)name } 3054# define const_iv(name) { # name, (IV)name }
2675 const_iv (GL_VENDOR), 3055 const_iv (GL_VENDOR),
2676 const_iv (GL_VERSION), 3056 const_iv (GL_VERSION),
2677 const_iv (GL_EXTENSIONS), 3057 const_iv (GL_EXTENSIONS),
3058 const_iv (GL_MAX_TEXTURE_UNITS),
2678 const_iv (GL_COLOR_MATERIAL), 3059 const_iv (GL_COLOR_MATERIAL),
2679 const_iv (GL_SMOOTH), 3060 const_iv (GL_SMOOTH),
2680 const_iv (GL_FLAT), 3061 const_iv (GL_FLAT),
2681 const_iv (GL_DITHER), 3062 const_iv (GL_DITHER),
2682 const_iv (GL_BLEND), 3063 const_iv (GL_BLEND),
2694 const_iv (GL_ZERO), 3075 const_iv (GL_ZERO),
2695 const_iv (GL_SRC_ALPHA), 3076 const_iv (GL_SRC_ALPHA),
2696 const_iv (GL_DST_ALPHA), 3077 const_iv (GL_DST_ALPHA),
2697 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3078 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2698 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),
2699 const_iv (GL_SRC_ALPHA_SATURATE), 3084 const_iv (GL_SRC_ALPHA_SATURATE),
2700 const_iv (GL_RGB), 3085 const_iv (GL_RGB),
2701 const_iv (GL_RGBA), 3086 const_iv (GL_RGBA),
2702 const_iv (GL_RGBA4), 3087 const_iv (GL_RGBA4),
2703 const_iv (GL_RGBA8), 3088 const_iv (GL_RGBA8),
2771 const_iv (GL_NICEST), 3156 const_iv (GL_NICEST),
2772 const_iv (GL_V2F), 3157 const_iv (GL_V2F),
2773 const_iv (GL_V3F), 3158 const_iv (GL_V3F),
2774 const_iv (GL_T2F_V3F), 3159 const_iv (GL_T2F_V3F),
2775 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),
2776# undef const_iv 3164# undef const_iv
2777 }; 3165 };
2778 3166
2779 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--)
2780 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3168 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2781 3169
2782 texture_av = newAV (); 3170 texture_av = newAV ();
2783 AvREAL_off (texture_av); 3171 AvREAL_off (texture_av);
2784} 3172}
2785 3173
2787disable_GL_EXT_blend_func_separate () 3175disable_GL_EXT_blend_func_separate ()
2788 CODE: 3176 CODE:
2789 gl.BlendFuncSeparate = 0; 3177 gl.BlendFuncSeparate = 0;
2790 gl.BlendFuncSeparateEXT = 0; 3178 gl.BlendFuncSeparateEXT = 0;
2791 3179
2792char * 3180void
3181apple_nvidia_bug (int enable)
3182
3183const char *
2793gl_vendor () 3184gl_vendor ()
2794 CODE: 3185 CODE:
2795 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
2796 OUTPUT: 3187 OUTPUT:
2797 RETVAL 3188 RETVAL
2798 3189
2799char * 3190const char *
2800gl_version () 3191gl_version ()
2801 CODE: 3192 CODE:
2802 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
2803 OUTPUT: 3194 OUTPUT:
2804 RETVAL 3195 RETVAL
2805 3196
2806char * 3197const char *
2807gl_extensions () 3198gl_extensions ()
2808 CODE: 3199 CODE:
2809 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2810 OUTPUT: 3201 OUTPUT:
2811 RETVAL 3202 RETVAL
2812 3203
2813const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
2814 3209
2815GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
2816 CODE: 3211 CODE:
2817 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
2818 OUTPUT: 3213 OUTPUT:
2826 3221
2827int glGetError () 3222int glGetError ()
2828 3223
2829void glFinish () 3224void glFinish ()
2830 3225
3226void glFlush ()
3227
2831void glClear (int mask) 3228void glClear (int mask)
2832 3229
2833void glClearColor (float r, float g, float b, float a = 1.0) 3230void glClearColor (float r, float g, float b, float a = 1.0)
2834 PROTOTYPE: @ 3231 PROTOTYPE: @
2835 3232
2844void glBlendFunc (int sfactor, int dfactor) 3241void glBlendFunc (int sfactor, int dfactor)
2845 3242
2846void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3243void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2847 CODE: 3244 CODE:
2848 gl_BlendFuncSeparate (sa, da, saa, daa); 3245 gl_BlendFuncSeparate (sa, da, saa, daa);
3246
3247# void glBlendEquation (int se)
2849 3248
2850void glDepthMask (int flag) 3249void glDepthMask (int flag)
2851 3250
2852void glLogicOp (int opcode) 3251void glLogicOp (int opcode)
2853 3252
2888void glRotate (float angle, float x, float y, float z) 3287void glRotate (float angle, float x, float y, float z)
2889 CODE: 3288 CODE:
2890 glRotatef (angle, x, y, z); 3289 glRotatef (angle, x, y, z);
2891 3290
2892void 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: @
2893 ALIAS: 3293 ALIAS:
2894 glColor_premultiply = 1 3294 glColor_premultiply = 1
2895 CODE: 3295 CODE:
2896 if (ix) 3296 if (ix)
2897 { 3297 {
3003 3403
3004void glEndList () 3404void glEndList ()
3005 3405
3006void glCallList (int list) 3406void glCallList (int list)
3007 3407
3408void c_init ()
3409 CODE:
3410 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3411 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3412
3008MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3413MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3009 3414
3010PROTOTYPES: DISABLE 3415PROTOTYPES: DISABLE
3011 3416
3012void 3417void
3013find_widget (SV *self, NV x, NV y) 3418find_widget (SV *self, NV x, NV y)
3014 PPCODE: 3419 PPCODE:
3015{ 3420{
3016 if (within_widget (self, x, y)) 3421 if (within_widget (self, x, y))
3017 XPUSHs (self); 3422 XPUSHs (self);
3018} 3423}
3019 3424
3020BOOT: 3425BOOT:
3021{ 3426{
3029 3434
3030void 3435void
3031draw (SV *self) 3436draw (SV *self)
3032 CODE: 3437 CODE:
3033{ 3438{
3034 HV *hv; 3439 HV *hv;
3035 SV **svp; 3440 SV **svp;
3036 NV x, y, w, h; 3441 NV x, y, w, h;
3037 SV *draw_x_sv = GvSV (draw_x_gv); 3442 SV *draw_x_sv = GvSV (draw_x_gv);
3038 SV *draw_y_sv = GvSV (draw_y_gv); 3443 SV *draw_y_sv = GvSV (draw_y_gv);
3039 SV *draw_w_sv = GvSV (draw_w_gv); 3444 SV *draw_w_sv = GvSV (draw_w_gv);
3040 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