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.267 by root, Sun Jul 20 02:55:36 2008 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 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>
39#include <SDL_endian.h> 43#include <SDL_endian.h>
40#include <SDL_image.h> 44#include <SDL_image.h>
41#include <SDL_mixer.h> 45#include <SDL_mixer.h>
42#include <SDL_opengl.h> 46#include <SDL_opengl.h>
43 47
48/* work around os x broken headers */
49#ifdef __MACOSX__
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);
53#endif
54
44#define PANGO_ENABLE_BACKEND 55#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 56#define G_DISABLE_CAST_CHECKS
46 57
47#include <glib/gmacros.h> 58#include <glib.h>
48 59
49#include <pango/pango.h> 60#include <pango/pango.h>
50 61
51#ifndef PANGO_VERSION_CHECK 62#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0 63# define PANGO_VERSION_CHECK(a,b,c) 0
76#define expect_false(expr) expect ((expr) != 0, 0) 87#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 88#define expect_true(expr) expect ((expr) != 0, 1)
78 89
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 90#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 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 */
81#define FOW_DARKNESS 32 94#define FOW_DARKNESS 50
95#define DARKNESS_ADJUST(n) (n)
82 96
83#define MAP_EXTEND_X 32 97#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 98#define MAP_EXTEND_Y 512
85 99
86#define MIN_FONT_HEIGHT 10 100#define MIN_FONT_HEIGHT 10
87 101
88/* mask out modifiers we are not interested in */ 102/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 103#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
104
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}
90 128
91static AV *texture_av; 129static AV *texture_av;
92 130
93static struct 131static struct
94{ 132{
151{ 189{
152 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
153 191
154 while (attrs) 192 while (attrs)
155 { 193 {
156 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
157 195
158 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
159 return 1; 197 return 1;
160 198
161 attrs = attrs->next; 199 attrs = attrs->next;
162 } 200 }
163 201
164 return 0; 202 return 0;
165} 203}
166 204
167typedef struct cf_layout { 205struct cf_layout {
168 PangoLayout *pl; 206 PangoLayout *pl;
169 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
170 int base_height; 208 int base_height;
171 DC__Font font; 209 DC__Font font;
172 rc_t *rc; 210 rc_t rc;
173} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
174 214
175static DC__Font default_font; 215static DC__Font default_font;
176static PangoContext *opengl_context; 216static PangoContext *opengl_context;
177static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
178 218
179static void 219static void
180substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
181{ 221{
182 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
183#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
184 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185#endif 225#endif
186 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187} 227}
188 228
189static void 229static void
219} 259}
220 260
221typedef uint16_t tileid; 261typedef uint16_t tileid;
222typedef uint16_t faceid; 262typedef uint16_t faceid;
223 263
224typedef struct { 264struct maptex
265{
225 GLuint name; 266 GLuint name;
226 int w, h; 267 int w, h;
227 float s, t; 268 float s, t;
228 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
229 tileid smoothtile; 270 tileid smoothtile;
230 uint8_t smoothlevel; 271 uint8_t smoothlevel;
231} maptex; 272 uint8_t unused; /* set to zero on use */
273};
232 274
233typedef struct { 275struct mapcell
276{
234 uint32_t player; 277 uint32_t player;
235 tileid tile[3]; 278 tileid tile[3];
236 uint16_t darkness; 279 uint16_t darkness;
237 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
238} mapcell; 281};
239 282
240typedef struct { 283struct maprow
284{
241 int32_t c0, c1; 285 int32_t c0, c1;
242 mapcell *col; 286 mapcell *col;
243} maprow; 287};
244 288
245typedef struct map { 289struct mapgrid {
246 int x, y, w, h; 290 int x, y, w, h;
247 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
248 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
249 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
250 294
251 int32_t rows; 295 int32_t rows;
252 maprow *row; 296 maprow *row;
253} *DC__Map; 297};
254 298
255static char * 299typedef mapgrid *DC__Map;
300
301template<typename T>
302static void
256prepend (char *ptr, int sze, int inc) 303prepend (T *&ptr, int sze, int inc)
257{ 304{
258 char *p; 305 T *p;
259 306
260 New (0, p, sze + inc, char); 307 Newxz (p, sze + inc, T);
261 Zero (p, inc, char);
262 Move (ptr, p + inc, sze, char); 308 Move (ptr, p + inc, sze, T);
263 Safefree (ptr); 309 Safefree (ptr);
264 310
265 return p; 311 ptr = p;
266} 312}
267 313
268static char * 314template<typename T>
269append (char *ptr, int sze, int inc)
270{
271 Renew (ptr, sze + inc, char);
272 Zero (ptr + sze, inc, char);
273
274 return ptr;
275}
276
277#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
278#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
279
280static void 315static void
316append (T *&ptr, int sze, int inc)
317{
318 Renew (ptr, sze + inc, T);
319 Zero (ptr + sze, inc, T);
320}
321
322static void
281need_facenum (struct map *self, faceid face) 323need_facenum (struct mapgrid *self, faceid face)
282{ 324{
283 while (self->faces <= face) 325 while (self->faces <= face)
284 { 326 {
285 Append (tileid, self->face2tile, self->faces, self->faces); 327 append (self->face2tile, self->faces, self->faces);
286 self->faces *= 2; 328 self->faces *= 2;
287 } 329 }
288} 330}
289 331
290static void 332static void
291need_texid (struct map *self, int texid) 333need_texid (struct mapgrid *self, int texid)
292{ 334{
293 while (self->texs <= texid) 335 while (self->texs <= texid)
294 { 336 {
295 Append (maptex, self->tex, self->texs, self->texs); 337 append (self->tex, self->texs, self->texs);
296 self->texs *= 2; 338 self->texs *= 2;
297 } 339 }
298} 340}
299 341
300static maprow * 342static maprow *
301map_get_row (DC__Map self, int y) 343map_get_row (mapgrid *self, int y)
302{ 344{
303 if (0 > y) 345 if (0 > y)
304 { 346 {
305 int extend = - y + MAP_EXTEND_Y; 347 int extend = - y + MAP_EXTEND_Y;
306 Prepend (maprow, self->row, self->rows, extend); 348 prepend (self->row, self->rows, extend);
307 349
308 self->rows += extend; 350 self->rows += extend;
309 self->y += extend; 351 self->y += extend;
310 y += extend; 352 y += extend;
311 } 353 }
312 else if (y >= self->rows) 354 else if (y >= self->rows)
313 { 355 {
314 int extend = y - self->rows + MAP_EXTEND_Y; 356 int extend = y - self->rows + MAP_EXTEND_Y;
315 Append (maprow, self->row, self->rows, extend); 357 append (self->row, self->rows, extend);
316 self->rows += extend; 358 self->rows += extend;
317 } 359 }
318 360
319 return self->row + y; 361 return self->row + y;
320} 362}
330 } 372 }
331 373
332 if (row->c0 > x) 374 if (row->c0 > x)
333 { 375 {
334 int extend = row->c0 - x + MAP_EXTEND_X; 376 int extend = row->c0 - x + MAP_EXTEND_X;
335 Prepend (mapcell, row->col, row->c1 - row->c0, extend); 377 prepend (row->col, row->c1 - row->c0, extend);
336 row->c0 -= extend; 378 row->c0 -= extend;
337 } 379 }
338 else if (x >= row->c1) 380 else if (x >= row->c1)
339 { 381 {
340 int extend = x - row->c1 + MAP_EXTEND_X; 382 int extend = x - row->c1 + MAP_EXTEND_X;
341 Append (mapcell, row->col, row->c1 - row->c0, extend); 383 append (row->col, row->c1 - row->c0, extend);
342 row->c1 += extend; 384 row->c1 += extend;
343 } 385 }
344 386
345 return row->col + (x - row->c0); 387 return row->col + (x - row->c0);
346} 388}
347 389
348static mapcell * 390static mapcell *
349map_get_cell (DC__Map self, int x, int y) 391map_get_cell (mapgrid *self, int x, int y)
350{ 392{
351 return row_get_cell (map_get_row (self, y), x); 393 return row_get_cell (map_get_row (self, y), x);
352} 394}
353 395
354static void 396static void
355map_clear (DC__Map self) 397map_clear (mapgrid *self)
356{ 398{
357 int r; 399 int r;
358 400
359 for (r = 0; r < self->rows; r++) 401 for (r = 0; r < self->rows; r++)
360 Safefree (self->row[r].col); 402 Safefree (self->row[r].col);
369 self->rows = 0; 411 self->rows = 0;
370} 412}
371 413
372#define CELL_CLEAR(cell) \ 414#define CELL_CLEAR(cell) \
373 do { \ 415 do { \
416 if ((cell)->player) \
417 (cell)->tile [2] = 0; \
374 (cell)->darkness = 0; \ 418 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \ 419 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \ 420 (cell)->flags = 0; \
377 (cell)->player = 0; \ 421 (cell)->player = 0; \
378 } while (0) 422 } while (0)
379 423
380static void 424static void
381map_blank (DC__Map self, int x0, int y0, int w, int h) 425map_blank (mapgrid *self, int x0, int y0, int w, int h)
382{ 426{
383 int x, y; 427 int x, y;
384 maprow *row; 428 maprow *row;
385 mapcell *cell; 429 mapcell *cell;
386 430
403 CELL_CLEAR (cell); 447 CELL_CLEAR (cell);
404 } 448 }
405 } 449 }
406} 450}
407 451
408typedef struct { 452struct smooth_key
453{
409 tileid tile; 454 tileid tile;
410 uint8_t x, y, level; 455 uint8_t x, y, level;
411} smooth_key; 456
457 bool operator == (const smooth_key &o) const
458 {
459 return tile == o.tile && x == o.x && y == o.y && level == o.level;
460 }
461};
462
463typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
464
465namespace std {
466 template <>
467 struct hash<smooth_key>
468 {
469 size_t operator () (const smooth_key &v) const
470 {
471 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
472 }
473 };
474}
412 475
413static void 476static void
414smooth_or_bits (HV *hv, smooth_key *key, IV bits) 477smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
415{ 478{
416 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 479 auto &&it = h.find (key);
417 480
418 if (SvIOK (*sv)) 481 if (it == h.end ())
419 SvIV_set (*sv, SvIVX (*sv) | bits); 482 h.insert (std::make_pair (key, bits));
420 else 483 else
421 sv_setiv (*sv, bits); 484 it->second |= bits;
422} 485}
423 486
424static void 487static void
425music_finished (void) 488music_finished (void)
426{ 489{
443 ev.code = 1; 506 ev.code = 1;
444 ev.data1 = (void *)(long)channel; 507 ev.data1 = (void *)(long)channel;
445 ev.data2 = 0; 508 ev.data2 = 0;
446 509
447 SDL_PushEvent ((SDL_Event *)&ev); 510 SDL_PushEvent ((SDL_Event *)&ev);
511}
512
513// approximately divide by 255
514static unsigned int
515div255 (unsigned int n)
516{
517 return (n + (n >> 8)) >> 8;
448} 518}
449 519
450static unsigned int 520static unsigned int
451minpot (unsigned int n) 521minpot (unsigned int n)
452{ 522{
519 if (!svp || !SvTRUE (*svp)) 589 if (!svp || !SvTRUE (*svp))
520 return 0; 590 return 0;
521 591
522 return 1; 592 return 1;
523} 593}
594
595/******************************************************************************/
596
597/* process keyboard modifiers */
598static int
599mod_munge (int mod)
600{
601 mod &= MOD_MASK;
602
603 if (mod & (KMOD_META | KMOD_ALT))
604 mod |= KMOD_LRAM;
605
606 return mod;
607}
608
609static void
610deliantra_main (SV *real_main)
611{
612 dSP;
613
614 PUSHMARK (SP);
615 call_sv (real_main, G_DISCARD | G_VOID);
616}
617
618#ifdef __MACOSX__
619 static SV *real_main;
620
621 /* to due surprising braindamage on the side of SDL design, we
622 * do some mind-boggling hack here: SDL requires a custom main()
623 * on OS X, so... we provide one and call the original main(), which,
624 * due to shared library magic, calls -lSDLmain's main, not perl's main,
625 * and which calls our main (== SDL_main) back.
626 */
627 extern C_LINKAGE int
628 main (int argc, char *argv[])
629 {
630 deliantra_main (real_main);
631 }
632
633 #undef main
634
635 extern C_LINKAGE int main (int argc, char *argv[]);
636
637 static void
638 SDL_main_hack (SV *real_main_)
639 {
640 real_main = real_main_;
641
642 char *argv[] = { "deliantra client", 0 };
643 (main) (1, argv);
644 }
645#else
646 static void
647 SDL_main_hack (SV *real_main)
648 {
649 deliantra_main (real_main);
650 }
651#endif
524 652
525MODULE = Deliantra::Client PACKAGE = DC 653MODULE = Deliantra::Client PACKAGE = DC
526 654
527PROTOTYPES: ENABLE 655PROTOTYPES: ENABLE
528 656
557 const_iv (SDL_USEREVENT), 685 const_iv (SDL_USEREVENT),
558 686
559 const_iv (SDL_APPINPUTFOCUS), 687 const_iv (SDL_APPINPUTFOCUS),
560 const_iv (SDL_APPMOUSEFOCUS), 688 const_iv (SDL_APPMOUSEFOCUS),
561 const_iv (SDL_APPACTIVE), 689 const_iv (SDL_APPACTIVE),
690
691
692 const_iv (SDLK_UNKNOWN),
693 const_iv (SDLK_FIRST),
694 const_iv (SDLK_BACKSPACE),
695 const_iv (SDLK_TAB),
696 const_iv (SDLK_CLEAR),
697 const_iv (SDLK_RETURN),
698 const_iv (SDLK_PAUSE),
699 const_iv (SDLK_ESCAPE),
700 const_iv (SDLK_SPACE),
701 const_iv (SDLK_EXCLAIM),
702 const_iv (SDLK_QUOTEDBL),
703 const_iv (SDLK_HASH),
704 const_iv (SDLK_DOLLAR),
705 const_iv (SDLK_AMPERSAND),
706 const_iv (SDLK_QUOTE),
707 const_iv (SDLK_LEFTPAREN),
708 const_iv (SDLK_RIGHTPAREN),
709 const_iv (SDLK_ASTERISK),
710 const_iv (SDLK_PLUS),
711 const_iv (SDLK_COMMA),
712 const_iv (SDLK_MINUS),
713 const_iv (SDLK_PERIOD),
714 const_iv (SDLK_SLASH),
715 const_iv (SDLK_0),
716 const_iv (SDLK_1),
717 const_iv (SDLK_2),
718 const_iv (SDLK_3),
719 const_iv (SDLK_4),
720 const_iv (SDLK_5),
721 const_iv (SDLK_6),
722 const_iv (SDLK_7),
723 const_iv (SDLK_8),
724 const_iv (SDLK_9),
725 const_iv (SDLK_COLON),
726 const_iv (SDLK_SEMICOLON),
727 const_iv (SDLK_LESS),
728 const_iv (SDLK_EQUALS),
729 const_iv (SDLK_GREATER),
730 const_iv (SDLK_QUESTION),
731 const_iv (SDLK_AT),
732
733 const_iv (SDLK_LEFTBRACKET),
734 const_iv (SDLK_BACKSLASH),
735 const_iv (SDLK_RIGHTBRACKET),
736 const_iv (SDLK_CARET),
737 const_iv (SDLK_UNDERSCORE),
738 const_iv (SDLK_BACKQUOTE),
739 const_iv (SDLK_DELETE),
562 740
563 const_iv (SDLK_FIRST), 741 const_iv (SDLK_FIRST),
564 const_iv (SDLK_LAST), 742 const_iv (SDLK_LAST),
565 const_iv (SDLK_KP0), 743 const_iv (SDLK_KP0),
566 const_iv (SDLK_KP1), 744 const_iv (SDLK_KP1),
642 const_iv (KMOD_RMETA), 820 const_iv (KMOD_RMETA),
643 const_iv (KMOD_NUM), 821 const_iv (KMOD_NUM),
644 const_iv (KMOD_CAPS), 822 const_iv (KMOD_CAPS),
645 const_iv (KMOD_MODE), 823 const_iv (KMOD_MODE),
646 824
825 const_iv (KMOD_LRAM),
826
647 const_iv (MIX_DEFAULT_FORMAT), 827 const_iv (MIX_DEFAULT_FORMAT),
648 828
649 const_iv (SDL_INIT_TIMER), 829 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO), 830 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO), 831 const_iv (SDL_INIT_VIDEO),
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 849 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO), 850 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 851 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES), 852 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL), 853 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL) 854 const_iv (SDL_GL_SWAP_CONTROL),
855
856 const_iv (FOW_DARKNESS)
675# undef const_iv 857# undef const_iv
676 }; 858 };
677 859
678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 860 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 861 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
680 862
681 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 863 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
682 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 864 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
683} 865}
684 866
700NV ceil (NV x) 882NV ceil (NV x)
701 883
702IV minpot (UV n) 884IV minpot (UV n)
703 885
704IV popcount (UV n) 886IV popcount (UV n)
887
888NV distance (NV dx, NV dy)
889 CODE:
890 RETVAL = pow (dx * dx + dy * dy, 0.5);
891 OUTPUT:
892 RETVAL
705 893
706void 894void
707pango_init () 895pango_init ()
708 CODE: 896 CODE:
709{ 897{
717#endif 905#endif
718} 906}
719 907
720char *SDL_GetError () 908char *SDL_GetError ()
721 909
910void SDL_main_hack (SV *real_main)
911 PROTOTYPE: &
912
722int SDL_Init (U32 flags) 913int SDL_Init (U32 flags)
723 914
724int SDL_InitSubSystem (U32 flags) 915int SDL_InitSubSystem (U32 flags)
725 916
726void SDL_QuitSubSystem (U32 flags) 917void SDL_QuitSubSystem (U32 flags)
727 918
728void SDL_Quit () 919void SDL_Quit ()
729 920
730int SDL_GL_SetAttribute (int attr, int value) 921int SDL_GL_SetAttribute (int attr, int value)
922 C_ARGS: (SDL_GLattr)attr, value
731 923
732int SDL_GL_GetAttribute (int attr) 924int SDL_GL_GetAttribute (int attr)
733 CODE: 925 CODE:
734 if (SDL_GL_GetAttribute (attr, &RETVAL)) 926 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
735 XSRETURN_UNDEF; 927 XSRETURN_UNDEF;
736 OUTPUT: 928 OUTPUT:
737 RETVAL 929 RETVAL
738 930
739void 931void
794 ); 986 );
795 987
796 if (RETVAL) 988 if (RETVAL)
797 { 989 {
798 av_clear (texture_av); 990 av_clear (texture_av);
799
800 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
801#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 991#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
802#include "glfunc.h" 992#include "glfunc.h"
803#undef GL_FUNC 993#undef GL_FUNC
994 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
995 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
804 } 996 }
805} 997}
806 OUTPUT: 998 OUTPUT:
807 RETVAL 999 RETVAL
1000
1001void
1002SDL_WM_SetCaption (const char *title, const char *icon)
808 1003
809void 1004void
810SDL_GL_SwapBuffers () 1005SDL_GL_SwapBuffers ()
811 1006
812char * 1007char *
813SDL_GetKeyName (int sym) 1008SDL_GetKeyName (int sym)
1009 C_ARGS: (SDLKey)sym
814 1010
815int 1011int
816SDL_GetAppState () 1012SDL_GetAppState ()
817 1013
818int 1014int
819SDL_GetModState () 1015SDL_GetModState ()
820 1016
1017int
1018SDL_WaitEvent ()
1019 C_ARGS: 0
1020
821void 1021void
1022SDL_PumpEvents ()
1023
1024void
822poll_events () 1025peep_events ()
823 PPCODE: 1026 PPCODE:
824{ 1027{
825 SDL_Event ev; 1028 SDL_Event ev;
826 1029
827 SDL_PumpEvents (); 1030 SDL_PumpEvents ();
834 { 1037 {
835 case SDL_KEYDOWN: 1038 case SDL_KEYDOWN:
836 case SDL_KEYUP: 1039 case SDL_KEYUP:
837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1040 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1041 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
839 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1042 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
840 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1043 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1044 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
842 break; 1045 break;
843 1046
844 case SDL_ACTIVEEVENT: 1047 case SDL_ACTIVEEVENT:
845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1048 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
863 x = ev.motion.x; 1066 x = ev.motion.x;
864 y = ev.motion.y; 1067 y = ev.motion.y;
865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1068 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
866 } 1069 }
867 1070
868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1071 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
869 hv_store (hv, "state", 5, newSViv (state), 0); 1072 hv_store (hv, "state", 5, newSViv (state), 0);
870 hv_store (hv, "x", 1, newSViv (x), 0); 1073 hv_store (hv, "x", 1, newSViv (x), 0);
871 hv_store (hv, "y", 1, newSViv (y), 0); 1074 hv_store (hv, "y", 1, newSViv (y), 0);
872 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1075 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
873 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1076 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
893 1096
894 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1097 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
895 } 1098 }
896} 1099}
897 1100
1101char *
1102SDL_AudioDriverName ()
1103 CODE:
1104{
1105 char buf [256];
1106 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1107 XSRETURN_UNDEF;
1108
1109 RETVAL = buf;
1110}
1111 OUTPUT:
1112 RETVAL
1113
898int 1114int
899Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1115Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
900 POSTCALL: 1116 POSTCALL:
901 Mix_HookMusicFinished (music_finished); 1117 Mix_HookMusicFinished (music_finished);
902 Mix_ChannelFinished (channel_finished); 1118 Mix_ChannelFinished (channel_finished);
903 1119
904void 1120void
905Mix_QuerySpec () 1121Mix_QuerySpec ()
964add_font (char *file) 1180add_font (char *file)
965 CODE: 1181 CODE:
966 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1182 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
967 OUTPUT: 1183 OUTPUT:
968 RETVAL 1184 RETVAL
1185
1186void
1187IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1188
1189# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1190void
1191Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
969 1192
970void 1193void
971load_image_inline (SV *image_) 1194load_image_inline (SV *image_)
972 ALIAS: 1195 ALIAS:
973 load_image_file = 1 1196 load_image_file = 1
1019 1242
1020 SDL_LockSurface (surface2); 1243 SDL_LockSurface (surface2);
1021 EXTEND (SP, 6); 1244 EXTEND (SP, 6);
1022 PUSHs (sv_2mortal (newSViv (surface2->w))); 1245 PUSHs (sv_2mortal (newSViv (surface2->w)));
1023 PUSHs (sv_2mortal (newSViv (surface2->h))); 1246 PUSHs (sv_2mortal (newSViv (surface2->h)));
1024 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1247 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1025 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1248 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1026 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1249 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1027 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1250 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1028 SDL_UnlockSurface (surface2); 1251 SDL_UnlockSurface (surface2);
1029 1252
1089#if DEBUG 1312#if DEBUG
1090 VALGRIND_DO_LEAK_CHECK; 1313 VALGRIND_DO_LEAK_CHECK;
1091#endif 1314#endif
1092} 1315}
1093 1316
1317int
1318SvREFCNT (SV *sv)
1319 CODE:
1320 RETVAL = SvREFCNT (sv);
1321 OUTPUT:
1322 RETVAL
1323
1094MODULE = Deliantra::Client PACKAGE = DC::Font 1324MODULE = Deliantra::Client PACKAGE = DC::Font
1095 1325
1096PROTOTYPES: DISABLE 1326PROTOTYPES: DISABLE
1097 1327
1098DC::Font 1328DC::Font
1099new_from_file (SV *class, char *path, int id = 0) 1329new_from_file (SV *klass, char *path, int id = 0)
1100 CODE: 1330 CODE:
1101{ 1331{
1102 int count; 1332 int count;
1103 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1333 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1104 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1334 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1133 PROTOTYPE: 1363 PROTOTYPE:
1134 CODE: 1364 CODE:
1135 tc_restore (); 1365 tc_restore ();
1136 1366
1137DC::Layout 1367DC::Layout
1138new (SV *class) 1368new (SV *klass)
1139 CODE: 1369 CODE:
1140 New (0, RETVAL, 1, struct cf_layout); 1370 RETVAL = new cf_layout;
1141 1371
1142 RETVAL->pl = pango_layout_new (opengl_context); 1372 RETVAL->pl = pango_layout_new (opengl_context);
1143 RETVAL->r = 1.; 1373 RETVAL->r = 1.;
1144 RETVAL->g = 1.; 1374 RETVAL->g = 1.;
1145 RETVAL->b = 1.; 1375 RETVAL->b = 1.;
1146 RETVAL->a = 1.; 1376 RETVAL->a = 1.;
1147 RETVAL->base_height = MIN_FONT_HEIGHT; 1377 RETVAL->base_height = MIN_FONT_HEIGHT;
1148 RETVAL->font = 0; 1378 RETVAL->font = 0;
1149 RETVAL->rc = rc_alloc ();
1150 1379
1151 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1380 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1152 layout_update_font (RETVAL); 1381 layout_update_font (RETVAL);
1153 OUTPUT: 1382 OUTPUT:
1154 RETVAL 1383 RETVAL
1155 1384
1156void 1385void
1157DESTROY (DC::Layout self) 1386DESTROY (DC::Layout self)
1158 CODE: 1387 CODE:
1159 g_object_unref (self->pl); 1388 g_object_unref (self->pl);
1160 rc_free (self->rc);
1161 Safefree (self); 1389 delete self;
1162 1390
1163void 1391void
1164set_text (DC::Layout self, SV *text_) 1392set_text (DC::Layout self, SV *text_)
1165 CODE: 1393 CODE:
1166{ 1394{
1292 1520
1293void 1521void
1294set_height (DC::Layout self, int base_height) 1522set_height (DC::Layout self, int base_height)
1295 CODE: 1523 CODE:
1296 if (self->base_height != base_height) 1524 if (self->base_height != base_height)
1297 { 1525 {
1298 self->base_height = base_height; 1526 self->base_height = base_height;
1299 layout_update_font (self); 1527 layout_update_font (self);
1300 } 1528 }
1301 1529
1302void 1530void
1420} 1648}
1421 1649
1422void 1650void
1423render (DC::Layout self, float x, float y, int flags = 0) 1651render (DC::Layout self, float x, float y, int flags = 0)
1424 CODE: 1652 CODE:
1425 rc_clear (self->rc); 1653 self->rc.clear ();
1426 pango_opengl_render_layout_subpixel ( 1654 pango_opengl_render_layout_subpixel (
1427 self->pl, 1655 self->pl,
1428 self->rc, 1656 &self->rc,
1429 x * PANGO_SCALE, y * PANGO_SCALE, 1657 x * PANGO_SCALE, y * PANGO_SCALE,
1430 self->r, self->g, self->b, self->a, 1658 self->r, self->g, self->b, self->a,
1431 flags 1659 flags
1432 ); 1660 );
1433 // we assume that context_change actually clears/frees stuff 1661 // we assume that context_change actually clears/frees stuff
1444 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 1672 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1445 GL_ONE , GL_ONE_MINUS_SRC_ALPHA); 1673 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1446 glEnable (GL_ALPHA_TEST); 1674 glEnable (GL_ALPHA_TEST);
1447 glAlphaFunc (GL_GREATER, 7.f / 255.f); 1675 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1448 1676
1449 rc_draw (self->rc); 1677 self->rc.draw ();
1450 1678
1451 glDisable (GL_ALPHA_TEST); 1679 glDisable (GL_ALPHA_TEST);
1452 glDisable (GL_BLEND); 1680 glDisable (GL_BLEND);
1453 glDisable (GL_TEXTURE_2D); 1681 glDisable (GL_TEXTURE_2D);
1454} 1682}
1529 glDisable (GL_ALPHA_TEST); 1757 glDisable (GL_ALPHA_TEST);
1530 glDisable (GL_BLEND); 1758 glDisable (GL_BLEND);
1531 } 1759 }
1532} 1760}
1533 1761
1762void
1763draw_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)
1764 PROTOTYPE: @
1765 CODE:
1766{
1767 glEnable (GL_BLEND);
1768 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1769 glEnable (GL_TEXTURE_2D);
1770 glBindTexture (GL_TEXTURE_2D, name1);
1771
1772 glColor3f (intensity, intensity, intensity);
1773 glPushMatrix ();
1774 glScalef (1./3, 1./3, 1.);
1775
1776 if (blend > 0.f)
1777 {
1778 float dx3 = dx * -3.f / w;
1779 float dy3 = dy * -3.f / h;
1780 GLfloat env_color[4] = { 0., 0., 0., blend };
1781
1782 /* interpolate the two shadow textures */
1783 /* stage 0 == rgb(glcolor) + alpha(t0) */
1784 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1785
1786 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1787 gl.ActiveTexture (GL_TEXTURE1);
1788 glEnable (GL_TEXTURE_2D);
1789 glBindTexture (GL_TEXTURE_2D, name2);
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1791
1792 /* rgb == rgb(glcolor) */
1793 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1794 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1795 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1796
1797 /* alpha = interpolate t0, t1 by env_alpha */
1798 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1799
1800 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1802 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1803
1804 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1805 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1806
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1809
1810 glBegin (GL_QUADS);
1811 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1812 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1813 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1814 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1815 glEnd ();
1816
1817 glDisable (GL_TEXTURE_2D);
1818 gl.ActiveTexture (GL_TEXTURE0);
1819 }
1820 else
1821 {
1822 /* simple blending of one texture, also opengl <1.3 path */
1823 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1824
1825 glBegin (GL_QUADS);
1826 glTexCoord2f (0, 0); glVertex2f (0, 0);
1827 glTexCoord2f (0, t); glVertex2f (0, h);
1828 glTexCoord2f (s, t); glVertex2f (w, h);
1829 glTexCoord2f (s, 0); glVertex2f (w, 0);
1830 glEnd ();
1831 }
1832
1833 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1834 {
1835 int x, y;
1836 int dx3 = dx * 3;
1837 int dy3 = dy * 3;
1838
1839 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1840 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1841 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1842 glTranslatef (-1., -1., 0);
1843 glBegin (GL_QUADS);
1844
1845 for (y = 1; y < h; y += 3)
1846 {
1847 int y1 = y - dy3;
1848 int y1valid = y1 >= 0 && y1 < h;
1849
1850 for (x = 1; x < w; x += 3)
1851 {
1852 int x1 = x - dx3;
1853 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1854 uint8_t h2;
1855
1856 if (y1valid && x1 >= 0 && x1 < w)
1857 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1858 else
1859 h2 = 1; /* out of range == invisible */
1860
1861 if (h1 || h2)
1862 {
1863 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1864 glColor4f (1., 1., 1., alpha);
1865
1866 glTexCoord2f (0, 0.); glVertex2i (x , y );
1867 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1868 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1869 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1870 }
1871 }
1872 }
1873 }
1874
1875 glEnd ();
1876
1877 glPopMatrix ();
1878
1879 glDisable (GL_TEXTURE_2D);
1880 glDisable (GL_BLEND);
1881}
1882
1534IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1883IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1535 CODE: 1884 CODE:
1536{ 1885{
1537 GLint width; 1886 GLint width;
1538 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1887 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1545MODULE = Deliantra::Client PACKAGE = DC::Map 1894MODULE = Deliantra::Client PACKAGE = DC::Map
1546 1895
1547PROTOTYPES: DISABLE 1896PROTOTYPES: DISABLE
1548 1897
1549DC::Map 1898DC::Map
1550new (SV *class) 1899new (SV *klass)
1551 CODE: 1900 CODE:
1552 New (0, RETVAL, 1, struct map); 1901 New (0, RETVAL, 1, mapgrid);
1553 RETVAL->x = 0; 1902 RETVAL->x = 0;
1554 RETVAL->y = 0; 1903 RETVAL->y = 0;
1555 RETVAL->w = 0; 1904 RETVAL->w = 0;
1556 RETVAL->h = 0; 1905 RETVAL->h = 0;
1557 RETVAL->ox = 0; 1906 RETVAL->ox = 0;
1594 1943
1595void 1944void
1596set_smooth (DC::Map self, int face, int smooth, int level) 1945set_smooth (DC::Map self, int face, int smooth, int level)
1597 CODE: 1946 CODE:
1598{ 1947{
1599 tileid texid; 1948 tileid texid;
1600 maptex *tex; 1949 maptex *tex;
1601 1950
1602 if (face < 0 || face >= self->faces) 1951 if (face < 0 || face >= self->faces)
1603 return; 1952 return;
1604 1953
1605 if (smooth < 0 || smooth >= self->faces) 1954 if (smooth < 0 || smooth >= self->faces)
1606 return; 1955 return;
1607 1956
1608 texid = self->face2tile [face]; 1957 texid = self->face2tile [face];
1609 1958
1610 if (!texid) 1959 if (!texid)
1611 return; 1960 return;
1612 1961
1613 tex = self->tex + texid; 1962 tex = self->tex + texid;
1642 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1991 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1643 // use uglier nearest interpolation because linear suffers 1992 // use uglier nearest interpolation because linear suffers
1644 // from transparent color bleeding and ugly wrapping effects. 1993 // from transparent color bleeding and ugly wrapping effects.
1645 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1994 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1646} 1995}
1996
1997void
1998expire_textures (DC::Map self, int texid, int count)
1999 PPCODE:
2000 for (; texid < self->texs && count; ++texid, --count)
2001 {
2002 maptex *tex = self->tex + texid;
2003
2004 if (tex->name)
2005 {
2006 if (tex->unused)
2007 {
2008 tex->name = 0;
2009 tex->unused = 0;
2010 XPUSHs (sv_2mortal (newSViv (texid)));
2011 }
2012 else
2013 tex->unused = 1;
2014 }
2015 }
1647 2016
1648int 2017int
1649ox (DC::Map self) 2018ox (DC::Map self)
1650 ALIAS: 2019 ALIAS:
1651 oy = 1 2020 oy = 1
1683 self->ox += dx; self->x += dx; 2052 self->ox += dx; self->x += dx;
1684 self->oy += dy; self->y += dy; 2053 self->oy += dy; self->y += dy;
1685 2054
1686 while (self->y < 0) 2055 while (self->y < 0)
1687 { 2056 {
1688 Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y); 2057 prepend (self->row, self->rows, MAP_EXTEND_Y);
1689 2058
1690 self->rows += MAP_EXTEND_Y; 2059 self->rows += MAP_EXTEND_Y;
1691 self->y += MAP_EXTEND_Y; 2060 self->y += MAP_EXTEND_Y;
1692 } 2061 }
1693} 2062}
1694 2063
1695SV * 2064SV *
1696map1a_update (DC::Map self, SV *data_, int extmap) 2065map1a_update (DC::Map self, SV *data_)
1697 CODE: 2066 CODE:
1698{ 2067{
1699 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2068 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1700 uint8_t *data_end = (uint8_t *)SvEND (data_); 2069 uint8_t *data_end = (uint8_t *)SvEND (data_);
1701 mapcell *cell; 2070 mapcell *cell;
1722 2091
1723 //TODO: don't trust server data to be in-range(!) 2092 //TODO: don't trust server data to be in-range(!)
1724 2093
1725 if (flags & 8) 2094 if (flags & 8)
1726 { 2095 {
2096 uint8_t ext, cmd;
2097
1727 if (extmap) 2098 do
1728 { 2099 {
1729 uint8_t ext, cmd; 2100 ext = *data++;
2101 cmd = ext & 0x7f;
1730 2102
1731 do 2103 if (cmd < 4)
2104 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2105 else if (cmd == 5) // health
1732 { 2106 {
1733 ext = *data++;
1734 cmd = ext & 0x7f;
1735
1736 if (cmd < 4)
1737 cell->darkness = 255 - ext * 64 + 1;
1738 else if (cmd == 5) // health
1739 {
1740 cell->stat_width = 1; 2107 cell->stat_width = 1;
1741 cell->stat_hp = *data++; 2108 cell->stat_hp = *data++;
1742 }
1743 else if (cmd == 6) // monster width
1744 cell->stat_width = *data++ + 1;
1745 else if (cmd == 0x47)
1746 {
1747 if (*data == 1) cell->player = data [1];
1748 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1749 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1750 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1751
1752 data += *data + 1;
1753 }
1754 else if (cmd == 8) // cell flags
1755 cell->flags = *data++;
1756 else if (ext & 0x40) // unknown, multibyte => skip
1757 data += *data + 1;
1758 else
1759 data++;
1760 } 2109 }
1761 while (ext & 0x80); 2110 else if (cmd == 6) // monster width
2111 cell->stat_width = *data++ + 1;
2112 else if (cmd == 0x47)
2113 {
2114 if (*data == 1) cell->player = data [1];
2115 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2116 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2117 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2118
2119 data += *data + 1;
2120 }
2121 else if (cmd == 8) // cell flags
2122 cell->flags = *data++;
2123 else if (ext & 0x40) // unknown, multibyte => skip
2124 data += *data + 1;
2125 else
2126 data++;
1762 } 2127 }
1763 else 2128 while (ext & 0x80);
1764 cell->darkness = *data++ + 1;
1765 } 2129 }
1766 2130
1767 for (z = 0; z <= 2; ++z) 2131 for (z = 0; z <= 2; ++z)
1768 if (flags & (4 >> z)) 2132 if (flags & (4 >> z))
1769 { 2133 {
1772 cell->tile [z] = self->face2tile [face]; 2136 cell->tile [z] = self->face2tile [face];
1773 2137
1774 if (cell->tile [z]) 2138 if (cell->tile [z])
1775 { 2139 {
1776 maptex *tex = self->tex + cell->tile [z]; 2140 maptex *tex = self->tex + cell->tile [z];
2141 tex->unused = 0;
1777 if (!tex->name) 2142 if (!tex->name)
1778 av_push (missing, newSViv (cell->tile [z])); 2143 av_push (missing, newSViv (cell->tile [z]));
1779 2144
1780 if (tex->smoothtile) 2145 if (tex->smoothtile)
1781 { 2146 {
1782 maptex *smooth = self->tex + tex->smoothtile; 2147 maptex *smooth = self->tex + tex->smoothtile;
2148 smooth->unused = 0;
1783 if (!smooth->name) 2149 if (!smooth->name)
1784 av_push (missing, newSViv (tex->smoothtile)); 2150 av_push (missing, newSViv (tex->smoothtile));
1785 } 2151 }
1786 } 2152 }
1787 } 2153 }
1815 ? self->row + y 2181 ? self->row + y
1816 : 0; 2182 : 0;
1817 2183
1818 for (x = x0; x < x1; x++) 2184 for (x = x0; x < x1; x++)
1819 { 2185 {
1820 int r = 32, g = 32, b = 32, a = 192; 2186 unsigned int r = 32, g = 32, b = 32, a = 192;
1821 2187
1822 if (row && row->c0 <= x && x < row->c1) 2188 if (row && row->c0 <= x && x < row->c1)
1823 { 2189 {
1824 mapcell *cell = row->col + (x - row->c0); 2190 mapcell *cell = row->col + (x - row->c0);
1825 2191
1827 { 2193 {
1828 maptex tex = self->tex [cell->tile [z]]; 2194 maptex tex = self->tex [cell->tile [z]];
1829 int a0 = 255 - tex.a; 2195 int a0 = 255 - tex.a;
1830 int a1 = tex.a; 2196 int a1 = tex.a;
1831 2197
1832 r = (r * a0 + tex.r * a1) / 255; 2198 r = div255 (r * a0 + tex.r * a1);
1833 g = (g * a0 + tex.g * a1) / 255; 2199 g = div255 (g * a0 + tex.g * a1);
1834 b = (b * a0 + tex.b * a1) / 255; 2200 b = div255 (b * a0 + tex.b * a1);
1835 a = (a * a0 + tex.a * a1) / 255; 2201 a = div255 (a * a0 + tex.a * a1);
1836 } 2202 }
1837 } 2203 }
1838 2204
1839 *map++ = (r ) 2205 *map++ = (r )
1840 | (g << 8) 2206 | (g << 8)
1841 | (b << 16) 2207 | (b << 16)
1842 | (a << 24); 2208 | (a << 24);
1843 } 2209 }
1844 } 2210 }
1845 2211
1846 RETVAL = map_sv; 2212 RETVAL = map_sv;
1847} 2213}
1848 OUTPUT: 2214 OUTPUT:
1849 RETVAL 2215 RETVAL
1850 2216
1851void 2217void
1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2218draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1853 CODE: 2219 CODE:
1854{ 2220{
1855 int x, y, z; 2221 int x, y, z;
1856 2222
1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1858 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2223 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1860 smooth_key skey;
1861 int pl_x, pl_y; 2224 int pl_x, pl_y;
1862 maptex pl_tex; 2225 maptex pl_tex;
1863 rc_t *rc = rc_alloc (); 2226 rc_t rc;
2227 rc_t rc_ov;
1864 rc_key_t key; 2228 rc_key_t key;
1865 rc_array_t *arr; 2229 rc_t::array_t *arr;
1866 2230
1867 pl_tex.name = 0; 2231 pl_tex.name = 0;
1868 2232
1869 // thats current max. sorry. 2233 // that's current max. sorry.
1870 if (sw > 255) sw = 255; 2234 if (sw > 255) sw = 255;
1871 if (sh > 255) sh = 255; 2235 if (sh > 255) sh = 255;
1872
1873 // clear key, in case of extra padding
1874 memset (&skey, 0, sizeof (skey));
1875 2236
1876 memset (&key, 0, sizeof (key)); 2237 memset (&key, 0, sizeof (key));
1877 key.r = 255; 2238 key.r = 255;
1878 key.g = 255; 2239 key.g = 255;
1879 key.b = 255; 2240 key.b = 255;
1880 key.a = 255; 2241 key.a = 255;
1881 key.mode = GL_QUADS; 2242 key.mode = GL_QUADS;
1882 key.format = GL_T2F_V3F; 2243 key.format = GL_T2F_V3F;
1883 key.texname = -1;
1884 2244
1885 mx += self->x; 2245 mx += self->x;
1886 my += self->y; 2246 my += self->y;
1887 2247
1888 // first pass: determine smooth_max 2248 // first pass: determine smooth_max
1889 // rather ugly, if you ask me 2249 // rather ugly, if you ask me
1890 // could also be stored inside mapcell and updated on change 2250 // could also be stored inside mapcell and updated on change
1891 memset (smooth_max, 0, sizeof (smooth_max)); 2251 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1892 2252
1893 for (y = 0; y < sh; y++) 2253 for (y = 0; y < sh; y++)
1894 if (0 <= y + my && y + my < self->rows) 2254 if (0 <= y + my && y + my < self->rows)
1895 { 2255 {
1896 maprow *row = self->row + (y + my); 2256 maprow *row = self->row + (y + my);
1911 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2271 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1912 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2272 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1913 2273
1914 for (z = 0; z <= 2; z++) 2274 for (z = 0; z <= 2; z++)
1915 { 2275 {
1916 memset (smooth_level, 0, sizeof (smooth_level)); 2276 std::bitset<256> smooth_level; // one bit for every possible smooth level
2277 smooth_key skey;
2278 smooth_hash smooth;
2279 key.texname = -1;
1917 2280
1918 for (y = 0; y < sh; y++) 2281 for (y = 0; y < sh; y++)
1919 if (0 <= y + my && y + my < self->rows) 2282 if (0 <= y + my && y + my < self->rows)
1920 { 2283 {
1921 maprow *row = self->row + (y + my); 2284 maprow *row = self->row + (y + my);
1927 tileid tile = cell->tile [z]; 2290 tileid tile = cell->tile [z];
1928 2291
1929 if (tile) 2292 if (tile)
1930 { 2293 {
1931 maptex tex = self->tex [tile]; 2294 maptex tex = self->tex [tile];
1932 int px = (x + 1) * T - tex.w; 2295 int px, py;
1933 int py = (y + 1) * T - tex.h;
1934 2296
1935 if (key.texname != tex.name) 2297 if (key.texname != tex.name)
1936 { 2298 {
2299 self->tex [tile].unused = 0;
2300
1937 if (!tex.name) 2301 if (!tex.name)
1938 tex = self->tex [2]; /* missing, replace by noface */ 2302 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1939 2303
1940 key.texname = tex.name; 2304 key.texname = tex.name;
1941 arr = rc_array (rc, &key); 2305 arr = &rc.array (key);
1942 } 2306 }
2307
2308 px = (x + 1) * Th - tex.w;
2309 py = (y + 1) * Tw - tex.h;
1943 2310
1944 if (expect_false (cell->player == player) && expect_false (z == 2)) 2311 if (expect_false (cell->player == player) && expect_false (z == 2))
1945 { 2312 {
1946 pl_x = px; 2313 pl_x = px;
1947 pl_y = py; 2314 pl_y = py;
1948 pl_tex = tex; 2315 pl_tex = tex;
1949 continue; 2316 continue;
1950 } 2317 }
1951 2318
1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2319 arr->t2f_v3f (0 , 0 , px , py , 0);
1953 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2320 arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
1954 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2321 arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2322 arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
1956
1957 if (expect_false (cell->flags) && expect_false (z == 2))
1958 {
1959 // overlays such as the speech bubble, probably more to come
1960 if (cell->flags & 1)
1961 {
1962 maptex tex = self->tex [1];
1963 int px = x * T + T * 2 / 32;
1964 int py = y * T - T * 6 / 32;
1965
1966 if (tex.name)
1967 {
1968 if (key.texname != tex.name)
1969 {
1970 key.texname = tex.name;
1971 arr = rc_array (rc, &key);
1972 }
1973
1974 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1975 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1976 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1977 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1978 }
1979 }
1980 }
1981 2323
1982 // update smooth hash 2324 // update smooth hash
1983 if (tex.smoothtile) 2325 if (tex.smoothtile)
1984 { 2326 {
1985 skey.tile = tex.smoothtile; 2327 skey.tile = tex.smoothtile;
1986 skey.level = tex.smoothlevel; 2328 skey.level = tex.smoothlevel;
1987 2329
1988 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2330 smooth_level[tex.smoothlevel] = 1;
1989 2331
1990 // add bits to current tile and all neighbours. skey.x|y is 2332 // add bits to current tile and all neighbours. skey.x|y is
1991 // shifted +1|+1 so we always stay positive. 2333 // shifted +1|+1 so we always stay positive.
1992 2334
1993 // bits is ___n cccc CCCC bbbb 2335 // bits is ___n cccc CCCC bbbb
2001 2343
2002 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2344 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2003 // ·· ·· ·┏ ┓· 2345 // ·· ·· ·┏ ┓·
2004 2346
2005 // full tile 2347 // full tile
2006 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2348 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2007 2349
2008 // borders 2350 // borders
2009 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2351 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2010 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2352 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2011 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2353 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2012 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2354 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2013 2355
2014 // corners 2356 // corners
2015 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2357 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2016 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2358 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2017 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2359 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2018 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2360 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2361 }
2362 }
2363
2364 if (expect_false (z == 2) && expect_false (cell->flags))
2365 {
2366 // overlays such as the speech bubble, probably more to come
2367 if (cell->flags & 1)
2368 {
2369 rc_key_t key_ov = key;
2370 maptex tex = self->tex[TEXID_SPEECH];
2371 int px = x * Tw + Tw * 2 / 32;
2372 int py = y * Th - Th * 6 / 32;
2373
2374 key_ov.texname = tex.name;
2375 rc_t::array_t &arr = rc_ov.array (key_ov);
2376
2377 arr.t2f_v3f (0 , 0 , px , py , 0);
2378 arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2379 arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2380 arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2019 } 2381 }
2020 } 2382 }
2021 } 2383 }
2022 } 2384 }
2023 2385
2024 rc_draw (rc); 2386 rc.draw ();
2025 rc_clear (rc); 2387 rc.clear ();
2026 2388
2027 // go through all smoothlevels, lowest to highest, then draw. 2389 // go through all smoothlevels, lowest to highest, then draw.
2028 // this is basically counting sort 2390 // this is basically counting sort
2029 { 2391 {
2030 int w, b; 2392 int w, b;
2031 2393
2032 glEnable (GL_TEXTURE_2D); 2394 glEnable (GL_TEXTURE_2D);
2033 glBegin (GL_QUADS); 2395 glBegin (GL_QUADS);
2034 for (w = 0; w < 256 / 32; ++w) 2396 for (int level = 0; level < smooth_level.size (); ++level)
2397 if (smooth_level[level])
2398 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2035 { 2399 {
2036 uint32_t smask = smooth_level [w]; 2400 smooth_key &skey = it->first;
2037 if (smask) 2401 IV bits = it->second;
2038 for (b = 0; b < 32; ++b) 2402
2039 if (smask & (((uint32_t)1) << b)) 2403 if (!(bits & 0x1000)
2404 && skey.level == level
2405 && level > smooth_max [skey.x][skey.y])
2040 { 2406 {
2041 int level = (w << 5) | b; 2407 maptex tex = self->tex [skey.tile];
2408 int px = (((int)skey.x) - 1) * Tw;
2409 int py = (((int)skey.y) - 1) * Th;
2410 int border = bits & 15;
2411 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2412 float dx = tex.s * .0625f; // 16 images/row
2413 float dy = tex.t * .5f ; // 2 images/column
2414
2042 HE *he; 2415 if (tex.name)
2043
2044 hv_iterinit (smooth);
2045 while ((he = hv_iternext (smooth)))
2046 { 2416 {
2047 smooth_key *skey = (smooth_key *)HeKEY (he); 2417 // this time avoiding texture state changes
2048 IV bits = SvIVX (HeVAL (he)); 2418 // save gobs of state changes.
2049 2419 if (key.texname != tex.name)
2050 if (!(bits & 0x1000)
2051 && skey->level == level
2052 && level > smooth_max [skey->x][skey->y])
2053 { 2420 {
2054 maptex tex = self->tex [skey->tile]; 2421 self->tex [skey.tile].unused = 0;
2055 int px = (((int)skey->x) - 1) * T;
2056 int py = (((int)skey->y) - 1) * T;
2057 int border = bits & 15;
2058 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2059 float dx = tex.s * .0625f; // 16 images/row
2060 float dy = tex.t * .5f ; // 2 images/column
2061 2422
2062 if (tex.name)
2063 {
2064 // this time avoiding texture state changes
2065 // save gobs of state changes.
2066 if (key.texname != tex.name)
2067 {
2068 glEnd (); 2423 glEnd ();
2069 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2424 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2070 glBegin (GL_QUADS); 2425 glBegin (GL_QUADS);
2071 } 2426 }
2072 2427
2073 if (border) 2428 if (border)
2074 { 2429 {
2075 float ox = border * dx; 2430 float ox = border * dx;
2076 2431
2077 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2432 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2078 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2079 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2080 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2435 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2081 } 2436 }
2082 2437
2083 if (corner) 2438 if (corner)
2084 { 2439 {
2085 float ox = corner * dx; 2440 float ox = corner * dx;
2086 2441
2087 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2442 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2088 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2443 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2089 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2444 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2090 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2445 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2091 }
2092 }
2093 } 2446 }
2094 } 2447 }
2095 } 2448 }
2096 } 2449 }
2097 2450
2098 glEnd (); 2451 glEnd ();
2099 glDisable (GL_TEXTURE_2D); 2452 glDisable (GL_TEXTURE_2D);
2100 key.texname = -1; 2453 key.texname = -1;
2101 } 2454 }
2102
2103 hv_clear (smooth);
2104 } 2455 }
2105 2456
2106 if (pl_tex.name) 2457 if (pl_tex.name)
2107 { 2458 {
2108 maptex tex = pl_tex; 2459 maptex tex = pl_tex;
2109 int px = pl_x + sdx; 2460 int px = pl_x + sdx;
2110 int py = pl_y + sdy; 2461 int py = pl_y + sdy;
2111 2462
2112 key.texname = tex.name; 2463 key.texname = tex.name;
2113 arr = rc_array (rc, &key); 2464 rc_t::array_t &arr = rc.array (key);
2114 2465
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2466 arr.t2f_v3f (0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2467 arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2468 arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2469 arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2119 2470
2120 rc_draw (rc); 2471 rc.draw ();
2121 } 2472 }
2122 2473
2474 rc_ov.draw ();
2475 rc_ov.clear ();
2476
2123 glDisable (GL_BLEND); 2477 glDisable (GL_BLEND);
2124 rc_free (rc);
2125 2478
2126 // top layer: overlays such as the health bar 2479 // top layer: overlays such as the health bar
2127 for (y = 0; y < sh; y++) 2480 for (y = 0; y < sh; y++)
2128 if (0 <= y + my && y + my < self->rows) 2481 if (0 <= y + my && y + my < self->rows)
2129 { 2482 {
2132 for (x = 0; x < sw; x++) 2485 for (x = 0; x < sw; x++)
2133 if (row->c0 <= x + mx && x + mx < row->c1) 2486 if (row->c0 <= x + mx && x + mx < row->c1)
2134 { 2487 {
2135 mapcell *cell = row->col + (x + mx - row->c0); 2488 mapcell *cell = row->col + (x + mx - row->c0);
2136 2489
2137 int px = x * T; 2490 int px = x * Tw;
2138 int py = y * T; 2491 int py = y * Th;
2492
2493 if (expect_false (cell->player == player))
2494 {
2495 px += sdx;
2496 py += sdy;
2497 }
2139 2498
2140 if (cell->stat_hp) 2499 if (cell->stat_hp)
2141 { 2500 {
2142 int width = cell->stat_width * T; 2501 int width = cell->stat_width * Tw;
2143 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2502 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2144 2503
2145 glColor3ub (0, 0, 0); 2504 glColor3ub (0, 0, 0);
2146 glRectf (px + 1, py - thick - 2, 2505 glRectf (px + 1, py - thick - 2,
2147 px + width - 1, py); 2506 px + width - 1, py);
2148 2507
2154 } 2513 }
2155 } 2514 }
2156} 2515}
2157 2516
2158void 2517void
2159draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2518draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2160 CODE: 2519 CODE:
2161{ 2520{
2162 static float color[16][3] = { 2521 static float color[16][3] = {
2163 { 0.00F, 0.00F, 0.00F }, 2522 { 0.00f, 0.00f, 0.00f },
2164 { 1.00F, 1.00F, 1.00F }, 2523 { 1.00f, 1.00f, 1.00f },
2165 { 0.00F, 0.00F, 0.55F }, 2524 { 0.00f, 0.00f, 0.55f },
2166 { 1.00F, 0.00F, 0.00F }, 2525 { 1.00f, 0.00f, 0.00f },
2167 2526
2168 { 1.00F, 0.54F, 0.00F }, 2527 { 1.00f, 0.54f, 0.00f },
2169 { 0.11F, 0.56F, 1.00F }, 2528 { 0.11f, 0.56f, 1.00f },
2170 { 0.93F, 0.46F, 0.00F }, 2529 { 0.93f, 0.46f, 0.00f },
2171 { 0.18F, 0.54F, 0.34F }, 2530 { 0.18f, 0.54f, 0.34f },
2172 2531
2173 { 0.56F, 0.73F, 0.56F }, 2532 { 0.56f, 0.73f, 0.56f },
2174 { 0.80F, 0.80F, 0.80F }, 2533 { 0.80f, 0.80f, 0.80f },
2175 { 0.55F, 0.41F, 0.13F }, 2534 { 0.55f, 0.41f, 0.13f },
2176 { 0.99F, 0.77F, 0.26F }, 2535 { 0.99f, 0.77f, 0.26f },
2177 2536
2178 { 0.74F, 0.65F, 0.41F }, 2537 { 0.74f, 0.65f, 0.41f },
2179 2538
2180 { 0.00F, 1.00F, 1.00F }, 2539 { 0.00f, 1.00f, 1.00f },
2181 { 1.00F, 0.00F, 1.00F }, 2540 { 1.00f, 0.00f, 1.00f },
2182 { 1.00F, 1.00F, 0.00F }, 2541 { 1.00f, 1.00f, 0.00f },
2183 }; 2542 };
2184 2543
2185 int x, y; 2544 int x, y;
2186 2545
2187 glEnable (GL_TEXTURE_2D); 2546 glEnable (GL_TEXTURE_2D);
2547 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2548 * but the nvidia driver (185.18.14) mishandles alpha textures
2549 * and takes the colour from god knows where instead of using
2550 * Cp. MODULATE results in the same colour, but slightly different
2551 * alpha, but atcually gives us the correct colour with nvidia.
2552 */
2188 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2553 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2189 glEnable (GL_BLEND); 2554 glEnable (GL_BLEND);
2190 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2555 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191 glBegin (GL_QUADS); 2556 glBegin (GL_QUADS);
2192 2557
2193 for (y = 0; y < h; y++) 2558 for (y = 0; y < h; y++)
2197 2562
2198 if (m) 2563 if (m)
2199 { 2564 {
2200 float *c = color [m & 15]; 2565 float *c = color [m & 15];
2201 2566
2202 float tx1 = m & 0x40 ? 0.5 : 0.; 2567 float tx1 = m & 0x40 ? 0.5f : 0.f;
2203 float tx2 = tx1 + 0.5; 2568 float tx2 = tx1 + 0.5f;
2204 2569
2205 glColor4f (c[0], c[1], c[2], 0.75); 2570 glColor4f (c[0], c[1], c[2], 1);
2206 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2571 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2207 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2572 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2208 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2573 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2209 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2574 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2210 } 2575 }
2218void 2583void
2219fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2584fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2220 PPCODE: 2585 PPCODE:
2221{ 2586{
2222 int x, y; 2587 int x, y;
2223 int sw1 = sw + 2; 2588 int sw1 = sw + 2;
2224 int sh1 = sh + 2; 2589 int sh1 = sh + 2;
2225 int sh3 = sh * 3; 2590 int sh3 = sh * 3;
2226 int sw34 = (sw * 3 + 3) & ~3; 2591 int sw3 = sw * 3;
2592 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2593 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2227 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2594 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2228 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2595 memset (darkness1, 0, sw1*sh1);
2229 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2230 2596
2231 SvPOK_only (darkness3_sv); 2597 SvPOK_only (darkness3_sv);
2232 SvCUR_set (darkness3_sv, sw34 * sh3); 2598 SvCUR_set (darkness3_sv, sw3 * sh3);
2233 2599
2234 mx += self->x - 1; 2600 mx += self->x - 1;
2235 my += self->y - 1; 2601 my += self->y - 1;
2236
2237 memset (darkness1, 255, sw1 * sh1);
2238 2602
2239 for (y = 0; y < sh1; y++) 2603 for (y = 0; y < sh1; y++)
2240 if (0 <= y + my && y + my < self->rows) 2604 if (0 <= y + my && y + my < self->rows)
2241 { 2605 {
2242 maprow *row = self->row + (y + my); 2606 maprow *row = self->row + (y + my);
2245 if (row->c0 <= x + mx && x + mx < row->c1) 2609 if (row->c0 <= x + mx && x + mx < row->c1)
2246 { 2610 {
2247 mapcell *cell = row->col + (x + mx - row->c0); 2611 mapcell *cell = row->col + (x + mx - row->c0);
2248 2612
2249 darkness1 [y * sw1 + x] = cell->darkness 2613 darkness1 [y * sw1 + x] = cell->darkness
2250 ? 255 - (cell->darkness - 1) 2614 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2251 : 255 - FOW_DARKNESS; 2615 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2252 } 2616 }
2253 } 2617 }
2254 2618
2255 for (y = 0; y < sh; ++y) 2619 for (y = 0; y < sh; ++y)
2256 for (x = 0; x < sw; ++x) 2620 for (x = 0; x < sw; ++x)
2275 2639
2276 uint8_t r13 = (d13 + d23 + d12) / 3; 2640 uint8_t r13 = (d13 + d23 + d12) / 3;
2277 uint8_t r23 = d23; 2641 uint8_t r23 = d23;
2278 uint8_t r33 = (d23 + d33 + d32) / 3; 2642 uint8_t r33 = (d23 + d33 + d32) / 3;
2279 2643
2280 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2644 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2281 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2645 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2282 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2646 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2283 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2647 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2284 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2648 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2285 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2649 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2286 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2650 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2287 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2651 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2288 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2652 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2289 } 2653 }
2290 2654
2291 free (darkness1); 2655 free (darkness1);
2292 2656
2293 EXTEND (SP, 3); 2657 EXTEND (SP, 3);
2294 PUSHs (sv_2mortal (newSViv (sw34))); 2658 PUSHs (sv_2mortal (newSViv (sw3)));
2295 PUSHs (sv_2mortal (newSViv (sh3))); 2659 PUSHs (sv_2mortal (newSViv (sh3)));
2296 PUSHs (darkness3_sv); 2660 PUSHs (darkness3_sv);
2297} 2661}
2298 2662
2299SV * 2663SV *
2362 else 2726 else
2363 *data++ = 0; 2727 *data++ = 0;
2364 } 2728 }
2365 } 2729 }
2366 2730
2367 /* if size is w*h + 5 then no data has been found */ 2731 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2732 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 { 2733 {
2370 SvPOK_only (data_sv); 2734 SvPOK_only (data_sv);
2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2735 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 } 2736 }
2373 2737
2374 RETVAL = data_sv; 2738 RETVAL = data_sv;
2375} 2739}
2376 OUTPUT: 2740 OUTPUT:
2377 RETVAL 2741 RETVAL
2378 2742
2379void 2743void
2386 STRLEN len; 2750 STRLEN len;
2387 uint8_t *data, *end; 2751 uint8_t *data, *end;
2388 2752
2389 len = SvLEN (data_sv); 2753 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2754 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv); 2755 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2392 end = data + len + 8; 2756 end = data + len + 8;
2393 2757
2394 if (len < 5) 2758 if (len < 5)
2395 XSRETURN_EMPTY; 2759 XSRETURN_EMPTY;
2396 2760
2457} 2821}
2458 2822
2459MODULE = Deliantra::Client PACKAGE = DC::RW 2823MODULE = Deliantra::Client PACKAGE = DC::RW
2460 2824
2461DC::RW 2825DC::RW
2462new (SV *class, SV *data_sv) 2826new (SV *klass, SV *data_sv)
2463 CODE: 2827 CODE:
2464{ 2828{
2465 STRLEN datalen; 2829 STRLEN datalen;
2466 char *data = SvPVbyte (data_sv, datalen); 2830 char *data = SvPVbyte (data_sv, datalen);
2467 2831
2469} 2833}
2470 OUTPUT: 2834 OUTPUT:
2471 RETVAL 2835 RETVAL
2472 2836
2473DC::RW 2837DC::RW
2474new_from_file (SV *class, const char *path, const char *mode = "rb") 2838new_from_file (SV *klass, const char *path, const char *mode = "rb")
2475 CODE: 2839 CODE:
2476 RETVAL = SDL_RWFromFile (path, mode); 2840 RETVAL = SDL_RWFromFile (path, mode);
2477 OUTPUT: 2841 OUTPUT:
2478 RETVAL 2842 RETVAL
2479 2843
2497 if (RETVAL < 0) 2861 if (RETVAL < 0)
2498 { 2862 {
2499 RETVAL = Mix_GroupOldest (-1); 2863 RETVAL = Mix_GroupOldest (-1);
2500 2864
2501 if (RETVAL < 0) 2865 if (RETVAL < 0)
2866 {
2867 // happens sometimes, maybe it just stopped playing(?)
2868 RETVAL = Mix_GroupAvailable (-1);
2869
2870 if (RETVAL < 0)
2502 XSRETURN_UNDEF; 2871 XSRETURN_UNDEF;
2503 2872 }
2873 else
2504 Mix_HaltChannel (RETVAL); 2874 Mix_HaltChannel (RETVAL);
2505 } 2875 }
2506 2876
2507 Mix_UnregisterAllEffects (RETVAL); 2877 Mix_UnregisterAllEffects (RETVAL);
2508 Mix_Volume (RETVAL, 128); 2878 Mix_Volume (RETVAL, 128);
2509} 2879}
2556void 2926void
2557set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2927set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2558 CODE: 2928 CODE:
2559{ 2929{
2560 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2930 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2561 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2931 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2562 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2932 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2563} 2933}
2564 2934
2565void 2935void
2566set_reverse_stereo (DC::Channel self, int flip) 2936set_reverse_stereo (DC::Channel self, int flip)
2569 2939
2570MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2940MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2571 2941
2572PROTOTYPES: DISABLE 2942PROTOTYPES: DISABLE
2573 2943
2944void
2945decoders ()
2946 PPCODE:
2947#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2948 int i, num = Mix_GetNumChunkDecoders ();
2949 EXTEND (SP, num);
2950 for (i = 0; i < num; ++i)
2951 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2952#else
2953 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2954#endif
2955
2574DC::MixChunk 2956DC::MixChunk
2575new (SV *class, DC::RW rwops) 2957new (SV *klass, DC::RW rwops)
2576 CODE: 2958 CODE:
2577 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2959 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2578 OUTPUT: 2960 OUTPUT:
2579 RETVAL 2961 RETVAL
2580 2962
2610 OUTPUT: 2992 OUTPUT:
2611 RETVAL 2993 RETVAL
2612 2994
2613MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2995MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2614 2996
2997void
2998decoders ()
2999 PPCODE:
3000#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3001 int i, num = Mix_GetNumMusicDecoders ();
3002 EXTEND (SP, num);
3003 for (i = 0; i < num; ++i)
3004 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3005#else
3006 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3007#endif
3008
2615int 3009int
2616volume (int volume = -1) 3010volume (int volume = -1)
2617 PROTOTYPE: ;$ 3011 PROTOTYPE: ;$
2618 CODE: 3012 CODE:
2619 if (items > 0) 3013 if (items > 0)
2630void 3024void
2631halt () 3025halt ()
2632 CODE: 3026 CODE:
2633 Mix_HaltMusic (); 3027 Mix_HaltMusic ();
2634 3028
3029int
3030playing ()
3031 CODE:
3032 RETVAL = Mix_PlayingMusic ();
3033 OUTPUT:
3034 RETVAL
3035
2635DC::MixMusic 3036DC::MixMusic
2636new (SV *class, DC::RW rwops) 3037new (SV *klass, DC::RW rwops)
2637 CODE: 3038 CODE:
2638 RETVAL = Mix_LoadMUS_RW (rwops); 3039 RETVAL = Mix_LoadMUS_RW (rwops);
2639 OUTPUT: 3040 OUTPUT:
2640 RETVAL 3041 RETVAL
2641 3042
2669 } *civ, const_iv[] = { 3070 } *civ, const_iv[] = {
2670# define const_iv(name) { # name, (IV)name } 3071# define const_iv(name) { # name, (IV)name }
2671 const_iv (GL_VENDOR), 3072 const_iv (GL_VENDOR),
2672 const_iv (GL_VERSION), 3073 const_iv (GL_VERSION),
2673 const_iv (GL_EXTENSIONS), 3074 const_iv (GL_EXTENSIONS),
3075 const_iv (GL_MAX_TEXTURE_UNITS),
2674 const_iv (GL_COLOR_MATERIAL), 3076 const_iv (GL_COLOR_MATERIAL),
2675 const_iv (GL_SMOOTH), 3077 const_iv (GL_SMOOTH),
2676 const_iv (GL_FLAT), 3078 const_iv (GL_FLAT),
2677 const_iv (GL_DITHER), 3079 const_iv (GL_DITHER),
2678 const_iv (GL_BLEND), 3080 const_iv (GL_BLEND),
2690 const_iv (GL_ZERO), 3092 const_iv (GL_ZERO),
2691 const_iv (GL_SRC_ALPHA), 3093 const_iv (GL_SRC_ALPHA),
2692 const_iv (GL_DST_ALPHA), 3094 const_iv (GL_DST_ALPHA),
2693 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3095 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2694 const_iv (GL_ONE_MINUS_DST_ALPHA), 3096 const_iv (GL_ONE_MINUS_DST_ALPHA),
3097 const_iv (GL_SRC_COLOR),
3098 const_iv (GL_DST_COLOR),
3099 const_iv (GL_ONE_MINUS_SRC_COLOR),
3100 const_iv (GL_ONE_MINUS_DST_COLOR),
2695 const_iv (GL_SRC_ALPHA_SATURATE), 3101 const_iv (GL_SRC_ALPHA_SATURATE),
2696 const_iv (GL_RGB), 3102 const_iv (GL_RGB),
2697 const_iv (GL_RGBA), 3103 const_iv (GL_RGBA),
2698 const_iv (GL_RGBA4), 3104 const_iv (GL_RGBA4),
2699 const_iv (GL_RGBA8), 3105 const_iv (GL_RGBA8),
2767 const_iv (GL_NICEST), 3173 const_iv (GL_NICEST),
2768 const_iv (GL_V2F), 3174 const_iv (GL_V2F),
2769 const_iv (GL_V3F), 3175 const_iv (GL_V3F),
2770 const_iv (GL_T2F_V3F), 3176 const_iv (GL_T2F_V3F),
2771 const_iv (GL_T2F_N3F_V3F), 3177 const_iv (GL_T2F_N3F_V3F),
3178 const_iv (GL_FUNC_ADD),
3179 const_iv (GL_FUNC_SUBTRACT),
3180 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2772# undef const_iv 3181# undef const_iv
2773 }; 3182 };
2774 3183
2775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3184 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3185 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2777 3186
2778 texture_av = newAV (); 3187 texture_av = newAV ();
2779 AvREAL_off (texture_av); 3188 AvREAL_off (texture_av);
2780} 3189}
2781 3190
2783disable_GL_EXT_blend_func_separate () 3192disable_GL_EXT_blend_func_separate ()
2784 CODE: 3193 CODE:
2785 gl.BlendFuncSeparate = 0; 3194 gl.BlendFuncSeparate = 0;
2786 gl.BlendFuncSeparateEXT = 0; 3195 gl.BlendFuncSeparateEXT = 0;
2787 3196
2788char * 3197void
3198apple_nvidia_bug (int enable)
3199
3200const char *
2789gl_vendor () 3201gl_vendor ()
2790 CODE: 3202 CODE:
2791 RETVAL = (char *)glGetString (GL_VENDOR); 3203 RETVAL = (const char *)glGetString (GL_VENDOR);
2792 OUTPUT: 3204 OUTPUT:
2793 RETVAL 3205 RETVAL
2794 3206
2795char * 3207const char *
2796gl_version () 3208gl_version ()
2797 CODE: 3209 CODE:
2798 RETVAL = (char *)glGetString (GL_VERSION); 3210 RETVAL = (const char *)glGetString (GL_VERSION);
2799 OUTPUT: 3211 OUTPUT:
2800 RETVAL 3212 RETVAL
2801 3213
2802char * 3214const char *
2803gl_extensions () 3215gl_extensions ()
2804 CODE: 3216 CODE:
2805 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3217 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2806 OUTPUT: 3218 OUTPUT:
2807 RETVAL 3219 RETVAL
2808 3220
2809const char *glGetString (GLenum pname) 3221const char *glGetString (GLenum pname)
3222 CODE:
3223 RETVAL = (const char *)glGetString (pname);
3224 OUTPUT:
3225 RETVAL
2810 3226
2811GLint glGetInteger (GLenum pname) 3227GLint glGetInteger (GLenum pname)
2812 CODE: 3228 CODE:
2813 glGetIntegerv (pname, &RETVAL); 3229 glGetIntegerv (pname, &RETVAL);
2814 OUTPUT: 3230 OUTPUT:
2822 3238
2823int glGetError () 3239int glGetError ()
2824 3240
2825void glFinish () 3241void glFinish ()
2826 3242
3243void glFlush ()
3244
2827void glClear (int mask) 3245void glClear (int mask)
2828 3246
2829void glClearColor (float r, float g, float b, float a = 1.0) 3247void glClearColor (float r, float g, float b, float a = 1.0)
2830 PROTOTYPE: @ 3248 PROTOTYPE: @
2831 3249
2840void glBlendFunc (int sfactor, int dfactor) 3258void glBlendFunc (int sfactor, int dfactor)
2841 3259
2842void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3260void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2843 CODE: 3261 CODE:
2844 gl_BlendFuncSeparate (sa, da, saa, daa); 3262 gl_BlendFuncSeparate (sa, da, saa, daa);
3263
3264# void glBlendEquation (int se)
2845 3265
2846void glDepthMask (int flag) 3266void glDepthMask (int flag)
2847 3267
2848void glLogicOp (int opcode) 3268void glLogicOp (int opcode)
2849 3269
2884void glRotate (float angle, float x, float y, float z) 3304void glRotate (float angle, float x, float y, float z)
2885 CODE: 3305 CODE:
2886 glRotatef (angle, x, y, z); 3306 glRotatef (angle, x, y, z);
2887 3307
2888void glColor (float r, float g, float b, float a = 1.0) 3308void glColor (float r, float g, float b, float a = 1.0)
3309 PROTOTYPE: @
2889 ALIAS: 3310 ALIAS:
2890 glColor_premultiply = 1 3311 glColor_premultiply = 1
2891 CODE: 3312 CODE:
2892 if (ix) 3313 if (ix)
2893 { 3314 {
2999 3420
3000void glEndList () 3421void glEndList ()
3001 3422
3002void glCallList (int list) 3423void glCallList (int list)
3003 3424
3425void c_init ()
3426 CODE:
3427 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3428 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3429
3004MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3430MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3005 3431
3006PROTOTYPES: DISABLE 3432PROTOTYPES: DISABLE
3007 3433
3008void 3434void
3009find_widget (SV *self, NV x, NV y) 3435find_widget (SV *self, NV x, NV y)
3010 PPCODE: 3436 PPCODE:
3011{ 3437{
3012 if (within_widget (self, x, y)) 3438 if (within_widget (self, x, y))
3013 XPUSHs (self); 3439 XPUSHs (self);
3014} 3440}
3015 3441
3016BOOT: 3442BOOT:
3017{ 3443{
3025 3451
3026void 3452void
3027draw (SV *self) 3453draw (SV *self)
3028 CODE: 3454 CODE:
3029{ 3455{
3030 HV *hv; 3456 HV *hv;
3031 SV **svp; 3457 SV **svp;
3032 NV x, y, w, h; 3458 NV x, y, w, h;
3033 SV *draw_x_sv = GvSV (draw_x_gv); 3459 SV *draw_x_sv = GvSV (draw_x_gv);
3034 SV *draw_y_sv = GvSV (draw_y_gv); 3460 SV *draw_y_sv = GvSV (draw_y_gv);
3035 SV *draw_w_sv = GvSV (draw_w_gv); 3461 SV *draw_w_sv = GvSV (draw_w_gv);
3036 SV *draw_h_sv = GvSV (draw_h_gv); 3462 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines