ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.296 by root, Mon Dec 21 23:52:34 2009 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines