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.327 by root, Sun Nov 18 12:01:50 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
100#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
101 106
102#define TEXID_SPEECH 1 107#define TEXID_SPEECH 1
103#define TEXID_NOFACE 2 108#define TEXID_NOFACE 2
104 109
110static char *
111fast_sv_grow (SV *sv, STRLEN need)
112{
113 STRLEN len = SvLEN (sv);
114 STRLEN want = SvCUR (sv) + need;
115
116 if (expect_false (len < want))
117 {
118 do
119 len *= 2;
120 while (len < want);
121
122 sv_grow (sv, len);
123 }
124
125 SvCUR_set (sv, want);
126 return SvEND (sv) - need;
127}
128
105static AV *texture_av; 129static AV *texture_av;
106 130
107static struct 131static struct
108{ 132{
109#define GL_FUNC(ptr,name) ptr name; 133#define GL_FUNC(ptr,name) ptr name;
165{ 189{
166 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
167 191
168 while (attrs) 192 while (attrs)
169 { 193 {
170 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
171 195
172 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
173 return 1; 197 return 1;
174 198
175 attrs = attrs->next; 199 attrs = attrs->next;
176 } 200 }
177 201
178 return 0; 202 return 0;
179} 203}
180 204
181typedef struct cf_layout { 205struct cf_layout {
182 PangoLayout *pl; 206 PangoLayout *pl;
183 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
184 int base_height; 208 int base_height;
185 DC__Font font; 209 DC__Font font;
186 rc_t *rc; 210 rc_t rc;
187} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
188 214
189static DC__Font default_font; 215static DC__Font default_font;
190static PangoContext *opengl_context; 216static PangoContext *opengl_context;
191static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
192 218
193static void 219static void
194substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
195{ 221{
196 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
197#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
198 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199#endif 225#endif
200 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201} 227}
202 228
203static void 229static void
233} 259}
234 260
235typedef uint16_t tileid; 261typedef uint16_t tileid;
236typedef uint16_t faceid; 262typedef uint16_t faceid;
237 263
238typedef struct { 264struct maptex
265{
239 GLuint name; 266 GLuint name;
240 int w, h; 267 int w, h;
241 float s, t; 268 float s, t;
242 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
243 tileid smoothtile; 270 tileid smoothtile;
244 uint8_t smoothlevel; 271 uint8_t smoothlevel;
245 uint8_t unused; /* set to zero on use */ 272 uint8_t unused; /* set to zero on use */
246} maptex; 273};
247 274
248typedef struct { 275struct mapcell
276{
249 uint32_t player; 277 uint32_t player;
250 tileid tile[3]; 278 tileid tile[3];
251 uint16_t darkness; 279 uint16_t darkness;
252 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
253} mapcell; 281};
254 282
255typedef struct { 283struct maprow
284{
256 int32_t c0, c1; 285 int32_t c0, c1;
257 mapcell *col; 286 mapcell *col;
258} maprow; 287};
259 288
260typedef struct map { 289struct mapgrid {
261 int x, y, w, h; 290 int x, y, w, h;
262 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
263 int faces; tileid *face2tile; // [faceid] 292 std::vector<tileid> tile;
264 int texs; maptex *tex; // [tileid] 293 std::vector<maptex> tex;
265 294
266 int32_t rows; 295 int32_t rows;
267 maprow *row; 296 maprow *row;
268} *DC__Map; 297
298 ~mapgrid ()
299 {
300 clear_cells ();
301 }
302
303 void clear_cells ();
304};
305
306typedef mapgrid *DC__Map;
269 307
270static char * 308static char *
271prepend (char *ptr, int sze, int inc) 309prepend (char *ptr, int sze, int inc)
272{ 310{
273 char *p; 311 char *p;
290} 328}
291 329
292#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 330#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)) 331#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
294 332
295static void
296need_facenum (struct map *self, faceid face)
297{
298 while (self->faces <= face)
299 {
300 Append (tileid, self->face2tile, self->faces, self->faces);
301 self->faces *= 2;
302 }
303}
304
305static void
306need_texid (struct map *self, int texid)
307{
308 while (self->texs <= texid)
309 {
310 Append (maptex, self->tex, self->texs, self->texs);
311 self->texs *= 2;
312 }
313}
314
315static maprow * 333static maprow *
316map_get_row (DC__Map self, int y) 334map_get_row (mapgrid *self, int y)
317{ 335{
318 if (0 > y) 336 if (0 > y)
319 { 337 {
320 int extend = - y + MAP_EXTEND_Y; 338 int extend = - y + MAP_EXTEND_Y;
321 Prepend (maprow, self->row, self->rows, extend); 339 Prepend (maprow, self->row, self->rows, extend);
359 377
360 return row->col + (x - row->c0); 378 return row->col + (x - row->c0);
361} 379}
362 380
363static mapcell * 381static mapcell *
364map_get_cell (DC__Map self, int x, int y) 382map_get_cell (mapgrid *self, int x, int y)
365{ 383{
366 return row_get_cell (map_get_row (self, y), x); 384 return row_get_cell (map_get_row (self, y), x);
367} 385}
368 386
369static void 387void mapgrid::clear_cells ()
370map_clear (DC__Map self)
371{ 388{
372 int r; 389 int r;
373 390
374 for (r = 0; r < self->rows; r++) 391 for (r = 0; r < rows; r++)
375 Safefree (self->row[r].col); 392 Safefree (row[r].col);
376 393
377 Safefree (self->row); 394 Safefree (row);
378 395
379 self->x = 0; 396 x = 0;
380 self->y = 0; 397 y = 0;
381 self->ox = 0; 398 ox = 0;
382 self->oy = 0; 399 oy = 0;
383 self->row = 0; 400 row = 0;
384 self->rows = 0; 401 rows = 0;
385} 402}
386 403
387#define CELL_CLEAR(cell) \ 404#define CELL_CLEAR(cell) \
388 do { \ 405 do { \
389 if ((cell)->player) \ 406 if ((cell)->player) \
393 (cell)->flags = 0; \ 410 (cell)->flags = 0; \
394 (cell)->player = 0; \ 411 (cell)->player = 0; \
395 } while (0) 412 } while (0)
396 413
397static void 414static void
398map_blank (DC__Map self, int x0, int y0, int w, int h) 415map_blank (mapgrid *self, int x0, int y0, int w, int h)
399{ 416{
400 int x, y; 417 int x, y;
401 maprow *row; 418 maprow *row;
402 mapcell *cell; 419 mapcell *cell;
403 420
420 CELL_CLEAR (cell); 437 CELL_CLEAR (cell);
421 } 438 }
422 } 439 }
423} 440}
424 441
425typedef struct { 442struct smooth_key
443{
426 tileid tile; 444 tileid tile;
427 uint8_t x, y, level; 445 uint8_t x, y, level;
428} smooth_key; 446
447 bool operator == (const smooth_key &o) const
448 {
449 return tile == o.tile && x == o.x && y == o.y && level == o.level;
450 }
451};
452
453typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
454
455namespace std {
456 template <>
457 struct hash<smooth_key>
458 {
459 size_t operator () (const smooth_key &v) const
460 {
461 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
462 }
463 };
464}
429 465
430static void 466static void
431smooth_or_bits (HV *hv, smooth_key *key, IV bits) 467smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432{ 468{
433 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 469 auto &&it = h.find (key);
434 470
435 if (SvIOK (*sv)) 471 if (it == h.end ())
436 SvIV_set (*sv, SvIVX (*sv) | bits); 472 h.insert (std::make_pair (key, bits));
437 else 473 else
438 sv_setiv (*sv, bits); 474 it->second |= bits;
439} 475}
440 476
441static void 477static void
442music_finished (void) 478music_finished (void)
443{ 479{
460 ev.code = 1; 496 ev.code = 1;
461 ev.data1 = (void *)(long)channel; 497 ev.data1 = (void *)(long)channel;
462 ev.data2 = 0; 498 ev.data2 = 0;
463 499
464 SDL_PushEvent ((SDL_Event *)&ev); 500 SDL_PushEvent ((SDL_Event *)&ev);
501}
502
503// approximately divide by 255
504static unsigned int
505div255 (unsigned int n)
506{
507 return (n + (n >> 8)) >> 8;
465} 508}
466 509
467static unsigned int 510static unsigned int
468minpot (unsigned int n) 511minpot (unsigned int n)
469{ 512{
552 595
553 return mod; 596 return mod;
554} 597}
555 598
556static void 599static void
557deliantra_main () 600deliantra_main (SV *real_main)
558{ 601{
559 char *argv[] = { 0 }; 602 dSP;
560 call_argv ("::main", G_DISCARD | G_VOID, argv); 603
604 PUSHMARK (SP);
605 call_sv (real_main, G_DISCARD | G_VOID);
561} 606}
562 607
563#ifdef __MACOSX__ 608#ifdef __MACOSX__
609 static SV *real_main;
610
564 /* to due surprising braindamage on the side of SDL design, we 611 /* to due surprising braindamage on the side of SDL design, we
565 * do some mind-boggling hack here: SDL requires a custom main() 612 * 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, 613 * 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, 614 * due to shared library magic, calls -lSDLmain's main, not perl's main,
568 * and which calls our main (== SDL_main) back. 615 * and which calls our main (== SDL_main) back.
569 */ 616 */
570 extern C_LINKAGE int 617 extern C_LINKAGE int
571 main (int argc, char *argv[]) 618 main (int argc, char *argv[])
572 { 619 {
573 deliantra_main (); 620 deliantra_main (real_main);
574 } 621 }
575 622
576 #undef main 623 #undef main
577 624
578 extern C_LINKAGE int main (int argc, char *argv[]); 625 extern C_LINKAGE int main (int argc, char *argv[]);
579 626
580 static void 627 static void
581 SDL_braino (void) 628 SDL_main_hack (SV *real_main_)
582 { 629 {
630 real_main = real_main_;
631
583 char *argv[] = { "deliantra client", 0 }; 632 char *argv[] = { "deliantra client", 0 };
584 (main) (1, argv); 633 (main) (1, argv);
585 } 634 }
586#else 635#else
587 static void 636 static void
588 SDL_braino (void) 637 SDL_main_hack (SV *real_main)
589 { 638 {
590 deliantra_main (); 639 deliantra_main (real_main);
591 } 640 }
592#endif 641#endif
593 642
594MODULE = Deliantra::Client PACKAGE = DC 643MODULE = Deliantra::Client PACKAGE = DC
595 644
796 845
797 const_iv (FOW_DARKNESS) 846 const_iv (FOW_DARKNESS)
798# undef const_iv 847# undef const_iv
799 }; 848 };
800 849
801 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 850 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 851 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803 852
804 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 853 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 854 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806} 855}
807 856
846#endif 895#endif
847} 896}
848 897
849char *SDL_GetError () 898char *SDL_GetError ()
850 899
851void SDL_braino () 900void SDL_main_hack (SV *real_main)
901 PROTOTYPE: &
852 902
853int SDL_Init (U32 flags) 903int SDL_Init (U32 flags)
854 904
855int SDL_InitSubSystem (U32 flags) 905int SDL_InitSubSystem (U32 flags)
856 906
857void SDL_QuitSubSystem (U32 flags) 907void SDL_QuitSubSystem (U32 flags)
858 908
859void SDL_Quit () 909void SDL_Quit ()
860 910
861int SDL_GL_SetAttribute (int attr, int value) 911int SDL_GL_SetAttribute (int attr, int value)
912 C_ARGS: (SDL_GLattr)attr, value
862 913
863int SDL_GL_GetAttribute (int attr) 914int SDL_GL_GetAttribute (int attr)
864 CODE: 915 CODE:
865 if (SDL_GL_GetAttribute (attr, &RETVAL)) 916 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866 XSRETURN_UNDEF; 917 XSRETURN_UNDEF;
867 OUTPUT: 918 OUTPUT:
868 RETVAL 919 RETVAL
869 920
870void 921void
925 ); 976 );
926 977
927 if (RETVAL) 978 if (RETVAL)
928 { 979 {
929 av_clear (texture_av); 980 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); 981#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933#include "glfunc.h" 982#include "glfunc.h"
934#undef GL_FUNC 983#undef GL_FUNC
984 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
985 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
935 } 986 }
936} 987}
937 OUTPUT: 988 OUTPUT:
938 RETVAL 989 RETVAL
990
991void
992SDL_WM_SetCaption (const char *title, const char *icon)
939 993
940void 994void
941SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
942 996
943char * 997char *
944SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
945 1000
946int 1001int
947SDL_GetAppState () 1002SDL_GetAppState ()
948 1003
949int 1004int
950SDL_GetModState () 1005SDL_GetModState ()
951 1006
1007int
1008SDL_WaitEvent ()
1009 C_ARGS: 0
1010
952void 1011void
1012SDL_PumpEvents ()
1013
1014void
953poll_events () 1015peep_events ()
954 PPCODE: 1016 PPCODE:
955{ 1017{
956 SDL_Event ev; 1018 SDL_Event ev;
957 1019
958 SDL_PumpEvents (); 1020 SDL_PumpEvents ();
1024 1086
1025 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1087 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1026 } 1088 }
1027} 1089}
1028 1090
1091char *
1092SDL_AudioDriverName ()
1093 CODE:
1094{
1095 char buf [256];
1096 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1097 XSRETURN_UNDEF;
1098
1099 RETVAL = buf;
1100}
1101 OUTPUT:
1102 RETVAL
1103
1029int 1104int
1030Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1105Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1031 POSTCALL: 1106 POSTCALL:
1032 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
1033 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
1034 1109
1035void 1110void
1036Mix_QuerySpec () 1111Mix_QuerySpec ()
1095add_font (char *file) 1170add_font (char *file)
1096 CODE: 1171 CODE:
1097 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1172 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1098 OUTPUT: 1173 OUTPUT:
1099 RETVAL 1174 RETVAL
1175
1176void
1177IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1178
1179# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1180void
1181Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1100 1182
1101void 1183void
1102load_image_inline (SV *image_) 1184load_image_inline (SV *image_)
1103 ALIAS: 1185 ALIAS:
1104 load_image_file = 1 1186 load_image_file = 1
1150 1232
1151 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
1152 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
1153 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
1154 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
1155 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 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))); 1238 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1157 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1158 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1159 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
1160 1242
1232MODULE = Deliantra::Client PACKAGE = DC::Font 1314MODULE = Deliantra::Client PACKAGE = DC::Font
1233 1315
1234PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1235 1317
1236DC::Font 1318DC::Font
1237new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
1238 CODE: 1320 CODE:
1239{ 1321{
1240 int count; 1322 int count;
1241 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1242 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1271 PROTOTYPE: 1353 PROTOTYPE:
1272 CODE: 1354 CODE:
1273 tc_restore (); 1355 tc_restore ();
1274 1356
1275DC::Layout 1357DC::Layout
1276new (SV *class) 1358new (SV *klass)
1277 CODE: 1359 CODE:
1278 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
1279 1361
1280 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
1281 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
1282 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
1283 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
1284 RETVAL->a = 1.; 1366 RETVAL->a = 1.;
1285 RETVAL->base_height = MIN_FONT_HEIGHT; 1367 RETVAL->base_height = MIN_FONT_HEIGHT;
1286 RETVAL->font = 0; 1368 RETVAL->font = 0;
1287 RETVAL->rc = rc_alloc ();
1288 1369
1289 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1370 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1290 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
1291 OUTPUT: 1372 OUTPUT:
1292 RETVAL 1373 RETVAL
1293 1374
1294void 1375void
1295DESTROY (DC::Layout self) 1376DESTROY (DC::Layout self)
1296 CODE: 1377 CODE:
1297 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
1298 rc_free (self->rc);
1299 Safefree (self); 1379 delete self;
1300 1380
1301void 1381void
1302set_text (DC::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
1303 CODE: 1383 CODE:
1304{ 1384{
1430 1510
1431void 1511void
1432set_height (DC::Layout self, int base_height) 1512set_height (DC::Layout self, int base_height)
1433 CODE: 1513 CODE:
1434 if (self->base_height != base_height) 1514 if (self->base_height != base_height)
1435 { 1515 {
1436 self->base_height = base_height; 1516 self->base_height = base_height;
1437 layout_update_font (self); 1517 layout_update_font (self);
1438 } 1518 }
1439 1519
1440void 1520void
1558} 1638}
1559 1639
1560void 1640void
1561render (DC::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1562 CODE: 1642 CODE:
1563 rc_clear (self->rc); 1643 self->rc.clear ();
1564 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1565 self->pl, 1645 self->pl,
1566 self->rc, 1646 &self->rc,
1567 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1568 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1569 flags 1649 flags
1570 ); 1650 );
1571 // we assume that context_change actually clears/frees stuff 1651 // we assume that context_change actually clears/frees stuff
1582 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1662 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1583 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1663 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1584 glEnable (GL_ALPHA_TEST); 1664 glEnable (GL_ALPHA_TEST);
1585 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1665 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1586 1666
1587 rc_draw (self->rc); 1667 self->rc.draw ();
1588 1668
1589 glDisable (GL_ALPHA_TEST); 1669 glDisable (GL_ALPHA_TEST);
1590 glDisable (GL_BLEND); 1670 glDisable (GL_BLEND);
1591 glDisable (GL_TEXTURE_2D); 1671 glDisable (GL_TEXTURE_2D);
1592} 1672}
1672void 1752void
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) 1753draw_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: @ 1754 PROTOTYPE: @
1675 CODE: 1755 CODE:
1676{ 1756{
1757 glEnable (GL_BLEND);
1758 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glEnable (GL_TEXTURE_2D); 1759 glEnable (GL_TEXTURE_2D);
1678 glEnable (GL_BLEND);
1679 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1680 glBindTexture (GL_TEXTURE_2D, name1); 1760 glBindTexture (GL_TEXTURE_2D, name1);
1681 1761
1682 glColor3f (intensity, intensity, intensity); 1762 glColor3f (intensity, intensity, intensity);
1683 glPushMatrix (); 1763 glPushMatrix ();
1684 glScalef (1./3, 1./3, 1.); 1764 glScalef (1./3, 1./3, 1.);
1699 glBindTexture (GL_TEXTURE_2D, name2); 1779 glBindTexture (GL_TEXTURE_2D, name2);
1700 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1780 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1701 1781
1702 /* rgb == rgb(glcolor) */ 1782 /* rgb == rgb(glcolor) */
1703 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1783 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1704 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1784 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1705 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1785 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1706 1786
1707 /* alpha = interpolate t0, t1 by env_alpha */ 1787 /* alpha = interpolate t0, t1 by env_alpha */
1708 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1788 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1709 1789
1804MODULE = Deliantra::Client PACKAGE = DC::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1805 1885
1806PROTOTYPES: DISABLE 1886PROTOTYPES: DISABLE
1807 1887
1808DC::Map 1888DC::Map
1809new (SV *class) 1889new (SV *klass)
1810 CODE: 1890 CODE:
1811 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1812 RETVAL->x = 0; 1892 RETVAL->x = 0;
1813 RETVAL->y = 0; 1893 RETVAL->y = 0;
1814 RETVAL->w = 0; 1894 RETVAL->w = 0;
1815 RETVAL->h = 0; 1895 RETVAL->h = 0;
1816 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1817 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1818 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1819 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1820 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1821 RETVAL->row = 0; 1899 RETVAL->row = 0;
1822 OUTPUT: 1900 OUTPUT:
1823 RETVAL 1901 RETVAL
1824 1902
1825void 1903void
1826DESTROY (DC::Map self) 1904DESTROY (DC::Map self)
1827 CODE: 1905 CODE:
1828{ 1906{
1829 map_clear (self);
1830 Safefree (self->face2tile);
1831 Safefree (self->tex);
1832 Safefree (self); 1907 delete self;
1833} 1908}
1834 1909
1835void 1910void
1836resize (DC::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1837 CODE: 1912 CODE:
1839 self->h = map_height; 1914 self->h = map_height;
1840 1915
1841void 1916void
1842clear (DC::Map self) 1917clear (DC::Map self)
1843 CODE: 1918 CODE:
1844 map_clear (self); 1919 self->clear_cells ();
1845 1920
1846void 1921void
1847set_tileid (DC::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1848 CODE: 1923 CODE:
1849{ 1924{
1850 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1851 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1852} 1928}
1853 1929
1854void 1930void
1855set_smooth (DC::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1856 CODE: 1932 CODE:
1857{ 1933{
1858 tileid texid;
1859 maptex *tex;
1860
1861 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1862 return; 1935 return;
1863 1936
1864 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1865 return; 1938 return;
1866 1939
1867 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1868 1941
1869 if (!texid) 1942 if (!texid)
1870 return; 1943 return;
1871 1944
1872 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1873 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1874 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1875} 1948}
1876 1949
1877void 1950void
1878set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1951set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1879 CODE: 1952 CODE:
1880{ 1953{
1881 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1882 1955
1883 { 1956 {
1884 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1885 1958
1886 tex->name = name; 1959 tex.name = name;
1887 tex->w = w; 1960 tex.w = w;
1888 tex->h = h; 1961 tex.h = h;
1889 tex->s = s; 1962 tex.s = s;
1890 tex->t = t; 1963 tex.t = t;
1891 tex->r = r; 1964 tex.r = r;
1892 tex->g = g; 1965 tex.g = g;
1893 tex->b = b; 1966 tex.b = b;
1894 tex->a = a; 1967 tex.a = a;
1895 } 1968 }
1896 1969
1897 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1898 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1899 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
1905} 1978}
1906 1979
1907void 1980void
1908expire_textures (DC::Map self, int texid, int count) 1981expire_textures (DC::Map self, int texid, int count)
1909 PPCODE: 1982 PPCODE:
1910 for (; texid < self->texs && count; ++texid, --count) 1983 for (; texid < self->tex.size () && count; ++texid, --count)
1911 { 1984 {
1912 maptex *tex = self->tex + texid; 1985 maptex &tex = self->tex[texid];
1913 1986
1914 if (tex->name) 1987 if (tex.name)
1915 { 1988 {
1916 if (tex->unused) 1989 if (tex.unused)
1917 { 1990 {
1918 tex->name = 0; 1991 tex.name = 0;
1919 tex->unused = 0; 1992 tex.unused = 0;
1920 XPUSHs (sv_2mortal (newSViv (texid))); 1993 XPUSHs (sv_2mortal (newSViv (texid)));
1921 } 1994 }
1922 else 1995 else
1923 tex->unused = 1; 1996 tex.unused = 1;
1924 } 1997 }
1925 } 1998 }
1926 1999
1927int 2000int
1928ox (DC::Map self) 2001ox (DC::Map self)
1970 self->y += MAP_EXTEND_Y; 2043 self->y += MAP_EXTEND_Y;
1971 } 2044 }
1972} 2045}
1973 2046
1974SV * 2047SV *
1975map1a_update (DC::Map self, SV *data_, int extmap) 2048map1a_update (DC::Map self, SV *data_)
1976 CODE: 2049 CODE:
1977{ 2050{
1978 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2051 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1979 uint8_t *data_end = (uint8_t *)SvEND (data_); 2052 uint8_t *data_end = (uint8_t *)SvEND (data_);
1980 mapcell *cell; 2053 mapcell *cell;
2001 2074
2002 //TODO: don't trust server data to be in-range(!) 2075 //TODO: don't trust server data to be in-range(!)
2003 2076
2004 if (flags & 8) 2077 if (flags & 8)
2005 { 2078 {
2079 uint8_t ext, cmd;
2080
2006 if (extmap) 2081 do
2007 { 2082 {
2008 uint8_t ext, cmd; 2083 ext = *data++;
2084 cmd = ext & 0x7f;
2009 2085
2010 do 2086 if (cmd < 4)
2087 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2088 else if (cmd == 5) // health
2011 { 2089 {
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; 2090 cell->stat_width = 1;
2020 cell->stat_hp = *data++; 2091 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 } 2092 }
2040 while (ext & 0x80); 2093 else if (cmd == 6) // monster width
2094 cell->stat_width = *data++ + 1;
2095 else if (cmd == 0x47)
2096 {
2097 if (*data == 1) cell->player = data [1];
2098 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2099 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2100 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2101
2102 data += *data + 1;
2103 }
2104 else if (cmd == 8) // cell flags
2105 cell->flags = *data++;
2106 else if (ext & 0x40) // unknown, multibyte => skip
2107 data += *data + 1;
2108 else
2109 data++;
2041 } 2110 }
2042 else 2111 while (ext & 0x80);
2043 cell->darkness = *data++ + 1;
2044 } 2112 }
2045 2113
2046 for (z = 0; z <= 2; ++z) 2114 for (z = 0; z <= 2; ++z)
2047 if (flags & (4 >> z)) 2115 if (flags & (4 >> z))
2048 { 2116 {
2049 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
2050 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
2051 cell->tile [z] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
2052 2120
2053 if (cell->tile [z]) 2121 if (cell->tile[z])
2054 { 2122 {
2055 maptex *tex = self->tex + cell->tile [z]; 2123 maptex &tex = self->tex[cell->tile[z]];
2056 tex->unused = 0; 2124 tex.unused = 0;
2057 if (!tex->name) 2125 if (!tex.name)
2058 av_push (missing, newSViv (cell->tile [z])); 2126 av_push (missing, newSViv (cell->tile [z]));
2059 2127
2060 if (tex->smoothtile) 2128 if (tex.smoothtile)
2061 { 2129 {
2062 maptex *smooth = self->tex + tex->smoothtile; 2130 maptex &smooth = self->tex[tex.smoothtile];
2063 smooth->unused = 0; 2131 smooth.unused = 0;
2064 if (!smooth->name) 2132 if (!smooth.name)
2065 av_push (missing, newSViv (tex->smoothtile)); 2133 av_push (missing, newSViv (tex.smoothtile));
2066 } 2134 }
2067 } 2135 }
2068 } 2136 }
2069 } 2137 }
2070 else 2138 else
2096 ? self->row + y 2164 ? self->row + y
2097 : 0; 2165 : 0;
2098 2166
2099 for (x = x0; x < x1; x++) 2167 for (x = x0; x < x1; x++)
2100 { 2168 {
2101 int r = 32, g = 32, b = 32, a = 192; 2169 unsigned int r = 32, g = 32, b = 32, a = 192;
2102 2170
2103 if (row && row->c0 <= x && x < row->c1) 2171 if (row && row->c0 <= x && x < row->c1)
2104 { 2172 {
2105 mapcell *cell = row->col + (x - row->c0); 2173 mapcell *cell = row->col + (x - row->c0);
2106 2174
2108 { 2176 {
2109 maptex tex = self->tex [cell->tile [z]]; 2177 maptex tex = self->tex [cell->tile [z]];
2110 int a0 = 255 - tex.a; 2178 int a0 = 255 - tex.a;
2111 int a1 = tex.a; 2179 int a1 = tex.a;
2112 2180
2113 r = (r * a0 + tex.r * a1) / 255; 2181 r = div255 (r * a0 + tex.r * a1);
2114 g = (g * a0 + tex.g * a1) / 255; 2182 g = div255 (g * a0 + tex.g * a1);
2115 b = (b * a0 + tex.b * a1) / 255; 2183 b = div255 (b * a0 + tex.b * a1);
2116 a = (a * a0 + tex.a * a1) / 255; 2184 a = div255 (a * a0 + tex.a * a1);
2117 } 2185 }
2118 } 2186 }
2119 2187
2120 *map++ = (r ) 2188 *map++ = (r )
2121 | (g << 8) 2189 | (g << 8)
2122 | (b << 16) 2190 | (b << 16)
2123 | (a << 24); 2191 | (a << 24);
2124 } 2192 }
2125 } 2193 }
2126 2194
2127 RETVAL = map_sv; 2195 RETVAL = map_sv;
2128} 2196}
2129 OUTPUT: 2197 OUTPUT:
2130 RETVAL 2198 RETVAL
2131 2199
2132void 2200void
2133draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2201draw (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: 2202 CODE:
2135{ 2203{
2136 int x, y, z; 2204 int x, y, z;
2137 2205
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) 2206 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; 2207 int pl_x, pl_y;
2143 maptex pl_tex; 2208 maptex pl_tex;
2144 rc_t *rc = rc_alloc (); 2209 rc_t rc;
2145 rc_t *rc_ov = rc_alloc (); 2210 rc_t rc_ov;
2146 rc_key_t key; 2211 rc_key_t key;
2147 rc_array_t *arr; 2212 rc_t::array_t *arr;
2148 2213
2149 pl_tex.name = 0; 2214 pl_tex.name = 0;
2150 2215
2151 // that's current max. sorry. 2216 // that's current max. sorry.
2152 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
2153 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
2154
2155 // clear key, in case of extra padding
2156 memset (&skey, 0, sizeof (skey));
2157 2219
2158 memset (&key, 0, sizeof (key)); 2220 memset (&key, 0, sizeof (key));
2159 key.r = 255; 2221 key.r = 255;
2160 key.g = 255; 2222 key.g = 255;
2161 key.b = 255; 2223 key.b = 255;
2167 my += self->y; 2229 my += self->y;
2168 2230
2169 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
2170 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
2171 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
2172 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2173 2235
2174 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
2175 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
2176 { 2238 {
2177 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
2192 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2193 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2194 2256
2195 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
2196 { 2258 {
2197 memset (smooth_level, 0, sizeof (smooth_level)); 2259 std::bitset<256> smooth_level; // one bit for every possible smooth level
2260 smooth_key skey;
2261 smooth_hash smooth;
2198 key.texname = -1; 2262 key.texname = -1;
2199 2263
2200 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
2201 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
2202 { 2266 {
2219 2283
2220 if (!tex.name) 2284 if (!tex.name)
2221 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2222 2286
2223 key.texname = tex.name; 2287 key.texname = tex.name;
2224 arr = rc_array (rc, &key); 2288 arr = &rc.array (key);
2225 } 2289 }
2226 2290
2227 px = (x + 1) * T - tex.w; 2291 px = (x + 1) * Th - tex.w;
2228 py = (y + 1) * T - tex.h; 2292 py = (y + 1) * Tw - tex.h;
2229 2293
2230 if (expect_false (cell->player == player) && expect_false (z == 2)) 2294 if (expect_false (cell->player == player) && expect_false (z == 2))
2231 { 2295 {
2232 pl_x = px; 2296 pl_x = px;
2233 pl_y = py; 2297 pl_y = py;
2234 pl_tex = tex; 2298 pl_tex = tex;
2235 continue; 2299 continue;
2236 } 2300 }
2237 2301
2238 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2302 arr->t2f_v3f (0 , 0 , px , py , 0);
2239 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2303 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); 2304 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); 2305 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2242 2306
2243 // update smooth hash 2307 // update smooth hash
2244 if (tex.smoothtile) 2308 if (tex.smoothtile)
2245 { 2309 {
2246 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
2247 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
2248 2312
2249 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
2250 2314
2251 // add bits to current tile and all neighbours. skey.x|y is 2315 // add bits to current tile and all neighbours. skey.x|y is
2252 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
2253 2317
2254 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
2262 2326
2263 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2264 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
2265 2329
2266 // full tile 2330 // full tile
2267 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2331 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2268 2332
2269 // borders 2333 // borders
2270 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2334 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); 2335 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); 2336 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); 2337 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2274 2338
2275 // corners 2339 // corners
2276 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2340 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); 2341 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); 2342 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); 2343 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2280 } 2344 }
2281 } 2345 }
2282 2346
2283 if (expect_false (z == 2) && expect_false (cell->flags)) 2347 if (expect_false (z == 2) && expect_false (cell->flags))
2284 { 2348 {
2285 // overlays such as the speech bubble, probably more to come 2349 // overlays such as the speech bubble, probably more to come
2286 if (cell->flags & 1) 2350 if (cell->flags & 1)
2287 { 2351 {
2288 rc_key_t key_ov = key; 2352 rc_key_t key_ov = key;
2289 maptex tex = self->tex [TEXID_SPEECH]; 2353 maptex tex = self->tex[TEXID_SPEECH];
2290 rc_array_t *arr;
2291 int px = x * T + T * 2 / 32; 2354 int px = x * Tw + Tw * 2 / 32;
2292 int py = y * T - T * 6 / 32; 2355 int py = y * Th - Th * 6 / 32;
2293 2356
2294 key_ov.texname = tex.name; 2357 key_ov.texname = tex.name;
2295 arr = rc_array (rc_ov, &key_ov); 2358 rc_t::array_t &arr = rc_ov.array (key_ov);
2296 2359
2297 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2360 arr.t2f_v3f (0 , 0 , px , py , 0);
2298 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2361 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2299 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2362 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2300 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2363 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2301 } 2364 }
2302 } 2365 }
2303 } 2366 }
2304 } 2367 }
2305 2368
2306 rc_draw (rc); 2369 rc.draw ();
2307 rc_clear (rc); 2370 rc.clear ();
2308 2371
2309 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
2310 // this is basically counting sort 2373 // this is basically counting sort
2311 { 2374 {
2312 int w, b; 2375 int w, b;
2313 2376
2314 glEnable (GL_TEXTURE_2D); 2377 glEnable (GL_TEXTURE_2D);
2315 glBegin (GL_QUADS); 2378 glBegin (GL_QUADS);
2316 for (w = 0; w < 256 / 32; ++w) 2379 for (int level = 0; level < smooth_level.size (); ++level)
2380 if (smooth_level[level])
2381 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2317 { 2382 {
2318 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
2319 if (smask) 2384 IV bits = it->second;
2320 for (b = 0; b < 32; ++b) 2385
2321 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
2322 { 2389 {
2323 int level = (w << 5) | b; 2390 maptex tex = self->tex [skey.tile];
2391 int px = (((int)skey.x) - 1) * Tw;
2392 int py = (((int)skey.y) - 1) * Th;
2393 int border = bits & 15;
2394 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2395 float dx = tex.s * .0625f; // 16 images/row
2396 float dy = tex.t * .5f ; // 2 images/column
2397
2324 HE *he; 2398 if (tex.name)
2325
2326 hv_iterinit (smooth);
2327 while ((he = hv_iternext (smooth)))
2328 { 2399 {
2329 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
2330 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
2331 2402 if (key.texname != tex.name)
2332 if (!(bits & 0x1000)
2333 && skey->level == level
2334 && level > smooth_max [skey->x][skey->y])
2335 { 2403 {
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; 2404 self->tex [skey.tile].unused = 0;
2351 2405
2352 glEnd (); 2406 glEnd ();
2353 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2354 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2355 } 2409 }
2356 2410
2357 if (border) 2411 if (border)
2358 { 2412 {
2359 float ox = border * dx; 2413 float ox = border * dx;
2360 2414
2361 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2362 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2363 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2364 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2365 } 2419 }
2366 2420
2367 if (corner) 2421 if (corner)
2368 { 2422 {
2369 float ox = corner * dx; 2423 float ox = corner * dx;
2370 2424
2371 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2372 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2373 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2374 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2375 }
2376 }
2377 } 2429 }
2378 } 2430 }
2379 } 2431 }
2380 } 2432 }
2381 2433
2382 glEnd (); 2434 glEnd ();
2383 glDisable (GL_TEXTURE_2D); 2435 glDisable (GL_TEXTURE_2D);
2384 key.texname = -1; 2436 key.texname = -1;
2385 } 2437 }
2386
2387 hv_clear (smooth);
2388 } 2438 }
2389 2439
2390 if (pl_tex.name) 2440 if (pl_tex.name)
2391 { 2441 {
2392 maptex tex = pl_tex; 2442 maptex tex = pl_tex;
2393 int px = pl_x + sdx; 2443 int px = pl_x + sdx;
2394 int py = pl_y + sdy; 2444 int py = pl_y + sdy;
2395 2445
2396 key.texname = tex.name; 2446 key.texname = tex.name;
2397 arr = rc_array (rc, &key); 2447 rc_t::array_t &arr = rc.array (key);
2398 2448
2399 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2449 arr.t2f_v3f (0 , 0 , px , py , 0);
2400 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2450 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); 2451 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); 2452 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2403 2453
2404 rc_draw (rc); 2454 rc.draw ();
2405 } 2455 }
2406 2456
2407 rc_draw (rc_ov); 2457 rc_ov.draw ();
2408 rc_clear (rc_ov); 2458 rc_ov.clear ();
2409 2459
2410 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
2411 rc_free (rc);
2412 rc_free (rc_ov);
2413 2461
2414 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
2415 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
2416 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
2417 { 2465 {
2420 for (x = 0; x < sw; x++) 2468 for (x = 0; x < sw; x++)
2421 if (row->c0 <= x + mx && x + mx < row->c1) 2469 if (row->c0 <= x + mx && x + mx < row->c1)
2422 { 2470 {
2423 mapcell *cell = row->col + (x + mx - row->c0); 2471 mapcell *cell = row->col + (x + mx - row->c0);
2424 2472
2425 int px = x * T; 2473 int px = x * Tw;
2426 int py = y * T; 2474 int py = y * Th;
2427 2475
2428 if (expect_false (cell->player == player)) 2476 if (expect_false (cell->player == player))
2429 { 2477 {
2430 px += sdx; 2478 px += sdx;
2431 py += sdy; 2479 py += sdy;
2432 } 2480 }
2433 2481
2434 if (cell->stat_hp) 2482 if (cell->stat_hp)
2435 { 2483 {
2436 int width = cell->stat_width * T; 2484 int width = cell->stat_width * Tw;
2437 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2485 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2438 2486
2439 glColor3ub (0, 0, 0); 2487 glColor3ub (0, 0, 0);
2440 glRectf (px + 1, py - thick - 2, 2488 glRectf (px + 1, py - thick - 2,
2441 px + width - 1, py); 2489 px + width - 1, py);
2442 2490
2522 int x, y; 2570 int x, y;
2523 int sw1 = sw + 2; 2571 int sw1 = sw + 2;
2524 int sh1 = sh + 2; 2572 int sh1 = sh + 2;
2525 int sh3 = sh * 3; 2573 int sh3 = sh * 3;
2526 int sw3 = sw * 3; 2574 int sw3 = sw * 3;
2527 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2528 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2575 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2529 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2576 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2577 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2578 memset (darkness1, 0, sw1*sh1);
2530 2579
2531 SvPOK_only (darkness3_sv); 2580 SvPOK_only (darkness3_sv);
2532 SvCUR_set (darkness3_sv, sw3 * sh3); 2581 SvCUR_set (darkness3_sv, sw3 * sh3);
2533 2582
2534 mx += self->x - 1; 2583 mx += self->x - 1;
2660 else 2709 else
2661 *data++ = 0; 2710 *data++ = 0;
2662 } 2711 }
2663 } 2712 }
2664 2713
2665 /* if size is w*h + 5 then no data has been found */ 2714 /* if size is w*h + 5 then no data has been found */
2666 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2715 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2667 { 2716 {
2668 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2669 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2670 } 2719 }
2671 2720
2672 RETVAL = data_sv; 2721 RETVAL = data_sv;
2673} 2722}
2674 OUTPUT: 2723 OUTPUT:
2675 RETVAL 2724 RETVAL
2676 2725
2677void 2726void
2684 STRLEN len; 2733 STRLEN len;
2685 uint8_t *data, *end; 2734 uint8_t *data, *end;
2686 2735
2687 len = SvLEN (data_sv); 2736 len = SvLEN (data_sv);
2688 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2737 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2689 data = SvPVbyte_nolen (data_sv); 2738 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2690 end = data + len + 8; 2739 end = data + len + 8;
2691 2740
2692 if (len < 5) 2741 if (len < 5)
2693 XSRETURN_EMPTY; 2742 XSRETURN_EMPTY;
2694 2743
2738 2787
2739 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2740 { 2789 {
2741 tileid t = tile [z]; 2790 tileid t = tile [z];
2742 2791
2743 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2744 { 2793 {
2745 PUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2746 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2747 } 2796 }
2748 2797
2749 cell->tile [z] = t; 2798 cell->tile[z] = t;
2750 } 2799 }
2751 } 2800 }
2752 } 2801 }
2753 } 2802 }
2754 } 2803 }
2755} 2804}
2756 2805
2757MODULE = Deliantra::Client PACKAGE = DC::RW 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2758 2807
2759DC::RW 2808DC::RW
2760new (SV *class, SV *data_sv) 2809new (SV *klass, SV *data_sv)
2761 CODE: 2810 CODE:
2762{ 2811{
2763 STRLEN datalen; 2812 STRLEN datalen;
2764 char *data = SvPVbyte (data_sv, datalen); 2813 char *data = SvPVbyte (data_sv, datalen);
2765 2814
2767} 2816}
2768 OUTPUT: 2817 OUTPUT:
2769 RETVAL 2818 RETVAL
2770 2819
2771DC::RW 2820DC::RW
2772new_from_file (SV *class, const char *path, const char *mode = "rb") 2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2773 CODE: 2822 CODE:
2774 RETVAL = SDL_RWFromFile (path, mode); 2823 RETVAL = SDL_RWFromFile (path, mode);
2775 OUTPUT: 2824 OUTPUT:
2776 RETVAL 2825 RETVAL
2777 2826
2795 if (RETVAL < 0) 2844 if (RETVAL < 0)
2796 { 2845 {
2797 RETVAL = Mix_GroupOldest (-1); 2846 RETVAL = Mix_GroupOldest (-1);
2798 2847
2799 if (RETVAL < 0) 2848 if (RETVAL < 0)
2849 {
2850 // happens sometimes, maybe it just stopped playing(?)
2851 RETVAL = Mix_GroupAvailable (-1);
2852
2853 if (RETVAL < 0)
2800 XSRETURN_UNDEF; 2854 XSRETURN_UNDEF;
2801 2855 }
2856 else
2802 Mix_HaltChannel (RETVAL); 2857 Mix_HaltChannel (RETVAL);
2803 } 2858 }
2804 2859
2805 Mix_UnregisterAllEffects (RETVAL); 2860 Mix_UnregisterAllEffects (RETVAL);
2806 Mix_Volume (RETVAL, 128); 2861 Mix_Volume (RETVAL, 128);
2807} 2862}
2867 2922
2868MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2923MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2869 2924
2870PROTOTYPES: DISABLE 2925PROTOTYPES: DISABLE
2871 2926
2927void
2928decoders ()
2929 PPCODE:
2930#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2931 int i, num = Mix_GetNumChunkDecoders ();
2932 EXTEND (SP, num);
2933 for (i = 0; i < num; ++i)
2934 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2935#else
2936 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2937#endif
2938
2872DC::MixChunk 2939DC::MixChunk
2873new (SV *class, DC::RW rwops) 2940new (SV *klass, DC::RW rwops)
2874 CODE: 2941 CODE:
2875 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2876 OUTPUT: 2943 OUTPUT:
2877 RETVAL 2944 RETVAL
2878 2945
2908 OUTPUT: 2975 OUTPUT:
2909 RETVAL 2976 RETVAL
2910 2977
2911MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2978MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2912 2979
2980void
2981decoders ()
2982 PPCODE:
2983#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2984 int i, num = Mix_GetNumMusicDecoders ();
2985 EXTEND (SP, num);
2986 for (i = 0; i < num; ++i)
2987 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2988#else
2989 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2990#endif
2991
2913int 2992int
2914volume (int volume = -1) 2993volume (int volume = -1)
2915 PROTOTYPE: ;$ 2994 PROTOTYPE: ;$
2916 CODE: 2995 CODE:
2917 if (items > 0) 2996 if (items > 0)
2928void 3007void
2929halt () 3008halt ()
2930 CODE: 3009 CODE:
2931 Mix_HaltMusic (); 3010 Mix_HaltMusic ();
2932 3011
3012int
3013playing ()
3014 CODE:
3015 RETVAL = Mix_PlayingMusic ();
3016 OUTPUT:
3017 RETVAL
3018
2933DC::MixMusic 3019DC::MixMusic
2934new (SV *class, DC::RW rwops) 3020new (SV *klass, DC::RW rwops)
2935 CODE: 3021 CODE:
2936 RETVAL = Mix_LoadMUS_RW (rwops); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
2937 OUTPUT: 3023 OUTPUT:
2938 RETVAL 3024 RETVAL
2939 3025
3076 const_iv (GL_FUNC_SUBTRACT), 3162 const_iv (GL_FUNC_SUBTRACT),
3077 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3163 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3078# undef const_iv 3164# undef const_iv
3079 }; 3165 };
3080 3166
3081 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3167 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3082 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3168 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3083 3169
3084 texture_av = newAV (); 3170 texture_av = newAV ();
3085 AvREAL_off (texture_av); 3171 AvREAL_off (texture_av);
3086} 3172}
3087 3173
3092 gl.BlendFuncSeparateEXT = 0; 3178 gl.BlendFuncSeparateEXT = 0;
3093 3179
3094void 3180void
3095apple_nvidia_bug (int enable) 3181apple_nvidia_bug (int enable)
3096 3182
3097char * 3183const char *
3098gl_vendor () 3184gl_vendor ()
3099 CODE: 3185 CODE:
3100 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
3101 OUTPUT: 3187 OUTPUT:
3102 RETVAL 3188 RETVAL
3103 3189
3104char * 3190const char *
3105gl_version () 3191gl_version ()
3106 CODE: 3192 CODE:
3107 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
3108 OUTPUT: 3194 OUTPUT:
3109 RETVAL 3195 RETVAL
3110 3196
3111char * 3197const char *
3112gl_extensions () 3198gl_extensions ()
3113 CODE: 3199 CODE:
3114 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3115 OUTPUT: 3201 OUTPUT:
3116 RETVAL 3202 RETVAL
3117 3203
3118const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
3119 3209
3120GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
3121 CODE: 3211 CODE:
3122 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
3123 OUTPUT: 3213 OUTPUT:
3130 RETVAL 3220 RETVAL
3131 3221
3132int glGetError () 3222int glGetError ()
3133 3223
3134void glFinish () 3224void glFinish ()
3225
3226void glFlush ()
3135 3227
3136void glClear (int mask) 3228void glClear (int mask)
3137 3229
3138void glClearColor (float r, float g, float b, float a = 1.0) 3230void glClearColor (float r, float g, float b, float a = 1.0)
3139 PROTOTYPE: @ 3231 PROTOTYPE: @
3324 3416
3325void 3417void
3326find_widget (SV *self, NV x, NV y) 3418find_widget (SV *self, NV x, NV y)
3327 PPCODE: 3419 PPCODE:
3328{ 3420{
3329 if (within_widget (self, x, y)) 3421 if (within_widget (self, x, y))
3330 XPUSHs (self); 3422 XPUSHs (self);
3331} 3423}
3332 3424
3333BOOT: 3425BOOT:
3334{ 3426{
3342 3434
3343void 3435void
3344draw (SV *self) 3436draw (SV *self)
3345 CODE: 3437 CODE:
3346{ 3438{
3347 HV *hv; 3439 HV *hv;
3348 SV **svp; 3440 SV **svp;
3349 NV x, y, w, h; 3441 NV x, y, w, h;
3350 SV *draw_x_sv = GvSV (draw_x_gv); 3442 SV *draw_x_sv = GvSV (draw_x_gv);
3351 SV *draw_y_sv = GvSV (draw_y_gv); 3443 SV *draw_y_sv = GvSV (draw_y_gv);
3352 SV *draw_w_sv = GvSV (draw_w_gv); 3444 SV *draw_w_sv = GvSV (draw_w_gv);
3353 SV *draw_h_sv = GvSV (draw_h_gv); 3445 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines