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.296 by root, Mon Dec 21 23:52:34 2009 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 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 atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
25# define M_PI 3.14159265f 27# define M_PI 3.14159265f
26#endif 28#endif
27 29
28#include <assert.h> 30#include <cassert>
29#include <math.h> 31#include <cmath>
30#include <string.h> 32#include <cstring>
31#include <stdio.h> 33#include <cstdio>
32#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
33 38
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 40
36#include <SDL.h> 41#include <SDL.h>
37#include <SDL_thread.h> 42#include <SDL_thread.h>
41#include <SDL_opengl.h> 46#include <SDL_opengl.h>
42 47
43/* work around os x broken headers */ 48/* work around os x broken headers */
44#ifdef __MACOSX__ 49#ifdef __MACOSX__
45typedef 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);
46#endif 53#endif
47 54
48#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
49#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
50 57
51#include <glib/gmacros.h> 58#include <glib.h>
52 59
53#include <pango/pango.h> 60#include <pango/pango.h>
54 61
55#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
69# include <netinet/in.h> 76# include <netinet/in.h>
70# include <netinet/tcp.h> 77# include <netinet/tcp.h>
71# include <inttypes.h> 78# include <inttypes.h>
72#endif 79#endif
73 80
74#if __GNUC__ >= 4 81#include "ecb.h"
75# define expect(expr,value) __builtin_expect ((expr),(value)) 82#include "salloc.h"
76#else
77# define expect(expr,value) (expr)
78#endif
79
80#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1)
82 83
83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84 85
85/* this is used as fow flag as well, so has to have a different value */ 86/* this is used as fow flag as well, so has to have a different value */
86/* then anything that is computed by incoming darkness */ 87/* then anything that is computed by incoming darkness */
97 98
98#define KMOD_LRAM 0x10000 // our extension 99#define KMOD_LRAM 0x10000 // our extension
99 100
100#define TEXID_SPEECH 1 101#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2 102#define TEXID_NOFACE 2
102#define TEXID_HIDDEN 3 103
104// approximately divide by 255
105static unsigned int
106div255 (unsigned int n)
107{
108 return (n + (n >> 8)) >> 8;
109}
110
111static unsigned int
112minpot (unsigned int n)
113{
114 if (!n)
115 return 0;
116
117 --n;
118
119 n |= n >> 1;
120 n |= n >> 2;
121 n |= n >> 4;
122 n |= n >> 8;
123 n |= n >> 16;
124
125 return n + 1;
126}
127
128static char *
129fast_sv_grow (SV *sv, STRLEN need)
130{
131 STRLEN len = SvLEN (sv);
132 STRLEN want = SvCUR (sv) + need;
133
134 if (ecb_expect_false (len < want))
135 {
136 do
137 len *= 2;
138 while (len < want);
139
140 sv_grow (sv, len);
141 }
142
143 SvCUR_set (sv, want);
144 return SvEND (sv) - need;
145}
103 146
104static AV *texture_av; 147static AV *texture_av;
105 148
106static struct 149static struct
107{ 150{
164{ 207{
165 GSList *attrs = run->item->analysis.extra_attrs; 208 GSList *attrs = run->item->analysis.extra_attrs;
166 209
167 while (attrs) 210 while (attrs)
168 { 211 {
169 PangoAttribute *attr = attrs->data; 212 PangoAttribute *attr = (PangoAttribute *)attrs->data;
170 213
171 if (attr->klass->type == PANGO_ATTR_SHAPE) 214 if (attr->klass->type == PANGO_ATTR_SHAPE)
172 return 1; 215 return 1;
173 216
174 attrs = attrs->next; 217 attrs = attrs->next;
175 } 218 }
176 219
177 return 0; 220 return 0;
178} 221}
179 222
180typedef struct cf_layout { 223struct cf_layout {
181 PangoLayout *pl; 224 PangoLayout *pl;
182 float r, g, b, a; // default color for rgba mode 225 float r, g, b, a; // default color for rgba mode
183 int base_height; 226 int base_height;
184 DC__Font font; 227 DC__Font font;
185 rc_t *rc; 228 rc_t rc;
186} *DC__Layout; 229};
230
231typedef cf_layout *DC__Layout;
187 232
188static DC__Font default_font; 233static DC__Font default_font;
189static PangoContext *opengl_context; 234static PangoContext *opengl_context;
190static PangoFontMap *opengl_fontmap; 235static PangoFontMap *opengl_fontmap;
191 236
192static void 237static void
193substitute_func (FcPattern *pattern, gpointer data) 238substitute_func (FcPattern *pattern, gpointer data)
194{ 239{
195 FcPatternAddBool (pattern, FC_HINTING, 1); 240 FcPatternAddBool (pattern, FC_HINTING, 1);
196#ifdef FC_HINT_STYLE 241#ifdef FC_HINT_STYLE
197 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 242 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
198#endif 243#endif
199 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 244 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
200} 245}
201 246
202static void 247static void
229 274
230 *w = rect.width; 275 *w = rect.width;
231 *h = rect.height; 276 *h = rect.height;
232} 277}
233 278
279/////////////////////////////////////////////////////////////////////////////
280
234typedef uint16_t tileid; 281typedef uint16_t tileid;
235typedef uint16_t faceid; 282typedef uint16_t faceid;
236 283
237typedef struct { 284struct maptex
285{
238 GLuint name; 286 GLuint name;
239 int w, h; 287 int w, h;
240 float s, t; 288 float s, t;
241 uint8_t r, g, b, a; 289 uint8_t r, g, b, a;
242 tileid smoothtile; 290 tileid smoothtile;
243 uint8_t smoothlevel; 291 uint8_t smoothlevel;
244 uint8_t unused; /* set to zero on use */ 292 uint8_t unused; /* set to zero on use */
245} maptex; 293};
246 294
247typedef struct { 295struct mapcell
296{
248 uint32_t player; 297 uint32_t player;
249 tileid tile[3]; 298 tileid tile[3];
250 uint16_t darkness; 299 uint16_t darkness;
251 uint8_t stat_width, stat_hp, flags, smoothmax; 300 uint8_t stat_width, stat_hp, flags, smoothmax;
252} mapcell; 301};
253 302
254typedef struct { 303struct maprow
304{
255 int32_t c0, c1; 305 int32_t c0, c1;
256 mapcell *col; 306 mapcell *col;
257} maprow; 307};
258 308
259typedef struct map { 309struct mapgrid {
260 int x, y, w, h; 310 int x, y, w, h;
261 int ox, oy; /* offset to virtual global coordinate system */ 311 int ox, oy; /* offset to virtual global coordinate system */
262 int faces; tileid *face2tile; // [faceid] 312 int faces; tileid *face2tile; // [faceid]
263 int texs; maptex *tex; // [tileid] 313 int texs; maptex *tex; // [tileid]
264 314
265 int32_t rows; 315 int32_t rows;
266 maprow *row; 316 maprow *row;
267} *DC__Map; 317};
268 318
269static char * 319typedef mapgrid *DC__Map;
320
321template<typename T>
322ecb_cold static void
270prepend (char *ptr, int sze, int inc) 323prepend (T *&ptr, int sze, int inc)
271{ 324{
272 char *p; 325 T *p;
273 326
274 New (0, p, sze + inc, char); 327 Newx (p, inc + sze, T);
275 Zero (p, inc, char); 328 Zero (p, inc, T);
276 Move (ptr, p + inc, sze, char); 329 Move (ptr, p + inc, sze, T);
277 Safefree (ptr); 330 Safefree (ptr);
278 331
279 return p; 332 ptr = p;
280} 333}
281 334
282static char * 335template<typename T>
336ecb_cold static void
283append (char *ptr, int sze, int inc) 337append (T *&ptr, int sze, int inc)
284{ 338{
285 Renew (ptr, sze + inc, char); 339 Renew (ptr, sze + inc, T);
286 Zero (ptr + sze, inc, char); 340 Zero (ptr + sze, inc, T);
287
288 return ptr;
289} 341}
290
291#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
292#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
293 342
294static void 343static void
295need_facenum (struct map *self, faceid face) 344need_facenum (struct mapgrid *self, faceid face)
296{ 345{
297 while (self->faces <= face) 346 if (ecb_expect_true (self->faces > face))
298 { 347 return;
348
349 size_t newsize = minpot (face + 1);
299 Append (tileid, self->face2tile, self->faces, self->faces); 350 append (self->face2tile, self->faces, newsize - self->faces);
300 self->faces *= 2; 351 self->faces = newsize;
301 }
302} 352}
303 353
304static void 354static void
305need_texid (struct map *self, int texid) 355need_texid (struct mapgrid *self, int texid)
306{ 356{
307 while (self->texs <= texid) 357 if (ecb_expect_true (self->texs > texid))
308 { 358 return;
359
360 size_t newsize = minpot (texid + 1);
309 Append (maptex, self->tex, self->texs, self->texs); 361 append (self->tex, self->texs, newsize - self->texs);
310 self->texs *= 2; 362 self->texs = newsize;
311 }
312} 363}
313 364
314static maprow * 365static maprow *
315map_get_row (DC__Map self, int y) 366map_get_row (mapgrid *self, int y)
316{ 367{
317 if (0 > y) 368 if (0 > y)
318 { 369 {
319 int extend = - y + MAP_EXTEND_Y; 370 int extend = - y + MAP_EXTEND_Y;
320 Prepend (maprow, self->row, self->rows, extend); 371 prepend (self->row, self->rows, extend);
321 372
322 self->rows += extend; 373 self->rows += extend;
323 self->y += extend; 374 self->y += extend;
324 y += extend; 375 y += extend;
325 } 376 }
326 else if (y >= self->rows) 377 else if (y >= self->rows)
327 { 378 {
328 int extend = y - self->rows + MAP_EXTEND_Y; 379 int extend = y - self->rows + MAP_EXTEND_Y;
329 Append (maprow, self->row, self->rows, extend); 380 append (self->row, self->rows, extend);
330 self->rows += extend; 381 self->rows += extend;
331 } 382 }
332 383
333 return self->row + y; 384 return self->row + y;
334} 385}
344 } 395 }
345 396
346 if (row->c0 > x) 397 if (row->c0 > x)
347 { 398 {
348 int extend = row->c0 - x + MAP_EXTEND_X; 399 int extend = row->c0 - x + MAP_EXTEND_X;
349 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 400 prepend (row->col, row->c1 - row->c0, extend);
350 row->c0 -= extend; 401 row->c0 -= extend;
351 } 402 }
352 else if (x >= row->c1) 403 else if (x >= row->c1)
353 { 404 {
354 int extend = x - row->c1 + MAP_EXTEND_X; 405 int extend = x - row->c1 + MAP_EXTEND_X;
355 Append (mapcell, row->col, row->c1 - row->c0, extend); 406 append (row->col, row->c1 - row->c0, extend);
356 row->c1 += extend; 407 row->c1 += extend;
357 } 408 }
358 409
359 return row->col + (x - row->c0); 410 return row->col + (x - row->c0);
360} 411}
361 412
362static mapcell * 413static mapcell *
363map_get_cell (DC__Map self, int x, int y) 414map_get_cell (mapgrid *self, int x, int y)
364{ 415{
365 return row_get_cell (map_get_row (self, y), x); 416 return row_get_cell (map_get_row (self, y), x);
366} 417}
367 418
368static void 419static void
369map_clear (DC__Map self) 420map_clear (mapgrid *self)
370{ 421{
371 int r; 422 int r;
372 423
373 for (r = 0; r < self->rows; r++) 424 for (r = 0; r < self->rows; r++)
374 Safefree (self->row[r].col); 425 Safefree (self->row[r].col);
392 (cell)->flags = 0; \ 443 (cell)->flags = 0; \
393 (cell)->player = 0; \ 444 (cell)->player = 0; \
394 } while (0) 445 } while (0)
395 446
396static void 447static void
397map_blank (DC__Map self, int x0, int y0, int w, int h) 448map_blank (mapgrid *self, int x0, int y0, int w, int h)
398{ 449{
399 int x, y; 450 int x, y;
400 maprow *row; 451 maprow *row;
401 mapcell *cell; 452 mapcell *cell;
402 453
419 CELL_CLEAR (cell); 470 CELL_CLEAR (cell);
420 } 471 }
421 } 472 }
422} 473}
423 474
424typedef struct { 475struct smooth_key
476{
425 tileid tile; 477 tileid tile;
426 uint8_t x, y, level; 478 uint8_t x, y, level;
427} smooth_key; 479
480 bool operator == (const smooth_key &o) const
481 {
482 return tile == o.tile && x == o.x && y == o.y && level == o.level;
483 }
484};
485
486typedef ska::flat_hash_map<smooth_key, IV, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> smooth_hash;
487
488namespace std {
489 template <>
490 struct hash<smooth_key>
491 {
492 size_t operator () (const smooth_key &v) const
493 {
494 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
495 }
496 };
497}
428 498
429static void 499static void
430smooth_or_bits (HV *hv, smooth_key *key, IV bits) 500smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
431{ 501{
432 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 502 auto &&it = h.find (key);
433 503
434 if (SvIOK (*sv)) 504 if (it == h.end ())
435 SvIV_set (*sv, SvIVX (*sv) | bits); 505 h.insert (std::make_pair (key, bits));
436 else 506 else
437 sv_setiv (*sv, bits); 507 it->second |= bits;
438} 508}
439 509
440static void 510static void
441music_finished (void) 511music_finished (void)
442{ 512{
461 ev.data2 = 0; 531 ev.data2 = 0;
462 532
463 SDL_PushEvent ((SDL_Event *)&ev); 533 SDL_PushEvent ((SDL_Event *)&ev);
464} 534}
465 535
466static unsigned int
467minpot (unsigned int n)
468{
469 if (!n)
470 return 0;
471
472 --n;
473
474 n |= n >> 1;
475 n |= n >> 2;
476 n |= n >> 4;
477 n |= n >> 8;
478 n |= n >> 16;
479
480 return n + 1;
481}
482
483static unsigned int
484popcount (unsigned int n)
485{
486 n -= (n >> 1) & 0x55555555U;
487 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
488 n = ((n >> 4) + n) & 0x0f0f0f0fU;
489 n *= 0x01010101U;
490
491 return n >> 24;
492}
493
494/* SDL should provide this, really. */ 536/* SDL should provide this, really. */
495#define SDLK_MODIFIER_MIN 300 537#define SDLK_MODIFIER_MIN 300
496#define SDLK_MODIFIER_MAX 314 538#define SDLK_MODIFIER_MAX 314
497 539
498/******************************************************************************/ 540/******************************************************************************/
551 593
552 return mod; 594 return mod;
553} 595}
554 596
555static void 597static void
556deliantra_main () 598deliantra_main (SV *real_main)
557{ 599{
558 char *argv[] = { 0 }; 600 dSP;
559 call_argv ("::main", G_DISCARD | G_VOID, argv); 601
602 PUSHMARK (SP);
603 call_sv (real_main, G_DISCARD | G_VOID);
560} 604}
561 605
562#ifdef __MACOSX__ 606#ifdef __MACOSX__
607 static SV *real_main;
608
563 /* to due surprising braindamage on the side of SDL design, we 609 /* to due surprising braindamage on the side of SDL design, we
564 * do some mind-boggling hack here: SDL requires a custom main() 610 * do some mind-boggling hack here: SDL requires a custom main()
565 * on OS X, so... we provide one and call the original main(), which, 611 * on OS X, so... we provide one and call the original main(), which,
566 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 612 * due to shared library magic, calls -lSDLmain's main, not perl's main,
567 * and which calls our main (== SDL_main) back. 613 * and which calls our main (== SDL_main) back.
568 */ 614 */
569 extern C_LINKAGE int 615 extern C_LINKAGE int
570 main (int argc, char *argv[]) 616 main (int argc, char *argv[])
571 { 617 {
572 deliantra_main (); 618 deliantra_main (real_main);
573 } 619 }
574 620
575 #undef main 621 #undef main
576 622
577 extern C_LINKAGE int main (int argc, char *argv[]); 623 extern C_LINKAGE int main (int argc, char *argv[]);
578 624
579 static void 625 static void
580 SDL_braino (void) 626 SDL_main_hack (SV *real_main_)
581 { 627 {
628 real_main = real_main_;
629
582 char *argv[] = { "deliantra client", 0 }; 630 char *argv[] = { "deliantra client", 0 };
583 (main) (1, argv); 631 (main) (1, argv);
584 } 632 }
585#else 633#else
586 static void 634 static void
587 SDL_braino (void) 635 SDL_main_hack (SV *real_main)
588 { 636 {
589 deliantra_main (); 637 deliantra_main (real_main);
590 } 638 }
591#endif 639#endif
592 640
593MODULE = Deliantra::Client PACKAGE = DC 641MODULE = Deliantra::Client PACKAGE = DC
594 642
795 843
796 const_iv (FOW_DARKNESS) 844 const_iv (FOW_DARKNESS)
797# undef const_iv 845# undef const_iv
798 }; 846 };
799 847
800 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 848 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
801 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 849 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
802 850
803 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 851 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
804 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 852 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
805} 853}
806 854
821 869
822NV ceil (NV x) 870NV ceil (NV x)
823 871
824IV minpot (UV n) 872IV minpot (UV n)
825 873
874UV ld32 (UV n)
875 CODE:
876 RETVAL = ecb_ld32 (n);
877 OUTPUT:
878 RETVAL
879
826IV popcount (UV n) 880IV popcount (UV n)
881 CODE:
882 RETVAL = ecb_popcount32 (n);
883 OUTPUT:
884 RETVAL
827 885
828NV distance (NV dx, NV dy) 886NV distance (NV dx, NV dy)
829 CODE: 887 CODE:
830 RETVAL = pow (dx * dx + dy * dy, 0.5); 888 RETVAL = pow (dx * dx + dy * dy, 0.5);
831 OUTPUT: 889 OUTPUT:
845#endif 903#endif
846} 904}
847 905
848char *SDL_GetError () 906char *SDL_GetError ()
849 907
850void SDL_braino () 908void SDL_main_hack (SV *real_main)
909 PROTOTYPE: &
851 910
852int SDL_Init (U32 flags) 911int SDL_Init (U32 flags)
853 912
854int SDL_InitSubSystem (U32 flags) 913int SDL_InitSubSystem (U32 flags)
855 914
856void SDL_QuitSubSystem (U32 flags) 915void SDL_QuitSubSystem (U32 flags)
857 916
858void SDL_Quit () 917void SDL_Quit ()
859 918
860int SDL_GL_SetAttribute (int attr, int value) 919int SDL_GL_SetAttribute (int attr, int value)
920 C_ARGS: (SDL_GLattr)attr, value
861 921
862int SDL_GL_GetAttribute (int attr) 922int SDL_GL_GetAttribute (int attr)
863 CODE: 923 CODE:
864 if (SDL_GL_GetAttribute (attr, &RETVAL)) 924 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
865 XSRETURN_UNDEF; 925 XSRETURN_UNDEF;
866 OUTPUT: 926 OUTPUT:
867 RETVAL 927 RETVAL
868 928
869void 929void
924 ); 984 );
925 985
926 if (RETVAL) 986 if (RETVAL)
927 { 987 {
928 av_clear (texture_av); 988 av_clear (texture_av);
929
930 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
931#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 989#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
932#include "glfunc.h" 990#include "glfunc.h"
933#undef GL_FUNC 991#undef GL_FUNC
992 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
993 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
934 } 994 }
935} 995}
936 OUTPUT: 996 OUTPUT:
937 RETVAL 997 RETVAL
998
999void
1000SDL_WM_SetCaption (const char *title, const char *icon)
938 1001
939void 1002void
940SDL_GL_SwapBuffers () 1003SDL_GL_SwapBuffers ()
941 1004
942char * 1005char *
943SDL_GetKeyName (int sym) 1006SDL_GetKeyName (int sym)
1007 C_ARGS: (SDLKey)sym
944 1008
945int 1009int
946SDL_GetAppState () 1010SDL_GetAppState ()
947 1011
948int 1012int
949SDL_GetModState () 1013SDL_GetModState ()
950 1014
1015int
1016SDL_WaitEvent ()
1017 C_ARGS: 0
1018
951void 1019void
1020SDL_PumpEvents ()
1021
1022void
952poll_events () 1023peep_events ()
953 PPCODE: 1024 PPCODE:
954{ 1025{
955 SDL_Event ev; 1026 SDL_Event ev;
956 1027
957 SDL_PumpEvents (); 1028 SDL_PumpEvents ();
1023 1094
1024 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1095 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1025 } 1096 }
1026} 1097}
1027 1098
1099char *
1100SDL_AudioDriverName ()
1101 CODE:
1102{
1103 char buf [256];
1104 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1105 XSRETURN_UNDEF;
1106
1107 RETVAL = buf;
1108}
1109 OUTPUT:
1110 RETVAL
1111
1028int 1112int
1029Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1113Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1030 POSTCALL: 1114 POSTCALL:
1031 Mix_HookMusicFinished (music_finished); 1115 Mix_HookMusicFinished (music_finished);
1032 Mix_ChannelFinished (channel_finished); 1116 Mix_ChannelFinished (channel_finished);
1033 1117
1034void 1118void
1035Mix_QuerySpec () 1119Mix_QuerySpec ()
1094add_font (char *file) 1178add_font (char *file)
1095 CODE: 1179 CODE:
1096 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1180 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1097 OUTPUT: 1181 OUTPUT:
1098 RETVAL 1182 RETVAL
1183
1184void
1185IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1186
1187# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1188void
1189Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1099 1190
1100void 1191void
1101load_image_inline (SV *image_) 1192load_image_inline (SV *image_)
1102 ALIAS: 1193 ALIAS:
1103 load_image_file = 1 1194 load_image_file = 1
1149 1240
1150 SDL_LockSurface (surface2); 1241 SDL_LockSurface (surface2);
1151 EXTEND (SP, 6); 1242 EXTEND (SP, 6);
1152 PUSHs (sv_2mortal (newSViv (surface2->w))); 1243 PUSHs (sv_2mortal (newSViv (surface2->w)));
1153 PUSHs (sv_2mortal (newSViv (surface2->h))); 1244 PUSHs (sv_2mortal (newSViv (surface2->h)));
1154 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1245 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1155 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1246 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1156 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1247 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1157 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1248 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1158 SDL_UnlockSurface (surface2); 1249 SDL_UnlockSurface (surface2);
1159 1250
1231MODULE = Deliantra::Client PACKAGE = DC::Font 1322MODULE = Deliantra::Client PACKAGE = DC::Font
1232 1323
1233PROTOTYPES: DISABLE 1324PROTOTYPES: DISABLE
1234 1325
1235DC::Font 1326DC::Font
1236new_from_file (SV *class, char *path, int id = 0) 1327new_from_file (SV *klass, char *path, int id = 0)
1237 CODE: 1328 CODE:
1238{ 1329{
1239 int count; 1330 int count;
1240 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1331 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1241 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1332 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1270 PROTOTYPE: 1361 PROTOTYPE:
1271 CODE: 1362 CODE:
1272 tc_restore (); 1363 tc_restore ();
1273 1364
1274DC::Layout 1365DC::Layout
1275new (SV *class) 1366new (SV *klass)
1276 CODE: 1367 CODE:
1277 New (0, RETVAL, 1, struct cf_layout); 1368 RETVAL = new cf_layout;
1278 1369
1279 RETVAL->pl = pango_layout_new (opengl_context); 1370 RETVAL->pl = pango_layout_new (opengl_context);
1280 RETVAL->r = 1.; 1371 RETVAL->r = 1.;
1281 RETVAL->g = 1.; 1372 RETVAL->g = 1.;
1282 RETVAL->b = 1.; 1373 RETVAL->b = 1.;
1283 RETVAL->a = 1.; 1374 RETVAL->a = 1.;
1284 RETVAL->base_height = MIN_FONT_HEIGHT; 1375 RETVAL->base_height = MIN_FONT_HEIGHT;
1285 RETVAL->font = 0; 1376 RETVAL->font = 0;
1286 RETVAL->rc = rc_alloc ();
1287 1377
1288 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1378 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1289 layout_update_font (RETVAL); 1379 layout_update_font (RETVAL);
1290 OUTPUT: 1380 OUTPUT:
1291 RETVAL 1381 RETVAL
1292 1382
1293void 1383void
1294DESTROY (DC::Layout self) 1384DESTROY (DC::Layout self)
1295 CODE: 1385 CODE:
1296 g_object_unref (self->pl); 1386 g_object_unref (self->pl);
1297 rc_free (self->rc);
1298 Safefree (self); 1387 delete self;
1299 1388
1300void 1389void
1301set_text (DC::Layout self, SV *text_) 1390set_text (DC::Layout self, SV *text_)
1302 CODE: 1391 CODE:
1303{ 1392{
1429 1518
1430void 1519void
1431set_height (DC::Layout self, int base_height) 1520set_height (DC::Layout self, int base_height)
1432 CODE: 1521 CODE:
1433 if (self->base_height != base_height) 1522 if (self->base_height != base_height)
1434 { 1523 {
1435 self->base_height = base_height; 1524 self->base_height = base_height;
1436 layout_update_font (self); 1525 layout_update_font (self);
1437 } 1526 }
1438 1527
1439void 1528void
1557} 1646}
1558 1647
1559void 1648void
1560render (DC::Layout self, float x, float y, int flags = 0) 1649render (DC::Layout self, float x, float y, int flags = 0)
1561 CODE: 1650 CODE:
1562 rc_clear (self->rc); 1651 self->rc.clear ();
1563 pango_opengl_render_layout_subpixel ( 1652 pango_opengl_render_layout_subpixel (
1564 self->pl, 1653 self->pl,
1565 self->rc, 1654 &self->rc,
1566 x * PANGO_SCALE, y * PANGO_SCALE, 1655 x * PANGO_SCALE, y * PANGO_SCALE,
1567 self->r, self->g, self->b, self->a, 1656 self->r, self->g, self->b, self->a,
1568 flags 1657 flags
1569 ); 1658 );
1570 // we assume that context_change actually clears/frees stuff 1659 // we assume that context_change actually clears/frees stuff
1581 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1670 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1582 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1671 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1583 glEnable (GL_ALPHA_TEST); 1672 glEnable (GL_ALPHA_TEST);
1584 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1673 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1585 1674
1586 rc_draw (self->rc); 1675 self->rc.draw ();
1587 1676
1588 glDisable (GL_ALPHA_TEST); 1677 glDisable (GL_ALPHA_TEST);
1589 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1590 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1591} 1680}
1671void 1760void
1672draw_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) 1761draw_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)
1673 PROTOTYPE: @ 1762 PROTOTYPE: @
1674 CODE: 1763 CODE:
1675{ 1764{
1765 glEnable (GL_BLEND);
1766 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1676 glEnable (GL_TEXTURE_2D); 1767 glEnable (GL_TEXTURE_2D);
1677 glEnable (GL_BLEND);
1678 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1679 glBindTexture (GL_TEXTURE_2D, name1); 1768 glBindTexture (GL_TEXTURE_2D, name1);
1680 1769
1681 glColor3f (intensity, intensity, intensity); 1770 glColor3f (intensity, intensity, intensity);
1682 glPushMatrix (); 1771 glPushMatrix ();
1683 glScalef (1./3, 1./3, 1.); 1772 glScalef (1./3, 1./3, 1.);
1698 glBindTexture (GL_TEXTURE_2D, name2); 1787 glBindTexture (GL_TEXTURE_2D, name2);
1699 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1788 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1700 1789
1701 /* rgb == rgb(glcolor) */ 1790 /* rgb == rgb(glcolor) */
1702 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1791 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1792 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1793 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1705 1794
1706 /* alpha = interpolate t0, t1 by env_alpha */ 1795 /* alpha = interpolate t0, t1 by env_alpha */
1707 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1796 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1708 1797
1803MODULE = Deliantra::Client PACKAGE = DC::Map 1892MODULE = Deliantra::Client PACKAGE = DC::Map
1804 1893
1805PROTOTYPES: DISABLE 1894PROTOTYPES: DISABLE
1806 1895
1807DC::Map 1896DC::Map
1808new (SV *class) 1897new (SV *klass)
1809 CODE: 1898 CODE:
1810 New (0, RETVAL, 1, struct map); 1899 New (0, RETVAL, 1, mapgrid);
1811 RETVAL->x = 0; 1900 RETVAL->x = 0;
1812 RETVAL->y = 0; 1901 RETVAL->y = 0;
1813 RETVAL->w = 0; 1902 RETVAL->w = 0;
1814 RETVAL->h = 0; 1903 RETVAL->h = 0;
1815 RETVAL->ox = 0; 1904 RETVAL->ox = 0;
1852 1941
1853void 1942void
1854set_smooth (DC::Map self, int face, int smooth, int level) 1943set_smooth (DC::Map self, int face, int smooth, int level)
1855 CODE: 1944 CODE:
1856{ 1945{
1857 tileid texid; 1946 tileid texid;
1858 maptex *tex; 1947 maptex *tex;
1859 1948
1860 if (face < 0 || face >= self->faces) 1949 if (face < 0 || face >= self->faces)
1861 return; 1950 return;
1862 1951
1863 if (smooth < 0 || smooth >= self->faces) 1952 if (smooth < 0 || smooth >= self->faces)
1864 return; 1953 return;
1865 1954
1866 texid = self->face2tile [face]; 1955 texid = self->face2tile [face];
1867 1956
1868 if (!texid) 1957 if (!texid)
1869 return; 1958 return;
1870 1959
1871 tex = self->tex + texid; 1960 tex = self->tex + texid;
1904} 1993}
1905 1994
1906void 1995void
1907expire_textures (DC::Map self, int texid, int count) 1996expire_textures (DC::Map self, int texid, int count)
1908 PPCODE: 1997 PPCODE:
1909 for (; texid < self->texs && count; ++texid, --count) 1998 for (; texid < self->texs && count; ++texid, --count)
1910 { 1999 {
1911 maptex *tex = self->tex + texid; 2000 maptex *tex = self->tex + texid;
1912 2001
1913 if (tex->name) 2002 if (tex->name)
1914 { 2003 {
1961 self->ox += dx; self->x += dx; 2050 self->ox += dx; self->x += dx;
1962 self->oy += dy; self->y += dy; 2051 self->oy += dy; self->y += dy;
1963 2052
1964 while (self->y < 0) 2053 while (self->y < 0)
1965 { 2054 {
1966 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2055 prepend (self->row, self->rows, MAP_EXTEND_Y);
1967 2056
1968 self->rows += MAP_EXTEND_Y; 2057 self->rows += MAP_EXTEND_Y;
1969 self->y += MAP_EXTEND_Y; 2058 self->y += MAP_EXTEND_Y;
1970 } 2059 }
1971} 2060}
1972 2061
1973SV * 2062SV *
1974map1a_update (DC::Map self, SV *data_, int extmap) 2063map1a_update (DC::Map self, SV *data_)
1975 CODE: 2064 CODE:
1976{ 2065{
1977 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2066 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1978 uint8_t *data_end = (uint8_t *)SvEND (data_); 2067 uint8_t *data_end = (uint8_t *)SvEND (data_);
1979 mapcell *cell; 2068 mapcell *cell;
2000 2089
2001 //TODO: don't trust server data to be in-range(!) 2090 //TODO: don't trust server data to be in-range(!)
2002 2091
2003 if (flags & 8) 2092 if (flags & 8)
2004 { 2093 {
2094 uint8_t ext, cmd;
2095
2005 if (extmap) 2096 do
2006 { 2097 {
2007 uint8_t ext, cmd; 2098 ext = *data++;
2099 cmd = ext & 0x7f;
2008 2100
2009 do 2101 if (cmd < 4)
2102 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2103 else if (cmd == 5) // health
2010 { 2104 {
2011 ext = *data++;
2012 cmd = ext & 0x7f;
2013
2014 if (cmd < 4)
2015 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2016 else if (cmd == 5) // health
2017 {
2018 cell->stat_width = 1; 2105 cell->stat_width = 1;
2019 cell->stat_hp = *data++; 2106 cell->stat_hp = *data++;
2020 }
2021 else if (cmd == 6) // monster width
2022 cell->stat_width = *data++ + 1;
2023 else if (cmd == 0x47)
2024 {
2025 if (*data == 1) cell->player = data [1];
2026 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2027 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2028 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2029
2030 data += *data + 1;
2031 }
2032 else if (cmd == 8) // cell flags
2033 cell->flags = *data++;
2034 else if (ext & 0x40) // unknown, multibyte => skip
2035 data += *data + 1;
2036 else
2037 data++;
2038 } 2107 }
2039 while (ext & 0x80); 2108 else if (cmd == 6) // monster width
2109 cell->stat_width = *data++ + 1;
2110 else if (cmd == 0x47)
2111 {
2112 if (*data == 1) cell->player = data [1];
2113 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2114 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2115 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2116
2117 data += *data + 1;
2118 }
2119 else if (cmd == 8) // cell flags
2120 cell->flags = *data++;
2121 else if (ext & 0x40) // unknown, multibyte => skip
2122 data += *data + 1;
2123 else
2124 data++;
2040 } 2125 }
2041 else 2126 while (ext & 0x80);
2042 cell->darkness = *data++ + 1;
2043 } 2127 }
2044 2128
2045 for (z = 0; z <= 2; ++z) 2129 for (z = 0; z <= 2; ++z)
2046 if (flags & (4 >> z)) 2130 if (flags & (4 >> z))
2047 { 2131 {
2095 ? self->row + y 2179 ? self->row + y
2096 : 0; 2180 : 0;
2097 2181
2098 for (x = x0; x < x1; x++) 2182 for (x = x0; x < x1; x++)
2099 { 2183 {
2100 int r = 32, g = 32, b = 32, a = 192; 2184 unsigned int r = 32, g = 32, b = 32, a = 192;
2101 2185
2102 if (row && row->c0 <= x && x < row->c1) 2186 if (row && row->c0 <= x && x < row->c1)
2103 { 2187 {
2104 mapcell *cell = row->col + (x - row->c0); 2188 mapcell *cell = row->col + (x - row->c0);
2105 2189
2107 { 2191 {
2108 maptex tex = self->tex [cell->tile [z]]; 2192 maptex tex = self->tex [cell->tile [z]];
2109 int a0 = 255 - tex.a; 2193 int a0 = 255 - tex.a;
2110 int a1 = tex.a; 2194 int a1 = tex.a;
2111 2195
2112 r = (r * a0 + tex.r * a1) / 255; 2196 r = div255 (r * a0 + tex.r * a1);
2113 g = (g * a0 + tex.g * a1) / 255; 2197 g = div255 (g * a0 + tex.g * a1);
2114 b = (b * a0 + tex.b * a1) / 255; 2198 b = div255 (b * a0 + tex.b * a1);
2115 a = (a * a0 + tex.a * a1) / 255; 2199 a = div255 (a * a0 + tex.a * a1);
2116 } 2200 }
2117 } 2201 }
2118 2202
2119 *map++ = (r ) 2203 *map++ = (r )
2120 | (g << 8) 2204 | (g << 8)
2121 | (b << 16) 2205 | (b << 16)
2122 | (a << 24); 2206 | (a << 24);
2123 } 2207 }
2124 } 2208 }
2125 2209
2126 RETVAL = map_sv; 2210 RETVAL = map_sv;
2127} 2211}
2128 OUTPUT: 2212 OUTPUT:
2129 RETVAL 2213 RETVAL
2130 2214
2131void 2215void
2132draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2216draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2133 CODE: 2217 CODE:
2134{ 2218{
2135 int x, y, z; 2219 int x, y, z;
2136 2220
2137 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2138 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2139 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2221 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2140 smooth_key skey;
2141 int pl_x, pl_y; 2222 int pl_x, pl_y;
2142 maptex pl_tex; 2223 maptex pl_tex;
2143 rc_t *rc = rc_alloc (); 2224 rc_t rc;
2144 rc_t *rc_ov = rc_alloc (); 2225 rc_t rc_ov;
2145 rc_key_t key; 2226 rc_key_t key;
2146 rc_array_t *arr, *arr_hidden; 2227 rc_t::array_t *arr;
2147 2228
2148 pl_tex.name = 0; 2229 pl_tex.name = 0;
2149 2230
2150 // that's current max. sorry. 2231 // that's current max. sorry.
2151 if (sw > 255) sw = 255; 2232 if (sw > 255) sw = 255;
2152 if (sh > 255) sh = 255; 2233 if (sh > 255) sh = 255;
2153
2154 // clear key, in case of extra padding
2155 memset (&skey, 0, sizeof (skey));
2156 2234
2157 memset (&key, 0, sizeof (key)); 2235 memset (&key, 0, sizeof (key));
2158 key.r = 255; 2236 key.r = 255;
2159 key.g = 255; 2237 key.g = 255;
2160 key.b = 255; 2238 key.b = 255;
2166 my += self->y; 2244 my += self->y;
2167 2245
2168 // first pass: determine smooth_max 2246 // first pass: determine smooth_max
2169 // rather ugly, if you ask me 2247 // rather ugly, if you ask me
2170 // could also be stored inside mapcell and updated on change 2248 // could also be stored inside mapcell and updated on change
2171 memset (smooth_max, 0, sizeof (smooth_max)); 2249 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2172 2250
2173 for (y = 0; y < sh; y++) 2251 for (y = 0; y < sh; y++)
2174 if (0 <= y + my && y + my < self->rows) 2252 if (0 <= y + my && y + my < self->rows)
2175 { 2253 {
2176 maprow *row = self->row + (y + my); 2254 maprow *row = self->row + (y + my);
2189 2267
2190 glEnable (GL_BLEND); 2268 glEnable (GL_BLEND);
2191 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2269 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2192 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2270 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2193 2271
2194 key.texname = self->tex [TEXID_HIDDEN].name;
2195 arr_hidden = rc_array (rc_ov, &key);
2196
2197 for (z = 0; z <= 2; z++) 2272 for (z = 0; z <= 2; z++)
2198 { 2273 {
2199 memset (smooth_level, 0, sizeof (smooth_level)); 2274 std::bitset<256> smooth_level; // one bit for every possible smooth level
2275 smooth_key skey;
2276 smooth_hash smooth;
2200 key.texname = -1; 2277 key.texname = -1;
2201 2278
2202 for (y = 0; y < sh; y++) 2279 for (y = 0; y < sh; y++)
2203 if (0 <= y + my && y + my < self->rows) 2280 if (0 <= y + my && y + my < self->rows)
2204 { 2281 {
2221 2298
2222 if (!tex.name) 2299 if (!tex.name)
2223 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2300 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2224 2301
2225 key.texname = tex.name; 2302 key.texname = tex.name;
2226 arr = rc_array (rc, &key); 2303 arr = &rc.array (key);
2227 } 2304 }
2228 2305
2229 px = (x + 1) * T - tex.w; 2306 px = (x + 1) * Th - tex.w;
2230 py = (y + 1) * T - tex.h; 2307 py = (y + 1) * Tw - tex.h;
2231 2308
2232 if (expect_false (cell->player == player) && expect_false (z == 2)) 2309 if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2233 { 2310 {
2234 pl_x = px; 2311 pl_x = px;
2235 pl_y = py; 2312 pl_y = py;
2236 pl_tex = tex; 2313 pl_tex = tex;
2237 continue; 2314 continue;
2238 } 2315 }
2239 2316
2240 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2317 arr->t2f_v3f (0 , 0 , px , py , 0);
2241 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2318 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2242 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2319 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2243 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2320 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2244 2321
2245 // update smooth hash 2322 // update smooth hash
2246 if (tex.smoothtile) 2323 if (tex.smoothtile)
2247 { 2324 {
2248 skey.tile = tex.smoothtile; 2325 skey.tile = tex.smoothtile;
2249 skey.level = tex.smoothlevel; 2326 skey.level = tex.smoothlevel;
2250 2327
2251 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2328 smooth_level[tex.smoothlevel] = 1;
2252 2329
2253 // add bits to current tile and all neighbours. skey.x|y is 2330 // add bits to current tile and all neighbours. skey.x|y is
2254 // shifted +1|+1 so we always stay positive. 2331 // shifted +1|+1 so we always stay positive.
2255 2332
2256 // bits is ___n cccc CCCC bbbb 2333 // bits is ___n cccc CCCC bbbb
2264 2341
2265 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2342 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2266 // ·· ·· ·┏ ┓· 2343 // ·· ·· ·┏ ┓·
2267 2344
2268 // full tile 2345 // full tile
2269 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2346 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2270 2347
2271 // borders 2348 // borders
2272 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2349 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2273 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2350 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2274 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2351 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2275 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2352 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2276 2353
2277 // corners 2354 // corners
2278 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2355 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2279 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2356 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2280 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2357 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2281 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2358 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2282 } 2359 }
2283 } 2360 }
2284 2361
2285 if (expect_false (z == 2) && expect_false (cell->flags)) 2362 if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2286 { 2363 {
2287 // overlays such as the speech bubble, probably more to come 2364 // overlays such as the speech bubble, probably more to come
2288 if (cell->flags & 1) 2365 if (cell->flags & 1)
2289 { 2366 {
2290 rc_key_t key_ov = key; 2367 rc_key_t key_ov = key;
2291 maptex tex = self->tex [TEXID_SPEECH]; 2368 maptex tex = self->tex[TEXID_SPEECH];
2292 rc_array_t *arr;
2293 int px = x * T + T * 2 / 32; 2369 int px = x * Tw + Tw * 2 / 32;
2294 int py = y * T - T * 6 / 32; 2370 int py = y * Th - Th * 6 / 32;
2295 2371
2296 key_ov.texname = tex.name; 2372 key_ov.texname = tex.name;
2297 arr = rc_array (rc_ov, &key_ov); 2373 rc_t::array_t &arr = rc_ov.array (key_ov);
2298 2374
2299 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2375 arr.t2f_v3f (0 , 0 , px , py , 0);
2300 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2376 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2301 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2377 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2302 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2378 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2303 } 2379 }
2304 } 2380 }
2305 } 2381 }
2306 } 2382 }
2307 2383
2308 rc_draw (rc); 2384 rc.draw ();
2309 rc_clear (rc); 2385 rc.clear ();
2310 2386
2311 // go through all smoothlevels, lowest to highest, then draw. 2387 // go through all smoothlevels, lowest to highest, then draw.
2312 // this is basically counting sort 2388 // this is basically counting sort
2313 { 2389 {
2314 int w, b; 2390 int w, b;
2315 2391
2316 glEnable (GL_TEXTURE_2D); 2392 glEnable (GL_TEXTURE_2D);
2317 glBegin (GL_QUADS); 2393 glBegin (GL_QUADS);
2318 for (w = 0; w < 256 / 32; ++w) 2394 for (int level = 0; level < smooth_level.size (); ++level)
2395 if (smooth_level[level])
2396 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2319 { 2397 {
2320 uint32_t smask = smooth_level [w]; 2398 smooth_key &skey = it->first;
2321 if (smask) 2399 IV bits = it->second;
2322 for (b = 0; b < 32; ++b) 2400
2323 if (smask & (((uint32_t)1) << b)) 2401 if (!(bits & 0x1000)
2402 && skey.level == level
2403 && level > smooth_max [skey.x][skey.y])
2324 { 2404 {
2325 int level = (w << 5) | b; 2405 maptex tex = self->tex [skey.tile];
2406 int px = (((int)skey.x) - 1) * Tw;
2407 int py = (((int)skey.y) - 1) * Th;
2408 int border = bits & 15;
2409 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2410 float dx = tex.s * .0625f; // 16 images/row
2411 float dy = tex.t * .5f ; // 2 images/column
2412
2326 HE *he; 2413 if (tex.name)
2327
2328 hv_iterinit (smooth);
2329 while ((he = hv_iternext (smooth)))
2330 { 2414 {
2331 smooth_key *skey = (smooth_key *)HeKEY (he); 2415 // this time avoiding texture state changes
2332 IV bits = SvIVX (HeVAL (he)); 2416 // save gobs of state changes.
2333 2417 if (key.texname != tex.name)
2334 if (!(bits & 0x1000)
2335 && skey->level == level
2336 && level > smooth_max [skey->x][skey->y])
2337 { 2418 {
2338 maptex tex = self->tex [skey->tile];
2339 int px = (((int)skey->x) - 1) * T;
2340 int py = (((int)skey->y) - 1) * T;
2341 int border = bits & 15;
2342 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2343 float dx = tex.s * .0625f; // 16 images/row
2344 float dy = tex.t * .5f ; // 2 images/column
2345
2346 if (tex.name)
2347 {
2348 // this time avoiding texture state changes
2349 // save gobs of state changes.
2350 if (key.texname != tex.name)
2351 {
2352 self->tex [skey->tile].unused = 0; 2419 self->tex [skey.tile].unused = 0;
2353 2420
2354 glEnd (); 2421 glEnd ();
2355 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2422 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2356 glBegin (GL_QUADS); 2423 glBegin (GL_QUADS);
2357 } 2424 }
2358 2425
2359 if (border) 2426 if (border)
2360 { 2427 {
2361 float ox = border * dx; 2428 float ox = border * dx;
2362 2429
2363 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2430 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2364 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2365 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2432 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2366 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2433 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2367 } 2434 }
2368 2435
2369 if (corner) 2436 if (corner)
2370 { 2437 {
2371 float ox = corner * dx; 2438 float ox = corner * dx;
2372 2439
2373 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2374 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2441 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2375 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2442 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2376 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2443 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2377 }
2378 }
2379 } 2444 }
2380 } 2445 }
2381 } 2446 }
2382 } 2447 }
2383 2448
2384 glEnd (); 2449 glEnd ();
2385 glDisable (GL_TEXTURE_2D); 2450 glDisable (GL_TEXTURE_2D);
2386 key.texname = -1; 2451 key.texname = -1;
2387 } 2452 }
2388
2389 hv_clear (smooth);
2390 } 2453 }
2391 2454
2392 if (pl_tex.name) 2455 if (pl_tex.name)
2393 { 2456 {
2394 maptex tex = pl_tex; 2457 maptex tex = pl_tex;
2395 int px = pl_x + sdx; 2458 int px = pl_x + sdx;
2396 int py = pl_y + sdy; 2459 int py = pl_y + sdy;
2397 2460
2398 key.texname = tex.name; 2461 key.texname = tex.name;
2399 arr = rc_array (rc, &key); 2462 rc_t::array_t &arr = rc.array (key);
2400 2463
2401 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2464 arr.t2f_v3f (0 , 0 , px , py , 0);
2402 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2465 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2403 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2466 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2404 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2467 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2405 2468
2406 rc_draw (rc); 2469 rc.draw ();
2407 } 2470 }
2408 2471
2409 rc_draw (rc_ov); 2472 rc_ov.draw ();
2410 rc_clear (rc_ov); 2473 rc_ov.clear ();
2411 2474
2412 glDisable (GL_BLEND); 2475 glDisable (GL_BLEND);
2413 rc_free (rc);
2414 rc_free (rc_ov);
2415 2476
2416 // top layer: overlays such as the health bar 2477 // top layer: overlays such as the health bar
2417 for (y = 0; y < sh; y++) 2478 for (y = 0; y < sh; y++)
2418 if (0 <= y + my && y + my < self->rows) 2479 if (0 <= y + my && y + my < self->rows)
2419 { 2480 {
2422 for (x = 0; x < sw; x++) 2483 for (x = 0; x < sw; x++)
2423 if (row->c0 <= x + mx && x + mx < row->c1) 2484 if (row->c0 <= x + mx && x + mx < row->c1)
2424 { 2485 {
2425 mapcell *cell = row->col + (x + mx - row->c0); 2486 mapcell *cell = row->col + (x + mx - row->c0);
2426 2487
2427 int px = x * T; 2488 int px = x * Tw;
2428 int py = y * T; 2489 int py = y * Th;
2429 2490
2430 if (expect_false (cell->player == player)) 2491 if (ecb_expect_false (cell->player == player))
2431 { 2492 {
2432 px += sdx; 2493 px += sdx;
2433 py += sdy; 2494 py += sdy;
2434 } 2495 }
2435 2496
2436 if (cell->stat_hp) 2497 if (cell->stat_hp)
2437 { 2498 {
2438 int width = cell->stat_width * T; 2499 int width = cell->stat_width * Tw;
2439 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2500 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2440 2501
2441 glColor3ub (0, 0, 0); 2502 glColor3ub (0, 0, 0);
2442 glRectf (px + 1, py - thick - 2, 2503 glRectf (px + 1, py - thick - 2,
2443 px + width - 1, py); 2504 px + width - 1, py);
2444 2505
2524 int x, y; 2585 int x, y;
2525 int sw1 = sw + 2; 2586 int sw1 = sw + 2;
2526 int sh1 = sh + 2; 2587 int sh1 = sh + 2;
2527 int sh3 = sh * 3; 2588 int sh3 = sh * 3;
2528 int sw3 = sw * 3; 2589 int sw3 = sw * 3;
2529 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2530 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2590 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2531 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2591 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2592 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2593 memset (darkness1, 0, sw1*sh1);
2532 2594
2533 SvPOK_only (darkness3_sv); 2595 SvPOK_only (darkness3_sv);
2534 SvCUR_set (darkness3_sv, sw3 * sh3); 2596 SvCUR_set (darkness3_sv, sw3 * sh3);
2535 2597
2536 mx += self->x - 1; 2598 mx += self->x - 1;
2662 else 2724 else
2663 *data++ = 0; 2725 *data++ = 0;
2664 } 2726 }
2665 } 2727 }
2666 2728
2667 /* if size is w*h + 5 then no data has been found */ 2729 /* if size is w*h + 5 then no data has been found */
2668 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2730 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2669 { 2731 {
2670 SvPOK_only (data_sv); 2732 SvPOK_only (data_sv);
2671 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2733 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2672 } 2734 }
2673 2735
2674 RETVAL = data_sv; 2736 RETVAL = data_sv;
2675} 2737}
2676 OUTPUT: 2738 OUTPUT:
2677 RETVAL 2739 RETVAL
2678 2740
2679void 2741void
2686 STRLEN len; 2748 STRLEN len;
2687 uint8_t *data, *end; 2749 uint8_t *data, *end;
2688 2750
2689 len = SvLEN (data_sv); 2751 len = SvLEN (data_sv);
2690 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2752 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2691 data = SvPVbyte_nolen (data_sv); 2753 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2692 end = data + len + 8; 2754 end = data + len + 8;
2693 2755
2694 if (len < 5) 2756 if (len < 5)
2695 XSRETURN_EMPTY; 2757 XSRETURN_EMPTY;
2696 2758
2757} 2819}
2758 2820
2759MODULE = Deliantra::Client PACKAGE = DC::RW 2821MODULE = Deliantra::Client PACKAGE = DC::RW
2760 2822
2761DC::RW 2823DC::RW
2762new (SV *class, SV *data_sv) 2824new (SV *klass, SV *data_sv)
2763 CODE: 2825 CODE:
2764{ 2826{
2765 STRLEN datalen; 2827 STRLEN datalen;
2766 char *data = SvPVbyte (data_sv, datalen); 2828 char *data = SvPVbyte (data_sv, datalen);
2767 2829
2769} 2831}
2770 OUTPUT: 2832 OUTPUT:
2771 RETVAL 2833 RETVAL
2772 2834
2773DC::RW 2835DC::RW
2774new_from_file (SV *class, const char *path, const char *mode = "rb") 2836new_from_file (SV *klass, const char *path, const char *mode = "rb")
2775 CODE: 2837 CODE:
2776 RETVAL = SDL_RWFromFile (path, mode); 2838 RETVAL = SDL_RWFromFile (path, mode);
2777 OUTPUT: 2839 OUTPUT:
2778 RETVAL 2840 RETVAL
2779 2841
2797 if (RETVAL < 0) 2859 if (RETVAL < 0)
2798 { 2860 {
2799 RETVAL = Mix_GroupOldest (-1); 2861 RETVAL = Mix_GroupOldest (-1);
2800 2862
2801 if (RETVAL < 0) 2863 if (RETVAL < 0)
2864 {
2865 // happens sometimes, maybe it just stopped playing(?)
2866 RETVAL = Mix_GroupAvailable (-1);
2867
2868 if (RETVAL < 0)
2802 XSRETURN_UNDEF; 2869 XSRETURN_UNDEF;
2803 2870 }
2871 else
2804 Mix_HaltChannel (RETVAL); 2872 Mix_HaltChannel (RETVAL);
2805 } 2873 }
2806 2874
2807 Mix_UnregisterAllEffects (RETVAL); 2875 Mix_UnregisterAllEffects (RETVAL);
2808 Mix_Volume (RETVAL, 128); 2876 Mix_Volume (RETVAL, 128);
2809} 2877}
2869 2937
2870MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2938MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2871 2939
2872PROTOTYPES: DISABLE 2940PROTOTYPES: DISABLE
2873 2941
2942void
2943decoders ()
2944 PPCODE:
2945#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2946 int i, num = Mix_GetNumChunkDecoders ();
2947 EXTEND (SP, num);
2948 for (i = 0; i < num; ++i)
2949 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2950#else
2951 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2952#endif
2953
2874DC::MixChunk 2954DC::MixChunk
2875new (SV *class, DC::RW rwops) 2955new (SV *klass, DC::RW rwops)
2876 CODE: 2956 CODE:
2877 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2957 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2878 OUTPUT: 2958 OUTPUT:
2879 RETVAL 2959 RETVAL
2880 2960
2910 OUTPUT: 2990 OUTPUT:
2911 RETVAL 2991 RETVAL
2912 2992
2913MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2993MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2914 2994
2995void
2996decoders ()
2997 PPCODE:
2998#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2999 int i, num = Mix_GetNumMusicDecoders ();
3000 EXTEND (SP, num);
3001 for (i = 0; i < num; ++i)
3002 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3003#else
3004 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3005#endif
3006
2915int 3007int
2916volume (int volume = -1) 3008volume (int volume = -1)
2917 PROTOTYPE: ;$ 3009 PROTOTYPE: ;$
2918 CODE: 3010 CODE:
2919 if (items > 0) 3011 if (items > 0)
2930void 3022void
2931halt () 3023halt ()
2932 CODE: 3024 CODE:
2933 Mix_HaltMusic (); 3025 Mix_HaltMusic ();
2934 3026
3027int
3028playing ()
3029 CODE:
3030 RETVAL = Mix_PlayingMusic ();
3031 OUTPUT:
3032 RETVAL
3033
2935DC::MixMusic 3034DC::MixMusic
2936new (SV *class, DC::RW rwops) 3035new (SV *klass, DC::RW rwops)
2937 CODE: 3036 CODE:
2938 RETVAL = Mix_LoadMUS_RW (rwops); 3037 RETVAL = Mix_LoadMUS_RW (rwops);
2939 OUTPUT: 3038 OUTPUT:
2940 RETVAL 3039 RETVAL
2941 3040
3078 const_iv (GL_FUNC_SUBTRACT), 3177 const_iv (GL_FUNC_SUBTRACT),
3079 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3178 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3080# undef const_iv 3179# undef const_iv
3081 }; 3180 };
3082 3181
3083 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3182 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3084 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3183 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3085 3184
3086 texture_av = newAV (); 3185 texture_av = newAV ();
3087 AvREAL_off (texture_av); 3186 AvREAL_off (texture_av);
3088} 3187}
3089 3188
3094 gl.BlendFuncSeparateEXT = 0; 3193 gl.BlendFuncSeparateEXT = 0;
3095 3194
3096void 3195void
3097apple_nvidia_bug (int enable) 3196apple_nvidia_bug (int enable)
3098 3197
3099char * 3198const char *
3100gl_vendor () 3199gl_vendor ()
3101 CODE: 3200 CODE:
3102 RETVAL = (char *)glGetString (GL_VENDOR); 3201 RETVAL = (const char *)glGetString (GL_VENDOR);
3103 OUTPUT: 3202 OUTPUT:
3104 RETVAL 3203 RETVAL
3105 3204
3106char * 3205const char *
3107gl_version () 3206gl_version ()
3108 CODE: 3207 CODE:
3109 RETVAL = (char *)glGetString (GL_VERSION); 3208 RETVAL = (const char *)glGetString (GL_VERSION);
3110 OUTPUT: 3209 OUTPUT:
3111 RETVAL 3210 RETVAL
3112 3211
3113char * 3212const char *
3114gl_extensions () 3213gl_extensions ()
3115 CODE: 3214 CODE:
3116 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3215 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3117 OUTPUT: 3216 OUTPUT:
3118 RETVAL 3217 RETVAL
3119 3218
3120const char *glGetString (GLenum pname) 3219const char *glGetString (GLenum pname)
3220 CODE:
3221 RETVAL = (const char *)glGetString (pname);
3222 OUTPUT:
3223 RETVAL
3121 3224
3122GLint glGetInteger (GLenum pname) 3225GLint glGetInteger (GLenum pname)
3123 CODE: 3226 CODE:
3124 glGetIntegerv (pname, &RETVAL); 3227 glGetIntegerv (pname, &RETVAL);
3125 OUTPUT: 3228 OUTPUT:
3132 RETVAL 3235 RETVAL
3133 3236
3134int glGetError () 3237int glGetError ()
3135 3238
3136void glFinish () 3239void glFinish ()
3240
3241void glFlush ()
3137 3242
3138void glClear (int mask) 3243void glClear (int mask)
3139 3244
3140void glClearColor (float r, float g, float b, float a = 1.0) 3245void glClearColor (float r, float g, float b, float a = 1.0)
3141 PROTOTYPE: @ 3246 PROTOTYPE: @
3326 3431
3327void 3432void
3328find_widget (SV *self, NV x, NV y) 3433find_widget (SV *self, NV x, NV y)
3329 PPCODE: 3434 PPCODE:
3330{ 3435{
3331 if (within_widget (self, x, y)) 3436 if (within_widget (self, x, y))
3332 XPUSHs (self); 3437 XPUSHs (self);
3333} 3438}
3334 3439
3335BOOT: 3440BOOT:
3336{ 3441{
3344 3449
3345void 3450void
3346draw (SV *self) 3451draw (SV *self)
3347 CODE: 3452 CODE:
3348{ 3453{
3349 HV *hv; 3454 HV *hv;
3350 SV **svp; 3455 SV **svp;
3351 NV x, y, w, h; 3456 NV x, y, w, h;
3352 SV *draw_x_sv = GvSV (draw_x_gv); 3457 SV *draw_x_sv = GvSV (draw_x_gv);
3353 SV *draw_y_sv = GvSV (draw_y_gv); 3458 SV *draw_y_sv = GvSV (draw_y_gv);
3354 SV *draw_w_sv = GvSV (draw_w_gv); 3459 SV *draw_w_sv = GvSV (draw_w_gv);
3355 SV *draw_h_sv = GvSV (draw_h_gv); 3460 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines