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.334 by root, Mon Nov 19 01:37:28 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines