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.298 by root, Tue Dec 22 00:46:05 2009 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines