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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines