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.330 by root, Sun Nov 18 15:24:24 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 int faces; tileid *face2tile; // [faceid]
254 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
255 294
256 int32_t rows; 295 int32_t rows;
257 maprow *row; 296 maprow *row;
258} *DC__Map; 297};
259 298
260static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
261prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
262{ 304{
263 char *p; 305 T *p;
264 306
265 New (0, p, sze + inc, char); 307 Newxz (p, sze + inc, T);
266 Zero (p, inc, char);
267 Move (ptr, p + inc, sze, char); 308 Move (ptr, p + inc, sze, T);
268 Safefree (ptr); 309 Safefree (ptr);
269 310
270 return p; 311 ptr = p;
271} 312}
272 313
273static char * 314template<typename T>
274append (char *ptr, int sze, int inc)
275{
276 Renew (ptr, sze + inc, char);
277 Zero (ptr + sze, inc, char);
278
279 return ptr;
280}
281
282#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))
284
285static void 315static void
316append (T *&ptr, int sze, int inc)
317{
318 Renew (ptr, sze + inc, T);
319 Zero (ptr + sze, inc, T);
320}
321
322static void
286need_facenum (struct map *self, faceid face) 323need_facenum (struct mapgrid *self, faceid face)
287{ 324{
288 while (self->faces <= face) 325 while (self->faces <= face)
289 { 326 {
290 Append (tileid, self->face2tile, self->faces, self->faces); 327 append (self->face2tile, self->faces, self->faces);
291 self->faces *= 2; 328 self->faces *= 2;
292 } 329 }
293} 330}
294 331
295static void 332static void
296need_texid (struct map *self, int texid) 333need_texid (struct mapgrid *self, int texid)
297{ 334{
298 while (self->texs <= texid) 335 while (self->texs <= texid)
299 { 336 {
300 Append (maptex, self->tex, self->texs, self->texs); 337 append (self->tex, self->texs, self->texs);
301 self->texs *= 2; 338 self->texs *= 2;
302 } 339 }
303} 340}
304 341
305static maprow * 342static maprow *
306map_get_row (DC__Map self, int y) 343map_get_row (mapgrid *self, int y)
307{ 344{
308 if (0 > y) 345 if (0 > y)
309 { 346 {
310 int extend = - y + MAP_EXTEND_Y; 347 int extend = - y + MAP_EXTEND_Y;
311 Prepend (maprow, self->row, self->rows, extend); 348 prepend (self->row, self->rows, extend);
312 349
313 self->rows += extend; 350 self->rows += extend;
314 self->y += extend; 351 self->y += extend;
315 y += extend; 352 y += extend;
316 } 353 }
317 else if (y >= self->rows) 354 else if (y >= self->rows)
318 { 355 {
319 int extend = y - self->rows + MAP_EXTEND_Y; 356 int extend = y - self->rows + MAP_EXTEND_Y;
320 Append (maprow, self->row, self->rows, extend); 357 append (self->row, self->rows, extend);
321 self->rows += extend; 358 self->rows += extend;
322 } 359 }
323 360
324 return self->row + y; 361 return self->row + y;
325} 362}
335 } 372 }
336 373
337 if (row->c0 > x) 374 if (row->c0 > x)
338 { 375 {
339 int extend = row->c0 - x + MAP_EXTEND_X; 376 int extend = row->c0 - x + MAP_EXTEND_X;
340 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 377 prepend (row->col, row->c1 - row->c0, extend);
341 row->c0 -= extend; 378 row->c0 -= extend;
342 } 379 }
343 else if (x >= row->c1) 380 else if (x >= row->c1)
344 { 381 {
345 int extend = x - row->c1 + MAP_EXTEND_X; 382 int extend = x - row->c1 + MAP_EXTEND_X;
346 Append (mapcell, row->col, row->c1 - row->c0, extend); 383 append (row->col, row->c1 - row->c0, extend);
347 row->c1 += extend; 384 row->c1 += extend;
348 } 385 }
349 386
350 return row->col + (x - row->c0); 387 return row->col + (x - row->c0);
351} 388}
352 389
353static mapcell * 390static mapcell *
354map_get_cell (DC__Map self, int x, int y) 391map_get_cell (mapgrid *self, int x, int y)
355{ 392{
356 return row_get_cell (map_get_row (self, y), x); 393 return row_get_cell (map_get_row (self, y), x);
357} 394}
358 395
359static void 396static void
360map_clear (DC__Map self) 397map_clear (mapgrid *self)
361{ 398{
362 int r; 399 int r;
363 400
364 for (r = 0; r < self->rows; r++) 401 for (r = 0; r < self->rows; r++)
365 Safefree (self->row[r].col); 402 Safefree (self->row[r].col);
383 (cell)->flags = 0; \ 420 (cell)->flags = 0; \
384 (cell)->player = 0; \ 421 (cell)->player = 0; \
385 } while (0) 422 } while (0)
386 423
387static void 424static void
388map_blank (DC__Map self, int x0, int y0, int w, int h) 425map_blank (mapgrid *self, int x0, int y0, int w, int h)
389{ 426{
390 int x, y; 427 int x, y;
391 maprow *row; 428 maprow *row;
392 mapcell *cell; 429 mapcell *cell;
393 430
410 CELL_CLEAR (cell); 447 CELL_CLEAR (cell);
411 } 448 }
412 } 449 }
413} 450}
414 451
415typedef struct { 452struct smooth_key
453{
416 tileid tile; 454 tileid tile;
417 uint8_t x, y, level; 455 uint8_t x, y, level;
418} smooth_key; 456
457 bool operator == (const smooth_key &o) const
458 {
459 return tile == o.tile && x == o.x && y == o.y && level == o.level;
460 }
461};
462
463typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
464
465namespace std {
466 template <>
467 struct hash<smooth_key>
468 {
469 size_t operator () (const smooth_key &v) const
470 {
471 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
472 }
473 };
474}
419 475
420static void 476static void
421smooth_or_bits (HV *hv, smooth_key *key, IV bits) 477smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422{ 478{
423 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 479 auto &&it = h.find (key);
424 480
425 if (SvIOK (*sv)) 481 if (it == h.end ())
426 SvIV_set (*sv, SvIVX (*sv) | bits); 482 h.insert (std::make_pair (key, bits));
427 else 483 else
428 sv_setiv (*sv, bits); 484 it->second |= bits;
429} 485}
430 486
431static void 487static void
432music_finished (void) 488music_finished (void)
433{ 489{
450 ev.code = 1; 506 ev.code = 1;
451 ev.data1 = (void *)(long)channel; 507 ev.data1 = (void *)(long)channel;
452 ev.data2 = 0; 508 ev.data2 = 0;
453 509
454 SDL_PushEvent ((SDL_Event *)&ev); 510 SDL_PushEvent ((SDL_Event *)&ev);
511}
512
513// approximately divide by 255
514static unsigned int
515div255 (unsigned int n)
516{
517 return (n + (n >> 8)) >> 8;
455} 518}
456 519
457static unsigned int 520static unsigned int
458minpot (unsigned int n) 521minpot (unsigned int n)
459{ 522{
527 return 0; 590 return 0;
528 591
529 return 1; 592 return 1;
530} 593}
531 594
595/******************************************************************************/
596
597/* process keyboard modifiers */
598static int
599mod_munge (int mod)
600{
601 mod &= MOD_MASK;
602
603 if (mod & (KMOD_META | KMOD_ALT))
604 mod |= KMOD_LRAM;
605
606 return mod;
607}
608
532static void 609static void
533deliantra_main () 610deliantra_main (SV *real_main)
534{ 611{
535 char *argv[] = { 0 }; 612 dSP;
536 call_argv ("::main", G_DISCARD | G_VOID, argv); 613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
537} 616}
538 617
539#ifdef __MACOSX__ 618#ifdef __MACOSX__
619 static SV *real_main;
620
540 /* to due surprising braindamage on the side of SDL design, we 621 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main() 622 * 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, 623 * 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, 624 * due to shared library magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back. 625 * and which calls our main (== SDL_main) back.
545 */ 626 */
546 extern C_LINKAGE int 627 extern C_LINKAGE int
547 main (int argc, char *argv[]) 628 main (int argc, char *argv[])
548 { 629 {
549 deliantra_main (); 630 deliantra_main (real_main);
550 } 631 }
551 632
552 #undef main 633 #undef main
553 634
554 extern C_LINKAGE int main (int argc, char *argv[]); 635 extern C_LINKAGE int main (int argc, char *argv[]);
555 636
556 static void 637 static void
557 SDL_braino (void) 638 SDL_main_hack (SV *real_main_)
558 { 639 {
640 real_main = real_main_;
641
559 char *argv[] = { "deliantra client", 0 }; 642 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv); 643 (main) (1, argv);
561 } 644 }
562#else 645#else
563 static void 646 static void
564 SDL_braino (void) 647 SDL_main_hack (SV *real_main)
565 { 648 {
566 deliantra_main (); 649 deliantra_main (real_main);
567 } 650 }
568#endif 651#endif
569 652
570MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
571 654
737 const_iv (KMOD_RMETA), 820 const_iv (KMOD_RMETA),
738 const_iv (KMOD_NUM), 821 const_iv (KMOD_NUM),
739 const_iv (KMOD_CAPS), 822 const_iv (KMOD_CAPS),
740 const_iv (KMOD_MODE), 823 const_iv (KMOD_MODE),
741 824
825 const_iv (KMOD_LRAM),
826
742 const_iv (MIX_DEFAULT_FORMAT), 827 const_iv (MIX_DEFAULT_FORMAT),
743 828
744 const_iv (SDL_INIT_TIMER), 829 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO), 830 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO), 831 const_iv (SDL_INIT_VIDEO),
770 855
771 const_iv (FOW_DARKNESS) 856 const_iv (FOW_DARKNESS)
772# undef const_iv 857# undef const_iv
773 }; 858 };
774 859
775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 860 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
777 862
778 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
779 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
780} 865}
781 866
797NV ceil (NV x) 882NV ceil (NV x)
798 883
799IV minpot (UV n) 884IV minpot (UV n)
800 885
801IV popcount (UV n) 886IV popcount (UV n)
887
888NV distance (NV dx, NV dy)
889 CODE:
890 RETVAL = pow (dx * dx + dy * dy, 0.5);
891 OUTPUT:
892 RETVAL
802 893
803void 894void
804pango_init () 895pango_init ()
805 CODE: 896 CODE:
806{ 897{
814#endif 905#endif
815} 906}
816 907
817char *SDL_GetError () 908char *SDL_GetError ()
818 909
819void SDL_braino () 910void SDL_main_hack (SV *real_main)
911 PROTOTYPE: &
820 912
821int SDL_Init (U32 flags) 913int SDL_Init (U32 flags)
822 914
823int SDL_InitSubSystem (U32 flags) 915int SDL_InitSubSystem (U32 flags)
824 916
825void SDL_QuitSubSystem (U32 flags) 917void SDL_QuitSubSystem (U32 flags)
826 918
827void SDL_Quit () 919void SDL_Quit ()
828 920
829int SDL_GL_SetAttribute (int attr, int value) 921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
830 923
831int SDL_GL_GetAttribute (int attr) 924int SDL_GL_GetAttribute (int attr)
832 CODE: 925 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL)) 926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
834 XSRETURN_UNDEF; 927 XSRETURN_UNDEF;
835 OUTPUT: 928 OUTPUT:
836 RETVAL 929 RETVAL
837 930
838void 931void
893 ); 986 );
894 987
895 if (RETVAL) 988 if (RETVAL)
896 { 989 {
897 av_clear (texture_av); 990 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); 991#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
901#include "glfunc.h" 992#include "glfunc.h"
902#undef GL_FUNC 993#undef GL_FUNC
994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903 } 996 }
904} 997}
905 OUTPUT: 998 OUTPUT:
906 RETVAL 999 RETVAL
1000
1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
907 1003
908void 1004void
909SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
910 1006
911char * 1007char *
912SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
913 1010
914int 1011int
915SDL_GetAppState () 1012SDL_GetAppState ()
916 1013
917int 1014int
918SDL_GetModState () 1015SDL_GetModState ()
919 1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
920void 1021void
1022SDL_PumpEvents ()
1023
1024void
921poll_events () 1025peep_events ()
922 PPCODE: 1026 PPCODE:
923{ 1027{
924 SDL_Event ev; 1028 SDL_Event ev;
925 1029
926 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
933 { 1037 {
934 case SDL_KEYDOWN: 1038 case SDL_KEYDOWN:
935 case SDL_KEYUP: 1039 case SDL_KEYUP:
936 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1040 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1041 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); 1042 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 */ 1043 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); 1044 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941 break; 1045 break;
942 1046
943 case SDL_ACTIVEEVENT: 1047 case SDL_ACTIVEEVENT:
944 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1048 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
962 x = ev.motion.x; 1066 x = ev.motion.x;
963 y = ev.motion.y; 1067 y = ev.motion.y;
964 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1068 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965 } 1069 }
966 1070
967 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1071 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968 hv_store (hv, "state", 5, newSViv (state), 0); 1072 hv_store (hv, "state", 5, newSViv (state), 0);
969 hv_store (hv, "x", 1, newSViv (x), 0); 1073 hv_store (hv, "x", 1, newSViv (x), 0);
970 hv_store (hv, "y", 1, newSViv (y), 0); 1074 hv_store (hv, "y", 1, newSViv (y), 0);
971 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1075 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1076 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
992 1096
993 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1097 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
994 } 1098 }
995} 1099}
996 1100
1101char *
1102SDL_AudioDriverName ()
1103 CODE:
1104{
1105 char buf [256];
1106 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1107 XSRETURN_UNDEF;
1108
1109 RETVAL = buf;
1110}
1111 OUTPUT:
1112 RETVAL
1113
997int 1114int
998Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1115Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
999 POSTCALL: 1116 POSTCALL:
1000 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
1001 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
1002 1119
1003void 1120void
1004Mix_QuerySpec () 1121Mix_QuerySpec ()
1063add_font (char *file) 1180add_font (char *file)
1064 CODE: 1181 CODE:
1065 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066 OUTPUT: 1183 OUTPUT:
1067 RETVAL 1184 RETVAL
1185
1186void
1187IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1188
1189# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1190void
1191Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1068 1192
1069void 1193void
1070load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
1071 ALIAS: 1195 ALIAS:
1072 load_image_file = 1 1196 load_image_file = 1
1118 1242
1119 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
1120 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
1121 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
1122 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
1123 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 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))); 1248 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1125 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1126 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1127 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
1128 1252
1188#if DEBUG 1312#if DEBUG
1189 VALGRIND_DO_LEAK_CHECK; 1313 VALGRIND_DO_LEAK_CHECK;
1190#endif 1314#endif
1191} 1315}
1192 1316
1317int
1318SvREFCNT (SV *sv)
1319 CODE:
1320 RETVAL = SvREFCNT (sv);
1321 OUTPUT:
1322 RETVAL
1323
1193MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1194 1325
1195PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1196 1327
1197DC::Font 1328DC::Font
1198new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1199 CODE: 1330 CODE:
1200{ 1331{
1201 int count; 1332 int count;
1202 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1203 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1232 PROTOTYPE: 1363 PROTOTYPE:
1233 CODE: 1364 CODE:
1234 tc_restore (); 1365 tc_restore ();
1235 1366
1236DC::Layout 1367DC::Layout
1237new (SV *class) 1368new (SV *klass)
1238 CODE: 1369 CODE:
1239 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1240 1371
1241 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1242 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1243 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1244 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1245 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1246 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1247 RETVAL->font = 0; 1378 RETVAL->font = 0;
1248 RETVAL->rc = rc_alloc ();
1249 1379
1250 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1251 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1252 OUTPUT: 1382 OUTPUT:
1253 RETVAL 1383 RETVAL
1254 1384
1255void 1385void
1256DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1257 CODE: 1387 CODE:
1258 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1259 rc_free (self->rc);
1260 Safefree (self); 1389 delete self;
1261 1390
1262void 1391void
1263set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1264 CODE: 1393 CODE:
1265{ 1394{
1391 1520
1392void 1521void
1393set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1394 CODE: 1523 CODE:
1395 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1396 { 1525 {
1397 self->base_height = base_height; 1526 self->base_height = base_height;
1398 layout_update_font (self); 1527 layout_update_font (self);
1399 } 1528 }
1400 1529
1401void 1530void
1519} 1648}
1520 1649
1521void 1650void
1522render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1523 CODE: 1652 CODE:
1524 rc_clear (self->rc); 1653 self->rc.clear ();
1525 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1526 self->pl, 1655 self->pl,
1527 self->rc, 1656 &self->rc,
1528 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1529 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1530 flags 1659 flags
1531 ); 1660 );
1532 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1543 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1544 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1545 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1546 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1547 1676
1548 rc_draw (self->rc); 1677 self->rc.draw ();
1549 1678
1550 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1551 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1552 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1553} 1682}
1628 glDisable (GL_ALPHA_TEST); 1757 glDisable (GL_ALPHA_TEST);
1629 glDisable (GL_BLEND); 1758 glDisable (GL_BLEND);
1630 } 1759 }
1631} 1760}
1632 1761
1762void
1763draw_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)
1764 PROTOTYPE: @
1765 CODE:
1766{
1767 glEnable (GL_BLEND);
1768 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1769 glEnable (GL_TEXTURE_2D);
1770 glBindTexture (GL_TEXTURE_2D, name1);
1771
1772 glColor3f (intensity, intensity, intensity);
1773 glPushMatrix ();
1774 glScalef (1./3, 1./3, 1.);
1775
1776 if (blend > 0.f)
1777 {
1778 float dx3 = dx * -3.f / w;
1779 float dy3 = dy * -3.f / h;
1780 GLfloat env_color[4] = { 0., 0., 0., blend };
1781
1782 /* interpolate the two shadow textures */
1783 /* stage 0 == rgb(glcolor) + alpha(t0) */
1784 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1785
1786 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1787 gl.ActiveTexture (GL_TEXTURE1);
1788 glEnable (GL_TEXTURE_2D);
1789 glBindTexture (GL_TEXTURE_2D, name2);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1791
1792 /* rgb == rgb(glcolor) */
1793 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1796
1797 /* alpha = interpolate t0, t1 by env_alpha */
1798 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1799
1800 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1802 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1806
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1809
1810 glBegin (GL_QUADS);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1813 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1815 glEnd ();
1816
1817 glDisable (GL_TEXTURE_2D);
1818 gl.ActiveTexture (GL_TEXTURE0);
1819 }
1820 else
1821 {
1822 /* simple blending of one texture, also opengl <1.3 path */
1823 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1824
1825 glBegin (GL_QUADS);
1826 glTexCoord2f (0, 0); glVertex2f (0, 0);
1827 glTexCoord2f (0, t); glVertex2f (0, h);
1828 glTexCoord2f (s, t); glVertex2f (w, h);
1829 glTexCoord2f (s, 0); glVertex2f (w, 0);
1830 glEnd ();
1831 }
1832
1833 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1834 {
1835 int x, y;
1836 int dx3 = dx * 3;
1837 int dy3 = dy * 3;
1838
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1840 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1841 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1842 glTranslatef (-1., -1., 0);
1843 glBegin (GL_QUADS);
1844
1845 for (y = 1; y < h; y += 3)
1846 {
1847 int y1 = y - dy3;
1848 int y1valid = y1 >= 0 && y1 < h;
1849
1850 for (x = 1; x < w; x += 3)
1851 {
1852 int x1 = x - dx3;
1853 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1854 uint8_t h2;
1855
1856 if (y1valid && x1 >= 0 && x1 < w)
1857 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 else
1859 h2 = 1; /* out of range == invisible */
1860
1861 if (h1 || h2)
1862 {
1863 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1864 glColor4f (1., 1., 1., alpha);
1865
1866 glTexCoord2f (0, 0.); glVertex2i (x , y );
1867 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1868 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1869 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1870 }
1871 }
1872 }
1873 }
1874
1875 glEnd ();
1876
1877 glPopMatrix ();
1878
1879 glDisable (GL_TEXTURE_2D);
1880 glDisable (GL_BLEND);
1881}
1882
1633IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1883IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1634 CODE: 1884 CODE:
1635{ 1885{
1636 GLint width; 1886 GLint width;
1637 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1887 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1644MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1645 1895
1646PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1647 1897
1648DC::Map 1898DC::Map
1649new (SV *class) 1899new (SV *klass)
1650 CODE: 1900 CODE:
1651 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1652 RETVAL->x = 0; 1902 RETVAL->x = 0;
1653 RETVAL->y = 0; 1903 RETVAL->y = 0;
1654 RETVAL->w = 0; 1904 RETVAL->w = 0;
1655 RETVAL->h = 0; 1905 RETVAL->h = 0;
1656 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1693 1943
1694void 1944void
1695set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1696 CODE: 1946 CODE:
1697{ 1947{
1698 tileid texid; 1948 tileid texid;
1699 maptex *tex; 1949 maptex *tex;
1700 1950
1701 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1702 return; 1952 return;
1703 1953
1704 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1705 return; 1955 return;
1706 1956
1707 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1708 1958
1709 if (!texid) 1959 if (!texid)
1710 return; 1960 return;
1711 1961
1712 tex = self->tex + texid; 1962 tex = self->tex + texid;
1741 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1991 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1742 // use uglier nearest interpolation because linear suffers 1992 // use uglier nearest interpolation because linear suffers
1743 // from transparent color bleeding and ugly wrapping effects. 1993 // from transparent color bleeding and ugly wrapping effects.
1744 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1994 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745} 1995}
1996
1997void
1998expire_textures (DC::Map self, int texid, int count)
1999 PPCODE:
2000 for (; texid < self->texs && count; ++texid, --count)
2001 {
2002 maptex *tex = self->tex + texid;
2003
2004 if (tex->name)
2005 {
2006 if (tex->unused)
2007 {
2008 tex->name = 0;
2009 tex->unused = 0;
2010 XPUSHs (sv_2mortal (newSViv (texid)));
2011 }
2012 else
2013 tex->unused = 1;
2014 }
2015 }
1746 2016
1747int 2017int
1748ox (DC::Map self) 2018ox (DC::Map self)
1749 ALIAS: 2019 ALIAS:
1750 oy = 1 2020 oy = 1
1782 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1783 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1784 2054
1785 while (self->y < 0) 2055 while (self->y < 0)
1786 { 2056 {
1787 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1788 2058
1789 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1790 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1791 } 2061 }
1792} 2062}
1793 2063
1794SV * 2064SV *
1795map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1796 CODE: 2066 CODE:
1797{ 2067{
1798 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1799 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1800 mapcell *cell; 2070 mapcell *cell;
1821 2091
1822 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
1823 2093
1824 if (flags & 8) 2094 if (flags & 8)
1825 { 2095 {
2096 uint8_t ext, cmd;
2097
1826 if (extmap) 2098 do
1827 { 2099 {
1828 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
1829 2102
1830 do 2103 if (cmd < 4)
2104 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2105 else if (cmd == 5) // health
1831 { 2106 {
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; 2107 cell->stat_width = 1;
1840 cell->stat_hp = *data++; 2108 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 } 2109 }
1860 while (ext & 0x80); 2110 else if (cmd == 6) // monster width
2111 cell->stat_width = *data++ + 1;
2112 else if (cmd == 0x47)
2113 {
2114 if (*data == 1) cell->player = data [1];
2115 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2116 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2117 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2118
2119 data += *data + 1;
2120 }
2121 else if (cmd == 8) // cell flags
2122 cell->flags = *data++;
2123 else if (ext & 0x40) // unknown, multibyte => skip
2124 data += *data + 1;
2125 else
2126 data++;
1861 } 2127 }
1862 else 2128 while (ext & 0x80);
1863 cell->darkness = *data++ + 1;
1864 } 2129 }
1865 2130
1866 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
1867 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
1868 { 2133 {
1871 cell->tile [z] = self->face2tile [face]; 2136 cell->tile [z] = self->face2tile [face];
1872 2137
1873 if (cell->tile [z]) 2138 if (cell->tile [z])
1874 { 2139 {
1875 maptex *tex = self->tex + cell->tile [z]; 2140 maptex *tex = self->tex + cell->tile [z];
2141 tex->unused = 0;
1876 if (!tex->name) 2142 if (!tex->name)
1877 av_push (missing, newSViv (cell->tile [z])); 2143 av_push (missing, newSViv (cell->tile [z]));
1878 2144
1879 if (tex->smoothtile) 2145 if (tex->smoothtile)
1880 { 2146 {
1881 maptex *smooth = self->tex + tex->smoothtile; 2147 maptex *smooth = self->tex + tex->smoothtile;
2148 smooth->unused = 0;
1882 if (!smooth->name) 2149 if (!smooth->name)
1883 av_push (missing, newSViv (tex->smoothtile)); 2150 av_push (missing, newSViv (tex->smoothtile));
1884 } 2151 }
1885 } 2152 }
1886 } 2153 }
1914 ? self->row + y 2181 ? self->row + y
1915 : 0; 2182 : 0;
1916 2183
1917 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
1918 { 2185 {
1919 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
1920 2187
1921 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
1922 { 2189 {
1923 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
1924 2191
1926 { 2193 {
1927 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
1928 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
1929 int a1 = tex.a; 2196 int a1 = tex.a;
1930 2197
1931 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
1932 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
1933 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
1934 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
1935 } 2202 }
1936 } 2203 }
1937 2204
1938 *map++ = (r ) 2205 *map++ = (r )
1939 | (g << 8) 2206 | (g << 8)
1940 | (b << 16) 2207 | (b << 16)
1941 | (a << 24); 2208 | (a << 24);
1942 } 2209 }
1943 } 2210 }
1944 2211
1945 RETVAL = map_sv; 2212 RETVAL = map_sv;
1946} 2213}
1947 OUTPUT: 2214 OUTPUT:
1948 RETVAL 2215 RETVAL
1949 2216
1950void 2217void
1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2218draw (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: 2219 CODE:
1953{ 2220{
1954 int x, y, z; 2221 int x, y, z;
1955 2222
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) 2223 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; 2224 int pl_x, pl_y;
1961 maptex pl_tex; 2225 maptex pl_tex;
1962 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2227 rc_t rc_ov;
1963 rc_key_t key; 2228 rc_key_t key;
1964 rc_array_t *arr; 2229 rc_t::array_t *arr;
1965 2230
1966 pl_tex.name = 0; 2231 pl_tex.name = 0;
1967 2232
1968 // thats current max. sorry. 2233 // that's current max. sorry.
1969 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1970 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1971
1972 // clear key, in case of extra padding
1973 memset (&skey, 0, sizeof (skey));
1974 2236
1975 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
1976 key.r = 255; 2238 key.r = 255;
1977 key.g = 255; 2239 key.g = 255;
1978 key.b = 255; 2240 key.b = 255;
1979 key.a = 255; 2241 key.a = 255;
1980 key.mode = GL_QUADS; 2242 key.mode = GL_QUADS;
1981 key.format = GL_T2F_V3F; 2243 key.format = GL_T2F_V3F;
1982 key.texname = -1;
1983 2244
1984 mx += self->x; 2245 mx += self->x;
1985 my += self->y; 2246 my += self->y;
1986 2247
1987 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
1988 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
1989 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
1990 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1991 2252
1992 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
1993 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
1994 { 2255 {
1995 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
2010 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012 2273
2013 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
2014 { 2275 {
2015 memset (smooth_level, 0, sizeof (smooth_level)); 2276 std::bitset<256> smooth_level; // one bit for every possible smooth level
2277 smooth_key skey;
2278 smooth_hash smooth;
2279 key.texname = -1;
2016 2280
2017 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
2018 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
2019 { 2283 {
2020 maprow *row = self->row + (y + my); 2284 maprow *row = self->row + (y + my);
2026 tileid tile = cell->tile [z]; 2290 tileid tile = cell->tile [z];
2027 2291
2028 if (tile) 2292 if (tile)
2029 { 2293 {
2030 maptex tex = self->tex [tile]; 2294 maptex tex = self->tex [tile];
2031 int px = (x + 1) * T - tex.w; 2295 int px, py;
2032 int py = (y + 1) * T - tex.h;
2033 2296
2034 if (key.texname != tex.name) 2297 if (key.texname != tex.name)
2035 { 2298 {
2299 self->tex [tile].unused = 0;
2300
2036 if (!tex.name) 2301 if (!tex.name)
2037 tex = self->tex [2]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038 2303
2039 key.texname = tex.name; 2304 key.texname = tex.name;
2040 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
2041 } 2306 }
2307
2308 px = (x + 1) * Th - tex.w;
2309 py = (y + 1) * Tw - tex.h;
2042 2310
2043 if (expect_false (cell->player == player) && expect_false (z == 2)) 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
2044 { 2312 {
2045 pl_x = px; 2313 pl_x = px;
2046 pl_y = py; 2314 pl_y = py;
2047 pl_tex = tex; 2315 pl_tex = tex;
2048 continue; 2316 continue;
2049 } 2317 }
2050 2318
2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2319 arr->t2f_v3f (0 , 0 , px , py , 0);
2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2320 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); 2321 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); 2322 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 2323
2081 // update smooth hash 2324 // update smooth hash
2082 if (tex.smoothtile) 2325 if (tex.smoothtile)
2083 { 2326 {
2084 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
2085 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
2086 2329
2087 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
2088 2331
2089 // add bits to current tile and all neighbours. skey.x|y is 2332 // add bits to current tile and all neighbours. skey.x|y is
2090 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
2091 2334
2092 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
2100 2343
2101 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2102 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
2103 2346
2104 // full tile 2347 // full tile
2105 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2348 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2106 2349
2107 // borders 2350 // borders
2108 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2351 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); 2352 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); 2353 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); 2354 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2112 2355
2113 // corners 2356 // corners
2114 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2357 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); 2358 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); 2359 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); 2360 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2361 }
2362 }
2363
2364 if (expect_false (z == 2) && expect_false (cell->flags))
2365 {
2366 // overlays such as the speech bubble, probably more to come
2367 if (cell->flags & 1)
2368 {
2369 rc_key_t key_ov = key;
2370 maptex tex = self->tex[TEXID_SPEECH];
2371 int px = x * Tw + Tw * 2 / 32;
2372 int py = y * Th - Th * 6 / 32;
2373
2374 key_ov.texname = tex.name;
2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2376
2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2379 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2118 } 2381 }
2119 } 2382 }
2120 } 2383 }
2121 } 2384 }
2122 2385
2123 rc_draw (rc); 2386 rc.draw ();
2124 rc_clear (rc); 2387 rc.clear ();
2125 2388
2126 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
2127 // this is basically counting sort 2390 // this is basically counting sort
2128 { 2391 {
2129 int w, b; 2392 int w, b;
2130 2393
2131 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
2132 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
2133 for (w = 0; w < 256 / 32; ++w) 2396 for (int level = 0; level < smooth_level.size (); ++level)
2397 if (smooth_level[level])
2398 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2134 { 2399 {
2135 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
2136 if (smask) 2401 IV bits = it->second;
2137 for (b = 0; b < 32; ++b) 2402
2138 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
2139 { 2406 {
2140 int level = (w << 5) | b; 2407 maptex tex = self->tex [skey.tile];
2408 int px = (((int)skey.x) - 1) * Tw;
2409 int py = (((int)skey.y) - 1) * Th;
2410 int border = bits & 15;
2411 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2412 float dx = tex.s * .0625f; // 16 images/row
2413 float dy = tex.t * .5f ; // 2 images/column
2414
2141 HE *he; 2415 if (tex.name)
2142
2143 hv_iterinit (smooth);
2144 while ((he = hv_iternext (smooth)))
2145 { 2416 {
2146 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
2147 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
2148 2419 if (key.texname != tex.name)
2149 if (!(bits & 0x1000)
2150 && skey->level == level
2151 && level > smooth_max [skey->x][skey->y])
2152 { 2420 {
2153 maptex tex = self->tex [skey->tile]; 2421 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 2422
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 (); 2423 glEnd ();
2168 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2170 } 2426 }
2171 2427
2172 if (border) 2428 if (border)
2173 { 2429 {
2174 float ox = border * dx; 2430 float ox = border * dx;
2175 2431
2176 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2177 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2178 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2179 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2180 } 2436 }
2181 2437
2182 if (corner) 2438 if (corner)
2183 { 2439 {
2184 float ox = corner * dx; 2440 float ox = corner * dx;
2185 2441
2186 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2187 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2188 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2189 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2190 }
2191 }
2192 } 2446 }
2193 } 2447 }
2194 } 2448 }
2195 } 2449 }
2196 2450
2197 glEnd (); 2451 glEnd ();
2198 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2199 key.texname = -1; 2453 key.texname = -1;
2200 } 2454 }
2201
2202 hv_clear (smooth);
2203 } 2455 }
2204 2456
2205 if (pl_tex.name) 2457 if (pl_tex.name)
2206 { 2458 {
2207 maptex tex = pl_tex; 2459 maptex tex = pl_tex;
2208 int px = pl_x + sdx; 2460 int px = pl_x + sdx;
2209 int py = pl_y + sdy; 2461 int py = pl_y + sdy;
2210 2462
2211 key.texname = tex.name; 2463 key.texname = tex.name;
2212 arr = rc_array (rc, &key); 2464 rc_t::array_t &arr = rc.array (key);
2213 2465
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2467 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); 2468 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); 2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2218 2470
2219 rc_draw (rc); 2471 rc.draw ();
2220 } 2472 }
2221 2473
2474 rc_ov.draw ();
2475 rc_ov.clear ();
2476
2222 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2223 rc_free (rc);
2224 2478
2225 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2226 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2227 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2228 { 2482 {
2231 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2232 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2233 { 2487 {
2234 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2235 2489
2236 int px = x * T; 2490 int px = x * Tw;
2237 int py = y * T; 2491 int py = y * Th;
2492
2493 if (expect_false (cell->player == player))
2494 {
2495 px += sdx;
2496 py += sdy;
2497 }
2238 2498
2239 if (cell->stat_hp) 2499 if (cell->stat_hp)
2240 { 2500 {
2241 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2242 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2243 2503
2244 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2245 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2246 px + width - 1, py); 2506 px + width - 1, py);
2247 2507
2253 } 2513 }
2254 } 2514 }
2255} 2515}
2256 2516
2257void 2517void
2258draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2518draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2259 CODE: 2519 CODE:
2260{ 2520{
2261 static float color[16][3] = { 2521 static float color[16][3] = {
2262 { 0.00F, 0.00F, 0.00F }, 2522 { 0.00f, 0.00f, 0.00f },
2263 { 1.00F, 1.00F, 1.00F }, 2523 { 1.00f, 1.00f, 1.00f },
2264 { 0.00F, 0.00F, 0.55F }, 2524 { 0.00f, 0.00f, 0.55f },
2265 { 1.00F, 0.00F, 0.00F }, 2525 { 1.00f, 0.00f, 0.00f },
2266 2526
2267 { 1.00F, 0.54F, 0.00F }, 2527 { 1.00f, 0.54f, 0.00f },
2268 { 0.11F, 0.56F, 1.00F }, 2528 { 0.11f, 0.56f, 1.00f },
2269 { 0.93F, 0.46F, 0.00F }, 2529 { 0.93f, 0.46f, 0.00f },
2270 { 0.18F, 0.54F, 0.34F }, 2530 { 0.18f, 0.54f, 0.34f },
2271 2531
2272 { 0.56F, 0.73F, 0.56F }, 2532 { 0.56f, 0.73f, 0.56f },
2273 { 0.80F, 0.80F, 0.80F }, 2533 { 0.80f, 0.80f, 0.80f },
2274 { 0.55F, 0.41F, 0.13F }, 2534 { 0.55f, 0.41f, 0.13f },
2275 { 0.99F, 0.77F, 0.26F }, 2535 { 0.99f, 0.77f, 0.26f },
2276 2536
2277 { 0.74F, 0.65F, 0.41F }, 2537 { 0.74f, 0.65f, 0.41f },
2278 2538
2279 { 0.00F, 1.00F, 1.00F }, 2539 { 0.00f, 1.00f, 1.00f },
2280 { 1.00F, 0.00F, 1.00F }, 2540 { 1.00f, 0.00f, 1.00f },
2281 { 1.00F, 1.00F, 0.00F }, 2541 { 1.00f, 1.00f, 0.00f },
2282 }; 2542 };
2283 2543
2284 int x, y; 2544 int x, y;
2285 2545
2286 glEnable (GL_TEXTURE_2D); 2546 glEnable (GL_TEXTURE_2D);
2547 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2548 * but the nvidia driver (185.18.14) mishandles alpha textures
2549 * and takes the colour from god knows where instead of using
2550 * Cp. MODULATE results in the same colour, but slightly different
2551 * alpha, but atcually gives us the correct colour with nvidia.
2552 */
2287 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2553 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288 glEnable (GL_BLEND); 2554 glEnable (GL_BLEND);
2289 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2555 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290 glBegin (GL_QUADS); 2556 glBegin (GL_QUADS);
2291 2557
2292 for (y = 0; y < h; y++) 2558 for (y = 0; y < h; y++)
2296 2562
2297 if (m) 2563 if (m)
2298 { 2564 {
2299 float *c = color [m & 15]; 2565 float *c = color [m & 15];
2300 2566
2301 float tx1 = m & 0x40 ? 0.5 : 0.; 2567 float tx1 = m & 0x40 ? 0.5f : 0.f;
2302 float tx2 = tx1 + 0.5; 2568 float tx2 = tx1 + 0.5f;
2303 2569
2304 glColor4f (c[0], c[1], c[2], 0.75); 2570 glColor4f (c[0], c[1], c[2], 1);
2305 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2571 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2572 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2573 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2574 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309 } 2575 }
2317void 2583void
2318fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2584fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2319 PPCODE: 2585 PPCODE:
2320{ 2586{
2321 int x, y; 2587 int x, y;
2322 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2323 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2324 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2325 int sw34 = (sw * 3 + 3) & ~3; 2591 int sw3 = sw * 3;
2592 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2593 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2326 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2327 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2595 memset (darkness1, 0, sw1*sh1);
2328 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2329 2596
2330 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2331 SvCUR_set (darkness3_sv, sw34 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2332 2599
2333 mx += self->x - 1; 2600 mx += self->x - 1;
2334 my += self->y - 1; 2601 my += self->y - 1;
2335
2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337 2602
2338 for (y = 0; y < sh1; y++) 2603 for (y = 0; y < sh1; y++)
2339 if (0 <= y + my && y + my < self->rows) 2604 if (0 <= y + my && y + my < self->rows)
2340 { 2605 {
2341 maprow *row = self->row + (y + my); 2606 maprow *row = self->row + (y + my);
2344 if (row->c0 <= x + mx && x + mx < row->c1) 2609 if (row->c0 <= x + mx && x + mx < row->c1)
2345 { 2610 {
2346 mapcell *cell = row->col + (x + mx - row->c0); 2611 mapcell *cell = row->col + (x + mx - row->c0);
2347 2612
2348 darkness1 [y * sw1 + x] = cell->darkness 2613 darkness1 [y * sw1 + x] = cell->darkness
2349 ? 255 - (cell->darkness - 1) 2614 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350 : 255 - FOW_DARKNESS; 2615 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351 } 2616 }
2352 } 2617 }
2353 2618
2354 for (y = 0; y < sh; ++y) 2619 for (y = 0; y < sh; ++y)
2355 for (x = 0; x < sw; ++x) 2620 for (x = 0; x < sw; ++x)
2374 2639
2375 uint8_t r13 = (d13 + d23 + d12) / 3; 2640 uint8_t r13 = (d13 + d23 + d12) / 3;
2376 uint8_t r23 = d23; 2641 uint8_t r23 = d23;
2377 uint8_t r33 = (d23 + d33 + d32) / 3; 2642 uint8_t r33 = (d23 + d33 + d32) / 3;
2378 2643
2379 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2648 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); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388 } 2653 }
2389 2654
2390 free (darkness1); 2655 free (darkness1);
2391 2656
2392 EXTEND (SP, 3); 2657 EXTEND (SP, 3);
2393 PUSHs (sv_2mortal (newSViv (sw34))); 2658 PUSHs (sv_2mortal (newSViv (sw3)));
2394 PUSHs (sv_2mortal (newSViv (sh3))); 2659 PUSHs (sv_2mortal (newSViv (sh3)));
2395 PUSHs (darkness3_sv); 2660 PUSHs (darkness3_sv);
2396} 2661}
2397 2662
2398SV * 2663SV *
2461 else 2726 else
2462 *data++ = 0; 2727 *data++ = 0;
2463 } 2728 }
2464 } 2729 }
2465 2730
2466 /* if size is w*h + 5 then no data has been found */ 2731 /* if size is w*h + 5 then no data has been found */
2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468 { 2733 {
2469 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471 } 2736 }
2472 2737
2473 RETVAL = data_sv; 2738 RETVAL = data_sv;
2474} 2739}
2475 OUTPUT: 2740 OUTPUT:
2476 RETVAL 2741 RETVAL
2477 2742
2478void 2743void
2485 STRLEN len; 2750 STRLEN len;
2486 uint8_t *data, *end; 2751 uint8_t *data, *end;
2487 2752
2488 len = SvLEN (data_sv); 2753 len = SvLEN (data_sv);
2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490 data = SvPVbyte_nolen (data_sv); 2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2491 end = data + len + 8; 2756 end = data + len + 8;
2492 2757
2493 if (len < 5) 2758 if (len < 5)
2494 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2495 2760
2556} 2821}
2557 2822
2558MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2559 2824
2560DC::RW 2825DC::RW
2561new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2562 CODE: 2827 CODE:
2563{ 2828{
2564 STRLEN datalen; 2829 STRLEN datalen;
2565 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2566 2831
2568} 2833}
2569 OUTPUT: 2834 OUTPUT:
2570 RETVAL 2835 RETVAL
2571 2836
2572DC::RW 2837DC::RW
2573new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2574 CODE: 2839 CODE:
2575 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2576 OUTPUT: 2841 OUTPUT:
2577 RETVAL 2842 RETVAL
2578 2843
2596 if (RETVAL < 0) 2861 if (RETVAL < 0)
2597 { 2862 {
2598 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2599 2864
2600 if (RETVAL < 0) 2865 if (RETVAL < 0)
2866 {
2867 // happens sometimes, maybe it just stopped playing(?)
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2601 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2602 2872 }
2873 else
2603 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2604 } 2875 }
2605 2876
2606 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2607 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2608} 2879}
2655void 2926void
2656set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2927set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657 CODE: 2928 CODE:
2658{ 2929{
2659 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2930 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); 2931 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2661 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2932 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662} 2933}
2663 2934
2664void 2935void
2665set_reverse_stereo (DC::Channel self, int flip) 2936set_reverse_stereo (DC::Channel self, int flip)
2668 2939
2669MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670 2941
2671PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2672 2943
2944void
2945decoders ()
2946 PPCODE:
2947#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2948 int i, num = Mix_GetNumChunkDecoders ();
2949 EXTEND (SP, num);
2950 for (i = 0; i < num; ++i)
2951 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2952#else
2953 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2954#endif
2955
2673DC::MixChunk 2956DC::MixChunk
2674new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2675 CODE: 2958 CODE:
2676 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677 OUTPUT: 2960 OUTPUT:
2678 RETVAL 2961 RETVAL
2679 2962
2709 OUTPUT: 2992 OUTPUT:
2710 RETVAL 2993 RETVAL
2711 2994
2712MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713 2996
2997void
2998decoders ()
2999 PPCODE:
3000#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3001 int i, num = Mix_GetNumMusicDecoders ();
3002 EXTEND (SP, num);
3003 for (i = 0; i < num; ++i)
3004 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3005#else
3006 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3007#endif
3008
2714int 3009int
2715volume (int volume = -1) 3010volume (int volume = -1)
2716 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2717 CODE: 3012 CODE:
2718 if (items > 0) 3013 if (items > 0)
2729void 3024void
2730halt () 3025halt ()
2731 CODE: 3026 CODE:
2732 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2733 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2734DC::MixMusic 3036DC::MixMusic
2735new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2736 CODE: 3038 CODE:
2737 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2738 OUTPUT: 3040 OUTPUT:
2739 RETVAL 3041 RETVAL
2740 3042
2768 } *civ, const_iv[] = { 3070 } *civ, const_iv[] = {
2769# define const_iv(name) { # name, (IV)name } 3071# define const_iv(name) { # name, (IV)name }
2770 const_iv (GL_VENDOR), 3072 const_iv (GL_VENDOR),
2771 const_iv (GL_VERSION), 3073 const_iv (GL_VERSION),
2772 const_iv (GL_EXTENSIONS), 3074 const_iv (GL_EXTENSIONS),
3075 const_iv (GL_MAX_TEXTURE_UNITS),
2773 const_iv (GL_COLOR_MATERIAL), 3076 const_iv (GL_COLOR_MATERIAL),
2774 const_iv (GL_SMOOTH), 3077 const_iv (GL_SMOOTH),
2775 const_iv (GL_FLAT), 3078 const_iv (GL_FLAT),
2776 const_iv (GL_DITHER), 3079 const_iv (GL_DITHER),
2777 const_iv (GL_BLEND), 3080 const_iv (GL_BLEND),
2789 const_iv (GL_ZERO), 3092 const_iv (GL_ZERO),
2790 const_iv (GL_SRC_ALPHA), 3093 const_iv (GL_SRC_ALPHA),
2791 const_iv (GL_DST_ALPHA), 3094 const_iv (GL_DST_ALPHA),
2792 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3095 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793 const_iv (GL_ONE_MINUS_DST_ALPHA), 3096 const_iv (GL_ONE_MINUS_DST_ALPHA),
3097 const_iv (GL_SRC_COLOR),
3098 const_iv (GL_DST_COLOR),
3099 const_iv (GL_ONE_MINUS_SRC_COLOR),
3100 const_iv (GL_ONE_MINUS_DST_COLOR),
2794 const_iv (GL_SRC_ALPHA_SATURATE), 3101 const_iv (GL_SRC_ALPHA_SATURATE),
2795 const_iv (GL_RGB), 3102 const_iv (GL_RGB),
2796 const_iv (GL_RGBA), 3103 const_iv (GL_RGBA),
2797 const_iv (GL_RGBA4), 3104 const_iv (GL_RGBA4),
2798 const_iv (GL_RGBA8), 3105 const_iv (GL_RGBA8),
2866 const_iv (GL_NICEST), 3173 const_iv (GL_NICEST),
2867 const_iv (GL_V2F), 3174 const_iv (GL_V2F),
2868 const_iv (GL_V3F), 3175 const_iv (GL_V3F),
2869 const_iv (GL_T2F_V3F), 3176 const_iv (GL_T2F_V3F),
2870 const_iv (GL_T2F_N3F_V3F), 3177 const_iv (GL_T2F_N3F_V3F),
3178 const_iv (GL_FUNC_ADD),
3179 const_iv (GL_FUNC_SUBTRACT),
3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2871# undef const_iv 3181# undef const_iv
2872 }; 3182 };
2873 3183
2874 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3184 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2875 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2876 3186
2877 texture_av = newAV (); 3187 texture_av = newAV ();
2878 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
2879} 3189}
2880 3190
2882disable_GL_EXT_blend_func_separate () 3192disable_GL_EXT_blend_func_separate ()
2883 CODE: 3193 CODE:
2884 gl.BlendFuncSeparate = 0; 3194 gl.BlendFuncSeparate = 0;
2885 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
2886 3196
2887char * 3197void
3198apple_nvidia_bug (int enable)
3199
3200const char *
2888gl_vendor () 3201gl_vendor ()
2889 CODE: 3202 CODE:
2890 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
2891 OUTPUT: 3204 OUTPUT:
2892 RETVAL 3205 RETVAL
2893 3206
2894char * 3207const char *
2895gl_version () 3208gl_version ()
2896 CODE: 3209 CODE:
2897 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
2898 OUTPUT: 3211 OUTPUT:
2899 RETVAL 3212 RETVAL
2900 3213
2901char * 3214const char *
2902gl_extensions () 3215gl_extensions ()
2903 CODE: 3216 CODE:
2904 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2905 OUTPUT: 3218 OUTPUT:
2906 RETVAL 3219 RETVAL
2907 3220
2908const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
2909 3226
2910GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
2911 CODE: 3228 CODE:
2912 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
2913 OUTPUT: 3230 OUTPUT:
2921 3238
2922int glGetError () 3239int glGetError ()
2923 3240
2924void glFinish () 3241void glFinish ()
2925 3242
3243void glFlush ()
3244
2926void glClear (int mask) 3245void glClear (int mask)
2927 3246
2928void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
2929 PROTOTYPE: @ 3248 PROTOTYPE: @
2930 3249
2939void glBlendFunc (int sfactor, int dfactor) 3258void glBlendFunc (int sfactor, int dfactor)
2940 3259
2941void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3260void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942 CODE: 3261 CODE:
2943 gl_BlendFuncSeparate (sa, da, saa, daa); 3262 gl_BlendFuncSeparate (sa, da, saa, daa);
3263
3264# void glBlendEquation (int se)
2944 3265
2945void glDepthMask (int flag) 3266void glDepthMask (int flag)
2946 3267
2947void glLogicOp (int opcode) 3268void glLogicOp (int opcode)
2948 3269
2983void glRotate (float angle, float x, float y, float z) 3304void glRotate (float angle, float x, float y, float z)
2984 CODE: 3305 CODE:
2985 glRotatef (angle, x, y, z); 3306 glRotatef (angle, x, y, z);
2986 3307
2987void glColor (float r, float g, float b, float a = 1.0) 3308void glColor (float r, float g, float b, float a = 1.0)
3309 PROTOTYPE: @
2988 ALIAS: 3310 ALIAS:
2989 glColor_premultiply = 1 3311 glColor_premultiply = 1
2990 CODE: 3312 CODE:
2991 if (ix) 3313 if (ix)
2992 { 3314 {
3098 3420
3099void glEndList () 3421void glEndList ()
3100 3422
3101void glCallList (int list) 3423void glCallList (int list)
3102 3424
3425void c_init ()
3426 CODE:
3427 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3428 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3429
3103MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3430MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104 3431
3105PROTOTYPES: DISABLE 3432PROTOTYPES: DISABLE
3106 3433
3107void 3434void
3108find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
3109 PPCODE: 3436 PPCODE:
3110{ 3437{
3111 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
3112 XPUSHs (self); 3439 XPUSHs (self);
3113} 3440}
3114 3441
3115BOOT: 3442BOOT:
3116{ 3443{
3124 3451
3125void 3452void
3126draw (SV *self) 3453draw (SV *self)
3127 CODE: 3454 CODE:
3128{ 3455{
3129 HV *hv; 3456 HV *hv;
3130 SV **svp; 3457 SV **svp;
3131 NV x, y, w, h; 3458 NV x, y, w, h;
3132 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
3133 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
3134 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
3135 SV *draw_h_sv = GvSV (draw_h_gv); 3462 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines