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.275 by root, Thu Aug 28 00:53:53 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>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 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);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
83 89
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 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 */
86#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
87 96
88#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
90 99
91#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
92 101
93/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
94#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}
95 128
96static AV *texture_av; 129static AV *texture_av;
97 130
98static struct 131static struct
99{ 132{
156{ 189{
157 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
158 191
159 while (attrs) 192 while (attrs)
160 { 193 {
161 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
162 195
163 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
164 return 1; 197 return 1;
165 198
166 attrs = attrs->next; 199 attrs = attrs->next;
167 } 200 }
168 201
169 return 0; 202 return 0;
170} 203}
171 204
172typedef struct cf_layout { 205struct cf_layout {
173 PangoLayout *pl; 206 PangoLayout *pl;
174 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
175 int base_height; 208 int base_height;
176 DC__Font font; 209 DC__Font font;
177 rc_t *rc; 210 rc_t rc;
178} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
179 214
180static DC__Font default_font; 215static DC__Font default_font;
181static PangoContext *opengl_context; 216static PangoContext *opengl_context;
182static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
183 218
184static void 219static void
185substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
186{ 221{
187 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
188#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
189 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190#endif 225#endif
191 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192} 227}
193 228
194static void 229static void
224} 259}
225 260
226typedef uint16_t tileid; 261typedef uint16_t tileid;
227typedef uint16_t faceid; 262typedef uint16_t faceid;
228 263
229typedef struct { 264struct maptex
265{
230 GLuint name; 266 GLuint name;
231 int w, h; 267 int w, h;
232 float s, t; 268 float s, t;
233 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
234 tileid smoothtile; 270 tileid smoothtile;
235 uint8_t smoothlevel; 271 uint8_t smoothlevel;
236} maptex; 272 uint8_t unused; /* set to zero on use */
273};
237 274
238typedef struct { 275struct mapcell
276{
239 uint32_t player; 277 uint32_t player;
240 tileid tile[3]; 278 tileid tile[3];
241 uint16_t darkness; 279 uint16_t darkness;
242 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
243} mapcell; 281};
244 282
245typedef struct { 283struct maprow
284{
246 int32_t c0, c1; 285 int32_t c0, c1;
247 mapcell *col; 286 mapcell *col;
248} maprow; 287};
249 288
250typedef struct map { 289struct mapgrid {
251 int x, y, w, h; 290 int x, y, w, h;
252 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
253 int faces; tileid *face2tile; // [faceid] 292 std::vector<tileid> tile;
254 int texs; maptex *tex; // [tileid] 293 std::vector<maptex> tex;
255 294
256 int32_t rows; 295 int32_t rows;
257 maprow *row; 296 maprow *row;
258} *DC__Map; 297
298 ~mapgrid ()
299 {
300 clear_cells ();
301 }
302
303 void clear_cells ();
304};
305
306typedef mapgrid *DC__Map;
259 307
260static char * 308static char *
261prepend (char *ptr, int sze, int inc) 309prepend (char *ptr, int sze, int inc)
262{ 310{
263 char *p; 311 char *p;
280} 328}
281 329
282#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))
283#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))
284 332
285static void
286need_facenum (struct map *self, faceid face)
287{
288 while (self->faces <= face)
289 {
290 Append (tileid, self->face2tile, self->faces, self->faces);
291 self->faces *= 2;
292 }
293}
294
295static void
296need_texid (struct map *self, int texid)
297{
298 while (self->texs <= texid)
299 {
300 Append (maptex, self->tex, self->texs, self->texs);
301 self->texs *= 2;
302 }
303}
304
305static maprow * 333static maprow *
306map_get_row (DC__Map self, int y) 334map_get_row (mapgrid *self, int y)
307{ 335{
308 if (0 > y) 336 if (0 > y)
309 { 337 {
310 int extend = - y + MAP_EXTEND_Y; 338 int extend = - y + MAP_EXTEND_Y;
311 Prepend (maprow, self->row, self->rows, extend); 339 Prepend (maprow, self->row, self->rows, extend);
349 377
350 return row->col + (x - row->c0); 378 return row->col + (x - row->c0);
351} 379}
352 380
353static mapcell * 381static mapcell *
354map_get_cell (DC__Map self, int x, int y) 382map_get_cell (mapgrid *self, int x, int y)
355{ 383{
356 return row_get_cell (map_get_row (self, y), x); 384 return row_get_cell (map_get_row (self, y), x);
357} 385}
358 386
359static void 387void mapgrid::clear_cells ()
360map_clear (DC__Map self)
361{ 388{
362 int r; 389 int r;
363 390
364 for (r = 0; r < self->rows; r++) 391 for (r = 0; r < rows; r++)
365 Safefree (self->row[r].col); 392 Safefree (row[r].col);
366 393
367 Safefree (self->row); 394 Safefree (row);
368 395
369 self->x = 0; 396 x = 0;
370 self->y = 0; 397 y = 0;
371 self->ox = 0; 398 ox = 0;
372 self->oy = 0; 399 oy = 0;
373 self->row = 0; 400 row = 0;
374 self->rows = 0; 401 rows = 0;
375} 402}
376 403
377#define CELL_CLEAR(cell) \ 404#define CELL_CLEAR(cell) \
378 do { \ 405 do { \
379 if ((cell)->player) \ 406 if ((cell)->player) \
383 (cell)->flags = 0; \ 410 (cell)->flags = 0; \
384 (cell)->player = 0; \ 411 (cell)->player = 0; \
385 } while (0) 412 } while (0)
386 413
387static void 414static void
388map_blank (DC__Map self, int x0, int y0, int w, int h) 415map_blank (mapgrid *self, int x0, int y0, int w, int h)
389{ 416{
390 int x, y; 417 int x, y;
391 maprow *row; 418 maprow *row;
392 mapcell *cell; 419 mapcell *cell;
393 420
410 CELL_CLEAR (cell); 437 CELL_CLEAR (cell);
411 } 438 }
412 } 439 }
413} 440}
414 441
415typedef struct { 442struct smooth_key
443{
416 tileid tile; 444 tileid tile;
417 uint8_t x, y, level; 445 uint8_t x, y, level;
418} 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}
419 465
420static void 466static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 467smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 468{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 469 auto &&it = h.find (key);
424 470
425 if (SvIOK (*sv)) 471 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 472 h.insert (std::make_pair (key, bits));
427 else 473 else
428 sv_setiv (*sv, bits); 474 it->second |= bits;
429} 475}
430 476
431static void 477static void
432music_finished (void) 478music_finished (void)
433{ 479{
450 ev.code = 1; 496 ev.code = 1;
451 ev.data1 = (void *)(long)channel; 497 ev.data1 = (void *)(long)channel;
452 ev.data2 = 0; 498 ev.data2 = 0;
453 499
454 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;
455} 508}
456 509
457static unsigned int 510static unsigned int
458minpot (unsigned int n) 511minpot (unsigned int n)
459{ 512{
527 return 0; 580 return 0;
528 581
529 return 1; 582 return 1;
530} 583}
531 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
532static void 599static void
533deliantra_main () 600deliantra_main (SV *real_main)
534{ 601{
535 char *argv[] = { 0 }; 602 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 603
604 PUSHMARK (SP);
605 call_sv (real_main, G_DISCARD | G_VOID);
537} 606}
538 607
539#ifdef __MACOSX__ 608#ifdef __MACOSX__
609 static SV *real_main;
610
540 /* to due surprising braindamage on the side of SDL design, we 611 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 612 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which, 613 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 614 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 615 * and which calls our main (== SDL_main) back.
545 */ 616 */
546 extern C_LINKAGE int 617 extern C_LINKAGE int
547 main (int argc, char *argv[]) 618 main (int argc, char *argv[])
548 { 619 {
549 deliantra_main (); 620 deliantra_main (real_main);
550 } 621 }
551 622
552 #undef main 623 #undef main
553 624
554 extern C_LINKAGE int main (int argc, char *argv[]); 625 extern C_LINKAGE int main (int argc, char *argv[]);
555 626
556 static void 627 static void
557 SDL_braino (void) 628 SDL_main_hack (SV *real_main_)
558 { 629 {
630 real_main = real_main_;
631
559 char *argv[] = { "deliantra client", 0 }; 632 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 633 (main) (1, argv);
561 } 634 }
562#else 635#else
563 static void 636 static void
564 SDL_braino (void) 637 SDL_main_hack (SV *real_main)
565 { 638 {
566 deliantra_main (); 639 deliantra_main (real_main);
567 } 640 }
568#endif 641#endif
569 642
570MODULE = Deliantra::Client PACKAGE = DC 643MODULE = Deliantra::Client PACKAGE = DC
571 644
737 const_iv (KMOD_RMETA), 810 const_iv (KMOD_RMETA),
738 const_iv (KMOD_NUM), 811 const_iv (KMOD_NUM),
739 const_iv (KMOD_CAPS), 812 const_iv (KMOD_CAPS),
740 const_iv (KMOD_MODE), 813 const_iv (KMOD_MODE),
741 814
815 const_iv (KMOD_LRAM),
816
742 const_iv (MIX_DEFAULT_FORMAT), 817 const_iv (MIX_DEFAULT_FORMAT),
743 818
744 const_iv (SDL_INIT_TIMER), 819 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO), 820 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO), 821 const_iv (SDL_INIT_VIDEO),
770 845
771 const_iv (FOW_DARKNESS) 846 const_iv (FOW_DARKNESS)
772# undef const_iv 847# undef const_iv
773 }; 848 };
774 849
775 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--)
776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 851 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
777 852
778 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 853 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
779 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 854 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
780} 855}
781 856
797NV ceil (NV x) 872NV ceil (NV x)
798 873
799IV minpot (UV n) 874IV minpot (UV n)
800 875
801IV 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
802 883
803void 884void
804pango_init () 885pango_init ()
805 CODE: 886 CODE:
806{ 887{
814#endif 895#endif
815} 896}
816 897
817char *SDL_GetError () 898char *SDL_GetError ()
818 899
819void SDL_braino () 900void SDL_main_hack (SV *real_main)
901 PROTOTYPE: &
820 902
821int SDL_Init (U32 flags) 903int SDL_Init (U32 flags)
822 904
823int SDL_InitSubSystem (U32 flags) 905int SDL_InitSubSystem (U32 flags)
824 906
825void SDL_QuitSubSystem (U32 flags) 907void SDL_QuitSubSystem (U32 flags)
826 908
827void SDL_Quit () 909void SDL_Quit ()
828 910
829int SDL_GL_SetAttribute (int attr, int value) 911int SDL_GL_SetAttribute (int attr, int value)
912 C_ARGS: (SDL_GLattr)attr, value
830 913
831int SDL_GL_GetAttribute (int attr) 914int SDL_GL_GetAttribute (int attr)
832 CODE: 915 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL)) 916 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
834 XSRETURN_UNDEF; 917 XSRETURN_UNDEF;
835 OUTPUT: 918 OUTPUT:
836 RETVAL 919 RETVAL
837 920
838void 921void
893 ); 976 );
894 977
895 if (RETVAL) 978 if (RETVAL)
896 { 979 {
897 av_clear (texture_av); 980 av_clear (texture_av);
898
899 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
900#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);
901#include "glfunc.h" 982#include "glfunc.h"
902#undef GL_FUNC 983#undef GL_FUNC
984 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
985 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903 } 986 }
904} 987}
905 OUTPUT: 988 OUTPUT:
906 RETVAL 989 RETVAL
990
991void
992SDL_WM_SetCaption (const char *title, const char *icon)
907 993
908void 994void
909SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
910 996
911char * 997char *
912SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
913 1000
914int 1001int
915SDL_GetAppState () 1002SDL_GetAppState ()
916 1003
917int 1004int
918SDL_GetModState () 1005SDL_GetModState ()
919 1006
1007int
1008SDL_WaitEvent ()
1009 C_ARGS: 0
1010
920void 1011void
1012SDL_PumpEvents ()
1013
1014void
921poll_events () 1015peep_events ()
922 PPCODE: 1016 PPCODE:
923{ 1017{
924 SDL_Event ev; 1018 SDL_Event ev;
925 1019
926 SDL_PumpEvents (); 1020 SDL_PumpEvents ();
933 { 1027 {
934 case SDL_KEYDOWN: 1028 case SDL_KEYDOWN:
935 case SDL_KEYUP: 1029 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1030 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1031 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
938 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);
939 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 */
940 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1034 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 1035 break;
942 1036
943 case SDL_ACTIVEEVENT: 1037 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1038 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
962 x = ev.motion.x; 1056 x = ev.motion.x;
963 y = ev.motion.y; 1057 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1058 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 1059 }
966 1060
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1061 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 1062 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 1063 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 1064 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1065 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1066 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
992 1086
993 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))));
994 } 1088 }
995} 1089}
996 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
997int 1104int
998Mix_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)
999 POSTCALL: 1106 POSTCALL:
1000 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
1001 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
1002 1109
1003void 1110void
1004Mix_QuerySpec () 1111Mix_QuerySpec ()
1063add_font (char *file) 1170add_font (char *file)
1064 CODE: 1171 CODE:
1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1172 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT: 1173 OUTPUT:
1067 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)
1068 1182
1069void 1183void
1070load_image_inline (SV *image_) 1184load_image_inline (SV *image_)
1071 ALIAS: 1185 ALIAS:
1072 load_image_file = 1 1186 load_image_file = 1
1118 1232
1119 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
1120 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
1121 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
1122 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
1123 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1124 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)));
1125 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1126 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1127 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
1128 1242
1188#if DEBUG 1302#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1303 VALGRIND_DO_LEAK_CHECK;
1190#endif 1304#endif
1191} 1305}
1192 1306
1307int
1308SvREFCNT (SV *sv)
1309 CODE:
1310 RETVAL = SvREFCNT (sv);
1311 OUTPUT:
1312 RETVAL
1313
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1314MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1315
1195PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1196 1317
1197DC::Font 1318DC::Font
1198new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
1199 CODE: 1320 CODE:
1200{ 1321{
1201 int count; 1322 int count;
1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1203 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1232 PROTOTYPE: 1353 PROTOTYPE:
1233 CODE: 1354 CODE:
1234 tc_restore (); 1355 tc_restore ();
1235 1356
1236DC::Layout 1357DC::Layout
1237new (SV *class) 1358new (SV *klass)
1238 CODE: 1359 CODE:
1239 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
1240 1361
1241 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
1242 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
1243 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
1244 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
1245 RETVAL->a = 1.; 1366 RETVAL->a = 1.;
1246 RETVAL->base_height = MIN_FONT_HEIGHT; 1367 RETVAL->base_height = MIN_FONT_HEIGHT;
1247 RETVAL->font = 0; 1368 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
1249 1369
1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1370 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1251 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
1252 OUTPUT: 1372 OUTPUT:
1253 RETVAL 1373 RETVAL
1254 1374
1255void 1375void
1256DESTROY (DC::Layout self) 1376DESTROY (DC::Layout self)
1257 CODE: 1377 CODE:
1258 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
1259 rc_free (self->rc);
1260 Safefree (self); 1379 delete self;
1261 1380
1262void 1381void
1263set_text (DC::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
1264 CODE: 1383 CODE:
1265{ 1384{
1391 1510
1392void 1511void
1393set_height (DC::Layout self, int base_height) 1512set_height (DC::Layout self, int base_height)
1394 CODE: 1513 CODE:
1395 if (self->base_height != base_height) 1514 if (self->base_height != base_height)
1396 { 1515 {
1397 self->base_height = base_height; 1516 self->base_height = base_height;
1398 layout_update_font (self); 1517 layout_update_font (self);
1399 } 1518 }
1400 1519
1401void 1520void
1519} 1638}
1520 1639
1521void 1640void
1522render (DC::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1523 CODE: 1642 CODE:
1524 rc_clear (self->rc); 1643 self->rc.clear ();
1525 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1526 self->pl, 1645 self->pl,
1527 self->rc, 1646 &self->rc,
1528 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1529 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1530 flags 1649 flags
1531 ); 1650 );
1532 // we assume that context_change actually clears/frees stuff 1651 // we assume that context_change actually clears/frees stuff
1543 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1662 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1544 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1663 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1545 glEnable (GL_ALPHA_TEST); 1664 glEnable (GL_ALPHA_TEST);
1546 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1665 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1547 1666
1548 rc_draw (self->rc); 1667 self->rc.draw ();
1549 1668
1550 glDisable (GL_ALPHA_TEST); 1669 glDisable (GL_ALPHA_TEST);
1551 glDisable (GL_BLEND); 1670 glDisable (GL_BLEND);
1552 glDisable (GL_TEXTURE_2D); 1671 glDisable (GL_TEXTURE_2D);
1553} 1672}
1628 glDisable (GL_ALPHA_TEST); 1747 glDisable (GL_ALPHA_TEST);
1629 glDisable (GL_BLEND); 1748 glDisable (GL_BLEND);
1630 } 1749 }
1631} 1750}
1632 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
1633IV 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)
1634 CODE: 1874 CODE:
1635{ 1875{
1636 GLint width; 1876 GLint width;
1637 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);
1644MODULE = Deliantra::Client PACKAGE = DC::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1645 1885
1646PROTOTYPES: DISABLE 1886PROTOTYPES: DISABLE
1647 1887
1648DC::Map 1888DC::Map
1649new (SV *class) 1889new (SV *klass)
1650 CODE: 1890 CODE:
1651 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1652 RETVAL->x = 0; 1892 RETVAL->x = 0;
1653 RETVAL->y = 0; 1893 RETVAL->y = 0;
1654 RETVAL->w = 0; 1894 RETVAL->w = 0;
1655 RETVAL->h = 0; 1895 RETVAL->h = 0;
1656 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1657 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1658 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1659 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1660 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1661 RETVAL->row = 0; 1899 RETVAL->row = 0;
1662 OUTPUT: 1900 OUTPUT:
1663 RETVAL 1901 RETVAL
1664 1902
1665void 1903void
1666DESTROY (DC::Map self) 1904DESTROY (DC::Map self)
1667 CODE: 1905 CODE:
1668{ 1906{
1669 map_clear (self);
1670 Safefree (self->face2tile);
1671 Safefree (self->tex);
1672 Safefree (self); 1907 delete self;
1673} 1908}
1674 1909
1675void 1910void
1676resize (DC::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1677 CODE: 1912 CODE:
1679 self->h = map_height; 1914 self->h = map_height;
1680 1915
1681void 1916void
1682clear (DC::Map self) 1917clear (DC::Map self)
1683 CODE: 1918 CODE:
1684 map_clear (self); 1919 self->clear_cells ();
1685 1920
1686void 1921void
1687set_tileid (DC::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1688 CODE: 1923 CODE:
1689{ 1924{
1690 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1691 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1692} 1928}
1693 1929
1694void 1930void
1695set_smooth (DC::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1696 CODE: 1932 CODE:
1697{ 1933{
1698 tileid texid;
1699 maptex *tex;
1700
1701 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1702 return; 1935 return;
1703 1936
1704 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1705 return; 1938 return;
1706 1939
1707 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1708 1941
1709 if (!texid) 1942 if (!texid)
1710 return; 1943 return;
1711 1944
1712 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1713 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1714 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1715} 1948}
1716 1949
1717void 1950void
1718set_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)
1719 CODE: 1952 CODE:
1720{ 1953{
1721 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1722 1955
1723 { 1956 {
1724 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1725 1958
1726 tex->name = name; 1959 tex.name = name;
1727 tex->w = w; 1960 tex.w = w;
1728 tex->h = h; 1961 tex.h = h;
1729 tex->s = s; 1962 tex.s = s;
1730 tex->t = t; 1963 tex.t = t;
1731 tex->r = r; 1964 tex.r = r;
1732 tex->g = g; 1965 tex.g = g;
1733 tex->b = b; 1966 tex.b = b;
1734 tex->a = a; 1967 tex.a = a;
1735 } 1968 }
1736 1969
1737 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1738 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1739 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
1741 //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);
1742 // use uglier nearest interpolation because linear suffers 1975 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1976 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1977 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 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 }
1746 1999
1747int 2000int
1748ox (DC::Map self) 2001ox (DC::Map self)
1749 ALIAS: 2002 ALIAS:
1750 oy = 1 2003 oy = 1
1790 self->y += MAP_EXTEND_Y; 2043 self->y += MAP_EXTEND_Y;
1791 } 2044 }
1792} 2045}
1793 2046
1794SV * 2047SV *
1795map1a_update (DC::Map self, SV *data_, int extmap) 2048map1a_update (DC::Map self, SV *data_)
1796 CODE: 2049 CODE:
1797{ 2050{
1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2051 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1799 uint8_t *data_end = (uint8_t *)SvEND (data_); 2052 uint8_t *data_end = (uint8_t *)SvEND (data_);
1800 mapcell *cell; 2053 mapcell *cell;
1821 2074
1822 //TODO: don't trust server data to be in-range(!) 2075 //TODO: don't trust server data to be in-range(!)
1823 2076
1824 if (flags & 8) 2077 if (flags & 8)
1825 { 2078 {
2079 uint8_t ext, cmd;
2080
1826 if (extmap) 2081 do
1827 { 2082 {
1828 uint8_t ext, cmd; 2083 ext = *data++;
2084 cmd = ext & 0x7f;
1829 2085
1830 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
1831 { 2089 {
1832 ext = *data++;
1833 cmd = ext & 0x7f;
1834
1835 if (cmd < 4)
1836 cell->darkness = 255 - ext * 64 + 1;
1837 else if (cmd == 5) // health
1838 {
1839 cell->stat_width = 1; 2090 cell->stat_width = 1;
1840 cell->stat_hp = *data++; 2091 cell->stat_hp = *data++;
1841 }
1842 else if (cmd == 6) // monster width
1843 cell->stat_width = *data++ + 1;
1844 else if (cmd == 0x47)
1845 {
1846 if (*data == 1) cell->player = data [1];
1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1850
1851 data += *data + 1;
1852 }
1853 else if (cmd == 8) // cell flags
1854 cell->flags = *data++;
1855 else if (ext & 0x40) // unknown, multibyte => skip
1856 data += *data + 1;
1857 else
1858 data++;
1859 } 2092 }
1860 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++;
1861 } 2110 }
1862 else 2111 while (ext & 0x80);
1863 cell->darkness = *data++ + 1;
1864 } 2112 }
1865 2113
1866 for (z = 0; z <= 2; ++z) 2114 for (z = 0; z <= 2; ++z)
1867 if (flags & (4 >> z)) 2115 if (flags & (4 >> z))
1868 { 2116 {
1869 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
1870 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
1871 cell->tile [z] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
1872 2120
1873 if (cell->tile [z]) 2121 if (cell->tile[z])
1874 { 2122 {
1875 maptex *tex = self->tex + cell->tile [z]; 2123 maptex &tex = self->tex[cell->tile[z]];
2124 tex.unused = 0;
1876 if (!tex->name) 2125 if (!tex.name)
1877 av_push (missing, newSViv (cell->tile [z])); 2126 av_push (missing, newSViv (cell->tile [z]));
1878 2127
1879 if (tex->smoothtile) 2128 if (tex.smoothtile)
1880 { 2129 {
1881 maptex *smooth = self->tex + tex->smoothtile; 2130 maptex &smooth = self->tex[tex.smoothtile];
2131 smooth.unused = 0;
1882 if (!smooth->name) 2132 if (!smooth.name)
1883 av_push (missing, newSViv (tex->smoothtile)); 2133 av_push (missing, newSViv (tex.smoothtile));
1884 } 2134 }
1885 } 2135 }
1886 } 2136 }
1887 } 2137 }
1888 else 2138 else
1914 ? self->row + y 2164 ? self->row + y
1915 : 0; 2165 : 0;
1916 2166
1917 for (x = x0; x < x1; x++) 2167 for (x = x0; x < x1; x++)
1918 { 2168 {
1919 int r = 32, g = 32, b = 32, a = 192; 2169 unsigned int r = 32, g = 32, b = 32, a = 192;
1920 2170
1921 if (row && row->c0 <= x && x < row->c1) 2171 if (row && row->c0 <= x && x < row->c1)
1922 { 2172 {
1923 mapcell *cell = row->col + (x - row->c0); 2173 mapcell *cell = row->col + (x - row->c0);
1924 2174
1926 { 2176 {
1927 maptex tex = self->tex [cell->tile [z]]; 2177 maptex tex = self->tex [cell->tile [z]];
1928 int a0 = 255 - tex.a; 2178 int a0 = 255 - tex.a;
1929 int a1 = tex.a; 2179 int a1 = tex.a;
1930 2180
1931 r = (r * a0 + tex.r * a1) / 255; 2181 r = div255 (r * a0 + tex.r * a1);
1932 g = (g * a0 + tex.g * a1) / 255; 2182 g = div255 (g * a0 + tex.g * a1);
1933 b = (b * a0 + tex.b * a1) / 255; 2183 b = div255 (b * a0 + tex.b * a1);
1934 a = (a * a0 + tex.a * a1) / 255; 2184 a = div255 (a * a0 + tex.a * a1);
1935 } 2185 }
1936 } 2186 }
1937 2187
1938 *map++ = (r ) 2188 *map++ = (r )
1939 | (g << 8) 2189 | (g << 8)
1940 | (b << 16) 2190 | (b << 16)
1941 | (a << 24); 2191 | (a << 24);
1942 } 2192 }
1943 } 2193 }
1944 2194
1945 RETVAL = map_sv; 2195 RETVAL = map_sv;
1946} 2196}
1947 OUTPUT: 2197 OUTPUT:
1948 RETVAL 2198 RETVAL
1949 2199
1950void 2200void
1951draw (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)
1952 CODE: 2202 CODE:
1953{ 2203{
1954 int x, y, z; 2204 int x, y, z;
1955 2205
1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1958 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!
1959 smooth_key skey;
1960 int pl_x, pl_y; 2207 int pl_x, pl_y;
1961 maptex pl_tex; 2208 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2209 rc_t rc;
2210 rc_t rc_ov;
1963 rc_key_t key; 2211 rc_key_t key;
1964 rc_array_t *arr; 2212 rc_t::array_t *arr;
1965 2213
1966 pl_tex.name = 0; 2214 pl_tex.name = 0;
1967 2215
1968 // thats current max. sorry. 2216 // that's current max. sorry.
1969 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
1970 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
1971
1972 // clear key, in case of extra padding
1973 memset (&skey, 0, sizeof (skey));
1974 2219
1975 memset (&key, 0, sizeof (key)); 2220 memset (&key, 0, sizeof (key));
1976 key.r = 255; 2221 key.r = 255;
1977 key.g = 255; 2222 key.g = 255;
1978 key.b = 255; 2223 key.b = 255;
1979 key.a = 255; 2224 key.a = 255;
1980 key.mode = GL_QUADS; 2225 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2226 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2227
1984 mx += self->x; 2228 mx += self->x;
1985 my += self->y; 2229 my += self->y;
1986 2230
1987 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
1988 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
1989 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
1990 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1991 2235
1992 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
1994 { 2238 {
1995 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2256
2013 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
2014 { 2258 {
2015 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;
2016 2263
2017 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
2019 { 2266 {
2020 maprow *row = self->row + (y + my); 2267 maprow *row = self->row + (y + my);
2026 tileid tile = cell->tile [z]; 2273 tileid tile = cell->tile [z];
2027 2274
2028 if (tile) 2275 if (tile)
2029 { 2276 {
2030 maptex tex = self->tex [tile]; 2277 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2278 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2279
2034 if (key.texname != tex.name) 2280 if (key.texname != tex.name)
2035 { 2281 {
2282 self->tex [tile].unused = 0;
2283
2036 if (!tex.name) 2284 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2286
2039 key.texname = tex.name; 2287 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2288 arr = &rc.array (key);
2041 } 2289 }
2290
2291 px = (x + 1) * Th - tex.w;
2292 py = (y + 1) * Tw - tex.h;
2042 2293
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2294 if (expect_false (cell->player == player) && expect_false (z == 2))
2044 { 2295 {
2045 pl_x = px; 2296 pl_x = px;
2046 pl_y = py; 2297 pl_y = py;
2047 pl_tex = tex; 2298 pl_tex = tex;
2048 continue; 2299 continue;
2049 } 2300 }
2050 2301
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2302 arr->t2f_v3f (0 , 0 , px , py , 0);
2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2303 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2053 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);
2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2305 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2055
2056 if (expect_false (cell->flags) && expect_false (z == 2))
2057 {
2058 // overlays such as the speech bubble, probably more to come
2059 if (cell->flags & 1)
2060 {
2061 maptex tex = self->tex [1];
2062 int px = x * T + T * 2 / 32;
2063 int py = y * T - T * 6 / 32;
2064
2065 if (tex.name)
2066 {
2067 if (key.texname != tex.name)
2068 {
2069 key.texname = tex.name;
2070 arr = rc_array (rc, &key);
2071 }
2072
2073 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2077 }
2078 }
2079 }
2080 2306
2081 // update smooth hash 2307 // update smooth hash
2082 if (tex.smoothtile) 2308 if (tex.smoothtile)
2083 { 2309 {
2084 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
2086 2312
2087 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
2088 2314
2089 // 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
2090 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
2091 2317
2092 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
2100 2326
2101 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2102 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
2103 2329
2104 // full tile 2330 // full tile
2105 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);
2106 2332
2107 // borders 2333 // borders
2108 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);
2109 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);
2110 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);
2111 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);
2112 2338
2113 // corners 2339 // corners
2114 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);
2115 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);
2116 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);
2117 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);
2118 } 2364 }
2119 } 2365 }
2120 } 2366 }
2121 } 2367 }
2122 2368
2123 rc_draw (rc); 2369 rc.draw ();
2124 rc_clear (rc); 2370 rc.clear ();
2125 2371
2126 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
2127 // this is basically counting sort 2373 // this is basically counting sort
2128 { 2374 {
2129 int w, b; 2375 int w, b;
2130 2376
2131 glEnable (GL_TEXTURE_2D); 2377 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS); 2378 glBegin (GL_QUADS);
2133 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)
2134 { 2382 {
2135 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
2136 if (smask) 2384 IV bits = it->second;
2137 for (b = 0; b < 32; ++b) 2385
2138 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
2139 { 2389 {
2140 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
2141 HE *he; 2398 if (tex.name)
2142
2143 hv_iterinit (smooth);
2144 while ((he = hv_iternext (smooth)))
2145 { 2399 {
2146 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
2147 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
2148 2402 if (key.texname != tex.name)
2149 if (!(bits & 0x1000)
2150 && skey->level == level
2151 && level > smooth_max [skey->x][skey->y])
2152 { 2403 {
2153 maptex tex = self->tex [skey->tile]; 2404 self->tex [skey.tile].unused = 0;
2154 int px = (((int)skey->x) - 1) * T;
2155 int py = (((int)skey->y) - 1) * T;
2156 int border = bits & 15;
2157 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2158 float dx = tex.s * .0625f; // 16 images/row
2159 float dy = tex.t * .5f ; // 2 images/column
2160 2405
2161 if (tex.name)
2162 {
2163 // this time avoiding texture state changes
2164 // save gobs of state changes.
2165 if (key.texname != tex.name)
2166 {
2167 glEnd (); 2406 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2170 } 2409 }
2171 2410
2172 if (border) 2411 if (border)
2173 { 2412 {
2174 float ox = border * dx; 2413 float ox = border * dx;
2175 2414
2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2180 } 2419 }
2181 2420
2182 if (corner) 2421 if (corner)
2183 { 2422 {
2184 float ox = corner * dx; 2423 float ox = corner * dx;
2185 2424
2186 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2190 }
2191 }
2192 } 2429 }
2193 } 2430 }
2194 } 2431 }
2195 } 2432 }
2196 2433
2197 glEnd (); 2434 glEnd ();
2198 glDisable (GL_TEXTURE_2D); 2435 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1; 2436 key.texname = -1;
2200 } 2437 }
2201
2202 hv_clear (smooth);
2203 } 2438 }
2204 2439
2205 if (pl_tex.name) 2440 if (pl_tex.name)
2206 { 2441 {
2207 maptex tex = pl_tex; 2442 maptex tex = pl_tex;
2208 int px = pl_x + sdx; 2443 int px = pl_x + sdx;
2209 int py = pl_y + sdy; 2444 int py = pl_y + sdy;
2210 2445
2211 key.texname = tex.name; 2446 key.texname = tex.name;
2212 arr = rc_array (rc, &key); 2447 rc_t::array_t &arr = rc.array (key);
2213 2448
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2449 arr.t2f_v3f (0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2450 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2216 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);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2452 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2218 2453
2219 rc_draw (rc); 2454 rc.draw ();
2220 } 2455 }
2221 2456
2457 rc_ov.draw ();
2458 rc_ov.clear ();
2459
2222 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
2223 rc_free (rc);
2224 2461
2225 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
2228 { 2465 {
2231 for (x = 0; x < sw; x++) 2468 for (x = 0; x < sw; x++)
2232 if (row->c0 <= x + mx && x + mx < row->c1) 2469 if (row->c0 <= x + mx && x + mx < row->c1)
2233 { 2470 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2471 mapcell *cell = row->col + (x + mx - row->c0);
2235 2472
2236 int px = x * T; 2473 int px = x * Tw;
2237 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 }
2238 2481
2239 if (cell->stat_hp) 2482 if (cell->stat_hp)
2240 { 2483 {
2241 int width = cell->stat_width * T; 2484 int width = cell->stat_width * Tw;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2485 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2243 2486
2244 glColor3ub (0, 0, 0); 2487 glColor3ub (0, 0, 0);
2245 glRectf (px + 1, py - thick - 2, 2488 glRectf (px + 1, py - thick - 2,
2246 px + width - 1, py); 2489 px + width - 1, py);
2247 2490
2253 } 2496 }
2254 } 2497 }
2255} 2498}
2256 2499
2257void 2500void
2258draw_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)
2259 CODE: 2502 CODE:
2260{ 2503{
2261 static float color[16][3] = { 2504 static float color[16][3] = {
2262 { 0.00F, 0.00F, 0.00F }, 2505 { 0.00f, 0.00f, 0.00f },
2263 { 1.00F, 1.00F, 1.00F }, 2506 { 1.00f, 1.00f, 1.00f },
2264 { 0.00F, 0.00F, 0.55F }, 2507 { 0.00f, 0.00f, 0.55f },
2265 { 1.00F, 0.00F, 0.00F }, 2508 { 1.00f, 0.00f, 0.00f },
2266 2509
2267 { 1.00F, 0.54F, 0.00F }, 2510 { 1.00f, 0.54f, 0.00f },
2268 { 0.11F, 0.56F, 1.00F }, 2511 { 0.11f, 0.56f, 1.00f },
2269 { 0.93F, 0.46F, 0.00F }, 2512 { 0.93f, 0.46f, 0.00f },
2270 { 0.18F, 0.54F, 0.34F }, 2513 { 0.18f, 0.54f, 0.34f },
2271 2514
2272 { 0.56F, 0.73F, 0.56F }, 2515 { 0.56f, 0.73f, 0.56f },
2273 { 0.80F, 0.80F, 0.80F }, 2516 { 0.80f, 0.80f, 0.80f },
2274 { 0.55F, 0.41F, 0.13F }, 2517 { 0.55f, 0.41f, 0.13f },
2275 { 0.99F, 0.77F, 0.26F }, 2518 { 0.99f, 0.77f, 0.26f },
2276 2519
2277 { 0.74F, 0.65F, 0.41F }, 2520 { 0.74f, 0.65f, 0.41f },
2278 2521
2279 { 0.00F, 1.00F, 1.00F }, 2522 { 0.00f, 1.00f, 1.00f },
2280 { 1.00F, 0.00F, 1.00F }, 2523 { 1.00f, 0.00f, 1.00f },
2281 { 1.00F, 1.00F, 0.00F }, 2524 { 1.00f, 1.00f, 0.00f },
2282 }; 2525 };
2283 2526
2284 int x, y; 2527 int x, y;
2285 2528
2286 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 */
2287 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2536 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288 glEnable (GL_BLEND); 2537 glEnable (GL_BLEND);
2289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2538 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290 glBegin (GL_QUADS); 2539 glBegin (GL_QUADS);
2291 2540
2292 for (y = 0; y < h; y++) 2541 for (y = 0; y < h; y++)
2296 2545
2297 if (m) 2546 if (m)
2298 { 2547 {
2299 float *c = color [m & 15]; 2548 float *c = color [m & 15];
2300 2549
2301 float tx1 = m & 0x40 ? 0.5 : 0.; 2550 float tx1 = m & 0x40 ? 0.5f : 0.f;
2302 float tx2 = tx1 + 0.5; 2551 float tx2 = tx1 + 0.5f;
2303 2552
2304 glColor4f (c[0], c[1], c[2], 0.75); 2553 glColor4f (c[0], c[1], c[2], 1);
2305 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2554 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2555 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2556 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2557 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309 } 2558 }
2317void 2566void
2318fow_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)
2319 PPCODE: 2568 PPCODE:
2320{ 2569{
2321 int x, y; 2570 int x, y;
2322 int sw1 = sw + 2; 2571 int sw1 = sw + 2;
2323 int sh1 = sh + 2; 2572 int sh1 = sh + 2;
2324 int sh3 = sh * 3; 2573 int sh3 = sh * 3;
2325 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);
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2577 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2578 memset (darkness1, 0, sw1*sh1);
2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2329 2579
2330 SvPOK_only (darkness3_sv); 2580 SvPOK_only (darkness3_sv);
2331 SvCUR_set (darkness3_sv, sw34 * sh3); 2581 SvCUR_set (darkness3_sv, sw3 * sh3);
2332 2582
2333 mx += self->x - 1; 2583 mx += self->x - 1;
2334 my += self->y - 1; 2584 my += self->y - 1;
2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337 2585
2338 for (y = 0; y < sh1; y++) 2586 for (y = 0; y < sh1; y++)
2339 if (0 <= y + my && y + my < self->rows) 2587 if (0 <= y + my && y + my < self->rows)
2340 { 2588 {
2341 maprow *row = self->row + (y + my); 2589 maprow *row = self->row + (y + my);
2344 if (row->c0 <= x + mx && x + mx < row->c1) 2592 if (row->c0 <= x + mx && x + mx < row->c1)
2345 { 2593 {
2346 mapcell *cell = row->col + (x + mx - row->c0); 2594 mapcell *cell = row->col + (x + mx - row->c0);
2347 2595
2348 darkness1 [y * sw1 + x] = cell->darkness 2596 darkness1 [y * sw1 + x] = cell->darkness
2349 ? 255 - (cell->darkness - 1) 2597 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350 : 255 - FOW_DARKNESS; 2598 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351 } 2599 }
2352 } 2600 }
2353 2601
2354 for (y = 0; y < sh; ++y) 2602 for (y = 0; y < sh; ++y)
2355 for (x = 0; x < sw; ++x) 2603 for (x = 0; x < sw; ++x)
2374 2622
2375 uint8_t r13 = (d13 + d23 + d12) / 3; 2623 uint8_t r13 = (d13 + d23 + d12) / 3;
2376 uint8_t r23 = d23; 2624 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3; 2625 uint8_t r33 = (d23 + d33 + d32) / 3;
2378 2626
2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2629 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2630 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383 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 */
2384 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2632 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2635 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388 } 2636 }
2389 2637
2390 free (darkness1); 2638 free (darkness1);
2391 2639
2392 EXTEND (SP, 3); 2640 EXTEND (SP, 3);
2393 PUSHs (sv_2mortal (newSViv (sw34))); 2641 PUSHs (sv_2mortal (newSViv (sw3)));
2394 PUSHs (sv_2mortal (newSViv (sh3))); 2642 PUSHs (sv_2mortal (newSViv (sh3)));
2395 PUSHs (darkness3_sv); 2643 PUSHs (darkness3_sv);
2396} 2644}
2397 2645
2398SV * 2646SV *
2461 else 2709 else
2462 *data++ = 0; 2710 *data++ = 0;
2463 } 2711 }
2464 } 2712 }
2465 2713
2466 /* 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 */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2715 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 { 2716 {
2469 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 } 2719 }
2472 2720
2473 RETVAL = data_sv; 2721 RETVAL = data_sv;
2474} 2722}
2475 OUTPUT: 2723 OUTPUT:
2476 RETVAL 2724 RETVAL
2477 2725
2478void 2726void
2485 STRLEN len; 2733 STRLEN len;
2486 uint8_t *data, *end; 2734 uint8_t *data, *end;
2487 2735
2488 len = SvLEN (data_sv); 2736 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2737 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv); 2738 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2491 end = data + len + 8; 2739 end = data + len + 8;
2492 2740
2493 if (len < 5) 2741 if (len < 5)
2494 XSRETURN_EMPTY; 2742 XSRETURN_EMPTY;
2495 2743
2539 2787
2540 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2541 { 2789 {
2542 tileid t = tile [z]; 2790 tileid t = tile [z];
2543 2791
2544 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2545 { 2793 {
2546 PUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2547 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2548 } 2796 }
2549 2797
2550 cell->tile [z] = t; 2798 cell->tile[z] = t;
2551 } 2799 }
2552 } 2800 }
2553 } 2801 }
2554 } 2802 }
2555 } 2803 }
2556} 2804}
2557 2805
2558MODULE = Deliantra::Client PACKAGE = DC::RW 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2559 2807
2560DC::RW 2808DC::RW
2561new (SV *class, SV *data_sv) 2809new (SV *klass, SV *data_sv)
2562 CODE: 2810 CODE:
2563{ 2811{
2564 STRLEN datalen; 2812 STRLEN datalen;
2565 char *data = SvPVbyte (data_sv, datalen); 2813 char *data = SvPVbyte (data_sv, datalen);
2566 2814
2568} 2816}
2569 OUTPUT: 2817 OUTPUT:
2570 RETVAL 2818 RETVAL
2571 2819
2572DC::RW 2820DC::RW
2573new_from_file (SV *class, const char *path, const char *mode = "rb") 2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2574 CODE: 2822 CODE:
2575 RETVAL = SDL_RWFromFile (path, mode); 2823 RETVAL = SDL_RWFromFile (path, mode);
2576 OUTPUT: 2824 OUTPUT:
2577 RETVAL 2825 RETVAL
2578 2826
2596 if (RETVAL < 0) 2844 if (RETVAL < 0)
2597 { 2845 {
2598 RETVAL = Mix_GroupOldest (-1); 2846 RETVAL = Mix_GroupOldest (-1);
2599 2847
2600 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)
2601 XSRETURN_UNDEF; 2854 XSRETURN_UNDEF;
2602 2855 }
2856 else
2603 Mix_HaltChannel (RETVAL); 2857 Mix_HaltChannel (RETVAL);
2604 } 2858 }
2605 2859
2606 Mix_UnregisterAllEffects (RETVAL); 2860 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128); 2861 Mix_Volume (RETVAL, 128);
2608} 2862}
2655void 2909void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2910set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE: 2911 CODE:
2658{ 2912{
2659 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));
2660 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;
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2915 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662} 2916}
2663 2917
2664void 2918void
2665set_reverse_stereo (DC::Channel self, int flip) 2919set_reverse_stereo (DC::Channel self, int flip)
2668 2922
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2923MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670 2924
2671PROTOTYPES: DISABLE 2925PROTOTYPES: DISABLE
2672 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
2673DC::MixChunk 2939DC::MixChunk
2674new (SV *class, DC::RW rwops) 2940new (SV *klass, DC::RW rwops)
2675 CODE: 2941 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677 OUTPUT: 2943 OUTPUT:
2678 RETVAL 2944 RETVAL
2679 2945
2709 OUTPUT: 2975 OUTPUT:
2710 RETVAL 2976 RETVAL
2711 2977
2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2978MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713 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
2714int 2992int
2715volume (int volume = -1) 2993volume (int volume = -1)
2716 PROTOTYPE: ;$ 2994 PROTOTYPE: ;$
2717 CODE: 2995 CODE:
2718 if (items > 0) 2996 if (items > 0)
2729void 3007void
2730halt () 3008halt ()
2731 CODE: 3009 CODE:
2732 Mix_HaltMusic (); 3010 Mix_HaltMusic ();
2733 3011
3012int
3013playing ()
3014 CODE:
3015 RETVAL = Mix_PlayingMusic ();
3016 OUTPUT:
3017 RETVAL
3018
2734DC::MixMusic 3019DC::MixMusic
2735new (SV *class, DC::RW rwops) 3020new (SV *klass, DC::RW rwops)
2736 CODE: 3021 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
2738 OUTPUT: 3023 OUTPUT:
2739 RETVAL 3024 RETVAL
2740 3025
2768 } *civ, const_iv[] = { 3053 } *civ, const_iv[] = {
2769# define const_iv(name) { # name, (IV)name } 3054# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR), 3055 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION), 3056 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS), 3057 const_iv (GL_EXTENSIONS),
3058 const_iv (GL_MAX_TEXTURE_UNITS),
2773 const_iv (GL_COLOR_MATERIAL), 3059 const_iv (GL_COLOR_MATERIAL),
2774 const_iv (GL_SMOOTH), 3060 const_iv (GL_SMOOTH),
2775 const_iv (GL_FLAT), 3061 const_iv (GL_FLAT),
2776 const_iv (GL_DITHER), 3062 const_iv (GL_DITHER),
2777 const_iv (GL_BLEND), 3063 const_iv (GL_BLEND),
2789 const_iv (GL_ZERO), 3075 const_iv (GL_ZERO),
2790 const_iv (GL_SRC_ALPHA), 3076 const_iv (GL_SRC_ALPHA),
2791 const_iv (GL_DST_ALPHA), 3077 const_iv (GL_DST_ALPHA),
2792 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3078 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793 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),
2794 const_iv (GL_SRC_ALPHA_SATURATE), 3084 const_iv (GL_SRC_ALPHA_SATURATE),
2795 const_iv (GL_RGB), 3085 const_iv (GL_RGB),
2796 const_iv (GL_RGBA), 3086 const_iv (GL_RGBA),
2797 const_iv (GL_RGBA4), 3087 const_iv (GL_RGBA4),
2798 const_iv (GL_RGBA8), 3088 const_iv (GL_RGBA8),
2866 const_iv (GL_NICEST), 3156 const_iv (GL_NICEST),
2867 const_iv (GL_V2F), 3157 const_iv (GL_V2F),
2868 const_iv (GL_V3F), 3158 const_iv (GL_V3F),
2869 const_iv (GL_T2F_V3F), 3159 const_iv (GL_T2F_V3F),
2870 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),
2871# undef const_iv 3164# undef const_iv
2872 }; 3165 };
2873 3166
2874 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--)
2875 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3168 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2876 3169
2877 texture_av = newAV (); 3170 texture_av = newAV ();
2878 AvREAL_off (texture_av); 3171 AvREAL_off (texture_av);
2879} 3172}
2880 3173
2882disable_GL_EXT_blend_func_separate () 3175disable_GL_EXT_blend_func_separate ()
2883 CODE: 3176 CODE:
2884 gl.BlendFuncSeparate = 0; 3177 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0; 3178 gl.BlendFuncSeparateEXT = 0;
2886 3179
2887char * 3180void
3181apple_nvidia_bug (int enable)
3182
3183const char *
2888gl_vendor () 3184gl_vendor ()
2889 CODE: 3185 CODE:
2890 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
2891 OUTPUT: 3187 OUTPUT:
2892 RETVAL 3188 RETVAL
2893 3189
2894char * 3190const char *
2895gl_version () 3191gl_version ()
2896 CODE: 3192 CODE:
2897 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
2898 OUTPUT: 3194 OUTPUT:
2899 RETVAL 3195 RETVAL
2900 3196
2901char * 3197const char *
2902gl_extensions () 3198gl_extensions ()
2903 CODE: 3199 CODE:
2904 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2905 OUTPUT: 3201 OUTPUT:
2906 RETVAL 3202 RETVAL
2907 3203
2908const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
2909 3209
2910GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
2911 CODE: 3211 CODE:
2912 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
2913 OUTPUT: 3213 OUTPUT:
2921 3221
2922int glGetError () 3222int glGetError ()
2923 3223
2924void glFinish () 3224void glFinish ()
2925 3225
3226void glFlush ()
3227
2926void glClear (int mask) 3228void glClear (int mask)
2927 3229
2928void glClearColor (float r, float g, float b, float a = 1.0) 3230void glClearColor (float r, float g, float b, float a = 1.0)
2929 PROTOTYPE: @ 3231 PROTOTYPE: @
2930 3232
2939void glBlendFunc (int sfactor, int dfactor) 3241void glBlendFunc (int sfactor, int dfactor)
2940 3242
2941void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3243void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942 CODE: 3244 CODE:
2943 gl_BlendFuncSeparate (sa, da, saa, daa); 3245 gl_BlendFuncSeparate (sa, da, saa, daa);
3246
3247# void glBlendEquation (int se)
2944 3248
2945void glDepthMask (int flag) 3249void glDepthMask (int flag)
2946 3250
2947void glLogicOp (int opcode) 3251void glLogicOp (int opcode)
2948 3252
2983void glRotate (float angle, float x, float y, float z) 3287void glRotate (float angle, float x, float y, float z)
2984 CODE: 3288 CODE:
2985 glRotatef (angle, x, y, z); 3289 glRotatef (angle, x, y, z);
2986 3290
2987void 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: @
2988 ALIAS: 3293 ALIAS:
2989 glColor_premultiply = 1 3294 glColor_premultiply = 1
2990 CODE: 3295 CODE:
2991 if (ix) 3296 if (ix)
2992 { 3297 {
3098 3403
3099void glEndList () 3404void glEndList ()
3100 3405
3101void glCallList (int list) 3406void glCallList (int list)
3102 3407
3408void c_init ()
3409 CODE:
3410 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3411 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3412
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3413MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104 3414
3105PROTOTYPES: DISABLE 3415PROTOTYPES: DISABLE
3106 3416
3107void 3417void
3108find_widget (SV *self, NV x, NV y) 3418find_widget (SV *self, NV x, NV y)
3109 PPCODE: 3419 PPCODE:
3110{ 3420{
3111 if (within_widget (self, x, y)) 3421 if (within_widget (self, x, y))
3112 XPUSHs (self); 3422 XPUSHs (self);
3113} 3423}
3114 3424
3115BOOT: 3425BOOT:
3116{ 3426{
3124 3434
3125void 3435void
3126draw (SV *self) 3436draw (SV *self)
3127 CODE: 3437 CODE:
3128{ 3438{
3129 HV *hv; 3439 HV *hv;
3130 SV **svp; 3440 SV **svp;
3131 NV x, y, w, h; 3441 NV x, y, w, h;
3132 SV *draw_x_sv = GvSV (draw_x_gv); 3442 SV *draw_x_sv = GvSV (draw_x_gv);
3133 SV *draw_y_sv = GvSV (draw_y_gv); 3443 SV *draw_y_sv = GvSV (draw_y_gv);
3134 SV *draw_w_sv = GvSV (draw_w_gv); 3444 SV *draw_w_sv = GvSV (draw_w_gv);
3135 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