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.279 by root, Thu Oct 2 15:59:40 2008 UTC vs.
Revision 1.334 by root, Mon Nov 19 01:37:28 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
70# include <netinet/in.h> 76# include <netinet/in.h>
71# include <netinet/tcp.h> 77# include <netinet/tcp.h>
72# include <inttypes.h> 78# include <inttypes.h>
73#endif 79#endif
74 80
75#if __GNUC__ >= 4 81#include "ecb.h"
76# define expect(expr,value) __builtin_expect ((expr),(value)) 82#include "salloc.h"
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83 83
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 85
86/* this is used as fow flag as well, so has to have a different value */
87/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 88#define FOW_DARKNESS 50
89#define DARKNESS_ADJUST(n) (n)
87 90
88#define MAP_EXTEND_X 32 91#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 92#define MAP_EXTEND_Y 512
90 93
91#define MIN_FONT_HEIGHT 10 94#define MIN_FONT_HEIGHT 10
92 95
93/* mask out modifiers we are not interested in */ 96/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 97#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 98
96#define KMOD_LRAM 0x10000 // our extension 99#define KMOD_LRAM 0x10000 // our extension
100
101#define TEXID_SPEECH 1
102#define TEXID_NOFACE 2
103
104static char *
105fast_sv_grow (SV *sv, STRLEN need)
106{
107 STRLEN len = SvLEN (sv);
108 STRLEN want = SvCUR (sv) + need;
109
110 if (ecb_expect_false (len < want))
111 {
112 do
113 len *= 2;
114 while (len < want);
115
116 sv_grow (sv, len);
117 }
118
119 SvCUR_set (sv, want);
120 return SvEND (sv) - need;
121}
97 122
98static AV *texture_av; 123static AV *texture_av;
99 124
100static struct 125static struct
101{ 126{
158{ 183{
159 GSList *attrs = run->item->analysis.extra_attrs; 184 GSList *attrs = run->item->analysis.extra_attrs;
160 185
161 while (attrs) 186 while (attrs)
162 { 187 {
163 PangoAttribute *attr = attrs->data; 188 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 189
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 190 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 191 return 1;
167 192
168 attrs = attrs->next; 193 attrs = attrs->next;
169 } 194 }
170 195
171 return 0; 196 return 0;
172} 197}
173 198
174typedef struct cf_layout { 199struct cf_layout {
175 PangoLayout *pl; 200 PangoLayout *pl;
176 float r, g, b, a; // default color for rgba mode 201 float r, g, b, a; // default color for rgba mode
177 int base_height; 202 int base_height;
178 DC__Font font; 203 DC__Font font;
179 rc_t *rc; 204 rc_t rc;
180} *DC__Layout; 205};
206
207typedef cf_layout *DC__Layout;
181 208
182static DC__Font default_font; 209static DC__Font default_font;
183static PangoContext *opengl_context; 210static PangoContext *opengl_context;
184static PangoFontMap *opengl_fontmap; 211static PangoFontMap *opengl_fontmap;
185 212
186static void 213static void
187substitute_func (FcPattern *pattern, gpointer data) 214substitute_func (FcPattern *pattern, gpointer data)
188{ 215{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 216 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 217#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 218 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 219#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 220 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 221}
195 222
196static void 223static void
223 250
224 *w = rect.width; 251 *w = rect.width;
225 *h = rect.height; 252 *h = rect.height;
226} 253}
227 254
255/////////////////////////////////////////////////////////////////////////////
256
228typedef uint16_t tileid; 257typedef uint16_t tileid;
229typedef uint16_t faceid; 258typedef uint16_t faceid;
230 259
231typedef struct { 260struct maptex
261{
232 GLuint name; 262 GLuint name;
233 int w, h; 263 int w, h;
234 float s, t; 264 float s, t;
235 uint8_t r, g, b, a; 265 uint8_t r, g, b, a;
236 tileid smoothtile; 266 tileid smoothtile;
237 uint8_t smoothlevel; 267 uint8_t smoothlevel;
238} maptex; 268 uint8_t unused; /* set to zero on use */
269};
239 270
240typedef struct { 271struct mapcell
272{
241 uint32_t player; 273 uint32_t player;
242 tileid tile[3]; 274 tileid tile[3];
243 uint16_t darkness; 275 uint16_t darkness;
244 uint8_t stat_width, stat_hp, flags, smoothmax; 276 uint8_t stat_width, stat_hp, flags, smoothmax;
245} mapcell; 277};
246 278
247typedef struct { 279struct maprow
280{
248 int32_t c0, c1; 281 int32_t c0, c1;
249 mapcell *col; 282 mapcell *col;
250} maprow; 283};
251 284
252typedef struct map { 285struct mapgrid {
253 int x, y, w, h; 286 int x, y, w, h;
254 int ox, oy; /* offset to virtual global coordinate system */ 287 int ox, oy; /* offset to virtual global coordinate system */
255 int faces; tileid *face2tile; // [faceid] 288 int faces; tileid *face2tile; // [faceid]
256 int texs; maptex *tex; // [tileid] 289 int texs; maptex *tex; // [tileid]
257 290
258 int32_t rows; 291 int32_t rows;
259 maprow *row; 292 maprow *row;
260} *DC__Map; 293};
261 294
262static char * 295typedef mapgrid *DC__Map;
296
297template<typename T>
298static void
263prepend (char *ptr, int sze, int inc) 299prepend (T *&ptr, int sze, int inc)
264{ 300{
265 char *p; 301 T *p;
266 302
267 New (0, p, sze + inc, char); 303 Newx (p, inc + sze, T);
268 Zero (p, inc, char); 304 Zero (p, inc, T);
269 Move (ptr, p + inc, sze, char); 305 Move (ptr, p + inc, sze, T);
270 Safefree (ptr); 306 Safefree (ptr);
271 307
272 return p; 308 ptr = p;
273} 309}
274 310
275static char * 311template<typename T>
276append (char *ptr, int sze, int inc)
277{
278 Renew (ptr, sze + inc, char);
279 Zero (ptr + sze, inc, char);
280
281 return ptr;
282}
283
284#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
285#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
286
287static void 312static void
313append (T *&ptr, int sze, int inc)
314{
315 Renew (ptr, sze + inc, T);
316 Zero (ptr + sze, inc, T);
317}
318
319static void
288need_facenum (struct map *self, faceid face) 320need_facenum (struct mapgrid *self, faceid face)
289{ 321{
290 while (self->faces <= face) 322 while (self->faces <= face)
291 { 323 {
292 Append (tileid, self->face2tile, self->faces, self->faces); 324 append (self->face2tile, self->faces, self->faces);
293 self->faces *= 2; 325 self->faces *= 2;
294 } 326 }
295} 327}
296 328
297static void 329static void
298need_texid (struct map *self, int texid) 330need_texid (struct mapgrid *self, int texid)
299{ 331{
300 while (self->texs <= texid) 332 while (self->texs <= texid)
301 { 333 {
302 Append (maptex, self->tex, self->texs, self->texs); 334 append (self->tex, self->texs, self->texs);
303 self->texs *= 2; 335 self->texs *= 2;
304 } 336 }
305} 337}
306 338
307static maprow * 339static maprow *
308map_get_row (DC__Map self, int y) 340map_get_row (mapgrid *self, int y)
309{ 341{
310 if (0 > y) 342 if (0 > y)
311 { 343 {
312 int extend = - y + MAP_EXTEND_Y; 344 int extend = - y + MAP_EXTEND_Y;
313 Prepend (maprow, self->row, self->rows, extend); 345 prepend (self->row, self->rows, extend);
314 346
315 self->rows += extend; 347 self->rows += extend;
316 self->y += extend; 348 self->y += extend;
317 y += extend; 349 y += extend;
318 } 350 }
319 else if (y >= self->rows) 351 else if (y >= self->rows)
320 { 352 {
321 int extend = y - self->rows + MAP_EXTEND_Y; 353 int extend = y - self->rows + MAP_EXTEND_Y;
322 Append (maprow, self->row, self->rows, extend); 354 append (self->row, self->rows, extend);
323 self->rows += extend; 355 self->rows += extend;
324 } 356 }
325 357
326 return self->row + y; 358 return self->row + y;
327} 359}
337 } 369 }
338 370
339 if (row->c0 > x) 371 if (row->c0 > x)
340 { 372 {
341 int extend = row->c0 - x + MAP_EXTEND_X; 373 int extend = row->c0 - x + MAP_EXTEND_X;
342 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 374 prepend (row->col, row->c1 - row->c0, extend);
343 row->c0 -= extend; 375 row->c0 -= extend;
344 } 376 }
345 else if (x >= row->c1) 377 else if (x >= row->c1)
346 { 378 {
347 int extend = x - row->c1 + MAP_EXTEND_X; 379 int extend = x - row->c1 + MAP_EXTEND_X;
348 Append (mapcell, row->col, row->c1 - row->c0, extend); 380 append (row->col, row->c1 - row->c0, extend);
349 row->c1 += extend; 381 row->c1 += extend;
350 } 382 }
351 383
352 return row->col + (x - row->c0); 384 return row->col + (x - row->c0);
353} 385}
354 386
355static mapcell * 387static mapcell *
356map_get_cell (DC__Map self, int x, int y) 388map_get_cell (mapgrid *self, int x, int y)
357{ 389{
358 return row_get_cell (map_get_row (self, y), x); 390 return row_get_cell (map_get_row (self, y), x);
359} 391}
360 392
361static void 393static void
362map_clear (DC__Map self) 394map_clear (mapgrid *self)
363{ 395{
364 int r; 396 int r;
365 397
366 for (r = 0; r < self->rows; r++) 398 for (r = 0; r < self->rows; r++)
367 Safefree (self->row[r].col); 399 Safefree (self->row[r].col);
385 (cell)->flags = 0; \ 417 (cell)->flags = 0; \
386 (cell)->player = 0; \ 418 (cell)->player = 0; \
387 } while (0) 419 } while (0)
388 420
389static void 421static void
390map_blank (DC__Map self, int x0, int y0, int w, int h) 422map_blank (mapgrid *self, int x0, int y0, int w, int h)
391{ 423{
392 int x, y; 424 int x, y;
393 maprow *row; 425 maprow *row;
394 mapcell *cell; 426 mapcell *cell;
395 427
412 CELL_CLEAR (cell); 444 CELL_CLEAR (cell);
413 } 445 }
414 } 446 }
415} 447}
416 448
417typedef struct { 449struct smooth_key
450{
418 tileid tile; 451 tileid tile;
419 uint8_t x, y, level; 452 uint8_t x, y, level;
420} smooth_key; 453
454 bool operator == (const smooth_key &o) const
455 {
456 return tile == o.tile && x == o.x && y == o.y && level == o.level;
457 }
458};
459
460typedef ska::flat_hash_map<smooth_key, IV, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> smooth_hash;
461
462namespace std {
463 template <>
464 struct hash<smooth_key>
465 {
466 size_t operator () (const smooth_key &v) const
467 {
468 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
469 }
470 };
471}
421 472
422static void 473static void
423smooth_or_bits (HV *hv, smooth_key *key, IV bits) 474smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
424{ 475{
425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 476 auto &&it = h.find (key);
426 477
427 if (SvIOK (*sv)) 478 if (it == h.end ())
428 SvIV_set (*sv, SvIVX (*sv) | bits); 479 h.insert (std::make_pair (key, bits));
429 else 480 else
430 sv_setiv (*sv, bits); 481 it->second |= bits;
431} 482}
432 483
433static void 484static void
434music_finished (void) 485music_finished (void)
435{ 486{
452 ev.code = 1; 503 ev.code = 1;
453 ev.data1 = (void *)(long)channel; 504 ev.data1 = (void *)(long)channel;
454 ev.data2 = 0; 505 ev.data2 = 0;
455 506
456 SDL_PushEvent ((SDL_Event *)&ev); 507 SDL_PushEvent ((SDL_Event *)&ev);
508}
509
510// approximately divide by 255
511static unsigned int
512div255 (unsigned int n)
513{
514 return (n + (n >> 8)) >> 8;
457} 515}
458 516
459static unsigned int 517static unsigned int
460minpot (unsigned int n) 518minpot (unsigned int n)
461{ 519{
471 n |= n >> 16; 529 n |= n >> 16;
472 530
473 return n + 1; 531 return n + 1;
474} 532}
475 533
476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
487/* SDL should provide this, really. */ 534/* SDL should provide this, really. */
488#define SDLK_MODIFIER_MIN 300 535#define SDLK_MODIFIER_MIN 300
489#define SDLK_MODIFIER_MAX 314 536#define SDLK_MODIFIER_MAX 314
490 537
491/******************************************************************************/ 538/******************************************************************************/
544 591
545 return mod; 592 return mod;
546} 593}
547 594
548static void 595static void
549deliantra_main () 596deliantra_main (SV *real_main)
550{ 597{
551 char *argv[] = { 0 }; 598 dSP;
552 call_argv ("::main", G_DISCARD | G_VOID, argv); 599
600 PUSHMARK (SP);
601 call_sv (real_main, G_DISCARD | G_VOID);
553} 602}
554 603
555#ifdef __MACOSX__ 604#ifdef __MACOSX__
605 static SV *real_main;
606
556 /* to due surprising braindamage on the side of SDL design, we 607 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main() 608 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which, 609 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 610 * due to shared library magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back. 611 * and which calls our main (== SDL_main) back.
561 */ 612 */
562 extern C_LINKAGE int 613 extern C_LINKAGE int
563 main (int argc, char *argv[]) 614 main (int argc, char *argv[])
564 { 615 {
565 deliantra_main (); 616 deliantra_main (real_main);
566 } 617 }
567 618
568 #undef main 619 #undef main
569 620
570 extern C_LINKAGE int main (int argc, char *argv[]); 621 extern C_LINKAGE int main (int argc, char *argv[]);
571 622
572 static void 623 static void
573 SDL_braino (void) 624 SDL_main_hack (SV *real_main_)
574 { 625 {
626 real_main = real_main_;
627
575 char *argv[] = { "deliantra client", 0 }; 628 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv); 629 (main) (1, argv);
577 } 630 }
578#else 631#else
579 static void 632 static void
580 SDL_braino (void) 633 SDL_main_hack (SV *real_main)
581 { 634 {
582 deliantra_main (); 635 deliantra_main (real_main);
583 } 636 }
584#endif 637#endif
585 638
586MODULE = Deliantra::Client PACKAGE = DC 639MODULE = Deliantra::Client PACKAGE = DC
587 640
788 841
789 const_iv (FOW_DARKNESS) 842 const_iv (FOW_DARKNESS)
790# undef const_iv 843# undef const_iv
791 }; 844 };
792 845
793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 846 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 847 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
795 848
796 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 849 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
797 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 850 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
798} 851}
799 852
814 867
815NV ceil (NV x) 868NV ceil (NV x)
816 869
817IV minpot (UV n) 870IV minpot (UV n)
818 871
872UV ld32 (UV n)
873 CODE:
874 RETVAL = ecb_ld32 (n);
875 OUTPUT:
876 RETVAL
877
819IV popcount (UV n) 878IV popcount (UV n)
879 CODE:
880 RETVAL = ecb_popcount32 (n);
881 OUTPUT:
882 RETVAL
883
884NV distance (NV dx, NV dy)
885 CODE:
886 RETVAL = pow (dx * dx + dy * dy, 0.5);
887 OUTPUT:
888 RETVAL
820 889
821void 890void
822pango_init () 891pango_init ()
823 CODE: 892 CODE:
824{ 893{
832#endif 901#endif
833} 902}
834 903
835char *SDL_GetError () 904char *SDL_GetError ()
836 905
837void SDL_braino () 906void SDL_main_hack (SV *real_main)
907 PROTOTYPE: &
838 908
839int SDL_Init (U32 flags) 909int SDL_Init (U32 flags)
840 910
841int SDL_InitSubSystem (U32 flags) 911int SDL_InitSubSystem (U32 flags)
842 912
843void SDL_QuitSubSystem (U32 flags) 913void SDL_QuitSubSystem (U32 flags)
844 914
845void SDL_Quit () 915void SDL_Quit ()
846 916
847int SDL_GL_SetAttribute (int attr, int value) 917int SDL_GL_SetAttribute (int attr, int value)
918 C_ARGS: (SDL_GLattr)attr, value
848 919
849int SDL_GL_GetAttribute (int attr) 920int SDL_GL_GetAttribute (int attr)
850 CODE: 921 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL)) 922 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
852 XSRETURN_UNDEF; 923 XSRETURN_UNDEF;
853 OUTPUT: 924 OUTPUT:
854 RETVAL 925 RETVAL
855 926
856void 927void
911 ); 982 );
912 983
913 if (RETVAL) 984 if (RETVAL)
914 { 985 {
915 av_clear (texture_av); 986 av_clear (texture_av);
916
917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
918#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 987#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
919#include "glfunc.h" 988#include "glfunc.h"
920#undef GL_FUNC 989#undef GL_FUNC
990 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
991 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921 } 992 }
922} 993}
923 OUTPUT: 994 OUTPUT:
924 RETVAL 995 RETVAL
996
997void
998SDL_WM_SetCaption (const char *title, const char *icon)
925 999
926void 1000void
927SDL_GL_SwapBuffers () 1001SDL_GL_SwapBuffers ()
928 1002
929char * 1003char *
930SDL_GetKeyName (int sym) 1004SDL_GetKeyName (int sym)
1005 C_ARGS: (SDLKey)sym
931 1006
932int 1007int
933SDL_GetAppState () 1008SDL_GetAppState ()
934 1009
935int 1010int
936SDL_GetModState () 1011SDL_GetModState ()
937 1012
1013int
1014SDL_WaitEvent ()
1015 C_ARGS: 0
1016
938void 1017void
1018SDL_PumpEvents ()
1019
1020void
939poll_events () 1021peep_events ()
940 PPCODE: 1022 PPCODE:
941{ 1023{
942 SDL_Event ev; 1024 SDL_Event ev;
943 1025
944 SDL_PumpEvents (); 1026 SDL_PumpEvents ();
1010 1092
1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1093 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1012 } 1094 }
1013} 1095}
1014 1096
1097char *
1098SDL_AudioDriverName ()
1099 CODE:
1100{
1101 char buf [256];
1102 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1103 XSRETURN_UNDEF;
1104
1105 RETVAL = buf;
1106}
1107 OUTPUT:
1108 RETVAL
1109
1015int 1110int
1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1111Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1017 POSTCALL: 1112 POSTCALL:
1018 Mix_HookMusicFinished (music_finished); 1113 Mix_HookMusicFinished (music_finished);
1019 Mix_ChannelFinished (channel_finished); 1114 Mix_ChannelFinished (channel_finished);
1020 1115
1021void 1116void
1022Mix_QuerySpec () 1117Mix_QuerySpec ()
1081add_font (char *file) 1176add_font (char *file)
1082 CODE: 1177 CODE:
1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1178 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT: 1179 OUTPUT:
1085 RETVAL 1180 RETVAL
1181
1182void
1183IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1184
1185# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1186void
1187Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1086 1188
1087void 1189void
1088load_image_inline (SV *image_) 1190load_image_inline (SV *image_)
1089 ALIAS: 1191 ALIAS:
1090 load_image_file = 1 1192 load_image_file = 1
1136 1238
1137 SDL_LockSurface (surface2); 1239 SDL_LockSurface (surface2);
1138 EXTEND (SP, 6); 1240 EXTEND (SP, 6);
1139 PUSHs (sv_2mortal (newSViv (surface2->w))); 1241 PUSHs (sv_2mortal (newSViv (surface2->w)));
1140 PUSHs (sv_2mortal (newSViv (surface2->h))); 1242 PUSHs (sv_2mortal (newSViv (surface2->h)));
1141 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1243 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1142 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1244 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1143 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1245 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1144 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1246 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1145 SDL_UnlockSurface (surface2); 1247 SDL_UnlockSurface (surface2);
1146 1248
1206#if DEBUG 1308#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK; 1309 VALGRIND_DO_LEAK_CHECK;
1208#endif 1310#endif
1209} 1311}
1210 1312
1313int
1314SvREFCNT (SV *sv)
1315 CODE:
1316 RETVAL = SvREFCNT (sv);
1317 OUTPUT:
1318 RETVAL
1319
1211MODULE = Deliantra::Client PACKAGE = DC::Font 1320MODULE = Deliantra::Client PACKAGE = DC::Font
1212 1321
1213PROTOTYPES: DISABLE 1322PROTOTYPES: DISABLE
1214 1323
1215DC::Font 1324DC::Font
1216new_from_file (SV *class, char *path, int id = 0) 1325new_from_file (SV *klass, char *path, int id = 0)
1217 CODE: 1326 CODE:
1218{ 1327{
1219 int count; 1328 int count;
1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1329 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1221 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1330 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1250 PROTOTYPE: 1359 PROTOTYPE:
1251 CODE: 1360 CODE:
1252 tc_restore (); 1361 tc_restore ();
1253 1362
1254DC::Layout 1363DC::Layout
1255new (SV *class) 1364new (SV *klass)
1256 CODE: 1365 CODE:
1257 New (0, RETVAL, 1, struct cf_layout); 1366 RETVAL = new cf_layout;
1258 1367
1259 RETVAL->pl = pango_layout_new (opengl_context); 1368 RETVAL->pl = pango_layout_new (opengl_context);
1260 RETVAL->r = 1.; 1369 RETVAL->r = 1.;
1261 RETVAL->g = 1.; 1370 RETVAL->g = 1.;
1262 RETVAL->b = 1.; 1371 RETVAL->b = 1.;
1263 RETVAL->a = 1.; 1372 RETVAL->a = 1.;
1264 RETVAL->base_height = MIN_FONT_HEIGHT; 1373 RETVAL->base_height = MIN_FONT_HEIGHT;
1265 RETVAL->font = 0; 1374 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
1267 1375
1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1376 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1269 layout_update_font (RETVAL); 1377 layout_update_font (RETVAL);
1270 OUTPUT: 1378 OUTPUT:
1271 RETVAL 1379 RETVAL
1272 1380
1273void 1381void
1274DESTROY (DC::Layout self) 1382DESTROY (DC::Layout self)
1275 CODE: 1383 CODE:
1276 g_object_unref (self->pl); 1384 g_object_unref (self->pl);
1277 rc_free (self->rc);
1278 Safefree (self); 1385 delete self;
1279 1386
1280void 1387void
1281set_text (DC::Layout self, SV *text_) 1388set_text (DC::Layout self, SV *text_)
1282 CODE: 1389 CODE:
1283{ 1390{
1409 1516
1410void 1517void
1411set_height (DC::Layout self, int base_height) 1518set_height (DC::Layout self, int base_height)
1412 CODE: 1519 CODE:
1413 if (self->base_height != base_height) 1520 if (self->base_height != base_height)
1414 { 1521 {
1415 self->base_height = base_height; 1522 self->base_height = base_height;
1416 layout_update_font (self); 1523 layout_update_font (self);
1417 } 1524 }
1418 1525
1419void 1526void
1537} 1644}
1538 1645
1539void 1646void
1540render (DC::Layout self, float x, float y, int flags = 0) 1647render (DC::Layout self, float x, float y, int flags = 0)
1541 CODE: 1648 CODE:
1542 rc_clear (self->rc); 1649 self->rc.clear ();
1543 pango_opengl_render_layout_subpixel ( 1650 pango_opengl_render_layout_subpixel (
1544 self->pl, 1651 self->pl,
1545 self->rc, 1652 &self->rc,
1546 x * PANGO_SCALE, y * PANGO_SCALE, 1653 x * PANGO_SCALE, y * PANGO_SCALE,
1547 self->r, self->g, self->b, self->a, 1654 self->r, self->g, self->b, self->a,
1548 flags 1655 flags
1549 ); 1656 );
1550 // we assume that context_change actually clears/frees stuff 1657 // we assume that context_change actually clears/frees stuff
1561 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1668 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1562 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1669 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1563 glEnable (GL_ALPHA_TEST); 1670 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1671 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1565 1672
1566 rc_draw (self->rc); 1673 self->rc.draw ();
1567 1674
1568 glDisable (GL_ALPHA_TEST); 1675 glDisable (GL_ALPHA_TEST);
1569 glDisable (GL_BLEND); 1676 glDisable (GL_BLEND);
1570 glDisable (GL_TEXTURE_2D); 1677 glDisable (GL_TEXTURE_2D);
1571} 1678}
1646 glDisable (GL_ALPHA_TEST); 1753 glDisable (GL_ALPHA_TEST);
1647 glDisable (GL_BLEND); 1754 glDisable (GL_BLEND);
1648 } 1755 }
1649} 1756}
1650 1757
1758void
1759draw_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)
1760 PROTOTYPE: @
1761 CODE:
1762{
1763 glEnable (GL_BLEND);
1764 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1765 glEnable (GL_TEXTURE_2D);
1766 glBindTexture (GL_TEXTURE_2D, name1);
1767
1768 glColor3f (intensity, intensity, intensity);
1769 glPushMatrix ();
1770 glScalef (1./3, 1./3, 1.);
1771
1772 if (blend > 0.f)
1773 {
1774 float dx3 = dx * -3.f / w;
1775 float dy3 = dy * -3.f / h;
1776 GLfloat env_color[4] = { 0., 0., 0., blend };
1777
1778 /* interpolate the two shadow textures */
1779 /* stage 0 == rgb(glcolor) + alpha(t0) */
1780 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1781
1782 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1783 gl.ActiveTexture (GL_TEXTURE1);
1784 glEnable (GL_TEXTURE_2D);
1785 glBindTexture (GL_TEXTURE_2D, name2);
1786 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1787
1788 /* rgb == rgb(glcolor) */
1789 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1792
1793 /* alpha = interpolate t0, t1 by env_alpha */
1794 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1795
1796 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1797 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1799
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1802
1803 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1804 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1805
1806 glBegin (GL_QUADS);
1807 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1808 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1809 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1810 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1811 glEnd ();
1812
1813 glDisable (GL_TEXTURE_2D);
1814 gl.ActiveTexture (GL_TEXTURE0);
1815 }
1816 else
1817 {
1818 /* simple blending of one texture, also opengl <1.3 path */
1819 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1820
1821 glBegin (GL_QUADS);
1822 glTexCoord2f (0, 0); glVertex2f (0, 0);
1823 glTexCoord2f (0, t); glVertex2f (0, h);
1824 glTexCoord2f (s, t); glVertex2f (w, h);
1825 glTexCoord2f (s, 0); glVertex2f (w, 0);
1826 glEnd ();
1827 }
1828
1829 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1830 {
1831 int x, y;
1832 int dx3 = dx * 3;
1833 int dy3 = dy * 3;
1834
1835 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1836 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1837 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1838 glTranslatef (-1., -1., 0);
1839 glBegin (GL_QUADS);
1840
1841 for (y = 1; y < h; y += 3)
1842 {
1843 int y1 = y - dy3;
1844 int y1valid = y1 >= 0 && y1 < h;
1845
1846 for (x = 1; x < w; x += 3)
1847 {
1848 int x1 = x - dx3;
1849 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1850 uint8_t h2;
1851
1852 if (y1valid && x1 >= 0 && x1 < w)
1853 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1854 else
1855 h2 = 1; /* out of range == invisible */
1856
1857 if (h1 || h2)
1858 {
1859 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1860 glColor4f (1., 1., 1., alpha);
1861
1862 glTexCoord2f (0, 0.); glVertex2i (x , y );
1863 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1864 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1865 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1866 }
1867 }
1868 }
1869 }
1870
1871 glEnd ();
1872
1873 glPopMatrix ();
1874
1875 glDisable (GL_TEXTURE_2D);
1876 glDisable (GL_BLEND);
1877}
1878
1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1879IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE: 1880 CODE:
1653{ 1881{
1654 GLint width; 1882 GLint width;
1655 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1883 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1662MODULE = Deliantra::Client PACKAGE = DC::Map 1890MODULE = Deliantra::Client PACKAGE = DC::Map
1663 1891
1664PROTOTYPES: DISABLE 1892PROTOTYPES: DISABLE
1665 1893
1666DC::Map 1894DC::Map
1667new (SV *class) 1895new (SV *klass)
1668 CODE: 1896 CODE:
1669 New (0, RETVAL, 1, struct map); 1897 New (0, RETVAL, 1, mapgrid);
1670 RETVAL->x = 0; 1898 RETVAL->x = 0;
1671 RETVAL->y = 0; 1899 RETVAL->y = 0;
1672 RETVAL->w = 0; 1900 RETVAL->w = 0;
1673 RETVAL->h = 0; 1901 RETVAL->h = 0;
1674 RETVAL->ox = 0; 1902 RETVAL->ox = 0;
1711 1939
1712void 1940void
1713set_smooth (DC::Map self, int face, int smooth, int level) 1941set_smooth (DC::Map self, int face, int smooth, int level)
1714 CODE: 1942 CODE:
1715{ 1943{
1716 tileid texid; 1944 tileid texid;
1717 maptex *tex; 1945 maptex *tex;
1718 1946
1719 if (face < 0 || face >= self->faces) 1947 if (face < 0 || face >= self->faces)
1720 return; 1948 return;
1721 1949
1722 if (smooth < 0 || smooth >= self->faces) 1950 if (smooth < 0 || smooth >= self->faces)
1723 return; 1951 return;
1724 1952
1725 texid = self->face2tile [face]; 1953 texid = self->face2tile [face];
1726 1954
1727 if (!texid) 1955 if (!texid)
1728 return; 1956 return;
1729 1957
1730 tex = self->tex + texid; 1958 tex = self->tex + texid;
1759 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1987 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760 // use uglier nearest interpolation because linear suffers 1988 // use uglier nearest interpolation because linear suffers
1761 // from transparent color bleeding and ugly wrapping effects. 1989 // from transparent color bleeding and ugly wrapping effects.
1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1990 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763} 1991}
1992
1993void
1994expire_textures (DC::Map self, int texid, int count)
1995 PPCODE:
1996 for (; texid < self->texs && count; ++texid, --count)
1997 {
1998 maptex *tex = self->tex + texid;
1999
2000 if (tex->name)
2001 {
2002 if (tex->unused)
2003 {
2004 tex->name = 0;
2005 tex->unused = 0;
2006 XPUSHs (sv_2mortal (newSViv (texid)));
2007 }
2008 else
2009 tex->unused = 1;
2010 }
2011 }
1764 2012
1765int 2013int
1766ox (DC::Map self) 2014ox (DC::Map self)
1767 ALIAS: 2015 ALIAS:
1768 oy = 1 2016 oy = 1
1800 self->ox += dx; self->x += dx; 2048 self->ox += dx; self->x += dx;
1801 self->oy += dy; self->y += dy; 2049 self->oy += dy; self->y += dy;
1802 2050
1803 while (self->y < 0) 2051 while (self->y < 0)
1804 { 2052 {
1805 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2053 prepend (self->row, self->rows, MAP_EXTEND_Y);
1806 2054
1807 self->rows += MAP_EXTEND_Y; 2055 self->rows += MAP_EXTEND_Y;
1808 self->y += MAP_EXTEND_Y; 2056 self->y += MAP_EXTEND_Y;
1809 } 2057 }
1810} 2058}
1811 2059
1812SV * 2060SV *
1813map1a_update (DC::Map self, SV *data_, int extmap) 2061map1a_update (DC::Map self, SV *data_)
1814 CODE: 2062 CODE:
1815{ 2063{
1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2064 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1817 uint8_t *data_end = (uint8_t *)SvEND (data_); 2065 uint8_t *data_end = (uint8_t *)SvEND (data_);
1818 mapcell *cell; 2066 mapcell *cell;
1839 2087
1840 //TODO: don't trust server data to be in-range(!) 2088 //TODO: don't trust server data to be in-range(!)
1841 2089
1842 if (flags & 8) 2090 if (flags & 8)
1843 { 2091 {
2092 uint8_t ext, cmd;
2093
1844 if (extmap) 2094 do
1845 { 2095 {
1846 uint8_t ext, cmd; 2096 ext = *data++;
2097 cmd = ext & 0x7f;
1847 2098
1848 do 2099 if (cmd < 4)
2100 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2101 else if (cmd == 5) // health
1849 { 2102 {
1850 ext = *data++;
1851 cmd = ext & 0x7f;
1852
1853 if (cmd < 4)
1854 cell->darkness = 255 - ext * 64 + 1;
1855 else if (cmd == 5) // health
1856 {
1857 cell->stat_width = 1; 2103 cell->stat_width = 1;
1858 cell->stat_hp = *data++; 2104 cell->stat_hp = *data++;
1859 }
1860 else if (cmd == 6) // monster width
1861 cell->stat_width = *data++ + 1;
1862 else if (cmd == 0x47)
1863 {
1864 if (*data == 1) cell->player = data [1];
1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1868
1869 data += *data + 1;
1870 }
1871 else if (cmd == 8) // cell flags
1872 cell->flags = *data++;
1873 else if (ext & 0x40) // unknown, multibyte => skip
1874 data += *data + 1;
1875 else
1876 data++;
1877 } 2105 }
1878 while (ext & 0x80); 2106 else if (cmd == 6) // monster width
2107 cell->stat_width = *data++ + 1;
2108 else if (cmd == 0x47)
2109 {
2110 if (*data == 1) cell->player = data [1];
2111 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2112 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2113 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2114
2115 data += *data + 1;
2116 }
2117 else if (cmd == 8) // cell flags
2118 cell->flags = *data++;
2119 else if (ext & 0x40) // unknown, multibyte => skip
2120 data += *data + 1;
2121 else
2122 data++;
1879 } 2123 }
1880 else 2124 while (ext & 0x80);
1881 cell->darkness = *data++ + 1;
1882 } 2125 }
1883 2126
1884 for (z = 0; z <= 2; ++z) 2127 for (z = 0; z <= 2; ++z)
1885 if (flags & (4 >> z)) 2128 if (flags & (4 >> z))
1886 { 2129 {
1889 cell->tile [z] = self->face2tile [face]; 2132 cell->tile [z] = self->face2tile [face];
1890 2133
1891 if (cell->tile [z]) 2134 if (cell->tile [z])
1892 { 2135 {
1893 maptex *tex = self->tex + cell->tile [z]; 2136 maptex *tex = self->tex + cell->tile [z];
2137 tex->unused = 0;
1894 if (!tex->name) 2138 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z])); 2139 av_push (missing, newSViv (cell->tile [z]));
1896 2140
1897 if (tex->smoothtile) 2141 if (tex->smoothtile)
1898 { 2142 {
1899 maptex *smooth = self->tex + tex->smoothtile; 2143 maptex *smooth = self->tex + tex->smoothtile;
2144 smooth->unused = 0;
1900 if (!smooth->name) 2145 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile)); 2146 av_push (missing, newSViv (tex->smoothtile));
1902 } 2147 }
1903 } 2148 }
1904 } 2149 }
1932 ? self->row + y 2177 ? self->row + y
1933 : 0; 2178 : 0;
1934 2179
1935 for (x = x0; x < x1; x++) 2180 for (x = x0; x < x1; x++)
1936 { 2181 {
1937 int r = 32, g = 32, b = 32, a = 192; 2182 unsigned int r = 32, g = 32, b = 32, a = 192;
1938 2183
1939 if (row && row->c0 <= x && x < row->c1) 2184 if (row && row->c0 <= x && x < row->c1)
1940 { 2185 {
1941 mapcell *cell = row->col + (x - row->c0); 2186 mapcell *cell = row->col + (x - row->c0);
1942 2187
1944 { 2189 {
1945 maptex tex = self->tex [cell->tile [z]]; 2190 maptex tex = self->tex [cell->tile [z]];
1946 int a0 = 255 - tex.a; 2191 int a0 = 255 - tex.a;
1947 int a1 = tex.a; 2192 int a1 = tex.a;
1948 2193
1949 r = (r * a0 + tex.r * a1) / 255; 2194 r = div255 (r * a0 + tex.r * a1);
1950 g = (g * a0 + tex.g * a1) / 255; 2195 g = div255 (g * a0 + tex.g * a1);
1951 b = (b * a0 + tex.b * a1) / 255; 2196 b = div255 (b * a0 + tex.b * a1);
1952 a = (a * a0 + tex.a * a1) / 255; 2197 a = div255 (a * a0 + tex.a * a1);
1953 } 2198 }
1954 } 2199 }
1955 2200
1956 *map++ = (r ) 2201 *map++ = (r )
1957 | (g << 8) 2202 | (g << 8)
1958 | (b << 16) 2203 | (b << 16)
1959 | (a << 24); 2204 | (a << 24);
1960 } 2205 }
1961 } 2206 }
1962 2207
1963 RETVAL = map_sv; 2208 RETVAL = map_sv;
1964} 2209}
1965 OUTPUT: 2210 OUTPUT:
1966 RETVAL 2211 RETVAL
1967 2212
1968void 2213void
1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2214draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1970 CODE: 2215 CODE:
1971{ 2216{
1972 int x, y, z; 2217 int x, y, z;
1973 2218
1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2219 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1977 smooth_key skey;
1978 int pl_x, pl_y; 2220 int pl_x, pl_y;
1979 maptex pl_tex; 2221 maptex pl_tex;
1980 rc_t *rc = rc_alloc (); 2222 rc_t rc;
2223 rc_t rc_ov;
1981 rc_key_t key; 2224 rc_key_t key;
1982 rc_array_t *arr; 2225 rc_t::array_t *arr;
1983 2226
1984 pl_tex.name = 0; 2227 pl_tex.name = 0;
1985 2228
1986 // thats current max. sorry. 2229 // that's current max. sorry.
1987 if (sw > 255) sw = 255; 2230 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255; 2231 if (sh > 255) sh = 255;
1989
1990 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey));
1992 2232
1993 memset (&key, 0, sizeof (key)); 2233 memset (&key, 0, sizeof (key));
1994 key.r = 255; 2234 key.r = 255;
1995 key.g = 255; 2235 key.g = 255;
1996 key.b = 255; 2236 key.b = 255;
1997 key.a = 255; 2237 key.a = 255;
1998 key.mode = GL_QUADS; 2238 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F; 2239 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001 2240
2002 mx += self->x; 2241 mx += self->x;
2003 my += self->y; 2242 my += self->y;
2004 2243
2005 // first pass: determine smooth_max 2244 // first pass: determine smooth_max
2006 // rather ugly, if you ask me 2245 // rather ugly, if you ask me
2007 // could also be stored inside mapcell and updated on change 2246 // could also be stored inside mapcell and updated on change
2008 memset (smooth_max, 0, sizeof (smooth_max)); 2247 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2009 2248
2010 for (y = 0; y < sh; y++) 2249 for (y = 0; y < sh; y++)
2011 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2012 { 2251 {
2013 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2267 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2268 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030 2269
2031 for (z = 0; z <= 2; z++) 2270 for (z = 0; z <= 2; z++)
2032 { 2271 {
2033 memset (smooth_level, 0, sizeof (smooth_level)); 2272 std::bitset<256> smooth_level; // one bit for every possible smooth level
2273 smooth_key skey;
2274 smooth_hash smooth;
2275 key.texname = -1;
2034 2276
2035 for (y = 0; y < sh; y++) 2277 for (y = 0; y < sh; y++)
2036 if (0 <= y + my && y + my < self->rows) 2278 if (0 <= y + my && y + my < self->rows)
2037 { 2279 {
2038 maprow *row = self->row + (y + my); 2280 maprow *row = self->row + (y + my);
2044 tileid tile = cell->tile [z]; 2286 tileid tile = cell->tile [z];
2045 2287
2046 if (tile) 2288 if (tile)
2047 { 2289 {
2048 maptex tex = self->tex [tile]; 2290 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w; 2291 int px, py;
2050 int py = (y + 1) * T - tex.h;
2051 2292
2052 if (key.texname != tex.name) 2293 if (key.texname != tex.name)
2053 { 2294 {
2295 self->tex [tile].unused = 0;
2296
2054 if (!tex.name) 2297 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */ 2298 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056 2299
2057 key.texname = tex.name; 2300 key.texname = tex.name;
2058 arr = rc_array (rc, &key); 2301 arr = &rc.array (key);
2059 } 2302 }
2060 2303
2304 px = (x + 1) * Th - tex.w;
2305 py = (y + 1) * Tw - tex.h;
2306
2061 if (expect_false (cell->player == player) && expect_false (z == 2)) 2307 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2062 { 2308 {
2063 pl_x = px; 2309 pl_x = px;
2064 pl_y = py; 2310 pl_y = py;
2065 pl_tex = tex; 2311 pl_tex = tex;
2066 continue; 2312 continue;
2067 } 2313 }
2068 2314
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2315 arr->t2f_v3f (0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2316 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2317 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2318 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2073
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
2077 if (cell->flags & 1)
2078 {
2079 maptex tex = self->tex [1];
2080 int px = x * T + T * 2 / 32;
2081 int py = y * T - T * 6 / 32;
2082
2083 if (tex.name)
2084 {
2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095 }
2096 }
2097 }
2098 2319
2099 // update smooth hash 2320 // update smooth hash
2100 if (tex.smoothtile) 2321 if (tex.smoothtile)
2101 { 2322 {
2102 skey.tile = tex.smoothtile; 2323 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel; 2324 skey.level = tex.smoothlevel;
2104 2325
2105 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2326 smooth_level[tex.smoothlevel] = 1;
2106 2327
2107 // add bits to current tile and all neighbours. skey.x|y is 2328 // add bits to current tile and all neighbours. skey.x|y is
2108 // shifted +1|+1 so we always stay positive. 2329 // shifted +1|+1 so we always stay positive.
2109 2330
2110 // bits is ___n cccc CCCC bbbb 2331 // bits is ___n cccc CCCC bbbb
2118 2339
2119 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2340 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2120 // ·· ·· ·┏ ┓· 2341 // ·· ·· ·┏ ┓·
2121 2342
2122 // full tile 2343 // full tile
2123 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2344 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2124 2345
2125 // borders 2346 // borders
2126 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2347 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2127 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2348 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2128 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2349 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2129 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2350 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2130 2351
2131 // corners 2352 // corners
2132 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2353 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2133 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2354 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2134 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2355 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2135 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2356 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2357 }
2358 }
2359
2360 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2361 {
2362 // overlays such as the speech bubble, probably more to come
2363 if (cell->flags & 1)
2364 {
2365 rc_key_t key_ov = key;
2366 maptex tex = self->tex[TEXID_SPEECH];
2367 int px = x * Tw + Tw * 2 / 32;
2368 int py = y * Th - Th * 6 / 32;
2369
2370 key_ov.texname = tex.name;
2371 rc_t::array_t &arr = rc_ov.array (key_ov);
2372
2373 arr.t2f_v3f (0 , 0 , px , py , 0);
2374 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2375 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2376 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2136 } 2377 }
2137 } 2378 }
2138 } 2379 }
2139 } 2380 }
2140 2381
2141 rc_draw (rc); 2382 rc.draw ();
2142 rc_clear (rc); 2383 rc.clear ();
2143 2384
2144 // go through all smoothlevels, lowest to highest, then draw. 2385 // go through all smoothlevels, lowest to highest, then draw.
2145 // this is basically counting sort 2386 // this is basically counting sort
2146 { 2387 {
2147 int w, b; 2388 int w, b;
2148 2389
2149 glEnable (GL_TEXTURE_2D); 2390 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS); 2391 glBegin (GL_QUADS);
2151 for (w = 0; w < 256 / 32; ++w) 2392 for (int level = 0; level < smooth_level.size (); ++level)
2393 if (smooth_level[level])
2394 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2152 { 2395 {
2153 uint32_t smask = smooth_level [w]; 2396 smooth_key &skey = it->first;
2154 if (smask) 2397 IV bits = it->second;
2155 for (b = 0; b < 32; ++b) 2398
2156 if (smask & (((uint32_t)1) << b)) 2399 if (!(bits & 0x1000)
2400 && skey.level == level
2401 && level > smooth_max [skey.x][skey.y])
2157 { 2402 {
2158 int level = (w << 5) | b; 2403 maptex tex = self->tex [skey.tile];
2404 int px = (((int)skey.x) - 1) * Tw;
2405 int py = (((int)skey.y) - 1) * Th;
2406 int border = bits & 15;
2407 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2408 float dx = tex.s * .0625f; // 16 images/row
2409 float dy = tex.t * .5f ; // 2 images/column
2410
2159 HE *he; 2411 if (tex.name)
2160
2161 hv_iterinit (smooth);
2162 while ((he = hv_iternext (smooth)))
2163 { 2412 {
2164 smooth_key *skey = (smooth_key *)HeKEY (he); 2413 // this time avoiding texture state changes
2165 IV bits = SvIVX (HeVAL (he)); 2414 // save gobs of state changes.
2166 2415 if (key.texname != tex.name)
2167 if (!(bits & 0x1000)
2168 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y])
2170 { 2416 {
2171 maptex tex = self->tex [skey->tile]; 2417 self->tex [skey.tile].unused = 0;
2172 int px = (((int)skey->x) - 1) * T;
2173 int py = (((int)skey->y) - 1) * T;
2174 int border = bits & 15;
2175 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176 float dx = tex.s * .0625f; // 16 images/row
2177 float dy = tex.t * .5f ; // 2 images/column
2178 2418
2179 if (tex.name)
2180 {
2181 // this time avoiding texture state changes
2182 // save gobs of state changes.
2183 if (key.texname != tex.name)
2184 {
2185 glEnd (); 2419 glEnd ();
2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2420 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187 glBegin (GL_QUADS); 2421 glBegin (GL_QUADS);
2188 } 2422 }
2189 2423
2190 if (border) 2424 if (border)
2191 { 2425 {
2192 float ox = border * dx; 2426 float ox = border * dx;
2193 2427
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198 } 2432 }
2199 2433
2200 if (corner) 2434 if (corner)
2201 { 2435 {
2202 float ox = corner * dx; 2436 float ox = corner * dx;
2203 2437
2204 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2438 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2439 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2440 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208 }
2209 }
2210 } 2442 }
2211 } 2443 }
2212 } 2444 }
2213 } 2445 }
2214 2446
2215 glEnd (); 2447 glEnd ();
2216 glDisable (GL_TEXTURE_2D); 2448 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1; 2449 key.texname = -1;
2218 } 2450 }
2219
2220 hv_clear (smooth);
2221 } 2451 }
2222 2452
2223 if (pl_tex.name) 2453 if (pl_tex.name)
2224 { 2454 {
2225 maptex tex = pl_tex; 2455 maptex tex = pl_tex;
2226 int px = pl_x + sdx; 2456 int px = pl_x + sdx;
2227 int py = pl_y + sdy; 2457 int py = pl_y + sdy;
2228 2458
2229 key.texname = tex.name; 2459 key.texname = tex.name;
2230 arr = rc_array (rc, &key); 2460 rc_t::array_t &arr = rc.array (key);
2231 2461
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2462 arr.t2f_v3f (0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2463 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2464 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2465 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2236 2466
2237 rc_draw (rc); 2467 rc.draw ();
2238 } 2468 }
2239 2469
2470 rc_ov.draw ();
2471 rc_ov.clear ();
2472
2240 glDisable (GL_BLEND); 2473 glDisable (GL_BLEND);
2241 rc_free (rc);
2242 2474
2243 // top layer: overlays such as the health bar 2475 // top layer: overlays such as the health bar
2244 for (y = 0; y < sh; y++) 2476 for (y = 0; y < sh; y++)
2245 if (0 <= y + my && y + my < self->rows) 2477 if (0 <= y + my && y + my < self->rows)
2246 { 2478 {
2249 for (x = 0; x < sw; x++) 2481 for (x = 0; x < sw; x++)
2250 if (row->c0 <= x + mx && x + mx < row->c1) 2482 if (row->c0 <= x + mx && x + mx < row->c1)
2251 { 2483 {
2252 mapcell *cell = row->col + (x + mx - row->c0); 2484 mapcell *cell = row->col + (x + mx - row->c0);
2253 2485
2254 int px = x * T; 2486 int px = x * Tw;
2255 int py = y * T; 2487 int py = y * Th;
2256 2488
2257 if (expect_false (cell->player == player)) 2489 if (ecb_expect_false (cell->player == player))
2258 { 2490 {
2259 px += sdx; 2491 px += sdx;
2260 py += sdy; 2492 py += sdy;
2261 } 2493 }
2262 2494
2263 if (cell->stat_hp) 2495 if (cell->stat_hp)
2264 { 2496 {
2265 int width = cell->stat_width * T; 2497 int width = cell->stat_width * Tw;
2266 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2498 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2267 2499
2268 glColor3ub (0, 0, 0); 2500 glColor3ub (0, 0, 0);
2269 glRectf (px + 1, py - thick - 2, 2501 glRectf (px + 1, py - thick - 2,
2270 px + width - 1, py); 2502 px + width - 1, py);
2271 2503
2277 } 2509 }
2278 } 2510 }
2279} 2511}
2280 2512
2281void 2513void
2282draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2514draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2283 CODE: 2515 CODE:
2284{ 2516{
2285 static float color[16][3] = { 2517 static float color[16][3] = {
2286 { 0.00F, 0.00F, 0.00F }, 2518 { 0.00f, 0.00f, 0.00f },
2287 { 1.00F, 1.00F, 1.00F }, 2519 { 1.00f, 1.00f, 1.00f },
2288 { 0.00F, 0.00F, 0.55F }, 2520 { 0.00f, 0.00f, 0.55f },
2289 { 1.00F, 0.00F, 0.00F }, 2521 { 1.00f, 0.00f, 0.00f },
2290 2522
2291 { 1.00F, 0.54F, 0.00F }, 2523 { 1.00f, 0.54f, 0.00f },
2292 { 0.11F, 0.56F, 1.00F }, 2524 { 0.11f, 0.56f, 1.00f },
2293 { 0.93F, 0.46F, 0.00F }, 2525 { 0.93f, 0.46f, 0.00f },
2294 { 0.18F, 0.54F, 0.34F }, 2526 { 0.18f, 0.54f, 0.34f },
2295 2527
2296 { 0.56F, 0.73F, 0.56F }, 2528 { 0.56f, 0.73f, 0.56f },
2297 { 0.80F, 0.80F, 0.80F }, 2529 { 0.80f, 0.80f, 0.80f },
2298 { 0.55F, 0.41F, 0.13F }, 2530 { 0.55f, 0.41f, 0.13f },
2299 { 0.99F, 0.77F, 0.26F }, 2531 { 0.99f, 0.77f, 0.26f },
2300 2532
2301 { 0.74F, 0.65F, 0.41F }, 2533 { 0.74f, 0.65f, 0.41f },
2302 2534
2303 { 0.00F, 1.00F, 1.00F }, 2535 { 0.00f, 1.00f, 1.00f },
2304 { 1.00F, 0.00F, 1.00F }, 2536 { 1.00f, 0.00f, 1.00f },
2305 { 1.00F, 1.00F, 0.00F }, 2537 { 1.00f, 1.00f, 0.00f },
2306 }; 2538 };
2307 2539
2308 int x, y; 2540 int x, y;
2309 2541
2310 glEnable (GL_TEXTURE_2D); 2542 glEnable (GL_TEXTURE_2D);
2543 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2544 * but the nvidia driver (185.18.14) mishandles alpha textures
2545 * and takes the colour from god knows where instead of using
2546 * Cp. MODULATE results in the same colour, but slightly different
2547 * alpha, but atcually gives us the correct colour with nvidia.
2548 */
2311 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2549 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2312 glEnable (GL_BLEND); 2550 glEnable (GL_BLEND);
2313 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2551 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2314 glBegin (GL_QUADS); 2552 glBegin (GL_QUADS);
2315 2553
2316 for (y = 0; y < h; y++) 2554 for (y = 0; y < h; y++)
2320 2558
2321 if (m) 2559 if (m)
2322 { 2560 {
2323 float *c = color [m & 15]; 2561 float *c = color [m & 15];
2324 2562
2325 float tx1 = m & 0x40 ? 0.5 : 0.; 2563 float tx1 = m & 0x40 ? 0.5f : 0.f;
2326 float tx2 = tx1 + 0.5; 2564 float tx2 = tx1 + 0.5f;
2327 2565
2328 glColor4f (c[0], c[1], c[2], 0.75); 2566 glColor4f (c[0], c[1], c[2], 1);
2329 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2567 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2330 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2568 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2331 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2569 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2332 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2570 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2333 } 2571 }
2341void 2579void
2342fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2580fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2343 PPCODE: 2581 PPCODE:
2344{ 2582{
2345 int x, y; 2583 int x, y;
2346 int sw1 = sw + 2; 2584 int sw1 = sw + 2;
2347 int sh1 = sh + 2; 2585 int sh1 = sh + 2;
2348 int sh3 = sh * 3; 2586 int sh3 = sh * 3;
2349 int sw34 = (sw * 3 + 3) & ~3; 2587 int sw3 = sw * 3;
2588 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2589 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2350 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2590 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2351 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2591 memset (darkness1, 0, sw1*sh1);
2352 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2353 2592
2354 SvPOK_only (darkness3_sv); 2593 SvPOK_only (darkness3_sv);
2355 SvCUR_set (darkness3_sv, sw34 * sh3); 2594 SvCUR_set (darkness3_sv, sw3 * sh3);
2356 2595
2357 mx += self->x - 1; 2596 mx += self->x - 1;
2358 my += self->y - 1; 2597 my += self->y - 1;
2359
2360 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2361 2598
2362 for (y = 0; y < sh1; y++) 2599 for (y = 0; y < sh1; y++)
2363 if (0 <= y + my && y + my < self->rows) 2600 if (0 <= y + my && y + my < self->rows)
2364 { 2601 {
2365 maprow *row = self->row + (y + my); 2602 maprow *row = self->row + (y + my);
2368 if (row->c0 <= x + mx && x + mx < row->c1) 2605 if (row->c0 <= x + mx && x + mx < row->c1)
2369 { 2606 {
2370 mapcell *cell = row->col + (x + mx - row->c0); 2607 mapcell *cell = row->col + (x + mx - row->c0);
2371 2608
2372 darkness1 [y * sw1 + x] = cell->darkness 2609 darkness1 [y * sw1 + x] = cell->darkness
2373 ? 255 - (cell->darkness - 1) 2610 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2374 : 255 - FOW_DARKNESS; 2611 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2375 } 2612 }
2376 } 2613 }
2377 2614
2378 for (y = 0; y < sh; ++y) 2615 for (y = 0; y < sh; ++y)
2379 for (x = 0; x < sw; ++x) 2616 for (x = 0; x < sw; ++x)
2398 2635
2399 uint8_t r13 = (d13 + d23 + d12) / 3; 2636 uint8_t r13 = (d13 + d23 + d12) / 3;
2400 uint8_t r23 = d23; 2637 uint8_t r23 = d23;
2401 uint8_t r33 = (d23 + d33 + d32) / 3; 2638 uint8_t r33 = (d23 + d33 + d32) / 3;
2402 2639
2403 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2640 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2404 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2405 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2406 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2643 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2407 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2408 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2409 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2646 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2410 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2411 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2412 } 2649 }
2413 2650
2414 free (darkness1); 2651 free (darkness1);
2415 2652
2416 EXTEND (SP, 3); 2653 EXTEND (SP, 3);
2417 PUSHs (sv_2mortal (newSViv (sw34))); 2654 PUSHs (sv_2mortal (newSViv (sw3)));
2418 PUSHs (sv_2mortal (newSViv (sh3))); 2655 PUSHs (sv_2mortal (newSViv (sh3)));
2419 PUSHs (darkness3_sv); 2656 PUSHs (darkness3_sv);
2420} 2657}
2421 2658
2422SV * 2659SV *
2485 else 2722 else
2486 *data++ = 0; 2723 *data++ = 0;
2487 } 2724 }
2488 } 2725 }
2489 2726
2490 /* if size is w*h + 5 then no data has been found */ 2727 /* if size is w*h + 5 then no data has been found */
2491 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2728 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2492 { 2729 {
2493 SvPOK_only (data_sv); 2730 SvPOK_only (data_sv);
2494 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2731 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2495 } 2732 }
2496 2733
2497 RETVAL = data_sv; 2734 RETVAL = data_sv;
2498} 2735}
2499 OUTPUT: 2736 OUTPUT:
2500 RETVAL 2737 RETVAL
2501 2738
2502void 2739void
2509 STRLEN len; 2746 STRLEN len;
2510 uint8_t *data, *end; 2747 uint8_t *data, *end;
2511 2748
2512 len = SvLEN (data_sv); 2749 len = SvLEN (data_sv);
2513 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2750 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2514 data = SvPVbyte_nolen (data_sv); 2751 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2515 end = data + len + 8; 2752 end = data + len + 8;
2516 2753
2517 if (len < 5) 2754 if (len < 5)
2518 XSRETURN_EMPTY; 2755 XSRETURN_EMPTY;
2519 2756
2580} 2817}
2581 2818
2582MODULE = Deliantra::Client PACKAGE = DC::RW 2819MODULE = Deliantra::Client PACKAGE = DC::RW
2583 2820
2584DC::RW 2821DC::RW
2585new (SV *class, SV *data_sv) 2822new (SV *klass, SV *data_sv)
2586 CODE: 2823 CODE:
2587{ 2824{
2588 STRLEN datalen; 2825 STRLEN datalen;
2589 char *data = SvPVbyte (data_sv, datalen); 2826 char *data = SvPVbyte (data_sv, datalen);
2590 2827
2592} 2829}
2593 OUTPUT: 2830 OUTPUT:
2594 RETVAL 2831 RETVAL
2595 2832
2596DC::RW 2833DC::RW
2597new_from_file (SV *class, const char *path, const char *mode = "rb") 2834new_from_file (SV *klass, const char *path, const char *mode = "rb")
2598 CODE: 2835 CODE:
2599 RETVAL = SDL_RWFromFile (path, mode); 2836 RETVAL = SDL_RWFromFile (path, mode);
2600 OUTPUT: 2837 OUTPUT:
2601 RETVAL 2838 RETVAL
2602 2839
2620 if (RETVAL < 0) 2857 if (RETVAL < 0)
2621 { 2858 {
2622 RETVAL = Mix_GroupOldest (-1); 2859 RETVAL = Mix_GroupOldest (-1);
2623 2860
2624 if (RETVAL < 0) 2861 if (RETVAL < 0)
2862 {
2863 // happens sometimes, maybe it just stopped playing(?)
2864 RETVAL = Mix_GroupAvailable (-1);
2865
2866 if (RETVAL < 0)
2625 XSRETURN_UNDEF; 2867 XSRETURN_UNDEF;
2626 2868 }
2869 else
2627 Mix_HaltChannel (RETVAL); 2870 Mix_HaltChannel (RETVAL);
2628 } 2871 }
2629 2872
2630 Mix_UnregisterAllEffects (RETVAL); 2873 Mix_UnregisterAllEffects (RETVAL);
2631 Mix_Volume (RETVAL, 128); 2874 Mix_Volume (RETVAL, 128);
2632} 2875}
2679void 2922void
2680set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2923set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2681 CODE: 2924 CODE:
2682{ 2925{
2683 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2926 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2684 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2927 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2685 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2928 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2686} 2929}
2687 2930
2688void 2931void
2689set_reverse_stereo (DC::Channel self, int flip) 2932set_reverse_stereo (DC::Channel self, int flip)
2692 2935
2693MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2936MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2694 2937
2695PROTOTYPES: DISABLE 2938PROTOTYPES: DISABLE
2696 2939
2940void
2941decoders ()
2942 PPCODE:
2943#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2944 int i, num = Mix_GetNumChunkDecoders ();
2945 EXTEND (SP, num);
2946 for (i = 0; i < num; ++i)
2947 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2948#else
2949 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2950#endif
2951
2697DC::MixChunk 2952DC::MixChunk
2698new (SV *class, DC::RW rwops) 2953new (SV *klass, DC::RW rwops)
2699 CODE: 2954 CODE:
2700 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2955 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2701 OUTPUT: 2956 OUTPUT:
2702 RETVAL 2957 RETVAL
2703 2958
2733 OUTPUT: 2988 OUTPUT:
2734 RETVAL 2989 RETVAL
2735 2990
2736MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2991MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2737 2992
2993void
2994decoders ()
2995 PPCODE:
2996#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2997 int i, num = Mix_GetNumMusicDecoders ();
2998 EXTEND (SP, num);
2999 for (i = 0; i < num; ++i)
3000 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3001#else
3002 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3003#endif
3004
2738int 3005int
2739volume (int volume = -1) 3006volume (int volume = -1)
2740 PROTOTYPE: ;$ 3007 PROTOTYPE: ;$
2741 CODE: 3008 CODE:
2742 if (items > 0) 3009 if (items > 0)
2753void 3020void
2754halt () 3021halt ()
2755 CODE: 3022 CODE:
2756 Mix_HaltMusic (); 3023 Mix_HaltMusic ();
2757 3024
3025int
3026playing ()
3027 CODE:
3028 RETVAL = Mix_PlayingMusic ();
3029 OUTPUT:
3030 RETVAL
3031
2758DC::MixMusic 3032DC::MixMusic
2759new (SV *class, DC::RW rwops) 3033new (SV *klass, DC::RW rwops)
2760 CODE: 3034 CODE:
2761 RETVAL = Mix_LoadMUS_RW (rwops); 3035 RETVAL = Mix_LoadMUS_RW (rwops);
2762 OUTPUT: 3036 OUTPUT:
2763 RETVAL 3037 RETVAL
2764 3038
2792 } *civ, const_iv[] = { 3066 } *civ, const_iv[] = {
2793# define const_iv(name) { # name, (IV)name } 3067# define const_iv(name) { # name, (IV)name }
2794 const_iv (GL_VENDOR), 3068 const_iv (GL_VENDOR),
2795 const_iv (GL_VERSION), 3069 const_iv (GL_VERSION),
2796 const_iv (GL_EXTENSIONS), 3070 const_iv (GL_EXTENSIONS),
3071 const_iv (GL_MAX_TEXTURE_UNITS),
2797 const_iv (GL_COLOR_MATERIAL), 3072 const_iv (GL_COLOR_MATERIAL),
2798 const_iv (GL_SMOOTH), 3073 const_iv (GL_SMOOTH),
2799 const_iv (GL_FLAT), 3074 const_iv (GL_FLAT),
2800 const_iv (GL_DITHER), 3075 const_iv (GL_DITHER),
2801 const_iv (GL_BLEND), 3076 const_iv (GL_BLEND),
2813 const_iv (GL_ZERO), 3088 const_iv (GL_ZERO),
2814 const_iv (GL_SRC_ALPHA), 3089 const_iv (GL_SRC_ALPHA),
2815 const_iv (GL_DST_ALPHA), 3090 const_iv (GL_DST_ALPHA),
2816 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3091 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2817 const_iv (GL_ONE_MINUS_DST_ALPHA), 3092 const_iv (GL_ONE_MINUS_DST_ALPHA),
3093 const_iv (GL_SRC_COLOR),
3094 const_iv (GL_DST_COLOR),
3095 const_iv (GL_ONE_MINUS_SRC_COLOR),
3096 const_iv (GL_ONE_MINUS_DST_COLOR),
2818 const_iv (GL_SRC_ALPHA_SATURATE), 3097 const_iv (GL_SRC_ALPHA_SATURATE),
2819 const_iv (GL_RGB), 3098 const_iv (GL_RGB),
2820 const_iv (GL_RGBA), 3099 const_iv (GL_RGBA),
2821 const_iv (GL_RGBA4), 3100 const_iv (GL_RGBA4),
2822 const_iv (GL_RGBA8), 3101 const_iv (GL_RGBA8),
2890 const_iv (GL_NICEST), 3169 const_iv (GL_NICEST),
2891 const_iv (GL_V2F), 3170 const_iv (GL_V2F),
2892 const_iv (GL_V3F), 3171 const_iv (GL_V3F),
2893 const_iv (GL_T2F_V3F), 3172 const_iv (GL_T2F_V3F),
2894 const_iv (GL_T2F_N3F_V3F), 3173 const_iv (GL_T2F_N3F_V3F),
3174 const_iv (GL_FUNC_ADD),
3175 const_iv (GL_FUNC_SUBTRACT),
3176 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2895# undef const_iv 3177# undef const_iv
2896 }; 3178 };
2897 3179
2898 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3180 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2899 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3181 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2900 3182
2901 texture_av = newAV (); 3183 texture_av = newAV ();
2902 AvREAL_off (texture_av); 3184 AvREAL_off (texture_av);
2903} 3185}
2904 3186
2906disable_GL_EXT_blend_func_separate () 3188disable_GL_EXT_blend_func_separate ()
2907 CODE: 3189 CODE:
2908 gl.BlendFuncSeparate = 0; 3190 gl.BlendFuncSeparate = 0;
2909 gl.BlendFuncSeparateEXT = 0; 3191 gl.BlendFuncSeparateEXT = 0;
2910 3192
2911char * 3193void
3194apple_nvidia_bug (int enable)
3195
3196const char *
2912gl_vendor () 3197gl_vendor ()
2913 CODE: 3198 CODE:
2914 RETVAL = (char *)glGetString (GL_VENDOR); 3199 RETVAL = (const char *)glGetString (GL_VENDOR);
2915 OUTPUT: 3200 OUTPUT:
2916 RETVAL 3201 RETVAL
2917 3202
2918char * 3203const char *
2919gl_version () 3204gl_version ()
2920 CODE: 3205 CODE:
2921 RETVAL = (char *)glGetString (GL_VERSION); 3206 RETVAL = (const char *)glGetString (GL_VERSION);
2922 OUTPUT: 3207 OUTPUT:
2923 RETVAL 3208 RETVAL
2924 3209
2925char * 3210const char *
2926gl_extensions () 3211gl_extensions ()
2927 CODE: 3212 CODE:
2928 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3213 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2929 OUTPUT: 3214 OUTPUT:
2930 RETVAL 3215 RETVAL
2931 3216
2932const char *glGetString (GLenum pname) 3217const char *glGetString (GLenum pname)
3218 CODE:
3219 RETVAL = (const char *)glGetString (pname);
3220 OUTPUT:
3221 RETVAL
2933 3222
2934GLint glGetInteger (GLenum pname) 3223GLint glGetInteger (GLenum pname)
2935 CODE: 3224 CODE:
2936 glGetIntegerv (pname, &RETVAL); 3225 glGetIntegerv (pname, &RETVAL);
2937 OUTPUT: 3226 OUTPUT:
2945 3234
2946int glGetError () 3235int glGetError ()
2947 3236
2948void glFinish () 3237void glFinish ()
2949 3238
3239void glFlush ()
3240
2950void glClear (int mask) 3241void glClear (int mask)
2951 3242
2952void glClearColor (float r, float g, float b, float a = 1.0) 3243void glClearColor (float r, float g, float b, float a = 1.0)
2953 PROTOTYPE: @ 3244 PROTOTYPE: @
2954 3245
2963void glBlendFunc (int sfactor, int dfactor) 3254void glBlendFunc (int sfactor, int dfactor)
2964 3255
2965void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3256void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2966 CODE: 3257 CODE:
2967 gl_BlendFuncSeparate (sa, da, saa, daa); 3258 gl_BlendFuncSeparate (sa, da, saa, daa);
3259
3260# void glBlendEquation (int se)
2968 3261
2969void glDepthMask (int flag) 3262void glDepthMask (int flag)
2970 3263
2971void glLogicOp (int opcode) 3264void glLogicOp (int opcode)
2972 3265
3123 3416
3124void glEndList () 3417void glEndList ()
3125 3418
3126void glCallList (int list) 3419void glCallList (int list)
3127 3420
3421void c_init ()
3422 CODE:
3423 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3424 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3425
3128MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3426MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3129 3427
3130PROTOTYPES: DISABLE 3428PROTOTYPES: DISABLE
3131 3429
3132void 3430void
3133find_widget (SV *self, NV x, NV y) 3431find_widget (SV *self, NV x, NV y)
3134 PPCODE: 3432 PPCODE:
3135{ 3433{
3136 if (within_widget (self, x, y)) 3434 if (within_widget (self, x, y))
3137 XPUSHs (self); 3435 XPUSHs (self);
3138} 3436}
3139 3437
3140BOOT: 3438BOOT:
3141{ 3439{
3149 3447
3150void 3448void
3151draw (SV *self) 3449draw (SV *self)
3152 CODE: 3450 CODE:
3153{ 3451{
3154 HV *hv; 3452 HV *hv;
3155 SV **svp; 3453 SV **svp;
3156 NV x, y, w, h; 3454 NV x, y, w, h;
3157 SV *draw_x_sv = GvSV (draw_x_gv); 3455 SV *draw_x_sv = GvSV (draw_x_gv);
3158 SV *draw_y_sv = GvSV (draw_y_gv); 3456 SV *draw_y_sv = GvSV (draw_y_gv);
3159 SV *draw_w_sv = GvSV (draw_w_gv); 3457 SV *draw_w_sv = GvSV (draw_w_gv);
3160 SV *draw_h_sv = GvSV (draw_h_gv); 3458 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines