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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines