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