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.303 by root, Thu Apr 22 11:18:04 2010 UTC vs.
Revision 1.323 by root, Sun Nov 18 01:48:39 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>
33 37
34#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 38#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35 39
36#include <SDL.h> 40#include <SDL.h>
37#include <SDL_thread.h> 41#include <SDL_thread.h>
48#endif 52#endif
49 53
50#define PANGO_ENABLE_BACKEND 54#define PANGO_ENABLE_BACKEND
51#define G_DISABLE_CAST_CHECKS 55#define G_DISABLE_CAST_CHECKS
52 56
53#include <glib/gmacros.h> 57#include <glib.h>
54 58
55#include <pango/pango.h> 59#include <pango/pango.h>
56 60
57#ifndef PANGO_VERSION_CHECK 61#ifndef PANGO_VERSION_CHECK
58# define PANGO_VERSION_CHECK(a,b,c) 0 62# define PANGO_VERSION_CHECK(a,b,c) 0
100#define KMOD_LRAM 0x10000 // our extension 104#define KMOD_LRAM 0x10000 // our extension
101 105
102#define TEXID_SPEECH 1 106#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 107#define TEXID_NOFACE 2
104 108
109static char *
110fast_sv_grow (SV *sv, STRLEN need)
111{
112 STRLEN len = SvLEN (sv);
113 STRLEN want = SvCUR (sv) + need;
114
115 if (expect_false (len < want))
116 {
117 do
118 len *= 2;
119 while (len < want);
120
121 sv_grow (sv, len);
122 }
123
124 SvCUR_set (sv, want);
125 return SvEND (sv) - need;
126}
127
105static AV *texture_av; 128static AV *texture_av;
106 129
107static struct 130static struct
108{ 131{
109#define GL_FUNC(ptr,name) ptr name; 132#define GL_FUNC(ptr,name) ptr name;
165{ 188{
166 GSList *attrs = run->item->analysis.extra_attrs; 189 GSList *attrs = run->item->analysis.extra_attrs;
167 190
168 while (attrs) 191 while (attrs)
169 { 192 {
170 PangoAttribute *attr = attrs->data; 193 PangoAttribute *attr = (PangoAttribute *)attrs->data;
171 194
172 if (attr->klass->type == PANGO_ATTR_SHAPE) 195 if (attr->klass->type == PANGO_ATTR_SHAPE)
173 return 1; 196 return 1;
174 197
175 attrs = attrs->next; 198 attrs = attrs->next;
176 } 199 }
177 200
178 return 0; 201 return 0;
179} 202}
180 203
181typedef struct cf_layout { 204struct cf_layout {
182 PangoLayout *pl; 205 PangoLayout *pl;
183 float r, g, b, a; // default color for rgba mode 206 float r, g, b, a; // default color for rgba mode
184 int base_height; 207 int base_height;
185 DC__Font font; 208 DC__Font font;
186 rc_t *rc; 209 rc_t *rc;
187} *DC__Layout; 210};
211
212typedef cf_layout *DC__Layout;
188 213
189static DC__Font default_font; 214static DC__Font default_font;
190static PangoContext *opengl_context; 215static PangoContext *opengl_context;
191static PangoFontMap *opengl_fontmap; 216static PangoFontMap *opengl_fontmap;
192 217
193static void 218static void
194substitute_func (FcPattern *pattern, gpointer data) 219substitute_func (FcPattern *pattern, gpointer data)
195{ 220{
196 FcPatternAddBool (pattern, FC_HINTING, 1); 221 FcPatternAddBool (pattern, FC_HINTING, 1);
197#ifdef FC_HINT_STYLE 222#ifdef FC_HINT_STYLE
198 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 223 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199#endif 224#endif
200 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 225 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201} 226}
202 227
203static void 228static void
233} 258}
234 259
235typedef uint16_t tileid; 260typedef uint16_t tileid;
236typedef uint16_t faceid; 261typedef uint16_t faceid;
237 262
238typedef struct { 263struct maptex
264{
239 GLuint name; 265 GLuint name;
240 int w, h; 266 int w, h;
241 float s, t; 267 float s, t;
242 uint8_t r, g, b, a; 268 uint8_t r, g, b, a;
243 tileid smoothtile; 269 tileid smoothtile;
244 uint8_t smoothlevel; 270 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */ 271 uint8_t unused; /* set to zero on use */
246} maptex; 272};
247 273
248typedef struct { 274struct mapcell
275{
249 uint32_t player; 276 uint32_t player;
250 tileid tile[3]; 277 tileid tile[3];
251 uint16_t darkness; 278 uint16_t darkness;
252 uint8_t stat_width, stat_hp, flags, smoothmax; 279 uint8_t stat_width, stat_hp, flags, smoothmax;
253} mapcell; 280};
254 281
255typedef struct { 282struct maprow
283{
256 int32_t c0, c1; 284 int32_t c0, c1;
257 mapcell *col; 285 mapcell *col;
258} maprow; 286};
259 287
260typedef struct map { 288struct mapgrid {
261 int x, y, w, h; 289 int x, y, w, h;
262 int ox, oy; /* offset to virtual global coordinate system */ 290 int ox, oy; /* offset to virtual global coordinate system */
263 int faces; tileid *face2tile; // [faceid] 291 int faces; tileid *face2tile; // [faceid]
264 int texs; maptex *tex; // [tileid] 292 int texs; maptex *tex; // [tileid]
265 293
266 int32_t rows; 294 int32_t rows;
267 maprow *row; 295 maprow *row;
268} *DC__Map; 296};
297
298typedef mapgrid *DC__Map;
269 299
270static char * 300static char *
271prepend (char *ptr, int sze, int inc) 301prepend (char *ptr, int sze, int inc)
272{ 302{
273 char *p; 303 char *p;
291 321
292#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 322#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)) 323#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
294 324
295static void 325static void
296need_facenum (struct map *self, faceid face) 326need_facenum (struct mapgrid *self, faceid face)
297{ 327{
298 while (self->faces <= face) 328 while (self->faces <= face)
299 { 329 {
300 Append (tileid, self->face2tile, self->faces, self->faces); 330 Append (tileid, self->face2tile, self->faces, self->faces);
301 self->faces *= 2; 331 self->faces *= 2;
302 } 332 }
303} 333}
304 334
305static void 335static void
306need_texid (struct map *self, int texid) 336need_texid (struct mapgrid *self, int texid)
307{ 337{
308 while (self->texs <= texid) 338 while (self->texs <= texid)
309 { 339 {
310 Append (maptex, self->tex, self->texs, self->texs); 340 Append (maptex, self->tex, self->texs, self->texs);
311 self->texs *= 2; 341 self->texs *= 2;
312 } 342 }
313} 343}
314 344
315static maprow * 345static maprow *
316map_get_row (DC__Map self, int y) 346map_get_row (mapgrid *self, int y)
317{ 347{
318 if (0 > y) 348 if (0 > y)
319 { 349 {
320 int extend = - y + MAP_EXTEND_Y; 350 int extend = - y + MAP_EXTEND_Y;
321 Prepend (maprow, self->row, self->rows, extend); 351 Prepend (maprow, self->row, self->rows, extend);
359 389
360 return row->col + (x - row->c0); 390 return row->col + (x - row->c0);
361} 391}
362 392
363static mapcell * 393static mapcell *
364map_get_cell (DC__Map self, int x, int y) 394map_get_cell (mapgrid *self, int x, int y)
365{ 395{
366 return row_get_cell (map_get_row (self, y), x); 396 return row_get_cell (map_get_row (self, y), x);
367} 397}
368 398
369static void 399static void
370map_clear (DC__Map self) 400map_clear (mapgrid *self)
371{ 401{
372 int r; 402 int r;
373 403
374 for (r = 0; r < self->rows; r++) 404 for (r = 0; r < self->rows; r++)
375 Safefree (self->row[r].col); 405 Safefree (self->row[r].col);
393 (cell)->flags = 0; \ 423 (cell)->flags = 0; \
394 (cell)->player = 0; \ 424 (cell)->player = 0; \
395 } while (0) 425 } while (0)
396 426
397static void 427static void
398map_blank (DC__Map self, int x0, int y0, int w, int h) 428map_blank (mapgrid *self, int x0, int y0, int w, int h)
399{ 429{
400 int x, y; 430 int x, y;
401 maprow *row; 431 maprow *row;
402 mapcell *cell; 432 mapcell *cell;
403 433
420 CELL_CLEAR (cell); 450 CELL_CLEAR (cell);
421 } 451 }
422 } 452 }
423} 453}
424 454
425typedef struct { 455struct smooth_key
456{
426 tileid tile; 457 tileid tile;
427 uint8_t x, y, level; 458 uint8_t x, y, level;
428} smooth_key; 459
460 bool operator == (const smooth_key &o) const
461 {
462 return tile == o.tile && x == o.x && y == o.y && level == o.level;
463 }
464};
465
466typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
467
468namespace std {
469 template <>
470 struct hash<smooth_key>
471 {
472 size_t operator () (const smooth_key &v) const
473 {
474 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
475 }
476 };
477}
429 478
430static void 479static void
431smooth_or_bits (HV *hv, smooth_key *key, IV bits) 480smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432{ 481{
433 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 482 auto &&it = h.find (key);
434 483
435 if (SvIOK (*sv)) 484 if (it == h.end ())
436 SvIV_set (*sv, SvIVX (*sv) | bits); 485 h.insert (std::make_pair (key, bits));
437 else 486 else
438 sv_setiv (*sv, bits); 487 it->second |= bits;
439} 488}
440 489
441static void 490static void
442music_finished (void) 491music_finished (void)
443{ 492{
460 ev.code = 1; 509 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 510 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 511 ev.data2 = 0;
463 512
464 SDL_PushEvent ((SDL_Event *)&ev); 513 SDL_PushEvent ((SDL_Event *)&ev);
514}
515
516// approximately divide by 255
517static unsigned int
518div255 (unsigned int n)
519{
520 return (n + (n >> 8)) >> 8;
465} 521}
466 522
467static unsigned int 523static unsigned int
468minpot (unsigned int n) 524minpot (unsigned int n)
469{ 525{
552 608
553 return mod; 609 return mod;
554} 610}
555 611
556static void 612static void
557deliantra_main () 613deliantra_main (SV *real_main)
558{ 614{
559 char *argv[] = { 0 }; 615 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 616
617 PUSHMARK (SP);
618 call_sv (real_main, G_DISCARD | G_VOID);
561} 619}
562 620
563#ifdef __MACOSX__ 621#ifdef __MACOSX__
622 static SV *real_main;
623
564 /* to due surprising braindamage on the side of SDL design, we 624 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 625 * 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, 626 * 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, 627 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 628 * and which calls our main (== SDL_main) back.
569 */ 629 */
570 extern C_LINKAGE int 630 extern C_LINKAGE int
571 main (int argc, char *argv[]) 631 main (int argc, char *argv[])
572 { 632 {
573 deliantra_main (); 633 deliantra_main (real_main);
574 } 634 }
575 635
576 #undef main 636 #undef main
577 637
578 extern C_LINKAGE int main (int argc, char *argv[]); 638 extern C_LINKAGE int main (int argc, char *argv[]);
579 639
580 static void 640 static void
581 SDL_braino (void) 641 SDL_main_hack (SV *real_main_)
582 { 642 {
643 real_main = real_main_;
644
583 char *argv[] = { "deliantra client", 0 }; 645 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 646 (main) (1, argv);
585 } 647 }
586#else 648#else
587 static void 649 static void
588 SDL_braino (void) 650 SDL_main_hack (SV *real_main)
589 { 651 {
590 deliantra_main (); 652 deliantra_main (real_main);
591 } 653 }
592#endif 654#endif
593 655
594MODULE = Deliantra::Client PACKAGE = DC 656MODULE = Deliantra::Client PACKAGE = DC
595 657
796 858
797 const_iv (FOW_DARKNESS) 859 const_iv (FOW_DARKNESS)
798# undef const_iv 860# undef const_iv
799 }; 861 };
800 862
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 863 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 864 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 865
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 866 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 867 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 868}
807 869
846#endif 908#endif
847} 909}
848 910
849char *SDL_GetError () 911char *SDL_GetError ()
850 912
851void SDL_braino () 913void SDL_main_hack (SV *real_main)
914 PROTOTYPE: &
852 915
853int SDL_Init (U32 flags) 916int SDL_Init (U32 flags)
854 917
855int SDL_InitSubSystem (U32 flags) 918int SDL_InitSubSystem (U32 flags)
856 919
857void SDL_QuitSubSystem (U32 flags) 920void SDL_QuitSubSystem (U32 flags)
858 921
859void SDL_Quit () 922void SDL_Quit ()
860 923
861int SDL_GL_SetAttribute (int attr, int value) 924int SDL_GL_SetAttribute (int attr, int value)
925 C_ARGS: (SDL_GLattr)attr, value
862 926
863int SDL_GL_GetAttribute (int attr) 927int SDL_GL_GetAttribute (int attr)
864 CODE: 928 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL)) 929 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866 XSRETURN_UNDEF; 930 XSRETURN_UNDEF;
867 OUTPUT: 931 OUTPUT:
868 RETVAL 932 RETVAL
869 933
870void 934void
925 ); 989 );
926 990
927 if (RETVAL) 991 if (RETVAL)
928 { 992 {
929 av_clear (texture_av); 993 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); 994#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933#include "glfunc.h" 995#include "glfunc.h"
934#undef GL_FUNC 996#undef GL_FUNC
935
936 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB; 997 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB; 998 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938 } 999 }
939} 1000}
940 OUTPUT: 1001 OUTPUT:
941 RETVAL 1002 RETVAL
942 1003
943void 1004void
1005SDL_WM_SetCaption (const char *title, const char *icon)
1006
1007void
944SDL_GL_SwapBuffers () 1008SDL_GL_SwapBuffers ()
945 1009
946char * 1010char *
947SDL_GetKeyName (int sym) 1011SDL_GetKeyName (int sym)
1012 C_ARGS: (SDLKey)sym
948 1013
949int 1014int
950SDL_GetAppState () 1015SDL_GetAppState ()
951 1016
952int 1017int
953SDL_GetModState () 1018SDL_GetModState ()
954 1019
1020int
1021SDL_WaitEvent ()
1022 C_ARGS: 0
1023
955void 1024void
1025SDL_PumpEvents ()
1026
1027void
956poll_events () 1028peep_events ()
957 PPCODE: 1029 PPCODE:
958{ 1030{
959 SDL_Event ev; 1031 SDL_Event ev;
960 1032
961 SDL_PumpEvents (); 1033 SDL_PumpEvents ();
1042 OUTPUT: 1114 OUTPUT:
1043 RETVAL 1115 RETVAL
1044 1116
1045int 1117int
1046Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1118Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1047 POSTCALL: 1119 POSTCALL:
1048 Mix_HookMusicFinished (music_finished); 1120 Mix_HookMusicFinished (music_finished);
1049 Mix_ChannelFinished (channel_finished); 1121 Mix_ChannelFinished (channel_finished);
1050 1122
1051void 1123void
1052Mix_QuerySpec () 1124Mix_QuerySpec ()
1111add_font (char *file) 1183add_font (char *file)
1112 CODE: 1184 CODE:
1113 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1185 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114 OUTPUT: 1186 OUTPUT:
1115 RETVAL 1187 RETVAL
1188
1189void
1190IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1191
1192# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1193void
1194Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1116 1195
1117void 1196void
1118load_image_inline (SV *image_) 1197load_image_inline (SV *image_)
1119 ALIAS: 1198 ALIAS:
1120 load_image_file = 1 1199 load_image_file = 1
1166 1245
1167 SDL_LockSurface (surface2); 1246 SDL_LockSurface (surface2);
1168 EXTEND (SP, 6); 1247 EXTEND (SP, 6);
1169 PUSHs (sv_2mortal (newSViv (surface2->w))); 1248 PUSHs (sv_2mortal (newSViv (surface2->w)));
1170 PUSHs (sv_2mortal (newSViv (surface2->h))); 1249 PUSHs (sv_2mortal (newSViv (surface2->h)));
1171 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1250 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1172 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1251 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1173 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1252 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1174 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1253 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1175 SDL_UnlockSurface (surface2); 1254 SDL_UnlockSurface (surface2);
1176 1255
1248MODULE = Deliantra::Client PACKAGE = DC::Font 1327MODULE = Deliantra::Client PACKAGE = DC::Font
1249 1328
1250PROTOTYPES: DISABLE 1329PROTOTYPES: DISABLE
1251 1330
1252DC::Font 1331DC::Font
1253new_from_file (SV *class, char *path, int id = 0) 1332new_from_file (SV *klass, char *path, int id = 0)
1254 CODE: 1333 CODE:
1255{ 1334{
1256 int count; 1335 int count;
1257 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1336 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1258 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1337 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1287 PROTOTYPE: 1366 PROTOTYPE:
1288 CODE: 1367 CODE:
1289 tc_restore (); 1368 tc_restore ();
1290 1369
1291DC::Layout 1370DC::Layout
1292new (SV *class) 1371new (SV *klass)
1293 CODE: 1372 CODE:
1294 New (0, RETVAL, 1, struct cf_layout); 1373 New (0, RETVAL, 1, struct cf_layout);
1295 1374
1296 RETVAL->pl = pango_layout_new (opengl_context); 1375 RETVAL->pl = pango_layout_new (opengl_context);
1297 RETVAL->r = 1.; 1376 RETVAL->r = 1.;
1446 1525
1447void 1526void
1448set_height (DC::Layout self, int base_height) 1527set_height (DC::Layout self, int base_height)
1449 CODE: 1528 CODE:
1450 if (self->base_height != base_height) 1529 if (self->base_height != base_height)
1451 { 1530 {
1452 self->base_height = base_height; 1531 self->base_height = base_height;
1453 layout_update_font (self); 1532 layout_update_font (self);
1454 } 1533 }
1455 1534
1456void 1535void
1820MODULE = Deliantra::Client PACKAGE = DC::Map 1899MODULE = Deliantra::Client PACKAGE = DC::Map
1821 1900
1822PROTOTYPES: DISABLE 1901PROTOTYPES: DISABLE
1823 1902
1824DC::Map 1903DC::Map
1825new (SV *class) 1904new (SV *klass)
1826 CODE: 1905 CODE:
1827 New (0, RETVAL, 1, struct map); 1906 New (0, RETVAL, 1, mapgrid);
1828 RETVAL->x = 0; 1907 RETVAL->x = 0;
1829 RETVAL->y = 0; 1908 RETVAL->y = 0;
1830 RETVAL->w = 0; 1909 RETVAL->w = 0;
1831 RETVAL->h = 0; 1910 RETVAL->h = 0;
1832 RETVAL->ox = 0; 1911 RETVAL->ox = 0;
1869 1948
1870void 1949void
1871set_smooth (DC::Map self, int face, int smooth, int level) 1950set_smooth (DC::Map self, int face, int smooth, int level)
1872 CODE: 1951 CODE:
1873{ 1952{
1874 tileid texid; 1953 tileid texid;
1875 maptex *tex; 1954 maptex *tex;
1876 1955
1877 if (face < 0 || face >= self->faces) 1956 if (face < 0 || face >= self->faces)
1878 return; 1957 return;
1879 1958
1880 if (smooth < 0 || smooth >= self->faces) 1959 if (smooth < 0 || smooth >= self->faces)
1881 return; 1960 return;
1882 1961
1883 texid = self->face2tile [face]; 1962 texid = self->face2tile [face];
1884 1963
1885 if (!texid) 1964 if (!texid)
1886 return; 1965 return;
1887 1966
1888 tex = self->tex + texid; 1967 tex = self->tex + texid;
1921} 2000}
1922 2001
1923void 2002void
1924expire_textures (DC::Map self, int texid, int count) 2003expire_textures (DC::Map self, int texid, int count)
1925 PPCODE: 2004 PPCODE:
1926 for (; texid < self->texs && count; ++texid, --count) 2005 for (; texid < self->texs && count; ++texid, --count)
1927 { 2006 {
1928 maptex *tex = self->tex + texid; 2007 maptex *tex = self->tex + texid;
1929 2008
1930 if (tex->name) 2009 if (tex->name)
1931 { 2010 {
1986 self->y += MAP_EXTEND_Y; 2065 self->y += MAP_EXTEND_Y;
1987 } 2066 }
1988} 2067}
1989 2068
1990SV * 2069SV *
1991map1a_update (DC::Map self, SV *data_, int extmap) 2070map1a_update (DC::Map self, SV *data_)
1992 CODE: 2071 CODE:
1993{ 2072{
1994 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2073 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1995 uint8_t *data_end = (uint8_t *)SvEND (data_); 2074 uint8_t *data_end = (uint8_t *)SvEND (data_);
1996 mapcell *cell; 2075 mapcell *cell;
2017 2096
2018 //TODO: don't trust server data to be in-range(!) 2097 //TODO: don't trust server data to be in-range(!)
2019 2098
2020 if (flags & 8) 2099 if (flags & 8)
2021 { 2100 {
2101 uint8_t ext, cmd;
2102
2022 if (extmap) 2103 do
2023 { 2104 {
2024 uint8_t ext, cmd; 2105 ext = *data++;
2106 cmd = ext & 0x7f;
2025 2107
2026 do 2108 if (cmd < 4)
2109 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2110 else if (cmd == 5) // health
2027 { 2111 {
2028 ext = *data++;
2029 cmd = ext & 0x7f;
2030
2031 if (cmd < 4)
2032 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2033 else if (cmd == 5) // health
2034 {
2035 cell->stat_width = 1; 2112 cell->stat_width = 1;
2036 cell->stat_hp = *data++; 2113 cell->stat_hp = *data++;
2037 }
2038 else if (cmd == 6) // monster width
2039 cell->stat_width = *data++ + 1;
2040 else if (cmd == 0x47)
2041 {
2042 if (*data == 1) cell->player = data [1];
2043 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2046
2047 data += *data + 1;
2048 }
2049 else if (cmd == 8) // cell flags
2050 cell->flags = *data++;
2051 else if (ext & 0x40) // unknown, multibyte => skip
2052 data += *data + 1;
2053 else
2054 data++;
2055 } 2114 }
2056 while (ext & 0x80); 2115 else if (cmd == 6) // monster width
2116 cell->stat_width = *data++ + 1;
2117 else if (cmd == 0x47)
2118 {
2119 if (*data == 1) cell->player = data [1];
2120 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2121 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2122 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2123
2124 data += *data + 1;
2125 }
2126 else if (cmd == 8) // cell flags
2127 cell->flags = *data++;
2128 else if (ext & 0x40) // unknown, multibyte => skip
2129 data += *data + 1;
2130 else
2131 data++;
2057 } 2132 }
2058 else 2133 while (ext & 0x80);
2059 cell->darkness = *data++ + 1;
2060 } 2134 }
2061 2135
2062 for (z = 0; z <= 2; ++z) 2136 for (z = 0; z <= 2; ++z)
2063 if (flags & (4 >> z)) 2137 if (flags & (4 >> z))
2064 { 2138 {
2112 ? self->row + y 2186 ? self->row + y
2113 : 0; 2187 : 0;
2114 2188
2115 for (x = x0; x < x1; x++) 2189 for (x = x0; x < x1; x++)
2116 { 2190 {
2117 int r = 32, g = 32, b = 32, a = 192; 2191 unsigned int r = 32, g = 32, b = 32, a = 192;
2118 2192
2119 if (row && row->c0 <= x && x < row->c1) 2193 if (row && row->c0 <= x && x < row->c1)
2120 { 2194 {
2121 mapcell *cell = row->col + (x - row->c0); 2195 mapcell *cell = row->col + (x - row->c0);
2122 2196
2124 { 2198 {
2125 maptex tex = self->tex [cell->tile [z]]; 2199 maptex tex = self->tex [cell->tile [z]];
2126 int a0 = 255 - tex.a; 2200 int a0 = 255 - tex.a;
2127 int a1 = tex.a; 2201 int a1 = tex.a;
2128 2202
2129 r = (r * a0 + tex.r * a1) / 255; 2203 r = div255 (r * a0 + tex.r * a1);
2130 g = (g * a0 + tex.g * a1) / 255; 2204 g = div255 (g * a0 + tex.g * a1);
2131 b = (b * a0 + tex.b * a1) / 255; 2205 b = div255 (b * a0 + tex.b * a1);
2132 a = (a * a0 + tex.a * a1) / 255; 2206 a = div255 (a * a0 + tex.a * a1);
2133 } 2207 }
2134 } 2208 }
2135 2209
2136 *map++ = (r ) 2210 *map++ = (r )
2137 | (g << 8) 2211 | (g << 8)
2138 | (b << 16) 2212 | (b << 16)
2139 | (a << 24); 2213 | (a << 24);
2140 } 2214 }
2141 } 2215 }
2142 2216
2143 RETVAL = map_sv; 2217 RETVAL = map_sv;
2144} 2218}
2145 OUTPUT: 2219 OUTPUT:
2146 RETVAL 2220 RETVAL
2147 2221
2148void 2222void
2149draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2223draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2150 CODE: 2224 CODE:
2151{ 2225{
2152 int x, y, z; 2226 int x, y, z;
2153 2227
2154 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2155 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2228 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2156 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2157 smooth_key skey; 2230 smooth_key skey;
2158 int pl_x, pl_y; 2231 int pl_x, pl_y;
2159 maptex pl_tex; 2232 maptex pl_tex;
2208 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2281 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2209 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2282 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2210 2283
2211 for (z = 0; z <= 2; z++) 2284 for (z = 0; z <= 2; z++)
2212 { 2285 {
2286 smooth_hash smooth;
2213 memset (smooth_level, 0, sizeof (smooth_level)); 2287 memset (smooth_level, 0, sizeof (smooth_level));
2214 key.texname = -1; 2288 key.texname = -1;
2215 2289
2216 for (y = 0; y < sh; y++) 2290 for (y = 0; y < sh; y++)
2217 if (0 <= y + my && y + my < self->rows) 2291 if (0 <= y + my && y + my < self->rows)
2238 2312
2239 key.texname = tex.name; 2313 key.texname = tex.name;
2240 arr = rc_array (rc, &key); 2314 arr = rc_array (rc, &key);
2241 } 2315 }
2242 2316
2243 px = (x + 1) * T - tex.w; 2317 px = (x + 1) * Th - tex.w;
2244 py = (y + 1) * T - tex.h; 2318 py = (y + 1) * Tw - tex.h;
2245 2319
2246 if (expect_false (cell->player == player) && expect_false (z == 2)) 2320 if (expect_false (cell->player == player) && expect_false (z == 2))
2247 { 2321 {
2248 pl_x = px; 2322 pl_x = px;
2249 pl_y = py; 2323 pl_y = py;
2278 2352
2279 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2353 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2280 // ·· ·· ·┏ ┓· 2354 // ·· ·· ·┏ ┓·
2281 2355
2282 // full tile 2356 // full tile
2283 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2357 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2284 2358
2285 // borders 2359 // borders
2286 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2360 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2287 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2361 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2288 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2362 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2289 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2363 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2290 2364
2291 // corners 2365 // corners
2292 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2366 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2293 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2367 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2294 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2368 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2295 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2369 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2296 } 2370 }
2297 } 2371 }
2298 2372
2299 if (expect_false (z == 2) && expect_false (cell->flags)) 2373 if (expect_false (z == 2) && expect_false (cell->flags))
2300 { 2374 {
2302 if (cell->flags & 1) 2376 if (cell->flags & 1)
2303 { 2377 {
2304 rc_key_t key_ov = key; 2378 rc_key_t key_ov = key;
2305 maptex tex = self->tex [TEXID_SPEECH]; 2379 maptex tex = self->tex [TEXID_SPEECH];
2306 rc_array_t *arr; 2380 rc_array_t *arr;
2307 int px = x * T + T * 2 / 32; 2381 int px = x * Tw + Tw * 2 / 32;
2308 int py = y * T - T * 6 / 32; 2382 int py = y * Th - Th * 6 / 32;
2309 2383
2310 key_ov.texname = tex.name; 2384 key_ov.texname = tex.name;
2311 arr = rc_array (rc_ov, &key_ov); 2385 arr = rc_array (rc_ov, &key_ov);
2312 2386
2313 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2387 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2314 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2388 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2315 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2389 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2316 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2390 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2317 } 2391 }
2318 } 2392 }
2319 } 2393 }
2320 } 2394 }
2321 2395
2337 if (smask & (((uint32_t)1) << b)) 2411 if (smask & (((uint32_t)1) << b))
2338 { 2412 {
2339 int level = (w << 5) | b; 2413 int level = (w << 5) | b;
2340 HE *he; 2414 HE *he;
2341 2415
2342 hv_iterinit (smooth); 2416 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2343 while ((he = hv_iternext (smooth)))
2344 { 2417 {
2345 smooth_key *skey = (smooth_key *)HeKEY (he); 2418 smooth_key &skey = it->first;
2346 IV bits = SvIVX (HeVAL (he)); 2419 IV bits = it->second;
2347 2420
2348 if (!(bits & 0x1000) 2421 if (!(bits & 0x1000)
2349 && skey->level == level 2422 && skey.level == level
2350 && level > smooth_max [skey->x][skey->y]) 2423 && level > smooth_max [skey.x][skey.y])
2351 { 2424 {
2352 maptex tex = self->tex [skey->tile]; 2425 maptex tex = self->tex [skey.tile];
2353 int px = (((int)skey->x) - 1) * T; 2426 int px = (((int)skey.x) - 1) * Tw;
2354 int py = (((int)skey->y) - 1) * T; 2427 int py = (((int)skey.y) - 1) * Th;
2355 int border = bits & 15; 2428 int border = bits & 15;
2356 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2429 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2357 float dx = tex.s * .0625f; // 16 images/row 2430 float dx = tex.s * .0625f; // 16 images/row
2358 float dy = tex.t * .5f ; // 2 images/column 2431 float dy = tex.t * .5f ; // 2 images/column
2359 2432
2361 { 2434 {
2362 // this time avoiding texture state changes 2435 // this time avoiding texture state changes
2363 // save gobs of state changes. 2436 // save gobs of state changes.
2364 if (key.texname != tex.name) 2437 if (key.texname != tex.name)
2365 { 2438 {
2366 self->tex [skey->tile].unused = 0; 2439 self->tex [skey.tile].unused = 0;
2367 2440
2368 glEnd (); 2441 glEnd ();
2369 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2442 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2370 glBegin (GL_QUADS); 2443 glBegin (GL_QUADS);
2371 } 2444 }
2372 2445
2373 if (border) 2446 if (border)
2374 { 2447 {
2375 float ox = border * dx; 2448 float ox = border * dx;
2376 2449
2377 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2450 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2378 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2451 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2379 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2380 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2453 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2381 } 2454 }
2382 2455
2383 if (corner) 2456 if (corner)
2384 { 2457 {
2385 float ox = corner * dx; 2458 float ox = corner * dx;
2386 2459
2387 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2460 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2388 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2461 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2389 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2462 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2390 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2463 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2391 } 2464 }
2392 } 2465 }
2393 } 2466 }
2394 } 2467 }
2395 } 2468 }
2397 2470
2398 glEnd (); 2471 glEnd ();
2399 glDisable (GL_TEXTURE_2D); 2472 glDisable (GL_TEXTURE_2D);
2400 key.texname = -1; 2473 key.texname = -1;
2401 } 2474 }
2402
2403 hv_clear (smooth);
2404 } 2475 }
2405 2476
2406 if (pl_tex.name) 2477 if (pl_tex.name)
2407 { 2478 {
2408 maptex tex = pl_tex; 2479 maptex tex = pl_tex;
2436 for (x = 0; x < sw; x++) 2507 for (x = 0; x < sw; x++)
2437 if (row->c0 <= x + mx && x + mx < row->c1) 2508 if (row->c0 <= x + mx && x + mx < row->c1)
2438 { 2509 {
2439 mapcell *cell = row->col + (x + mx - row->c0); 2510 mapcell *cell = row->col + (x + mx - row->c0);
2440 2511
2441 int px = x * T; 2512 int px = x * Tw;
2442 int py = y * T; 2513 int py = y * Th;
2443 2514
2444 if (expect_false (cell->player == player)) 2515 if (expect_false (cell->player == player))
2445 { 2516 {
2446 px += sdx; 2517 px += sdx;
2447 py += sdy; 2518 py += sdy;
2448 } 2519 }
2449 2520
2450 if (cell->stat_hp) 2521 if (cell->stat_hp)
2451 { 2522 {
2452 int width = cell->stat_width * T; 2523 int width = cell->stat_width * Tw;
2453 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2524 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2454 2525
2455 glColor3ub (0, 0, 0); 2526 glColor3ub (0, 0, 0);
2456 glRectf (px + 1, py - thick - 2, 2527 glRectf (px + 1, py - thick - 2,
2457 px + width - 1, py); 2528 px + width - 1, py);
2458 2529
2538 int x, y; 2609 int x, y;
2539 int sw1 = sw + 2; 2610 int sw1 = sw + 2;
2540 int sh1 = sh + 2; 2611 int sh1 = sh + 2;
2541 int sh3 = sh * 3; 2612 int sh3 = sh * 3;
2542 int sw3 = sw * 3; 2613 int sw3 = sw * 3;
2543 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2544 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2614 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2545 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2615 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2616 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2617 memset (darkness1, 0, sw1*sh1);
2546 2618
2547 SvPOK_only (darkness3_sv); 2619 SvPOK_only (darkness3_sv);
2548 SvCUR_set (darkness3_sv, sw3 * sh3); 2620 SvCUR_set (darkness3_sv, sw3 * sh3);
2549 2621
2550 mx += self->x - 1; 2622 mx += self->x - 1;
2676 else 2748 else
2677 *data++ = 0; 2749 *data++ = 0;
2678 } 2750 }
2679 } 2751 }
2680 2752
2681 /* if size is w*h + 5 then no data has been found */ 2753 /* if size is w*h + 5 then no data has been found */
2682 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2754 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2683 { 2755 {
2684 SvPOK_only (data_sv); 2756 SvPOK_only (data_sv);
2685 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2757 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686 } 2758 }
2687 2759
2688 RETVAL = data_sv; 2760 RETVAL = data_sv;
2689} 2761}
2690 OUTPUT: 2762 OUTPUT:
2691 RETVAL 2763 RETVAL
2692 2764
2693void 2765void
2700 STRLEN len; 2772 STRLEN len;
2701 uint8_t *data, *end; 2773 uint8_t *data, *end;
2702 2774
2703 len = SvLEN (data_sv); 2775 len = SvLEN (data_sv);
2704 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2776 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705 data = SvPVbyte_nolen (data_sv); 2777 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2706 end = data + len + 8; 2778 end = data + len + 8;
2707 2779
2708 if (len < 5) 2780 if (len < 5)
2709 XSRETURN_EMPTY; 2781 XSRETURN_EMPTY;
2710 2782
2771} 2843}
2772 2844
2773MODULE = Deliantra::Client PACKAGE = DC::RW 2845MODULE = Deliantra::Client PACKAGE = DC::RW
2774 2846
2775DC::RW 2847DC::RW
2776new (SV *class, SV *data_sv) 2848new (SV *klass, SV *data_sv)
2777 CODE: 2849 CODE:
2778{ 2850{
2779 STRLEN datalen; 2851 STRLEN datalen;
2780 char *data = SvPVbyte (data_sv, datalen); 2852 char *data = SvPVbyte (data_sv, datalen);
2781 2853
2783} 2855}
2784 OUTPUT: 2856 OUTPUT:
2785 RETVAL 2857 RETVAL
2786 2858
2787DC::RW 2859DC::RW
2788new_from_file (SV *class, const char *path, const char *mode = "rb") 2860new_from_file (SV *klass, const char *path, const char *mode = "rb")
2789 CODE: 2861 CODE:
2790 RETVAL = SDL_RWFromFile (path, mode); 2862 RETVAL = SDL_RWFromFile (path, mode);
2791 OUTPUT: 2863 OUTPUT:
2792 RETVAL 2864 RETVAL
2793 2865
2902#else 2974#else
2903 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0))); 2975 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904#endif 2976#endif
2905 2977
2906DC::MixChunk 2978DC::MixChunk
2907new (SV *class, DC::RW rwops) 2979new (SV *klass, DC::RW rwops)
2908 CODE: 2980 CODE:
2909 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2981 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2910 OUTPUT: 2982 OUTPUT:
2911 RETVAL 2983 RETVAL
2912 2984
2982 RETVAL = Mix_PlayingMusic (); 3054 RETVAL = Mix_PlayingMusic ();
2983 OUTPUT: 3055 OUTPUT:
2984 RETVAL 3056 RETVAL
2985 3057
2986DC::MixMusic 3058DC::MixMusic
2987new (SV *class, DC::RW rwops) 3059new (SV *klass, DC::RW rwops)
2988 CODE: 3060 CODE:
2989 RETVAL = Mix_LoadMUS_RW (rwops); 3061 RETVAL = Mix_LoadMUS_RW (rwops);
2990 OUTPUT: 3062 OUTPUT:
2991 RETVAL 3063 RETVAL
2992 3064
3129 const_iv (GL_FUNC_SUBTRACT), 3201 const_iv (GL_FUNC_SUBTRACT),
3130 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3202 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3131# undef const_iv 3203# undef const_iv
3132 }; 3204 };
3133 3205
3134 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3206 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3135 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3207 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3136 3208
3137 texture_av = newAV (); 3209 texture_av = newAV ();
3138 AvREAL_off (texture_av); 3210 AvREAL_off (texture_av);
3139} 3211}
3140 3212
3145 gl.BlendFuncSeparateEXT = 0; 3217 gl.BlendFuncSeparateEXT = 0;
3146 3218
3147void 3219void
3148apple_nvidia_bug (int enable) 3220apple_nvidia_bug (int enable)
3149 3221
3150char * 3222const char *
3151gl_vendor () 3223gl_vendor ()
3152 CODE: 3224 CODE:
3153 RETVAL = (char *)glGetString (GL_VENDOR); 3225 RETVAL = (const char *)glGetString (GL_VENDOR);
3154 OUTPUT: 3226 OUTPUT:
3155 RETVAL 3227 RETVAL
3156 3228
3157char * 3229const char *
3158gl_version () 3230gl_version ()
3159 CODE: 3231 CODE:
3160 RETVAL = (char *)glGetString (GL_VERSION); 3232 RETVAL = (const char *)glGetString (GL_VERSION);
3161 OUTPUT: 3233 OUTPUT:
3162 RETVAL 3234 RETVAL
3163 3235
3164char * 3236const char *
3165gl_extensions () 3237gl_extensions ()
3166 CODE: 3238 CODE:
3167 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3239 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3168 OUTPUT: 3240 OUTPUT:
3169 RETVAL 3241 RETVAL
3170 3242
3171const char *glGetString (GLenum pname) 3243const char *glGetString (GLenum pname)
3244 CODE:
3245 RETVAL = (const char *)glGetString (pname);
3246 OUTPUT:
3247 RETVAL
3172 3248
3173GLint glGetInteger (GLenum pname) 3249GLint glGetInteger (GLenum pname)
3174 CODE: 3250 CODE:
3175 glGetIntegerv (pname, &RETVAL); 3251 glGetIntegerv (pname, &RETVAL);
3176 OUTPUT: 3252 OUTPUT:
3183 RETVAL 3259 RETVAL
3184 3260
3185int glGetError () 3261int glGetError ()
3186 3262
3187void glFinish () 3263void glFinish ()
3264
3265void glFlush ()
3188 3266
3189void glClear (int mask) 3267void glClear (int mask)
3190 3268
3191void glClearColor (float r, float g, float b, float a = 1.0) 3269void glClearColor (float r, float g, float b, float a = 1.0)
3192 PROTOTYPE: @ 3270 PROTOTYPE: @
3377 3455
3378void 3456void
3379find_widget (SV *self, NV x, NV y) 3457find_widget (SV *self, NV x, NV y)
3380 PPCODE: 3458 PPCODE:
3381{ 3459{
3382 if (within_widget (self, x, y)) 3460 if (within_widget (self, x, y))
3383 XPUSHs (self); 3461 XPUSHs (self);
3384} 3462}
3385 3463
3386BOOT: 3464BOOT:
3387{ 3465{
3395 3473
3396void 3474void
3397draw (SV *self) 3475draw (SV *self)
3398 CODE: 3476 CODE:
3399{ 3477{
3400 HV *hv; 3478 HV *hv;
3401 SV **svp; 3479 SV **svp;
3402 NV x, y, w, h; 3480 NV x, y, w, h;
3403 SV *draw_x_sv = GvSV (draw_x_gv); 3481 SV *draw_x_sv = GvSV (draw_x_gv);
3404 SV *draw_y_sv = GvSV (draw_y_gv); 3482 SV *draw_y_sv = GvSV (draw_y_gv);
3405 SV *draw_w_sv = GvSV (draw_w_gv); 3483 SV *draw_w_sv = GvSV (draw_w_gv);
3406 SV *draw_h_sv = GvSV (draw_h_gv); 3484 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines