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.276 by root, Sat Aug 30 08:04:01 2008 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 roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 26# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 27# define M_PI 3.14159265f
27#endif 28#endif
28 29
29#include <assert.h> 30#include <cassert>
30#include <math.h> 31#include <cmath>
31#include <string.h> 32#include <cstring>
32#include <stdio.h> 33#include <cstdio>
33#include <stdlib.h> 34#include <cstdlib>
35
36#include <utility>
37#include <bitset>
34 38
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW 39#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36 40
37#include <SDL.h> 41#include <SDL.h>
38#include <SDL_thread.h> 42#include <SDL_thread.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
44/* work around os x broken headers */ 48/* work around os x broken headers */
45#ifdef __MACOSX__ 49#ifdef __MACOSX__
46typedef 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);
47#endif 53#endif
48 54
49#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
51 57
52#include <glib/gmacros.h> 58#include <glib.h>
53 59
54#include <pango/pango.h> 60#include <pango/pango.h>
55 61
56#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
81#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
83 89
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 91
92/* this is used as fow flag as well, so has to have a different value */
93/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
87 96
88#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
90 99
91#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
92 101
93/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
95 104
96#define KMOD_LRAM 0x10000 // our extension 105#define KMOD_LRAM 0x10000 // our extension
106
107#define TEXID_SPEECH 1
108#define TEXID_NOFACE 2
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}
97 128
98static AV *texture_av; 129static AV *texture_av;
99 130
100static struct 131static struct
101{ 132{
158{ 189{
159 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
160 191
161 while (attrs) 192 while (attrs)
162 { 193 {
163 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
164 195
165 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
166 return 1; 197 return 1;
167 198
168 attrs = attrs->next; 199 attrs = attrs->next;
169 } 200 }
170 201
171 return 0; 202 return 0;
172} 203}
173 204
174typedef struct cf_layout { 205struct cf_layout {
175 PangoLayout *pl; 206 PangoLayout *pl;
176 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
177 int base_height; 208 int base_height;
178 DC__Font font; 209 DC__Font font;
179 rc_t *rc; 210 rc_t rc;
180} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
181 214
182static DC__Font default_font; 215static DC__Font default_font;
183static PangoContext *opengl_context; 216static PangoContext *opengl_context;
184static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
185 218
186static void 219static void
187substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
188{ 221{
189 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
190#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
191 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
192#endif 225#endif
193 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
194} 227}
195 228
196static void 229static void
226} 259}
227 260
228typedef uint16_t tileid; 261typedef uint16_t tileid;
229typedef uint16_t faceid; 262typedef uint16_t faceid;
230 263
231typedef struct { 264struct maptex
265{
232 GLuint name; 266 GLuint name;
233 int w, h; 267 int w, h;
234 float s, t; 268 float s, t;
235 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
236 tileid smoothtile; 270 tileid smoothtile;
237 uint8_t smoothlevel; 271 uint8_t smoothlevel;
238} maptex; 272 uint8_t unused; /* set to zero on use */
273};
239 274
240typedef struct { 275struct mapcell
276{
241 uint32_t player; 277 uint32_t player;
242 tileid tile[3]; 278 tileid tile[3];
243 uint16_t darkness; 279 uint16_t darkness;
244 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
245} mapcell; 281};
246 282
247typedef struct { 283struct maprow
284{
248 int32_t c0, c1; 285 int32_t c0, c1;
249 mapcell *col; 286 mapcell *col;
250} maprow; 287};
251 288
252typedef struct map { 289struct mapgrid {
253 int x, y, w, h; 290 int x, y, w, h;
254 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
255 int faces; tileid *face2tile; // [faceid] 292 std::vector<tileid> tile;
256 int texs; maptex *tex; // [tileid] 293 std::vector<maptex> tex;
257 294
258 int32_t rows; 295 int32_t rows;
259 maprow *row; 296 maprow *row;
260} *DC__Map; 297
298 ~mapgrid ()
299 {
300 clear_cells ();
301 }
302
303 void clear_cells ();
304};
305
306typedef mapgrid *DC__Map;
261 307
262static char * 308static char *
263prepend (char *ptr, int sze, int inc) 309prepend (char *ptr, int sze, int inc)
264{ 310{
265 char *p; 311 char *p;
282} 328}
283 329
284#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))
285#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))
286 332
287static void
288need_facenum (struct map *self, faceid face)
289{
290 while (self->faces <= face)
291 {
292 Append (tileid, self->face2tile, self->faces, self->faces);
293 self->faces *= 2;
294 }
295}
296
297static void
298need_texid (struct map *self, int texid)
299{
300 while (self->texs <= texid)
301 {
302 Append (maptex, self->tex, self->texs, self->texs);
303 self->texs *= 2;
304 }
305}
306
307static maprow * 333static maprow *
308map_get_row (DC__Map self, int y) 334map_get_row (mapgrid *self, int y)
309{ 335{
310 if (0 > y) 336 if (0 > y)
311 { 337 {
312 int extend = - y + MAP_EXTEND_Y; 338 int extend = - y + MAP_EXTEND_Y;
313 Prepend (maprow, self->row, self->rows, extend); 339 Prepend (maprow, self->row, self->rows, extend);
351 377
352 return row->col + (x - row->c0); 378 return row->col + (x - row->c0);
353} 379}
354 380
355static mapcell * 381static mapcell *
356map_get_cell (DC__Map self, int x, int y) 382map_get_cell (mapgrid *self, int x, int y)
357{ 383{
358 return row_get_cell (map_get_row (self, y), x); 384 return row_get_cell (map_get_row (self, y), x);
359} 385}
360 386
361static void 387void mapgrid::clear_cells ()
362map_clear (DC__Map self)
363{ 388{
364 int r; 389 int r;
365 390
366 for (r = 0; r < self->rows; r++) 391 for (r = 0; r < rows; r++)
367 Safefree (self->row[r].col); 392 Safefree (row[r].col);
368 393
369 Safefree (self->row); 394 Safefree (row);
370 395
371 self->x = 0; 396 x = 0;
372 self->y = 0; 397 y = 0;
373 self->ox = 0; 398 ox = 0;
374 self->oy = 0; 399 oy = 0;
375 self->row = 0; 400 row = 0;
376 self->rows = 0; 401 rows = 0;
377} 402}
378 403
379#define CELL_CLEAR(cell) \ 404#define CELL_CLEAR(cell) \
380 do { \ 405 do { \
381 if ((cell)->player) \ 406 if ((cell)->player) \
385 (cell)->flags = 0; \ 410 (cell)->flags = 0; \
386 (cell)->player = 0; \ 411 (cell)->player = 0; \
387 } while (0) 412 } while (0)
388 413
389static void 414static void
390map_blank (DC__Map self, int x0, int y0, int w, int h) 415map_blank (mapgrid *self, int x0, int y0, int w, int h)
391{ 416{
392 int x, y; 417 int x, y;
393 maprow *row; 418 maprow *row;
394 mapcell *cell; 419 mapcell *cell;
395 420
412 CELL_CLEAR (cell); 437 CELL_CLEAR (cell);
413 } 438 }
414 } 439 }
415} 440}
416 441
417typedef struct { 442struct smooth_key
443{
418 tileid tile; 444 tileid tile;
419 uint8_t x, y, level; 445 uint8_t x, y, level;
420} 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}
421 465
422static void 466static void
423smooth_or_bits (HV *hv, smooth_key *key, IV bits) 467smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
424{ 468{
425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 469 auto &&it = h.find (key);
426 470
427 if (SvIOK (*sv)) 471 if (it == h.end ())
428 SvIV_set (*sv, SvIVX (*sv) | bits); 472 h.insert (std::make_pair (key, bits));
429 else 473 else
430 sv_setiv (*sv, bits); 474 it->second |= bits;
431} 475}
432 476
433static void 477static void
434music_finished (void) 478music_finished (void)
435{ 479{
452 ev.code = 1; 496 ev.code = 1;
453 ev.data1 = (void *)(long)channel; 497 ev.data1 = (void *)(long)channel;
454 ev.data2 = 0; 498 ev.data2 = 0;
455 499
456 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;
457} 508}
458 509
459static unsigned int 510static unsigned int
460minpot (unsigned int n) 511minpot (unsigned int n)
461{ 512{
529 return 0; 580 return 0;
530 581
531 return 1; 582 return 1;
532} 583}
533 584
585/******************************************************************************/
586
534/* process keyboard modifiers */ 587/* process keyboard modifiers */
535static int 588static int
536mod_munge (int mod) 589mod_munge (int mod)
537{ 590{
538 mod &= MOD_MASK; 591 mod &= MOD_MASK;
542 595
543 return mod; 596 return mod;
544} 597}
545 598
546static void 599static void
547deliantra_main () 600deliantra_main (SV *real_main)
548{ 601{
549 char *argv[] = { 0 }; 602 dSP;
550 call_argv ("::main", G_DISCARD | G_VOID, argv); 603
604 PUSHMARK (SP);
605 call_sv (real_main, G_DISCARD | G_VOID);
551} 606}
552 607
553#ifdef __MACOSX__ 608#ifdef __MACOSX__
609 static SV *real_main;
610
554 /* to due surprising braindamage on the side of SDL design, we 611 /* to due surprising braindamage on the side of SDL design, we
555 * do some mind-boggling hack here: SDL requires a custom main() 612 * do some mind-boggling hack here: SDL requires a custom main()
556 * 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,
557 * 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,
558 * and which calls our main (== SDL_main) back. 615 * and which calls our main (== SDL_main) back.
559 */ 616 */
560 extern C_LINKAGE int 617 extern C_LINKAGE int
561 main (int argc, char *argv[]) 618 main (int argc, char *argv[])
562 { 619 {
563 deliantra_main (); 620 deliantra_main (real_main);
564 } 621 }
565 622
566 #undef main 623 #undef main
567 624
568 extern C_LINKAGE int main (int argc, char *argv[]); 625 extern C_LINKAGE int main (int argc, char *argv[]);
569 626
570 static void 627 static void
571 SDL_braino (void) 628 SDL_main_hack (SV *real_main_)
572 { 629 {
630 real_main = real_main_;
631
573 char *argv[] = { "deliantra client", 0 }; 632 char *argv[] = { "deliantra client", 0 };
574 (main) (1, argv); 633 (main) (1, argv);
575 } 634 }
576#else 635#else
577 static void 636 static void
578 SDL_braino (void) 637 SDL_main_hack (SV *real_main)
579 { 638 {
580 deliantra_main (); 639 deliantra_main (real_main);
581 } 640 }
582#endif 641#endif
583 642
584MODULE = Deliantra::Client PACKAGE = DC 643MODULE = Deliantra::Client PACKAGE = DC
585 644
786 845
787 const_iv (FOW_DARKNESS) 846 const_iv (FOW_DARKNESS)
788# undef const_iv 847# undef const_iv
789 }; 848 };
790 849
791 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--)
792 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 851 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
793 852
794 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 853 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
795 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 854 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
796} 855}
797 856
813NV ceil (NV x) 872NV ceil (NV x)
814 873
815IV minpot (UV n) 874IV minpot (UV n)
816 875
817IV popcount (UV n) 876IV popcount (UV n)
877
878NV distance (NV dx, NV dy)
879 CODE:
880 RETVAL = pow (dx * dx + dy * dy, 0.5);
881 OUTPUT:
882 RETVAL
818 883
819void 884void
820pango_init () 885pango_init ()
821 CODE: 886 CODE:
822{ 887{
830#endif 895#endif
831} 896}
832 897
833char *SDL_GetError () 898char *SDL_GetError ()
834 899
835void SDL_braino () 900void SDL_main_hack (SV *real_main)
901 PROTOTYPE: &
836 902
837int SDL_Init (U32 flags) 903int SDL_Init (U32 flags)
838 904
839int SDL_InitSubSystem (U32 flags) 905int SDL_InitSubSystem (U32 flags)
840 906
841void SDL_QuitSubSystem (U32 flags) 907void SDL_QuitSubSystem (U32 flags)
842 908
843void SDL_Quit () 909void SDL_Quit ()
844 910
845int SDL_GL_SetAttribute (int attr, int value) 911int SDL_GL_SetAttribute (int attr, int value)
912 C_ARGS: (SDL_GLattr)attr, value
846 913
847int SDL_GL_GetAttribute (int attr) 914int SDL_GL_GetAttribute (int attr)
848 CODE: 915 CODE:
849 if (SDL_GL_GetAttribute (attr, &RETVAL)) 916 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
850 XSRETURN_UNDEF; 917 XSRETURN_UNDEF;
851 OUTPUT: 918 OUTPUT:
852 RETVAL 919 RETVAL
853 920
854void 921void
909 ); 976 );
910 977
911 if (RETVAL) 978 if (RETVAL)
912 { 979 {
913 av_clear (texture_av); 980 av_clear (texture_av);
914
915 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
916#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);
917#include "glfunc.h" 982#include "glfunc.h"
918#undef GL_FUNC 983#undef GL_FUNC
984 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
985 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
919 } 986 }
920} 987}
921 OUTPUT: 988 OUTPUT:
922 RETVAL 989 RETVAL
990
991void
992SDL_WM_SetCaption (const char *title, const char *icon)
923 993
924void 994void
925SDL_GL_SwapBuffers () 995SDL_GL_SwapBuffers ()
926 996
927char * 997char *
928SDL_GetKeyName (int sym) 998SDL_GetKeyName (int sym)
999 C_ARGS: (SDLKey)sym
929 1000
930int 1001int
931SDL_GetAppState () 1002SDL_GetAppState ()
932 1003
933int 1004int
934SDL_GetModState () 1005SDL_GetModState ()
935 1006
1007int
1008SDL_WaitEvent ()
1009 C_ARGS: 0
1010
936void 1011void
1012SDL_PumpEvents ()
1013
1014void
937poll_events () 1015peep_events ()
938 PPCODE: 1016 PPCODE:
939{ 1017{
940 SDL_Event ev; 1018 SDL_Event ev;
941 1019
942 SDL_PumpEvents (); 1020 SDL_PumpEvents ();
1008 1086
1009 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))));
1010 } 1088 }
1011} 1089}
1012 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
1013int 1104int
1014Mix_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)
1015 POSTCALL: 1106 POSTCALL:
1016 Mix_HookMusicFinished (music_finished); 1107 Mix_HookMusicFinished (music_finished);
1017 Mix_ChannelFinished (channel_finished); 1108 Mix_ChannelFinished (channel_finished);
1018 1109
1019void 1110void
1020Mix_QuerySpec () 1111Mix_QuerySpec ()
1079add_font (char *file) 1170add_font (char *file)
1080 CODE: 1171 CODE:
1081 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1172 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082 OUTPUT: 1173 OUTPUT:
1083 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)
1084 1182
1085void 1183void
1086load_image_inline (SV *image_) 1184load_image_inline (SV *image_)
1087 ALIAS: 1185 ALIAS:
1088 load_image_file = 1 1186 load_image_file = 1
1134 1232
1135 SDL_LockSurface (surface2); 1233 SDL_LockSurface (surface2);
1136 EXTEND (SP, 6); 1234 EXTEND (SP, 6);
1137 PUSHs (sv_2mortal (newSViv (surface2->w))); 1235 PUSHs (sv_2mortal (newSViv (surface2->w)));
1138 PUSHs (sv_2mortal (newSViv (surface2->h))); 1236 PUSHs (sv_2mortal (newSViv (surface2->h)));
1139 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1237 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1140 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)));
1141 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1239 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1142 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1240 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1143 SDL_UnlockSurface (surface2); 1241 SDL_UnlockSurface (surface2);
1144 1242
1204#if DEBUG 1302#if DEBUG
1205 VALGRIND_DO_LEAK_CHECK; 1303 VALGRIND_DO_LEAK_CHECK;
1206#endif 1304#endif
1207} 1305}
1208 1306
1307int
1308SvREFCNT (SV *sv)
1309 CODE:
1310 RETVAL = SvREFCNT (sv);
1311 OUTPUT:
1312 RETVAL
1313
1209MODULE = Deliantra::Client PACKAGE = DC::Font 1314MODULE = Deliantra::Client PACKAGE = DC::Font
1210 1315
1211PROTOTYPES: DISABLE 1316PROTOTYPES: DISABLE
1212 1317
1213DC::Font 1318DC::Font
1214new_from_file (SV *class, char *path, int id = 0) 1319new_from_file (SV *klass, char *path, int id = 0)
1215 CODE: 1320 CODE:
1216{ 1321{
1217 int count; 1322 int count;
1218 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1323 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1219 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1324 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1248 PROTOTYPE: 1353 PROTOTYPE:
1249 CODE: 1354 CODE:
1250 tc_restore (); 1355 tc_restore ();
1251 1356
1252DC::Layout 1357DC::Layout
1253new (SV *class) 1358new (SV *klass)
1254 CODE: 1359 CODE:
1255 New (0, RETVAL, 1, struct cf_layout); 1360 RETVAL = new cf_layout;
1256 1361
1257 RETVAL->pl = pango_layout_new (opengl_context); 1362 RETVAL->pl = pango_layout_new (opengl_context);
1258 RETVAL->r = 1.; 1363 RETVAL->r = 1.;
1259 RETVAL->g = 1.; 1364 RETVAL->g = 1.;
1260 RETVAL->b = 1.; 1365 RETVAL->b = 1.;
1261 RETVAL->a = 1.; 1366 RETVAL->a = 1.;
1262 RETVAL->base_height = MIN_FONT_HEIGHT; 1367 RETVAL->base_height = MIN_FONT_HEIGHT;
1263 RETVAL->font = 0; 1368 RETVAL->font = 0;
1264 RETVAL->rc = rc_alloc ();
1265 1369
1266 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1370 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1267 layout_update_font (RETVAL); 1371 layout_update_font (RETVAL);
1268 OUTPUT: 1372 OUTPUT:
1269 RETVAL 1373 RETVAL
1270 1374
1271void 1375void
1272DESTROY (DC::Layout self) 1376DESTROY (DC::Layout self)
1273 CODE: 1377 CODE:
1274 g_object_unref (self->pl); 1378 g_object_unref (self->pl);
1275 rc_free (self->rc);
1276 Safefree (self); 1379 delete self;
1277 1380
1278void 1381void
1279set_text (DC::Layout self, SV *text_) 1382set_text (DC::Layout self, SV *text_)
1280 CODE: 1383 CODE:
1281{ 1384{
1407 1510
1408void 1511void
1409set_height (DC::Layout self, int base_height) 1512set_height (DC::Layout self, int base_height)
1410 CODE: 1513 CODE:
1411 if (self->base_height != base_height) 1514 if (self->base_height != base_height)
1412 { 1515 {
1413 self->base_height = base_height; 1516 self->base_height = base_height;
1414 layout_update_font (self); 1517 layout_update_font (self);
1415 } 1518 }
1416 1519
1417void 1520void
1535} 1638}
1536 1639
1537void 1640void
1538render (DC::Layout self, float x, float y, int flags = 0) 1641render (DC::Layout self, float x, float y, int flags = 0)
1539 CODE: 1642 CODE:
1540 rc_clear (self->rc); 1643 self->rc.clear ();
1541 pango_opengl_render_layout_subpixel ( 1644 pango_opengl_render_layout_subpixel (
1542 self->pl, 1645 self->pl,
1543 self->rc, 1646 &self->rc,
1544 x * PANGO_SCALE, y * PANGO_SCALE, 1647 x * PANGO_SCALE, y * PANGO_SCALE,
1545 self->r, self->g, self->b, self->a, 1648 self->r, self->g, self->b, self->a,
1546 flags 1649 flags
1547 ); 1650 );
1548 // we assume that context_change actually clears/frees stuff 1651 // we assume that context_change actually clears/frees stuff
1559 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1662 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1560 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1663 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1561 glEnable (GL_ALPHA_TEST); 1664 glEnable (GL_ALPHA_TEST);
1562 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1665 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1563 1666
1564 rc_draw (self->rc); 1667 self->rc.draw ();
1565 1668
1566 glDisable (GL_ALPHA_TEST); 1669 glDisable (GL_ALPHA_TEST);
1567 glDisable (GL_BLEND); 1670 glDisable (GL_BLEND);
1568 glDisable (GL_TEXTURE_2D); 1671 glDisable (GL_TEXTURE_2D);
1569} 1672}
1644 glDisable (GL_ALPHA_TEST); 1747 glDisable (GL_ALPHA_TEST);
1645 glDisable (GL_BLEND); 1748 glDisable (GL_BLEND);
1646 } 1749 }
1647} 1750}
1648 1751
1752void
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)
1754 PROTOTYPE: @
1755 CODE:
1756{
1757 glEnable (GL_BLEND);
1758 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1759 glEnable (GL_TEXTURE_2D);
1760 glBindTexture (GL_TEXTURE_2D, name1);
1761
1762 glColor3f (intensity, intensity, intensity);
1763 glPushMatrix ();
1764 glScalef (1./3, 1./3, 1.);
1765
1766 if (blend > 0.f)
1767 {
1768 float dx3 = dx * -3.f / w;
1769 float dy3 = dy * -3.f / h;
1770 GLfloat env_color[4] = { 0., 0., 0., blend };
1771
1772 /* interpolate the two shadow textures */
1773 /* stage 0 == rgb(glcolor) + alpha(t0) */
1774 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1775
1776 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1777 gl.ActiveTexture (GL_TEXTURE1);
1778 glEnable (GL_TEXTURE_2D);
1779 glBindTexture (GL_TEXTURE_2D, name2);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1781
1782 /* rgb == rgb(glcolor) */
1783 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1784 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1785 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1786
1787 /* alpha = interpolate t0, t1 by env_alpha */
1788 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1789
1790 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1791 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1792 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1793
1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1796
1797 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1798 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1799
1800 glBegin (GL_QUADS);
1801 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1802 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1803 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1804 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1805 glEnd ();
1806
1807 glDisable (GL_TEXTURE_2D);
1808 gl.ActiveTexture (GL_TEXTURE0);
1809 }
1810 else
1811 {
1812 /* simple blending of one texture, also opengl <1.3 path */
1813 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1814
1815 glBegin (GL_QUADS);
1816 glTexCoord2f (0, 0); glVertex2f (0, 0);
1817 glTexCoord2f (0, t); glVertex2f (0, h);
1818 glTexCoord2f (s, t); glVertex2f (w, h);
1819 glTexCoord2f (s, 0); glVertex2f (w, 0);
1820 glEnd ();
1821 }
1822
1823 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1824 {
1825 int x, y;
1826 int dx3 = dx * 3;
1827 int dy3 = dy * 3;
1828
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1830 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1831 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1832 glTranslatef (-1., -1., 0);
1833 glBegin (GL_QUADS);
1834
1835 for (y = 1; y < h; y += 3)
1836 {
1837 int y1 = y - dy3;
1838 int y1valid = y1 >= 0 && y1 < h;
1839
1840 for (x = 1; x < w; x += 3)
1841 {
1842 int x1 = x - dx3;
1843 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1844 uint8_t h2;
1845
1846 if (y1valid && x1 >= 0 && x1 < w)
1847 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1848 else
1849 h2 = 1; /* out of range == invisible */
1850
1851 if (h1 || h2)
1852 {
1853 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1854 glColor4f (1., 1., 1., alpha);
1855
1856 glTexCoord2f (0, 0.); glVertex2i (x , y );
1857 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1858 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1859 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1860 }
1861 }
1862 }
1863 }
1864
1865 glEnd ();
1866
1867 glPopMatrix ();
1868
1869 glDisable (GL_TEXTURE_2D);
1870 glDisable (GL_BLEND);
1871}
1872
1649IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1873IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1650 CODE: 1874 CODE:
1651{ 1875{
1652 GLint width; 1876 GLint width;
1653 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1877 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1660MODULE = Deliantra::Client PACKAGE = DC::Map 1884MODULE = Deliantra::Client PACKAGE = DC::Map
1661 1885
1662PROTOTYPES: DISABLE 1886PROTOTYPES: DISABLE
1663 1887
1664DC::Map 1888DC::Map
1665new (SV *class) 1889new (SV *klass)
1666 CODE: 1890 CODE:
1667 New (0, RETVAL, 1, struct map); 1891 RETVAL = new mapgrid;
1668 RETVAL->x = 0; 1892 RETVAL->x = 0;
1669 RETVAL->y = 0; 1893 RETVAL->y = 0;
1670 RETVAL->w = 0; 1894 RETVAL->w = 0;
1671 RETVAL->h = 0; 1895 RETVAL->h = 0;
1672 RETVAL->ox = 0; 1896 RETVAL->ox = 0;
1673 RETVAL->oy = 0; 1897 RETVAL->oy = 0;
1674 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1675 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1676 RETVAL->rows = 0; 1898 RETVAL->rows = 0;
1677 RETVAL->row = 0; 1899 RETVAL->row = 0;
1678 OUTPUT: 1900 OUTPUT:
1679 RETVAL 1901 RETVAL
1680 1902
1681void 1903void
1682DESTROY (DC::Map self) 1904DESTROY (DC::Map self)
1683 CODE: 1905 CODE:
1684{ 1906{
1685 map_clear (self);
1686 Safefree (self->face2tile);
1687 Safefree (self->tex);
1688 Safefree (self); 1907 delete self;
1689} 1908}
1690 1909
1691void 1910void
1692resize (DC::Map self, int map_width, int map_height) 1911resize (DC::Map self, int map_width, int map_height)
1693 CODE: 1912 CODE:
1695 self->h = map_height; 1914 self->h = map_height;
1696 1915
1697void 1916void
1698clear (DC::Map self) 1917clear (DC::Map self)
1699 CODE: 1918 CODE:
1700 map_clear (self); 1919 self->clear_cells ();
1701 1920
1702void 1921void
1703set_tileid (DC::Map self, int face, int tile) 1922set_tileid (DC::Map self, int face, int tile)
1704 CODE: 1923 CODE:
1705{ 1924{
1706 need_facenum (self, face); self->face2tile [face] = tile; 1925 if (self->tile.size () <= face) self->tile.resize (face + 1);
1707 need_texid (self, tile); 1926 self->tile[face] = tile;
1927 if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1708} 1928}
1709 1929
1710void 1930void
1711set_smooth (DC::Map self, int face, int smooth, int level) 1931set_smooth (DC::Map self, int face, int smooth, int level)
1712 CODE: 1932 CODE:
1713{ 1933{
1714 tileid texid;
1715 maptex *tex;
1716
1717 if (face < 0 || face >= self->faces) 1934 if (face < 0 || face >= self->tile.size ())
1718 return; 1935 return;
1719 1936
1720 if (smooth < 0 || smooth >= self->faces) 1937 if (smooth < 0 || smooth >= self->tile.size ())
1721 return; 1938 return;
1722 1939
1723 texid = self->face2tile [face]; 1940 tileid texid = self->tile[face];
1724 1941
1725 if (!texid) 1942 if (!texid)
1726 return; 1943 return;
1727 1944
1728 tex = self->tex + texid; 1945 maptex &tex = self->tex[texid];
1729 tex->smoothtile = self->face2tile [smooth]; 1946 tex.smoothtile = self->tile[smooth];
1730 tex->smoothlevel = level; 1947 tex.smoothlevel = level;
1731} 1948}
1732 1949
1733void 1950void
1734set_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)
1735 CODE: 1952 CODE:
1736{ 1953{
1737 need_texid (self, texid); 1954 if (self->tex.size () < texid) self->tex.resize (texid + 1);
1738 1955
1739 { 1956 {
1740 maptex *tex = self->tex + texid; 1957 maptex &tex = self->tex[texid];
1741 1958
1742 tex->name = name; 1959 tex.name = name;
1743 tex->w = w; 1960 tex.w = w;
1744 tex->h = h; 1961 tex.h = h;
1745 tex->s = s; 1962 tex.s = s;
1746 tex->t = t; 1963 tex.t = t;
1747 tex->r = r; 1964 tex.r = r;
1748 tex->g = g; 1965 tex.g = g;
1749 tex->b = b; 1966 tex.b = b;
1750 tex->a = a; 1967 tex.a = a;
1751 } 1968 }
1752 1969
1753 // somewhat hackish, but for textures that require it, it really 1970 // somewhat hackish, but for textures that require it, it really
1754 // improves the look, and most others don't suffer. 1971 // improves the look, and most others don't suffer.
1755 glBindTexture (GL_TEXTURE_2D, name); 1972 glBindTexture (GL_TEXTURE_2D, name);
1757 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1974 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1758 // use uglier nearest interpolation because linear suffers 1975 // use uglier nearest interpolation because linear suffers
1759 // from transparent color bleeding and ugly wrapping effects. 1976 // from transparent color bleeding and ugly wrapping effects.
1760 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1977 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1761} 1978}
1979
1980void
1981expire_textures (DC::Map self, int texid, int count)
1982 PPCODE:
1983 for (; texid < self->tex.size () && count; ++texid, --count)
1984 {
1985 maptex &tex = self->tex[texid];
1986
1987 if (tex.name)
1988 {
1989 if (tex.unused)
1990 {
1991 tex.name = 0;
1992 tex.unused = 0;
1993 XPUSHs (sv_2mortal (newSViv (texid)));
1994 }
1995 else
1996 tex.unused = 1;
1997 }
1998 }
1762 1999
1763int 2000int
1764ox (DC::Map self) 2001ox (DC::Map self)
1765 ALIAS: 2002 ALIAS:
1766 oy = 1 2003 oy = 1
1806 self->y += MAP_EXTEND_Y; 2043 self->y += MAP_EXTEND_Y;
1807 } 2044 }
1808} 2045}
1809 2046
1810SV * 2047SV *
1811map1a_update (DC::Map self, SV *data_, int extmap) 2048map1a_update (DC::Map self, SV *data_)
1812 CODE: 2049 CODE:
1813{ 2050{
1814 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2051 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1815 uint8_t *data_end = (uint8_t *)SvEND (data_); 2052 uint8_t *data_end = (uint8_t *)SvEND (data_);
1816 mapcell *cell; 2053 mapcell *cell;
1837 2074
1838 //TODO: don't trust server data to be in-range(!) 2075 //TODO: don't trust server data to be in-range(!)
1839 2076
1840 if (flags & 8) 2077 if (flags & 8)
1841 { 2078 {
2079 uint8_t ext, cmd;
2080
1842 if (extmap) 2081 do
1843 { 2082 {
1844 uint8_t ext, cmd; 2083 ext = *data++;
2084 cmd = ext & 0x7f;
1845 2085
1846 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
1847 { 2089 {
1848 ext = *data++;
1849 cmd = ext & 0x7f;
1850
1851 if (cmd < 4)
1852 cell->darkness = 255 - ext * 64 + 1;
1853 else if (cmd == 5) // health
1854 {
1855 cell->stat_width = 1; 2090 cell->stat_width = 1;
1856 cell->stat_hp = *data++; 2091 cell->stat_hp = *data++;
1857 }
1858 else if (cmd == 6) // monster width
1859 cell->stat_width = *data++ + 1;
1860 else if (cmd == 0x47)
1861 {
1862 if (*data == 1) cell->player = data [1];
1863 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1864 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1865 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1866
1867 data += *data + 1;
1868 }
1869 else if (cmd == 8) // cell flags
1870 cell->flags = *data++;
1871 else if (ext & 0x40) // unknown, multibyte => skip
1872 data += *data + 1;
1873 else
1874 data++;
1875 } 2092 }
1876 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++;
1877 } 2110 }
1878 else 2111 while (ext & 0x80);
1879 cell->darkness = *data++ + 1;
1880 } 2112 }
1881 2113
1882 for (z = 0; z <= 2; ++z) 2114 for (z = 0; z <= 2; ++z)
1883 if (flags & (4 >> z)) 2115 if (flags & (4 >> z))
1884 { 2116 {
1885 faceid face = (data [0] << 8) + data [1]; data += 2; 2117 faceid face = (data[0] << 8) + data[1]; data += 2;
1886 need_facenum (self, face); 2118 if (self->tile.size () <= face) self->tile.resize (face + 1);
1887 cell->tile [z] = self->face2tile [face]; 2119 cell->tile[z] = self->tile[face];
1888 2120
1889 if (cell->tile [z]) 2121 if (cell->tile[z])
1890 { 2122 {
1891 maptex *tex = self->tex + cell->tile [z]; 2123 maptex &tex = self->tex[cell->tile[z]];
2124 tex.unused = 0;
1892 if (!tex->name) 2125 if (!tex.name)
1893 av_push (missing, newSViv (cell->tile [z])); 2126 av_push (missing, newSViv (cell->tile [z]));
1894 2127
1895 if (tex->smoothtile) 2128 if (tex.smoothtile)
1896 { 2129 {
1897 maptex *smooth = self->tex + tex->smoothtile; 2130 maptex &smooth = self->tex[tex.smoothtile];
2131 smooth.unused = 0;
1898 if (!smooth->name) 2132 if (!smooth.name)
1899 av_push (missing, newSViv (tex->smoothtile)); 2133 av_push (missing, newSViv (tex.smoothtile));
1900 } 2134 }
1901 } 2135 }
1902 } 2136 }
1903 } 2137 }
1904 else 2138 else
1930 ? self->row + y 2164 ? self->row + y
1931 : 0; 2165 : 0;
1932 2166
1933 for (x = x0; x < x1; x++) 2167 for (x = x0; x < x1; x++)
1934 { 2168 {
1935 int r = 32, g = 32, b = 32, a = 192; 2169 unsigned int r = 32, g = 32, b = 32, a = 192;
1936 2170
1937 if (row && row->c0 <= x && x < row->c1) 2171 if (row && row->c0 <= x && x < row->c1)
1938 { 2172 {
1939 mapcell *cell = row->col + (x - row->c0); 2173 mapcell *cell = row->col + (x - row->c0);
1940 2174
1942 { 2176 {
1943 maptex tex = self->tex [cell->tile [z]]; 2177 maptex tex = self->tex [cell->tile [z]];
1944 int a0 = 255 - tex.a; 2178 int a0 = 255 - tex.a;
1945 int a1 = tex.a; 2179 int a1 = tex.a;
1946 2180
1947 r = (r * a0 + tex.r * a1) / 255; 2181 r = div255 (r * a0 + tex.r * a1);
1948 g = (g * a0 + tex.g * a1) / 255; 2182 g = div255 (g * a0 + tex.g * a1);
1949 b = (b * a0 + tex.b * a1) / 255; 2183 b = div255 (b * a0 + tex.b * a1);
1950 a = (a * a0 + tex.a * a1) / 255; 2184 a = div255 (a * a0 + tex.a * a1);
1951 } 2185 }
1952 } 2186 }
1953 2187
1954 *map++ = (r ) 2188 *map++ = (r )
1955 | (g << 8) 2189 | (g << 8)
1956 | (b << 16) 2190 | (b << 16)
1957 | (a << 24); 2191 | (a << 24);
1958 } 2192 }
1959 } 2193 }
1960 2194
1961 RETVAL = map_sv; 2195 RETVAL = map_sv;
1962} 2196}
1963 OUTPUT: 2197 OUTPUT:
1964 RETVAL 2198 RETVAL
1965 2199
1966void 2200void
1967draw (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)
1968 CODE: 2202 CODE:
1969{ 2203{
1970 int x, y, z; 2204 int x, y, z;
1971 2205
1972 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1973 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1974 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!
1975 smooth_key skey;
1976 int pl_x, pl_y; 2207 int pl_x, pl_y;
1977 maptex pl_tex; 2208 maptex pl_tex;
1978 rc_t *rc = rc_alloc (); 2209 rc_t rc;
2210 rc_t rc_ov;
1979 rc_key_t key; 2211 rc_key_t key;
1980 rc_array_t *arr; 2212 rc_t::array_t *arr;
1981 2213
1982 pl_tex.name = 0; 2214 pl_tex.name = 0;
1983 2215
1984 // thats current max. sorry. 2216 // that's current max. sorry.
1985 if (sw > 255) sw = 255; 2217 if (sw > 255) sw = 255;
1986 if (sh > 255) sh = 255; 2218 if (sh > 255) sh = 255;
1987
1988 // clear key, in case of extra padding
1989 memset (&skey, 0, sizeof (skey));
1990 2219
1991 memset (&key, 0, sizeof (key)); 2220 memset (&key, 0, sizeof (key));
1992 key.r = 255; 2221 key.r = 255;
1993 key.g = 255; 2222 key.g = 255;
1994 key.b = 255; 2223 key.b = 255;
1995 key.a = 255; 2224 key.a = 255;
1996 key.mode = GL_QUADS; 2225 key.mode = GL_QUADS;
1997 key.format = GL_T2F_V3F; 2226 key.format = GL_T2F_V3F;
1998 key.texname = -1;
1999 2227
2000 mx += self->x; 2228 mx += self->x;
2001 my += self->y; 2229 my += self->y;
2002 2230
2003 // first pass: determine smooth_max 2231 // first pass: determine smooth_max
2004 // rather ugly, if you ask me 2232 // rather ugly, if you ask me
2005 // could also be stored inside mapcell and updated on change 2233 // could also be stored inside mapcell and updated on change
2006 memset (smooth_max, 0, sizeof (smooth_max)); 2234 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2007 2235
2008 for (y = 0; y < sh; y++) 2236 for (y = 0; y < sh; y++)
2009 if (0 <= y + my && y + my < self->rows) 2237 if (0 <= y + my && y + my < self->rows)
2010 { 2238 {
2011 maprow *row = self->row + (y + my); 2239 maprow *row = self->row + (y + my);
2026 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2027 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2028 2256
2029 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
2030 { 2258 {
2031 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;
2262 key.texname = -1;
2032 2263
2033 for (y = 0; y < sh; y++) 2264 for (y = 0; y < sh; y++)
2034 if (0 <= y + my && y + my < self->rows) 2265 if (0 <= y + my && y + my < self->rows)
2035 { 2266 {
2036 maprow *row = self->row + (y + my); 2267 maprow *row = self->row + (y + my);
2042 tileid tile = cell->tile [z]; 2273 tileid tile = cell->tile [z];
2043 2274
2044 if (tile) 2275 if (tile)
2045 { 2276 {
2046 maptex tex = self->tex [tile]; 2277 maptex tex = self->tex [tile];
2047 int px = (x + 1) * T - tex.w; 2278 int px, py;
2048 int py = (y + 1) * T - tex.h;
2049 2279
2050 if (key.texname != tex.name) 2280 if (key.texname != tex.name)
2051 { 2281 {
2282 self->tex [tile].unused = 0;
2283
2052 if (!tex.name) 2284 if (!tex.name)
2053 tex = self->tex [2]; /* missing, replace by noface */ 2285 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2054 2286
2055 key.texname = tex.name; 2287 key.texname = tex.name;
2056 arr = rc_array (rc, &key); 2288 arr = &rc.array (key);
2057 } 2289 }
2290
2291 px = (x + 1) * Th - tex.w;
2292 py = (y + 1) * Tw - tex.h;
2058 2293
2059 if (expect_false (cell->player == player) && expect_false (z == 2)) 2294 if (expect_false (cell->player == player) && expect_false (z == 2))
2060 { 2295 {
2061 pl_x = px; 2296 pl_x = px;
2062 pl_y = py; 2297 pl_y = py;
2063 pl_tex = tex; 2298 pl_tex = tex;
2064 continue; 2299 continue;
2065 } 2300 }
2066 2301
2067 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2302 arr->t2f_v3f (0 , 0 , px , py , 0);
2068 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2303 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2069 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);
2070 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2305 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2071
2072 if (expect_false (cell->flags) && expect_false (z == 2))
2073 {
2074 // overlays such as the speech bubble, probably more to come
2075 if (cell->flags & 1)
2076 {
2077 maptex tex = self->tex [1];
2078 int px = x * T + T * 2 / 32;
2079 int py = y * T - T * 6 / 32;
2080
2081 if (tex.name)
2082 {
2083 if (key.texname != tex.name)
2084 {
2085 key.texname = tex.name;
2086 arr = rc_array (rc, &key);
2087 }
2088
2089 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2093 }
2094 }
2095 }
2096 2306
2097 // update smooth hash 2307 // update smooth hash
2098 if (tex.smoothtile) 2308 if (tex.smoothtile)
2099 { 2309 {
2100 skey.tile = tex.smoothtile; 2310 skey.tile = tex.smoothtile;
2101 skey.level = tex.smoothlevel; 2311 skey.level = tex.smoothlevel;
2102 2312
2103 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2313 smooth_level[tex.smoothlevel] = 1;
2104 2314
2105 // 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
2106 // shifted +1|+1 so we always stay positive. 2316 // shifted +1|+1 so we always stay positive.
2107 2317
2108 // bits is ___n cccc CCCC bbbb 2318 // bits is ___n cccc CCCC bbbb
2116 2326
2117 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2327 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2118 // ·· ·· ·┏ ┓· 2328 // ·· ·· ·┏ ┓·
2119 2329
2120 // full tile 2330 // full tile
2121 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);
2122 2332
2123 // borders 2333 // borders
2124 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);
2125 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);
2126 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);
2127 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);
2128 2338
2129 // corners 2339 // corners
2130 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);
2131 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);
2132 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);
2133 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);
2344 }
2345 }
2346
2347 if (expect_false (z == 2) && expect_false (cell->flags))
2348 {
2349 // overlays such as the speech bubble, probably more to come
2350 if (cell->flags & 1)
2351 {
2352 rc_key_t key_ov = key;
2353 maptex tex = self->tex[TEXID_SPEECH];
2354 int px = x * Tw + Tw * 2 / 32;
2355 int py = y * Th - Th * 6 / 32;
2356
2357 key_ov.texname = tex.name;
2358 rc_t::array_t &arr = rc_ov.array (key_ov);
2359
2360 arr.t2f_v3f (0 , 0 , px , py , 0);
2361 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2362 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2363 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2134 } 2364 }
2135 } 2365 }
2136 } 2366 }
2137 } 2367 }
2138 2368
2139 rc_draw (rc); 2369 rc.draw ();
2140 rc_clear (rc); 2370 rc.clear ();
2141 2371
2142 // go through all smoothlevels, lowest to highest, then draw. 2372 // go through all smoothlevels, lowest to highest, then draw.
2143 // this is basically counting sort 2373 // this is basically counting sort
2144 { 2374 {
2145 int w, b; 2375 int w, b;
2146 2376
2147 glEnable (GL_TEXTURE_2D); 2377 glEnable (GL_TEXTURE_2D);
2148 glBegin (GL_QUADS); 2378 glBegin (GL_QUADS);
2149 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)
2150 { 2382 {
2151 uint32_t smask = smooth_level [w]; 2383 smooth_key &skey = it->first;
2152 if (smask) 2384 IV bits = it->second;
2153 for (b = 0; b < 32; ++b) 2385
2154 if (smask & (((uint32_t)1) << b)) 2386 if (!(bits & 0x1000)
2387 && skey.level == level
2388 && level > smooth_max [skey.x][skey.y])
2155 { 2389 {
2156 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
2157 HE *he; 2398 if (tex.name)
2158
2159 hv_iterinit (smooth);
2160 while ((he = hv_iternext (smooth)))
2161 { 2399 {
2162 smooth_key *skey = (smooth_key *)HeKEY (he); 2400 // this time avoiding texture state changes
2163 IV bits = SvIVX (HeVAL (he)); 2401 // save gobs of state changes.
2164 2402 if (key.texname != tex.name)
2165 if (!(bits & 0x1000)
2166 && skey->level == level
2167 && level > smooth_max [skey->x][skey->y])
2168 { 2403 {
2169 maptex tex = self->tex [skey->tile]; 2404 self->tex [skey.tile].unused = 0;
2170 int px = (((int)skey->x) - 1) * T;
2171 int py = (((int)skey->y) - 1) * T;
2172 int border = bits & 15;
2173 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2174 float dx = tex.s * .0625f; // 16 images/row
2175 float dy = tex.t * .5f ; // 2 images/column
2176 2405
2177 if (tex.name)
2178 {
2179 // this time avoiding texture state changes
2180 // save gobs of state changes.
2181 if (key.texname != tex.name)
2182 {
2183 glEnd (); 2406 glEnd ();
2184 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2407 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2185 glBegin (GL_QUADS); 2408 glBegin (GL_QUADS);
2186 } 2409 }
2187 2410
2188 if (border) 2411 if (border)
2189 { 2412 {
2190 float ox = border * dx; 2413 float ox = border * dx;
2191 2414
2192 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2193 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2194 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2195 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2196 } 2419 }
2197 2420
2198 if (corner) 2421 if (corner)
2199 { 2422 {
2200 float ox = corner * dx; 2423 float ox = corner * dx;
2201 2424
2202 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2425 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2203 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2426 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2204 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2427 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2205 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2428 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2206 }
2207 }
2208 } 2429 }
2209 } 2430 }
2210 } 2431 }
2211 } 2432 }
2212 2433
2213 glEnd (); 2434 glEnd ();
2214 glDisable (GL_TEXTURE_2D); 2435 glDisable (GL_TEXTURE_2D);
2215 key.texname = -1; 2436 key.texname = -1;
2216 } 2437 }
2217
2218 hv_clear (smooth);
2219 } 2438 }
2220 2439
2221 if (pl_tex.name) 2440 if (pl_tex.name)
2222 { 2441 {
2223 maptex tex = pl_tex; 2442 maptex tex = pl_tex;
2224 int px = pl_x + sdx; 2443 int px = pl_x + sdx;
2225 int py = pl_y + sdy; 2444 int py = pl_y + sdy;
2226 2445
2227 key.texname = tex.name; 2446 key.texname = tex.name;
2228 arr = rc_array (rc, &key); 2447 rc_t::array_t &arr = rc.array (key);
2229 2448
2230 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2449 arr.t2f_v3f (0 , 0 , px , py , 0);
2231 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2450 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2232 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);
2233 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2452 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2234 2453
2235 rc_draw (rc); 2454 rc.draw ();
2236 } 2455 }
2237 2456
2457 rc_ov.draw ();
2458 rc_ov.clear ();
2459
2238 glDisable (GL_BLEND); 2460 glDisable (GL_BLEND);
2239 rc_free (rc);
2240 2461
2241 // top layer: overlays such as the health bar 2462 // top layer: overlays such as the health bar
2242 for (y = 0; y < sh; y++) 2463 for (y = 0; y < sh; y++)
2243 if (0 <= y + my && y + my < self->rows) 2464 if (0 <= y + my && y + my < self->rows)
2244 { 2465 {
2247 for (x = 0; x < sw; x++) 2468 for (x = 0; x < sw; x++)
2248 if (row->c0 <= x + mx && x + mx < row->c1) 2469 if (row->c0 <= x + mx && x + mx < row->c1)
2249 { 2470 {
2250 mapcell *cell = row->col + (x + mx - row->c0); 2471 mapcell *cell = row->col + (x + mx - row->c0);
2251 2472
2252 int px = x * T; 2473 int px = x * Tw;
2253 int py = y * T; 2474 int py = y * Th;
2475
2476 if (expect_false (cell->player == player))
2477 {
2478 px += sdx;
2479 py += sdy;
2480 }
2254 2481
2255 if (cell->stat_hp) 2482 if (cell->stat_hp)
2256 { 2483 {
2257 int width = cell->stat_width * T; 2484 int width = cell->stat_width * Tw;
2258 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2485 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2259 2486
2260 glColor3ub (0, 0, 0); 2487 glColor3ub (0, 0, 0);
2261 glRectf (px + 1, py - thick - 2, 2488 glRectf (px + 1, py - thick - 2,
2262 px + width - 1, py); 2489 px + width - 1, py);
2263 2490
2269 } 2496 }
2270 } 2497 }
2271} 2498}
2272 2499
2273void 2500void
2274draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2501draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2275 CODE: 2502 CODE:
2276{ 2503{
2277 static float color[16][3] = { 2504 static float color[16][3] = {
2278 { 0.00F, 0.00F, 0.00F }, 2505 { 0.00f, 0.00f, 0.00f },
2279 { 1.00F, 1.00F, 1.00F }, 2506 { 1.00f, 1.00f, 1.00f },
2280 { 0.00F, 0.00F, 0.55F }, 2507 { 0.00f, 0.00f, 0.55f },
2281 { 1.00F, 0.00F, 0.00F }, 2508 { 1.00f, 0.00f, 0.00f },
2282 2509
2283 { 1.00F, 0.54F, 0.00F }, 2510 { 1.00f, 0.54f, 0.00f },
2284 { 0.11F, 0.56F, 1.00F }, 2511 { 0.11f, 0.56f, 1.00f },
2285 { 0.93F, 0.46F, 0.00F }, 2512 { 0.93f, 0.46f, 0.00f },
2286 { 0.18F, 0.54F, 0.34F }, 2513 { 0.18f, 0.54f, 0.34f },
2287 2514
2288 { 0.56F, 0.73F, 0.56F }, 2515 { 0.56f, 0.73f, 0.56f },
2289 { 0.80F, 0.80F, 0.80F }, 2516 { 0.80f, 0.80f, 0.80f },
2290 { 0.55F, 0.41F, 0.13F }, 2517 { 0.55f, 0.41f, 0.13f },
2291 { 0.99F, 0.77F, 0.26F }, 2518 { 0.99f, 0.77f, 0.26f },
2292 2519
2293 { 0.74F, 0.65F, 0.41F }, 2520 { 0.74f, 0.65f, 0.41f },
2294 2521
2295 { 0.00F, 1.00F, 1.00F }, 2522 { 0.00f, 1.00f, 1.00f },
2296 { 1.00F, 0.00F, 1.00F }, 2523 { 1.00f, 0.00f, 1.00f },
2297 { 1.00F, 1.00F, 0.00F }, 2524 { 1.00f, 1.00f, 0.00f },
2298 }; 2525 };
2299 2526
2300 int x, y; 2527 int x, y;
2301 2528
2302 glEnable (GL_TEXTURE_2D); 2529 glEnable (GL_TEXTURE_2D);
2530 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2531 * but the nvidia driver (185.18.14) mishandles alpha textures
2532 * and takes the colour from god knows where instead of using
2533 * Cp. MODULATE results in the same colour, but slightly different
2534 * alpha, but atcually gives us the correct colour with nvidia.
2535 */
2303 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2536 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2304 glEnable (GL_BLEND); 2537 glEnable (GL_BLEND);
2305 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2538 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2306 glBegin (GL_QUADS); 2539 glBegin (GL_QUADS);
2307 2540
2308 for (y = 0; y < h; y++) 2541 for (y = 0; y < h; y++)
2312 2545
2313 if (m) 2546 if (m)
2314 { 2547 {
2315 float *c = color [m & 15]; 2548 float *c = color [m & 15];
2316 2549
2317 float tx1 = m & 0x40 ? 0.5 : 0.; 2550 float tx1 = m & 0x40 ? 0.5f : 0.f;
2318 float tx2 = tx1 + 0.5; 2551 float tx2 = tx1 + 0.5f;
2319 2552
2320 glColor4f (c[0], c[1], c[2], 0.75); 2553 glColor4f (c[0], c[1], c[2], 1);
2321 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2554 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2322 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2555 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2323 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2556 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2324 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2557 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2325 } 2558 }
2333void 2566void
2334fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2567fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2335 PPCODE: 2568 PPCODE:
2336{ 2569{
2337 int x, y; 2570 int x, y;
2338 int sw1 = sw + 2; 2571 int sw1 = sw + 2;
2339 int sh1 = sh + 2; 2572 int sh1 = sh + 2;
2340 int sh3 = sh * 3; 2573 int sh3 = sh * 3;
2341 int sw34 = (sw * 3 + 3) & ~3; 2574 int sw3 = sw * 3;
2575 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2576 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2342 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2577 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2343 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2578 memset (darkness1, 0, sw1*sh1);
2344 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2345 2579
2346 SvPOK_only (darkness3_sv); 2580 SvPOK_only (darkness3_sv);
2347 SvCUR_set (darkness3_sv, sw34 * sh3); 2581 SvCUR_set (darkness3_sv, sw3 * sh3);
2348 2582
2349 mx += self->x - 1; 2583 mx += self->x - 1;
2350 my += self->y - 1; 2584 my += self->y - 1;
2351
2352 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353 2585
2354 for (y = 0; y < sh1; y++) 2586 for (y = 0; y < sh1; y++)
2355 if (0 <= y + my && y + my < self->rows) 2587 if (0 <= y + my && y + my < self->rows)
2356 { 2588 {
2357 maprow *row = self->row + (y + my); 2589 maprow *row = self->row + (y + my);
2360 if (row->c0 <= x + mx && x + mx < row->c1) 2592 if (row->c0 <= x + mx && x + mx < row->c1)
2361 { 2593 {
2362 mapcell *cell = row->col + (x + mx - row->c0); 2594 mapcell *cell = row->col + (x + mx - row->c0);
2363 2595
2364 darkness1 [y * sw1 + x] = cell->darkness 2596 darkness1 [y * sw1 + x] = cell->darkness
2365 ? 255 - (cell->darkness - 1) 2597 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2366 : 255 - FOW_DARKNESS; 2598 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2367 } 2599 }
2368 } 2600 }
2369 2601
2370 for (y = 0; y < sh; ++y) 2602 for (y = 0; y < sh; ++y)
2371 for (x = 0; x < sw; ++x) 2603 for (x = 0; x < sw; ++x)
2390 2622
2391 uint8_t r13 = (d13 + d23 + d12) / 3; 2623 uint8_t r13 = (d13 + d23 + d12) / 3;
2392 uint8_t r23 = d23; 2624 uint8_t r23 = d23;
2393 uint8_t r33 = (d23 + d33 + d32) / 3; 2625 uint8_t r33 = (d23 + d33 + d32) / 3;
2394 2626
2395 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2627 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2396 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2628 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2629 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2398 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2630 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2399 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2631 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2632 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2401 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2633 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2402 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2634 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2635 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2404 } 2636 }
2405 2637
2406 free (darkness1); 2638 free (darkness1);
2407 2639
2408 EXTEND (SP, 3); 2640 EXTEND (SP, 3);
2409 PUSHs (sv_2mortal (newSViv (sw34))); 2641 PUSHs (sv_2mortal (newSViv (sw3)));
2410 PUSHs (sv_2mortal (newSViv (sh3))); 2642 PUSHs (sv_2mortal (newSViv (sh3)));
2411 PUSHs (darkness3_sv); 2643 PUSHs (darkness3_sv);
2412} 2644}
2413 2645
2414SV * 2646SV *
2477 else 2709 else
2478 *data++ = 0; 2710 *data++ = 0;
2479 } 2711 }
2480 } 2712 }
2481 2713
2482 /* 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 */
2483 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2715 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2484 { 2716 {
2485 SvPOK_only (data_sv); 2717 SvPOK_only (data_sv);
2486 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2718 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2487 } 2719 }
2488 2720
2489 RETVAL = data_sv; 2721 RETVAL = data_sv;
2490} 2722}
2491 OUTPUT: 2723 OUTPUT:
2492 RETVAL 2724 RETVAL
2493 2725
2494void 2726void
2501 STRLEN len; 2733 STRLEN len;
2502 uint8_t *data, *end; 2734 uint8_t *data, *end;
2503 2735
2504 len = SvLEN (data_sv); 2736 len = SvLEN (data_sv);
2505 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2737 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2506 data = SvPVbyte_nolen (data_sv); 2738 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2507 end = data + len + 8; 2739 end = data + len + 8;
2508 2740
2509 if (len < 5) 2741 if (len < 5)
2510 XSRETURN_EMPTY; 2742 XSRETURN_EMPTY;
2511 2743
2555 2787
2556 for (z = 0; z <= 2; z++) 2788 for (z = 0; z <= 2; z++)
2557 { 2789 {
2558 tileid t = tile [z]; 2790 tileid t = tile [z];
2559 2791
2560 if (t >= self->texs || (t && !self->tex [t].name)) 2792 if (t >= self->tex.size () || (t && !self->tex[t].name))
2561 { 2793 {
2562 PUSHs (sv_2mortal (newSViv (t))); 2794 PUSHs (sv_2mortal (newSViv (t)));
2563 need_texid (self, t); 2795 if (self->tex.size () <= t) self->tex.resize (t + 1);
2564 } 2796 }
2565 2797
2566 cell->tile [z] = t; 2798 cell->tile[z] = t;
2567 } 2799 }
2568 } 2800 }
2569 } 2801 }
2570 } 2802 }
2571 } 2803 }
2572} 2804}
2573 2805
2574MODULE = Deliantra::Client PACKAGE = DC::RW 2806MODULE = Deliantra::Client PACKAGE = DC::RW
2575 2807
2576DC::RW 2808DC::RW
2577new (SV *class, SV *data_sv) 2809new (SV *klass, SV *data_sv)
2578 CODE: 2810 CODE:
2579{ 2811{
2580 STRLEN datalen; 2812 STRLEN datalen;
2581 char *data = SvPVbyte (data_sv, datalen); 2813 char *data = SvPVbyte (data_sv, datalen);
2582 2814
2584} 2816}
2585 OUTPUT: 2817 OUTPUT:
2586 RETVAL 2818 RETVAL
2587 2819
2588DC::RW 2820DC::RW
2589new_from_file (SV *class, const char *path, const char *mode = "rb") 2821new_from_file (SV *klass, const char *path, const char *mode = "rb")
2590 CODE: 2822 CODE:
2591 RETVAL = SDL_RWFromFile (path, mode); 2823 RETVAL = SDL_RWFromFile (path, mode);
2592 OUTPUT: 2824 OUTPUT:
2593 RETVAL 2825 RETVAL
2594 2826
2612 if (RETVAL < 0) 2844 if (RETVAL < 0)
2613 { 2845 {
2614 RETVAL = Mix_GroupOldest (-1); 2846 RETVAL = Mix_GroupOldest (-1);
2615 2847
2616 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)
2617 XSRETURN_UNDEF; 2854 XSRETURN_UNDEF;
2618 2855 }
2856 else
2619 Mix_HaltChannel (RETVAL); 2857 Mix_HaltChannel (RETVAL);
2620 } 2858 }
2621 2859
2622 Mix_UnregisterAllEffects (RETVAL); 2860 Mix_UnregisterAllEffects (RETVAL);
2623 Mix_Volume (RETVAL, 128); 2861 Mix_Volume (RETVAL, 128);
2624} 2862}
2671void 2909void
2672set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2910set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673 CODE: 2911 CODE:
2674{ 2912{
2675 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2913 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2914 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2677 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2915 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678} 2916}
2679 2917
2680void 2918void
2681set_reverse_stereo (DC::Channel self, int flip) 2919set_reverse_stereo (DC::Channel self, int flip)
2684 2922
2685MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2923MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686 2924
2687PROTOTYPES: DISABLE 2925PROTOTYPES: DISABLE
2688 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
2689DC::MixChunk 2939DC::MixChunk
2690new (SV *class, DC::RW rwops) 2940new (SV *klass, DC::RW rwops)
2691 CODE: 2941 CODE:
2692 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2942 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2693 OUTPUT: 2943 OUTPUT:
2694 RETVAL 2944 RETVAL
2695 2945
2725 OUTPUT: 2975 OUTPUT:
2726 RETVAL 2976 RETVAL
2727 2977
2728MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2978MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2729 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
2730int 2992int
2731volume (int volume = -1) 2993volume (int volume = -1)
2732 PROTOTYPE: ;$ 2994 PROTOTYPE: ;$
2733 CODE: 2995 CODE:
2734 if (items > 0) 2996 if (items > 0)
2745void 3007void
2746halt () 3008halt ()
2747 CODE: 3009 CODE:
2748 Mix_HaltMusic (); 3010 Mix_HaltMusic ();
2749 3011
3012int
3013playing ()
3014 CODE:
3015 RETVAL = Mix_PlayingMusic ();
3016 OUTPUT:
3017 RETVAL
3018
2750DC::MixMusic 3019DC::MixMusic
2751new (SV *class, DC::RW rwops) 3020new (SV *klass, DC::RW rwops)
2752 CODE: 3021 CODE:
2753 RETVAL = Mix_LoadMUS_RW (rwops); 3022 RETVAL = Mix_LoadMUS_RW (rwops);
2754 OUTPUT: 3023 OUTPUT:
2755 RETVAL 3024 RETVAL
2756 3025
2784 } *civ, const_iv[] = { 3053 } *civ, const_iv[] = {
2785# define const_iv(name) { # name, (IV)name } 3054# define const_iv(name) { # name, (IV)name }
2786 const_iv (GL_VENDOR), 3055 const_iv (GL_VENDOR),
2787 const_iv (GL_VERSION), 3056 const_iv (GL_VERSION),
2788 const_iv (GL_EXTENSIONS), 3057 const_iv (GL_EXTENSIONS),
3058 const_iv (GL_MAX_TEXTURE_UNITS),
2789 const_iv (GL_COLOR_MATERIAL), 3059 const_iv (GL_COLOR_MATERIAL),
2790 const_iv (GL_SMOOTH), 3060 const_iv (GL_SMOOTH),
2791 const_iv (GL_FLAT), 3061 const_iv (GL_FLAT),
2792 const_iv (GL_DITHER), 3062 const_iv (GL_DITHER),
2793 const_iv (GL_BLEND), 3063 const_iv (GL_BLEND),
2805 const_iv (GL_ZERO), 3075 const_iv (GL_ZERO),
2806 const_iv (GL_SRC_ALPHA), 3076 const_iv (GL_SRC_ALPHA),
2807 const_iv (GL_DST_ALPHA), 3077 const_iv (GL_DST_ALPHA),
2808 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3078 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2809 const_iv (GL_ONE_MINUS_DST_ALPHA), 3079 const_iv (GL_ONE_MINUS_DST_ALPHA),
3080 const_iv (GL_SRC_COLOR),
3081 const_iv (GL_DST_COLOR),
3082 const_iv (GL_ONE_MINUS_SRC_COLOR),
3083 const_iv (GL_ONE_MINUS_DST_COLOR),
2810 const_iv (GL_SRC_ALPHA_SATURATE), 3084 const_iv (GL_SRC_ALPHA_SATURATE),
2811 const_iv (GL_RGB), 3085 const_iv (GL_RGB),
2812 const_iv (GL_RGBA), 3086 const_iv (GL_RGBA),
2813 const_iv (GL_RGBA4), 3087 const_iv (GL_RGBA4),
2814 const_iv (GL_RGBA8), 3088 const_iv (GL_RGBA8),
2882 const_iv (GL_NICEST), 3156 const_iv (GL_NICEST),
2883 const_iv (GL_V2F), 3157 const_iv (GL_V2F),
2884 const_iv (GL_V3F), 3158 const_iv (GL_V3F),
2885 const_iv (GL_T2F_V3F), 3159 const_iv (GL_T2F_V3F),
2886 const_iv (GL_T2F_N3F_V3F), 3160 const_iv (GL_T2F_N3F_V3F),
3161 const_iv (GL_FUNC_ADD),
3162 const_iv (GL_FUNC_SUBTRACT),
3163 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2887# undef const_iv 3164# undef const_iv
2888 }; 3165 };
2889 3166
2890 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--)
2891 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3168 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2892 3169
2893 texture_av = newAV (); 3170 texture_av = newAV ();
2894 AvREAL_off (texture_av); 3171 AvREAL_off (texture_av);
2895} 3172}
2896 3173
2898disable_GL_EXT_blend_func_separate () 3175disable_GL_EXT_blend_func_separate ()
2899 CODE: 3176 CODE:
2900 gl.BlendFuncSeparate = 0; 3177 gl.BlendFuncSeparate = 0;
2901 gl.BlendFuncSeparateEXT = 0; 3178 gl.BlendFuncSeparateEXT = 0;
2902 3179
2903char * 3180void
3181apple_nvidia_bug (int enable)
3182
3183const char *
2904gl_vendor () 3184gl_vendor ()
2905 CODE: 3185 CODE:
2906 RETVAL = (char *)glGetString (GL_VENDOR); 3186 RETVAL = (const char *)glGetString (GL_VENDOR);
2907 OUTPUT: 3187 OUTPUT:
2908 RETVAL 3188 RETVAL
2909 3189
2910char * 3190const char *
2911gl_version () 3191gl_version ()
2912 CODE: 3192 CODE:
2913 RETVAL = (char *)glGetString (GL_VERSION); 3193 RETVAL = (const char *)glGetString (GL_VERSION);
2914 OUTPUT: 3194 OUTPUT:
2915 RETVAL 3195 RETVAL
2916 3196
2917char * 3197const char *
2918gl_extensions () 3198gl_extensions ()
2919 CODE: 3199 CODE:
2920 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3200 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2921 OUTPUT: 3201 OUTPUT:
2922 RETVAL 3202 RETVAL
2923 3203
2924const char *glGetString (GLenum pname) 3204const char *glGetString (GLenum pname)
3205 CODE:
3206 RETVAL = (const char *)glGetString (pname);
3207 OUTPUT:
3208 RETVAL
2925 3209
2926GLint glGetInteger (GLenum pname) 3210GLint glGetInteger (GLenum pname)
2927 CODE: 3211 CODE:
2928 glGetIntegerv (pname, &RETVAL); 3212 glGetIntegerv (pname, &RETVAL);
2929 OUTPUT: 3213 OUTPUT:
2937 3221
2938int glGetError () 3222int glGetError ()
2939 3223
2940void glFinish () 3224void glFinish ()
2941 3225
3226void glFlush ()
3227
2942void glClear (int mask) 3228void glClear (int mask)
2943 3229
2944void glClearColor (float r, float g, float b, float a = 1.0) 3230void glClearColor (float r, float g, float b, float a = 1.0)
2945 PROTOTYPE: @ 3231 PROTOTYPE: @
2946 3232
2955void glBlendFunc (int sfactor, int dfactor) 3241void glBlendFunc (int sfactor, int dfactor)
2956 3242
2957void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3243void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2958 CODE: 3244 CODE:
2959 gl_BlendFuncSeparate (sa, da, saa, daa); 3245 gl_BlendFuncSeparate (sa, da, saa, daa);
3246
3247# void glBlendEquation (int se)
2960 3248
2961void glDepthMask (int flag) 3249void glDepthMask (int flag)
2962 3250
2963void glLogicOp (int opcode) 3251void glLogicOp (int opcode)
2964 3252
2999void glRotate (float angle, float x, float y, float z) 3287void glRotate (float angle, float x, float y, float z)
3000 CODE: 3288 CODE:
3001 glRotatef (angle, x, y, z); 3289 glRotatef (angle, x, y, z);
3002 3290
3003void glColor (float r, float g, float b, float a = 1.0) 3291void glColor (float r, float g, float b, float a = 1.0)
3292 PROTOTYPE: @
3004 ALIAS: 3293 ALIAS:
3005 glColor_premultiply = 1 3294 glColor_premultiply = 1
3006 CODE: 3295 CODE:
3007 if (ix) 3296 if (ix)
3008 { 3297 {
3114 3403
3115void glEndList () 3404void glEndList ()
3116 3405
3117void glCallList (int list) 3406void glCallList (int list)
3118 3407
3408void c_init ()
3409 CODE:
3410 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3411 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3412
3119MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3413MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3120 3414
3121PROTOTYPES: DISABLE 3415PROTOTYPES: DISABLE
3122 3416
3123void 3417void
3124find_widget (SV *self, NV x, NV y) 3418find_widget (SV *self, NV x, NV y)
3125 PPCODE: 3419 PPCODE:
3126{ 3420{
3127 if (within_widget (self, x, y)) 3421 if (within_widget (self, x, y))
3128 XPUSHs (self); 3422 XPUSHs (self);
3129} 3423}
3130 3424
3131BOOT: 3425BOOT:
3132{ 3426{
3140 3434
3141void 3435void
3142draw (SV *self) 3436draw (SV *self)
3143 CODE: 3437 CODE:
3144{ 3438{
3145 HV *hv; 3439 HV *hv;
3146 SV **svp; 3440 SV **svp;
3147 NV x, y, w, h; 3441 NV x, y, w, h;
3148 SV *draw_x_sv = GvSV (draw_x_gv); 3442 SV *draw_x_sv = GvSV (draw_x_gv);
3149 SV *draw_y_sv = GvSV (draw_y_gv); 3443 SV *draw_y_sv = GvSV (draw_y_gv);
3150 SV *draw_w_sv = GvSV (draw_w_gv); 3444 SV *draw_w_sv = GvSV (draw_w_gv);
3151 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