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.262 by root, Wed Jul 16 20:12:27 2008 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 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)
90 104
91#if 1 105#define KMOD_LRAM 0x10000 // our extension
92# define PARACHUTE SDL_INIT_NOPARACHUTE 106
93#else 107#define TEXID_SPEECH 1
94# define PARACHUTE 0 108#define TEXID_NOFACE 2
95#endif 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}
96 128
97static AV *texture_av; 129static AV *texture_av;
98 130
99static struct 131static struct
100{ 132{
157{ 189{
158 GSList *attrs = run->item->analysis.extra_attrs; 190 GSList *attrs = run->item->analysis.extra_attrs;
159 191
160 while (attrs) 192 while (attrs)
161 { 193 {
162 PangoAttribute *attr = attrs->data; 194 PangoAttribute *attr = (PangoAttribute *)attrs->data;
163 195
164 if (attr->klass->type == PANGO_ATTR_SHAPE) 196 if (attr->klass->type == PANGO_ATTR_SHAPE)
165 return 1; 197 return 1;
166 198
167 attrs = attrs->next; 199 attrs = attrs->next;
168 } 200 }
169 201
170 return 0; 202 return 0;
171} 203}
172 204
173typedef struct cf_layout { 205struct cf_layout {
174 PangoLayout *pl; 206 PangoLayout *pl;
175 float r, g, b, a; // default color for rgba mode 207 float r, g, b, a; // default color for rgba mode
176 int base_height; 208 int base_height;
177 DC__Font font; 209 DC__Font font;
178 rc_t *rc; 210 rc_t *rc;
179} *DC__Layout; 211};
212
213typedef cf_layout *DC__Layout;
180 214
181static DC__Font default_font; 215static DC__Font default_font;
182static PangoContext *opengl_context; 216static PangoContext *opengl_context;
183static PangoFontMap *opengl_fontmap; 217static PangoFontMap *opengl_fontmap;
184 218
185static void 219static void
186substitute_func (FcPattern *pattern, gpointer data) 220substitute_func (FcPattern *pattern, gpointer data)
187{ 221{
188 FcPatternAddBool (pattern, FC_HINTING, 1); 222 FcPatternAddBool (pattern, FC_HINTING, 1);
189#ifdef FC_HINT_STYLE 223#ifdef FC_HINT_STYLE
190 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 224 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
191#endif 225#endif
192 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 226 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
193} 227}
194 228
195static void 229static void
225} 259}
226 260
227typedef uint16_t tileid; 261typedef uint16_t tileid;
228typedef uint16_t faceid; 262typedef uint16_t faceid;
229 263
230typedef struct { 264struct maptex
265{
231 GLuint name; 266 GLuint name;
232 int w, h; 267 int w, h;
233 float s, t; 268 float s, t;
234 uint8_t r, g, b, a; 269 uint8_t r, g, b, a;
235 tileid smoothtile; 270 tileid smoothtile;
236 uint8_t smoothlevel; 271 uint8_t smoothlevel;
237} maptex; 272 uint8_t unused; /* set to zero on use */
273};
238 274
239typedef struct { 275struct mapcell
276{
240 uint32_t player; 277 uint32_t player;
241 tileid tile[3]; 278 tileid tile[3];
242 uint16_t darkness; 279 uint16_t darkness;
243 uint8_t stat_width, stat_hp, flags, smoothmax; 280 uint8_t stat_width, stat_hp, flags, smoothmax;
244} mapcell; 281};
245 282
246typedef struct { 283struct maprow
284{
247 int32_t c0, c1; 285 int32_t c0, c1;
248 mapcell *col; 286 mapcell *col;
249} maprow; 287};
250 288
251typedef struct map { 289struct mapgrid {
252 int x, y, w, h; 290 int x, y, w, h;
253 int ox, oy; /* offset to virtual global coordinate system */ 291 int ox, oy; /* offset to virtual global coordinate system */
254 int faces; tileid *face2tile; // [faceid] 292 int faces; tileid *face2tile; // [faceid]
255 int texs; maptex *tex; // [tileid] 293 int texs; maptex *tex; // [tileid]
256 294
257 int32_t rows; 295 int32_t rows;
258 maprow *row; 296 maprow *row;
259} *DC__Map; 297};
298
299typedef mapgrid *DC__Map;
260 300
261static char * 301static char *
262prepend (char *ptr, int sze, int inc) 302prepend (char *ptr, int sze, int inc)
263{ 303{
264 char *p; 304 char *p;
282 322
283#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 323#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
284#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 324#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
285 325
286static void 326static void
287need_facenum (struct map *self, faceid face) 327need_facenum (struct mapgrid *self, faceid face)
288{ 328{
289 while (self->faces <= face) 329 while (self->faces <= face)
290 { 330 {
291 Append (tileid, self->face2tile, self->faces, self->faces); 331 Append (tileid, self->face2tile, self->faces, self->faces);
292 self->faces *= 2; 332 self->faces *= 2;
293 } 333 }
294} 334}
295 335
296static void 336static void
297need_texid (struct map *self, int texid) 337need_texid (struct mapgrid *self, int texid)
298{ 338{
299 while (self->texs <= texid) 339 while (self->texs <= texid)
300 { 340 {
301 Append (maptex, self->tex, self->texs, self->texs); 341 Append (maptex, self->tex, self->texs, self->texs);
302 self->texs *= 2; 342 self->texs *= 2;
303 } 343 }
304} 344}
305 345
306static maprow * 346static maprow *
307map_get_row (DC__Map self, int y) 347map_get_row (mapgrid *self, int y)
308{ 348{
309 if (0 > y) 349 if (0 > y)
310 { 350 {
311 int extend = - y + MAP_EXTEND_Y; 351 int extend = - y + MAP_EXTEND_Y;
312 Prepend (maprow, self->row, self->rows, extend); 352 Prepend (maprow, self->row, self->rows, extend);
350 390
351 return row->col + (x - row->c0); 391 return row->col + (x - row->c0);
352} 392}
353 393
354static mapcell * 394static mapcell *
355map_get_cell (DC__Map self, int x, int y) 395map_get_cell (mapgrid *self, int x, int y)
356{ 396{
357 return row_get_cell (map_get_row (self, y), x); 397 return row_get_cell (map_get_row (self, y), x);
358} 398}
359 399
360static void 400static void
361map_clear (DC__Map self) 401map_clear (mapgrid *self)
362{ 402{
363 int r; 403 int r;
364 404
365 for (r = 0; r < self->rows; r++) 405 for (r = 0; r < self->rows; r++)
366 Safefree (self->row[r].col); 406 Safefree (self->row[r].col);
373 self->oy = 0; 413 self->oy = 0;
374 self->row = 0; 414 self->row = 0;
375 self->rows = 0; 415 self->rows = 0;
376} 416}
377 417
418#define CELL_CLEAR(cell) \
419 do { \
420 if ((cell)->player) \
421 (cell)->tile [2] = 0; \
422 (cell)->darkness = 0; \
423 (cell)->stat_hp = 0; \
424 (cell)->flags = 0; \
425 (cell)->player = 0; \
426 } while (0)
427
378static void 428static void
379map_blank (DC__Map self, int x0, int y0, int w, int h) 429map_blank (mapgrid *self, int x0, int y0, int w, int h)
380{ 430{
381 int x, y; 431 int x, y;
382 maprow *row; 432 maprow *row;
383 mapcell *cell; 433 mapcell *cell;
384 434
396 if (x >= row->c1) 446 if (x >= row->c1)
397 break; 447 break;
398 448
399 cell = row->col + x - row->c0; 449 cell = row->col + x - row->c0;
400 450
401 cell->darkness = 0; 451 CELL_CLEAR (cell);
402 cell->stat_hp = 0;
403 cell->flags = 0;
404 cell->player = 0;
405 } 452 }
406 } 453 }
407} 454}
408 455
409typedef struct { 456struct smooth_key
457{
410 tileid tile; 458 tileid tile;
411 uint8_t x, y, level; 459 uint8_t x, y, level;
412} smooth_key; 460
461 bool operator == (const smooth_key &o) const
462 {
463 return tile == o.tile && x == o.x && y == o.y && level == o.level;
464 }
465};
466
467typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
468
469namespace std {
470 template <>
471 struct hash<smooth_key>
472 {
473 size_t operator () (const smooth_key &v) const
474 {
475 return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
476 }
477 };
478}
413 479
414static void 480static void
415smooth_or_bits (HV *hv, smooth_key *key, IV bits) 481smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
416{ 482{
417 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1); 483 auto &&it = h.find (key);
418 484
419 if (SvIOK (*sv)) 485 if (it == h.end ())
420 SvIV_set (*sv, SvIVX (*sv) | bits); 486 h.insert (std::make_pair (key, bits));
421 else 487 else
422 sv_setiv (*sv, bits); 488 it->second |= bits;
423} 489}
424 490
425static void 491static void
426music_finished (void) 492music_finished (void)
427{ 493{
444 ev.code = 1; 510 ev.code = 1;
445 ev.data1 = (void *)(long)channel; 511 ev.data1 = (void *)(long)channel;
446 ev.data2 = 0; 512 ev.data2 = 0;
447 513
448 SDL_PushEvent ((SDL_Event *)&ev); 514 SDL_PushEvent ((SDL_Event *)&ev);
515}
516
517// approximately divide by 255
518static unsigned int
519div255 (unsigned int n)
520{
521 return (n + (n >> 8)) >> 8;
449} 522}
450 523
451static unsigned int 524static unsigned int
452minpot (unsigned int n) 525minpot (unsigned int n)
453{ 526{
520 if (!svp || !SvTRUE (*svp)) 593 if (!svp || !SvTRUE (*svp))
521 return 0; 594 return 0;
522 595
523 return 1; 596 return 1;
524} 597}
598
599/******************************************************************************/
600
601/* process keyboard modifiers */
602static int
603mod_munge (int mod)
604{
605 mod &= MOD_MASK;
606
607 if (mod & (KMOD_META | KMOD_ALT))
608 mod |= KMOD_LRAM;
609
610 return mod;
611}
612
613static void
614deliantra_main (SV *real_main)
615{
616 dSP;
617
618 PUSHMARK (SP);
619 call_sv (real_main, G_DISCARD | G_VOID);
620}
621
622#ifdef __MACOSX__
623 static SV *real_main;
624
625 /* to due surprising braindamage on the side of SDL design, we
626 * do some mind-boggling hack here: SDL requires a custom main()
627 * on OS X, so... we provide one and call the original main(), which,
628 * due to shared library magic, calls -lSDLmain's main, not perl's main,
629 * and which calls our main (== SDL_main) back.
630 */
631 extern C_LINKAGE int
632 main (int argc, char *argv[])
633 {
634 deliantra_main (real_main);
635 }
636
637 #undef main
638
639 extern C_LINKAGE int main (int argc, char *argv[]);
640
641 static void
642 SDL_main_hack (SV *real_main_)
643 {
644 real_main = real_main_;
645
646 char *argv[] = { "deliantra client", 0 };
647 (main) (1, argv);
648 }
649#else
650 static void
651 SDL_main_hack (SV *real_main)
652 {
653 deliantra_main (real_main);
654 }
655#endif
525 656
526MODULE = Deliantra::Client PACKAGE = DC 657MODULE = Deliantra::Client PACKAGE = DC
527 658
528PROTOTYPES: ENABLE 659PROTOTYPES: ENABLE
529 660
558 const_iv (SDL_USEREVENT), 689 const_iv (SDL_USEREVENT),
559 690
560 const_iv (SDL_APPINPUTFOCUS), 691 const_iv (SDL_APPINPUTFOCUS),
561 const_iv (SDL_APPMOUSEFOCUS), 692 const_iv (SDL_APPMOUSEFOCUS),
562 const_iv (SDL_APPACTIVE), 693 const_iv (SDL_APPACTIVE),
694
695
696 const_iv (SDLK_UNKNOWN),
697 const_iv (SDLK_FIRST),
698 const_iv (SDLK_BACKSPACE),
699 const_iv (SDLK_TAB),
700 const_iv (SDLK_CLEAR),
701 const_iv (SDLK_RETURN),
702 const_iv (SDLK_PAUSE),
703 const_iv (SDLK_ESCAPE),
704 const_iv (SDLK_SPACE),
705 const_iv (SDLK_EXCLAIM),
706 const_iv (SDLK_QUOTEDBL),
707 const_iv (SDLK_HASH),
708 const_iv (SDLK_DOLLAR),
709 const_iv (SDLK_AMPERSAND),
710 const_iv (SDLK_QUOTE),
711 const_iv (SDLK_LEFTPAREN),
712 const_iv (SDLK_RIGHTPAREN),
713 const_iv (SDLK_ASTERISK),
714 const_iv (SDLK_PLUS),
715 const_iv (SDLK_COMMA),
716 const_iv (SDLK_MINUS),
717 const_iv (SDLK_PERIOD),
718 const_iv (SDLK_SLASH),
719 const_iv (SDLK_0),
720 const_iv (SDLK_1),
721 const_iv (SDLK_2),
722 const_iv (SDLK_3),
723 const_iv (SDLK_4),
724 const_iv (SDLK_5),
725 const_iv (SDLK_6),
726 const_iv (SDLK_7),
727 const_iv (SDLK_8),
728 const_iv (SDLK_9),
729 const_iv (SDLK_COLON),
730 const_iv (SDLK_SEMICOLON),
731 const_iv (SDLK_LESS),
732 const_iv (SDLK_EQUALS),
733 const_iv (SDLK_GREATER),
734 const_iv (SDLK_QUESTION),
735 const_iv (SDLK_AT),
736
737 const_iv (SDLK_LEFTBRACKET),
738 const_iv (SDLK_BACKSLASH),
739 const_iv (SDLK_RIGHTBRACKET),
740 const_iv (SDLK_CARET),
741 const_iv (SDLK_UNDERSCORE),
742 const_iv (SDLK_BACKQUOTE),
743 const_iv (SDLK_DELETE),
563 744
564 const_iv (SDLK_FIRST), 745 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST), 746 const_iv (SDLK_LAST),
566 const_iv (SDLK_KP0), 747 const_iv (SDLK_KP0),
567 const_iv (SDLK_KP1), 748 const_iv (SDLK_KP1),
643 const_iv (KMOD_RMETA), 824 const_iv (KMOD_RMETA),
644 const_iv (KMOD_NUM), 825 const_iv (KMOD_NUM),
645 const_iv (KMOD_CAPS), 826 const_iv (KMOD_CAPS),
646 const_iv (KMOD_MODE), 827 const_iv (KMOD_MODE),
647 828
829 const_iv (KMOD_LRAM),
830
648 const_iv (MIX_DEFAULT_FORMAT), 831 const_iv (MIX_DEFAULT_FORMAT),
832
833 const_iv (SDL_INIT_TIMER),
834 const_iv (SDL_INIT_AUDIO),
835 const_iv (SDL_INIT_VIDEO),
836 const_iv (SDL_INIT_CDROM),
837 const_iv (SDL_INIT_JOYSTICK),
838 const_iv (SDL_INIT_EVERYTHING),
839 const_iv (SDL_INIT_NOPARACHUTE),
840 const_iv (SDL_INIT_EVENTTHREAD),
841
842 const_iv (SDL_GL_RED_SIZE),
843 const_iv (SDL_GL_GREEN_SIZE),
844 const_iv (SDL_GL_BLUE_SIZE),
845 const_iv (SDL_GL_ALPHA_SIZE),
846 const_iv (SDL_GL_DOUBLEBUFFER),
847 const_iv (SDL_GL_BUFFER_SIZE),
848 const_iv (SDL_GL_DEPTH_SIZE),
849 const_iv (SDL_GL_STENCIL_SIZE),
850 const_iv (SDL_GL_ACCUM_RED_SIZE),
851 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
852 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
853 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
854 const_iv (SDL_GL_STEREO),
855 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
856 const_iv (SDL_GL_MULTISAMPLESAMPLES),
857 const_iv (SDL_GL_ACCELERATED_VISUAL),
858 const_iv (SDL_GL_SWAP_CONTROL),
859
860 const_iv (FOW_DARKNESS)
649# undef const_iv 861# undef const_iv
650 }; 862 };
651 863
652 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 864 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 865 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
654 866
655 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 867 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
656 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 868 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
657} 869}
658 870
674NV ceil (NV x) 886NV ceil (NV x)
675 887
676IV minpot (UV n) 888IV minpot (UV n)
677 889
678IV popcount (UV n) 890IV popcount (UV n)
891
892NV distance (NV dx, NV dy)
893 CODE:
894 RETVAL = pow (dx * dx + dy * dy, 0.5);
895 OUTPUT:
896 RETVAL
679 897
680void 898void
681pango_init () 899pango_init ()
682 CODE: 900 CODE:
683{ 901{
689 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 907 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 908 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif 909#endif
692} 910}
693 911
694char *
695SDL_GetError () 912char *SDL_GetError ()
696 913
697int 914void SDL_main_hack (SV *real_main)
698SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 915 PROTOTYPE: &
699 916
700void 917int SDL_Init (U32 flags)
918
919int SDL_InitSubSystem (U32 flags)
920
921void SDL_QuitSubSystem (U32 flags)
922
701SDL_Quit () 923void SDL_Quit ()
924
925int SDL_GL_SetAttribute (int attr, int value)
926 C_ARGS: (SDL_GLattr)attr, value
927
928int SDL_GL_GetAttribute (int attr)
929 CODE:
930 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
931 XSRETURN_UNDEF;
932 OUTPUT:
933 RETVAL
702 934
703void 935void
704SDL_ListModes (int rgb, int alpha) 936SDL_ListModes (int rgb, int alpha)
705 PPCODE: 937 PPCODE:
706{ 938{
718 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 950 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
719 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 951 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
720 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 952 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
721 953
722 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 954 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
723#if SDL_VERSION_ATLEAST(1,2,10)
724 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
725 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 955 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
726#endif
727 956
728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 957 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
729 958
730 if (m && m != (SDL_Rect **)-1) 959 if (m && m != (SDL_Rect **)-1)
731 while (*m) 960 while (*m)
732 { 961 {
733 if ((*m)->w >= 800 && (*m)->h >= 480) 962 if ((*m)->w >= 400 && (*m)->h >= 300)
734 { 963 {
735 AV *av = newAV (); 964 AV *av = newAV ();
736 av_push (av, newSViv ((*m)->w)); 965 av_push (av, newSViv ((*m)->w));
737 av_push (av, newSViv ((*m)->h)); 966 av_push (av, newSViv ((*m)->h));
738 av_push (av, newSViv (rgb)); 967 av_push (av, newSViv (rgb));
761 ); 990 );
762 991
763 if (RETVAL) 992 if (RETVAL)
764 { 993 {
765 av_clear (texture_av); 994 av_clear (texture_av);
766
767 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
768#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 995#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
769#include "glfunc.h" 996#include "glfunc.h"
770#undef GL_FUNC 997#undef GL_FUNC
998 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
999 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
771 } 1000 }
772} 1001}
773 OUTPUT: 1002 OUTPUT:
774 RETVAL 1003 RETVAL
1004
1005void
1006SDL_WM_SetCaption (const char *title, const char *icon)
775 1007
776void 1008void
777SDL_GL_SwapBuffers () 1009SDL_GL_SwapBuffers ()
778 1010
779char * 1011char *
780SDL_GetKeyName (int sym) 1012SDL_GetKeyName (int sym)
1013 C_ARGS: (SDLKey)sym
781 1014
782int 1015int
783SDL_GetAppState () 1016SDL_GetAppState ()
784 1017
785int 1018int
786SDL_GetModState () 1019SDL_GetModState ()
787 1020
1021int
1022SDL_WaitEvent ()
1023 C_ARGS: 0
1024
788void 1025void
1026SDL_PumpEvents ()
1027
1028void
789poll_events () 1029peep_events ()
790 PPCODE: 1030 PPCODE:
791{ 1031{
792 SDL_Event ev; 1032 SDL_Event ev;
793 1033
794 SDL_PumpEvents (); 1034 SDL_PumpEvents ();
801 { 1041 {
802 case SDL_KEYDOWN: 1042 case SDL_KEYDOWN:
803 case SDL_KEYUP: 1043 case SDL_KEYUP:
804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 1044 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 1045 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
806 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 1046 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
807 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 1047 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 1048 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
809 break; 1049 break;
810 1050
811 case SDL_ACTIVEEVENT: 1051 case SDL_ACTIVEEVENT:
812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 1052 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
830 x = ev.motion.x; 1070 x = ev.motion.x;
831 y = ev.motion.y; 1071 y = ev.motion.y;
832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 1072 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
833 } 1073 }
834 1074
835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 1075 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
836 hv_store (hv, "state", 5, newSViv (state), 0); 1076 hv_store (hv, "state", 5, newSViv (state), 0);
837 hv_store (hv, "x", 1, newSViv (x), 0); 1077 hv_store (hv, "x", 1, newSViv (x), 0);
838 hv_store (hv, "y", 1, newSViv (y), 0); 1078 hv_store (hv, "y", 1, newSViv (y), 0);
839 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 1079 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
840 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 1080 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
860 1100
861 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1101 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
862 } 1102 }
863} 1103}
864 1104
1105char *
1106SDL_AudioDriverName ()
1107 CODE:
1108{
1109 char buf [256];
1110 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1111 XSRETURN_UNDEF;
1112
1113 RETVAL = buf;
1114}
1115 OUTPUT:
1116 RETVAL
1117
865int 1118int
866Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1119Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
867 POSTCALL: 1120 POSTCALL:
868 Mix_HookMusicFinished (music_finished); 1121 Mix_HookMusicFinished (music_finished);
869 Mix_ChannelFinished (channel_finished); 1122 Mix_ChannelFinished (channel_finished);
870 1123
871void 1124void
872Mix_QuerySpec () 1125Mix_QuerySpec ()
931add_font (char *file) 1184add_font (char *file)
932 CODE: 1185 CODE:
933 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1186 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
934 OUTPUT: 1187 OUTPUT:
935 RETVAL 1188 RETVAL
1189
1190void
1191IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1192
1193# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1194void
1195Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
936 1196
937void 1197void
938load_image_inline (SV *image_) 1198load_image_inline (SV *image_)
939 ALIAS: 1199 ALIAS:
940 load_image_file = 1 1200 load_image_file = 1
986 1246
987 SDL_LockSurface (surface2); 1247 SDL_LockSurface (surface2);
988 EXTEND (SP, 6); 1248 EXTEND (SP, 6);
989 PUSHs (sv_2mortal (newSViv (surface2->w))); 1249 PUSHs (sv_2mortal (newSViv (surface2->w)));
990 PUSHs (sv_2mortal (newSViv (surface2->h))); 1250 PUSHs (sv_2mortal (newSViv (surface2->h)));
991 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1251 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
992 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1252 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
993 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1253 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
994 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1254 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
995 SDL_UnlockSurface (surface2); 1255 SDL_UnlockSurface (surface2);
996 1256
1056#if DEBUG 1316#if DEBUG
1057 VALGRIND_DO_LEAK_CHECK; 1317 VALGRIND_DO_LEAK_CHECK;
1058#endif 1318#endif
1059} 1319}
1060 1320
1321int
1322SvREFCNT (SV *sv)
1323 CODE:
1324 RETVAL = SvREFCNT (sv);
1325 OUTPUT:
1326 RETVAL
1327
1061MODULE = Deliantra::Client PACKAGE = DC::Font 1328MODULE = Deliantra::Client PACKAGE = DC::Font
1062 1329
1063PROTOTYPES: DISABLE 1330PROTOTYPES: DISABLE
1064 1331
1065DC::Font 1332DC::Font
1066new_from_file (SV *class, char *path, int id = 0) 1333new_from_file (SV *klass, char *path, int id = 0)
1067 CODE: 1334 CODE:
1068{ 1335{
1069 int count; 1336 int count;
1070 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1337 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1071 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1338 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1100 PROTOTYPE: 1367 PROTOTYPE:
1101 CODE: 1368 CODE:
1102 tc_restore (); 1369 tc_restore ();
1103 1370
1104DC::Layout 1371DC::Layout
1105new (SV *class) 1372new (SV *klass)
1106 CODE: 1373 CODE:
1107 New (0, RETVAL, 1, struct cf_layout); 1374 New (0, RETVAL, 1, struct cf_layout);
1108 1375
1109 RETVAL->pl = pango_layout_new (opengl_context); 1376 RETVAL->pl = pango_layout_new (opengl_context);
1110 RETVAL->r = 1.; 1377 RETVAL->r = 1.;
1259 1526
1260void 1527void
1261set_height (DC::Layout self, int base_height) 1528set_height (DC::Layout self, int base_height)
1262 CODE: 1529 CODE:
1263 if (self->base_height != base_height) 1530 if (self->base_height != base_height)
1264 { 1531 {
1265 self->base_height = base_height; 1532 self->base_height = base_height;
1266 layout_update_font (self); 1533 layout_update_font (self);
1267 } 1534 }
1268 1535
1269void 1536void
1496 glDisable (GL_ALPHA_TEST); 1763 glDisable (GL_ALPHA_TEST);
1497 glDisable (GL_BLEND); 1764 glDisable (GL_BLEND);
1498 } 1765 }
1499} 1766}
1500 1767
1768void
1769draw_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)
1770 PROTOTYPE: @
1771 CODE:
1772{
1773 glEnable (GL_BLEND);
1774 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1775 glEnable (GL_TEXTURE_2D);
1776 glBindTexture (GL_TEXTURE_2D, name1);
1777
1778 glColor3f (intensity, intensity, intensity);
1779 glPushMatrix ();
1780 glScalef (1./3, 1./3, 1.);
1781
1782 if (blend > 0.f)
1783 {
1784 float dx3 = dx * -3.f / w;
1785 float dy3 = dy * -3.f / h;
1786 GLfloat env_color[4] = { 0., 0., 0., blend };
1787
1788 /* interpolate the two shadow textures */
1789 /* stage 0 == rgb(glcolor) + alpha(t0) */
1790 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1791
1792 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1793 gl.ActiveTexture (GL_TEXTURE1);
1794 glEnable (GL_TEXTURE_2D);
1795 glBindTexture (GL_TEXTURE_2D, name2);
1796 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1797
1798 /* rgb == rgb(glcolor) */
1799 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1800 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1801 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1802
1803 /* alpha = interpolate t0, t1 by env_alpha */
1804 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1805
1806 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1807 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1808 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1809
1810 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1811 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1812
1813 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1814 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1815
1816 glBegin (GL_QUADS);
1817 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1818 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1819 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1820 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1821 glEnd ();
1822
1823 glDisable (GL_TEXTURE_2D);
1824 gl.ActiveTexture (GL_TEXTURE0);
1825 }
1826 else
1827 {
1828 /* simple blending of one texture, also opengl <1.3 path */
1829 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1830
1831 glBegin (GL_QUADS);
1832 glTexCoord2f (0, 0); glVertex2f (0, 0);
1833 glTexCoord2f (0, t); glVertex2f (0, h);
1834 glTexCoord2f (s, t); glVertex2f (w, h);
1835 glTexCoord2f (s, 0); glVertex2f (w, 0);
1836 glEnd ();
1837 }
1838
1839 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1840 {
1841 int x, y;
1842 int dx3 = dx * 3;
1843 int dy3 = dy * 3;
1844
1845 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1846 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1847 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1848 glTranslatef (-1., -1., 0);
1849 glBegin (GL_QUADS);
1850
1851 for (y = 1; y < h; y += 3)
1852 {
1853 int y1 = y - dy3;
1854 int y1valid = y1 >= 0 && y1 < h;
1855
1856 for (x = 1; x < w; x += 3)
1857 {
1858 int x1 = x - dx3;
1859 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1860 uint8_t h2;
1861
1862 if (y1valid && x1 >= 0 && x1 < w)
1863 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1864 else
1865 h2 = 1; /* out of range == invisible */
1866
1867 if (h1 || h2)
1868 {
1869 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1870 glColor4f (1., 1., 1., alpha);
1871
1872 glTexCoord2f (0, 0.); glVertex2i (x , y );
1873 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1874 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1875 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1876 }
1877 }
1878 }
1879 }
1880
1881 glEnd ();
1882
1883 glPopMatrix ();
1884
1885 glDisable (GL_TEXTURE_2D);
1886 glDisable (GL_BLEND);
1887}
1888
1501IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type) 1889IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1502 CODE: 1890 CODE:
1503{ 1891{
1504 GLint width; 1892 GLint width;
1505 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0); 1893 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1512MODULE = Deliantra::Client PACKAGE = DC::Map 1900MODULE = Deliantra::Client PACKAGE = DC::Map
1513 1901
1514PROTOTYPES: DISABLE 1902PROTOTYPES: DISABLE
1515 1903
1516DC::Map 1904DC::Map
1517new (SV *class) 1905new (SV *klass)
1518 CODE: 1906 CODE:
1519 New (0, RETVAL, 1, struct map); 1907 New (0, RETVAL, 1, mapgrid);
1520 RETVAL->x = 0; 1908 RETVAL->x = 0;
1521 RETVAL->y = 0; 1909 RETVAL->y = 0;
1522 RETVAL->w = 0; 1910 RETVAL->w = 0;
1523 RETVAL->h = 0; 1911 RETVAL->h = 0;
1524 RETVAL->ox = 0; 1912 RETVAL->ox = 0;
1561 1949
1562void 1950void
1563set_smooth (DC::Map self, int face, int smooth, int level) 1951set_smooth (DC::Map self, int face, int smooth, int level)
1564 CODE: 1952 CODE:
1565{ 1953{
1566 tileid texid; 1954 tileid texid;
1567 maptex *tex; 1955 maptex *tex;
1568 1956
1569 if (face < 0 || face >= self->faces) 1957 if (face < 0 || face >= self->faces)
1570 return; 1958 return;
1571 1959
1572 if (smooth < 0 || smooth >= self->faces) 1960 if (smooth < 0 || smooth >= self->faces)
1573 return; 1961 return;
1574 1962
1575 texid = self->face2tile [face]; 1963 texid = self->face2tile [face];
1576 1964
1577 if (!texid) 1965 if (!texid)
1578 return; 1966 return;
1579 1967
1580 tex = self->tex + texid; 1968 tex = self->tex + texid;
1609 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1997 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1610 // use uglier nearest interpolation because linear suffers 1998 // use uglier nearest interpolation because linear suffers
1611 // from transparent color bleeding and ugly wrapping effects. 1999 // from transparent color bleeding and ugly wrapping effects.
1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 2000 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1613} 2001}
2002
2003void
2004expire_textures (DC::Map self, int texid, int count)
2005 PPCODE:
2006 for (; texid < self->texs && count; ++texid, --count)
2007 {
2008 maptex *tex = self->tex + texid;
2009
2010 if (tex->name)
2011 {
2012 if (tex->unused)
2013 {
2014 tex->name = 0;
2015 tex->unused = 0;
2016 XPUSHs (sv_2mortal (newSViv (texid)));
2017 }
2018 else
2019 tex->unused = 1;
2020 }
2021 }
1614 2022
1615int 2023int
1616ox (DC::Map self) 2024ox (DC::Map self)
1617 ALIAS: 2025 ALIAS:
1618 oy = 1 2026 oy = 1
1658 self->y += MAP_EXTEND_Y; 2066 self->y += MAP_EXTEND_Y;
1659 } 2067 }
1660} 2068}
1661 2069
1662SV * 2070SV *
1663map1a_update (DC::Map self, SV *data_, int extmap) 2071map1a_update (DC::Map self, SV *data_)
1664 CODE: 2072 CODE:
1665{ 2073{
1666 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2074 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1667 uint8_t *data_end = (uint8_t *)SvEND (data_); 2075 uint8_t *data_end = (uint8_t *)SvEND (data_);
1668 mapcell *cell; 2076 mapcell *cell;
1689 2097
1690 //TODO: don't trust server data to be in-range(!) 2098 //TODO: don't trust server data to be in-range(!)
1691 2099
1692 if (flags & 8) 2100 if (flags & 8)
1693 { 2101 {
2102 uint8_t ext, cmd;
2103
1694 if (extmap) 2104 do
1695 { 2105 {
1696 uint8_t ext, cmd; 2106 ext = *data++;
2107 cmd = ext & 0x7f;
1697 2108
1698 do 2109 if (cmd < 4)
2110 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2111 else if (cmd == 5) // health
1699 { 2112 {
1700 ext = *data++;
1701 cmd = ext & 0x7f;
1702
1703 if (cmd < 4)
1704 cell->darkness = 255 - ext * 64 + 1;
1705 else if (cmd == 5) // health
1706 {
1707 cell->stat_width = 1; 2113 cell->stat_width = 1;
1708 cell->stat_hp = *data++; 2114 cell->stat_hp = *data++;
1709 }
1710 else if (cmd == 6) // monster width
1711 cell->stat_width = *data++ + 1;
1712 else if (cmd == 0x47)
1713 {
1714 if (*data == 1) cell->player = data [1];
1715 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1716 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1717 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1718
1719 data += *data + 1;
1720 }
1721 else if (cmd == 8) // cell flags
1722 cell->flags = *data++;
1723 else if (ext & 0x40) // unknown, multibyte => skip
1724 data += *data + 1;
1725 else
1726 data++;
1727 } 2115 }
1728 while (ext & 0x80); 2116 else if (cmd == 6) // monster width
2117 cell->stat_width = *data++ + 1;
2118 else if (cmd == 0x47)
2119 {
2120 if (*data == 1) cell->player = data [1];
2121 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2122 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2123 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2124
2125 data += *data + 1;
2126 }
2127 else if (cmd == 8) // cell flags
2128 cell->flags = *data++;
2129 else if (ext & 0x40) // unknown, multibyte => skip
2130 data += *data + 1;
2131 else
2132 data++;
1729 } 2133 }
1730 else 2134 while (ext & 0x80);
1731 cell->darkness = *data++ + 1;
1732 } 2135 }
1733 2136
1734 for (z = 0; z <= 2; ++z) 2137 for (z = 0; z <= 2; ++z)
1735 if (flags & (4 >> z)) 2138 if (flags & (4 >> z))
1736 { 2139 {
1739 cell->tile [z] = self->face2tile [face]; 2142 cell->tile [z] = self->face2tile [face];
1740 2143
1741 if (cell->tile [z]) 2144 if (cell->tile [z])
1742 { 2145 {
1743 maptex *tex = self->tex + cell->tile [z]; 2146 maptex *tex = self->tex + cell->tile [z];
2147 tex->unused = 0;
1744 if (!tex->name) 2148 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z])); 2149 av_push (missing, newSViv (cell->tile [z]));
1746 2150
1747 if (tex->smoothtile) 2151 if (tex->smoothtile)
1748 { 2152 {
1749 maptex *smooth = self->tex + tex->smoothtile; 2153 maptex *smooth = self->tex + tex->smoothtile;
2154 smooth->unused = 0;
1750 if (!smooth->name) 2155 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile)); 2156 av_push (missing, newSViv (tex->smoothtile));
1752 } 2157 }
1753 } 2158 }
1754 } 2159 }
1755 } 2160 }
1756 else 2161 else
1757 cell->darkness = 0; 2162 CELL_CLEAR (cell);
1758 } 2163 }
1759} 2164}
1760 OUTPUT: 2165 OUTPUT:
1761 RETVAL 2166 RETVAL
1762 2167
1782 ? self->row + y 2187 ? self->row + y
1783 : 0; 2188 : 0;
1784 2189
1785 for (x = x0; x < x1; x++) 2190 for (x = x0; x < x1; x++)
1786 { 2191 {
1787 int r = 32, g = 32, b = 32, a = 192; 2192 unsigned int r = 32, g = 32, b = 32, a = 192;
1788 2193
1789 if (row && row->c0 <= x && x < row->c1) 2194 if (row && row->c0 <= x && x < row->c1)
1790 { 2195 {
1791 mapcell *cell = row->col + (x - row->c0); 2196 mapcell *cell = row->col + (x - row->c0);
1792 2197
1794 { 2199 {
1795 maptex tex = self->tex [cell->tile [z]]; 2200 maptex tex = self->tex [cell->tile [z]];
1796 int a0 = 255 - tex.a; 2201 int a0 = 255 - tex.a;
1797 int a1 = tex.a; 2202 int a1 = tex.a;
1798 2203
1799 r = (r * a0 + tex.r * a1) / 255; 2204 r = div255 (r * a0 + tex.r * a1);
1800 g = (g * a0 + tex.g * a1) / 255; 2205 g = div255 (g * a0 + tex.g * a1);
1801 b = (b * a0 + tex.b * a1) / 255; 2206 b = div255 (b * a0 + tex.b * a1);
1802 a = (a * a0 + tex.a * a1) / 255; 2207 a = div255 (a * a0 + tex.a * a1);
1803 } 2208 }
1804 } 2209 }
1805 2210
1806 *map++ = (r ) 2211 *map++ = (r )
1807 | (g << 8) 2212 | (g << 8)
1808 | (b << 16) 2213 | (b << 16)
1809 | (a << 24); 2214 | (a << 24);
1810 } 2215 }
1811 } 2216 }
1812 2217
1813 RETVAL = map_sv; 2218 RETVAL = map_sv;
1814} 2219}
1815 OUTPUT: 2220 OUTPUT:
1816 RETVAL 2221 RETVAL
1817 2222
1818void 2223void
1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2224draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1820 CODE: 2225 CODE:
1821{ 2226{
1822 int x, y, z; 2227 int x, y, z;
1823 2228
1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1825 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1826 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2229 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
1827 smooth_key skey;
1828 int pl_x, pl_y; 2230 int pl_x, pl_y;
1829 maptex pl_tex; 2231 maptex pl_tex;
1830 rc_t *rc = rc_alloc (); 2232 rc_t *rc = rc_alloc ();
2233 rc_t *rc_ov = rc_alloc ();
1831 rc_key_t key; 2234 rc_key_t key;
1832 rc_array_t *arr; 2235 rc_array_t *arr;
1833 2236
1834 pl_tex.name = 0; 2237 pl_tex.name = 0;
1835 2238
1836 // thats current max. sorry. 2239 // that's current max. sorry.
1837 if (sw > 255) sw = 255; 2240 if (sw > 255) sw = 255;
1838 if (sh > 255) sh = 255; 2241 if (sh > 255) sh = 255;
1839
1840 // clear key, in case of extra padding
1841 memset (&skey, 0, sizeof (skey));
1842 2242
1843 memset (&key, 0, sizeof (key)); 2243 memset (&key, 0, sizeof (key));
1844 key.r = 255; 2244 key.r = 255;
1845 key.g = 255; 2245 key.g = 255;
1846 key.b = 255; 2246 key.b = 255;
1847 key.a = 255; 2247 key.a = 255;
1848 key.mode = GL_QUADS; 2248 key.mode = GL_QUADS;
1849 key.format = GL_T2F_V3F; 2249 key.format = GL_T2F_V3F;
1850 key.texname = -1;
1851 2250
1852 mx += self->x; 2251 mx += self->x;
1853 my += self->y; 2252 my += self->y;
1854 2253
1855 // first pass: determine smooth_max 2254 // first pass: determine smooth_max
1856 // rather ugly, if you ask me 2255 // rather ugly, if you ask me
1857 // could also be stored inside mapcell and updated on change 2256 // could also be stored inside mapcell and updated on change
1858 memset (smooth_max, 0, sizeof (smooth_max)); 2257 memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
1859 2258
1860 for (y = 0; y < sh; y++) 2259 for (y = 0; y < sh; y++)
1861 if (0 <= y + my && y + my < self->rows) 2260 if (0 <= y + my && y + my < self->rows)
1862 { 2261 {
1863 maprow *row = self->row + (y + my); 2262 maprow *row = self->row + (y + my);
1878 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2277 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2278 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1880 2279
1881 for (z = 0; z <= 2; z++) 2280 for (z = 0; z <= 2; z++)
1882 { 2281 {
1883 memset (smooth_level, 0, sizeof (smooth_level)); 2282 std::bitset<256> smooth_level; // one bit for every possible smooth level
2283 smooth_key skey;
2284 smooth_hash smooth;
2285 key.texname = -1;
1884 2286
1885 for (y = 0; y < sh; y++) 2287 for (y = 0; y < sh; y++)
1886 if (0 <= y + my && y + my < self->rows) 2288 if (0 <= y + my && y + my < self->rows)
1887 { 2289 {
1888 maprow *row = self->row + (y + my); 2290 maprow *row = self->row + (y + my);
1894 tileid tile = cell->tile [z]; 2296 tileid tile = cell->tile [z];
1895 2297
1896 if (tile) 2298 if (tile)
1897 { 2299 {
1898 maptex tex = self->tex [tile]; 2300 maptex tex = self->tex [tile];
1899 int px = (x + 1) * T - tex.w; 2301 int px, py;
1900 int py = (y + 1) * T - tex.h;
1901 2302
1902 if (key.texname != tex.name) 2303 if (key.texname != tex.name)
1903 { 2304 {
2305 self->tex [tile].unused = 0;
2306
1904 if (!tex.name) 2307 if (!tex.name)
1905 tex = self->tex [2]; /* missing, replace by noface */ 2308 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1906 2309
1907 key.texname = tex.name; 2310 key.texname = tex.name;
1908 arr = rc_array (rc, &key); 2311 arr = rc_array (rc, &key);
1909 } 2312 }
2313
2314 px = (x + 1) * Th - tex.w;
2315 py = (y + 1) * Tw - tex.h;
1910 2316
1911 if (expect_false (cell->player == player) && expect_false (z == 2)) 2317 if (expect_false (cell->player == player) && expect_false (z == 2))
1912 { 2318 {
1913 pl_x = px; 2319 pl_x = px;
1914 pl_y = py; 2320 pl_y = py;
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2325 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1920 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2326 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1921 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2327 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1922 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2328 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1923 2329
1924 if (expect_false (cell->flags) && expect_false (z == 2))
1925 {
1926 // overlays such as the speech bubble, probably more to come
1927 if (cell->flags & 1)
1928 {
1929 maptex tex = self->tex [1];
1930 int px = x * T + T * 2 / 32;
1931 int py = y * T - T * 6 / 32;
1932
1933 if (tex.name)
1934 {
1935 if (key.texname != tex.name)
1936 {
1937 key.texname = tex.name;
1938 arr = rc_array (rc, &key);
1939 }
1940
1941 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1942 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1943 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1945 }
1946 }
1947 }
1948
1949 // update smooth hash 2330 // update smooth hash
1950 if (tex.smoothtile) 2331 if (tex.smoothtile)
1951 { 2332 {
1952 skey.tile = tex.smoothtile; 2333 skey.tile = tex.smoothtile;
1953 skey.level = tex.smoothlevel; 2334 skey.level = tex.smoothlevel;
1954 2335
1955 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31); 2336 smooth_level[tex.smoothlevel] = 1;
1956 2337
1957 // add bits to current tile and all neighbours. skey.x|y is 2338 // add bits to current tile and all neighbours. skey.x|y is
1958 // shifted +1|+1 so we always stay positive. 2339 // shifted +1|+1 so we always stay positive.
1959 2340
1960 // bits is ___n cccc CCCC bbbb 2341 // bits is ___n cccc CCCC bbbb
1968 2349
1969 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ·· 2350 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1970 // ·· ·· ·┏ ┓· 2351 // ·· ·· ·┏ ┓·
1971 2352
1972 // full tile 2353 // full tile
1973 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000); 2354 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
1974 2355
1975 // borders 2356 // borders
1976 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091); 2357 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
1977 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032); 2358 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
1978 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064); 2359 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
1979 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8); 2360 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
1980 2361
1981 // corners 2362 // corners
1982 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2363 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
1983 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2364 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
1984 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2365 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
1985 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2366 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2367 }
2368 }
2369
2370 if (expect_false (z == 2) && expect_false (cell->flags))
2371 {
2372 // overlays such as the speech bubble, probably more to come
2373 if (cell->flags & 1)
2374 {
2375 rc_key_t key_ov = key;
2376 maptex tex = self->tex [TEXID_SPEECH];
2377 rc_array_t *arr;
2378 int px = x * Tw + Tw * 2 / 32;
2379 int py = y * Th - Th * 6 / 32;
2380
2381 key_ov.texname = tex.name;
2382 arr = rc_array (rc_ov, &key_ov);
2383
2384 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2385 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2386 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2387 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
1986 } 2388 }
1987 } 2389 }
1988 } 2390 }
1989 } 2391 }
1990 2392
1996 { 2398 {
1997 int w, b; 2399 int w, b;
1998 2400
1999 glEnable (GL_TEXTURE_2D); 2401 glEnable (GL_TEXTURE_2D);
2000 glBegin (GL_QUADS); 2402 glBegin (GL_QUADS);
2001 for (w = 0; w < 256 / 32; ++w) 2403 for (int level = 0; level < smooth_level.size (); ++level)
2404 if (smooth_level[level])
2405 for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2002 { 2406 {
2003 uint32_t smask = smooth_level [w]; 2407 smooth_key &skey = it->first;
2004 if (smask) 2408 IV bits = it->second;
2005 for (b = 0; b < 32; ++b) 2409
2006 if (smask & (((uint32_t)1) << b)) 2410 if (!(bits & 0x1000)
2411 && skey.level == level
2412 && level > smooth_max [skey.x][skey.y])
2007 { 2413 {
2008 int level = (w << 5) | b; 2414 maptex tex = self->tex [skey.tile];
2415 int px = (((int)skey.x) - 1) * Tw;
2416 int py = (((int)skey.y) - 1) * Th;
2417 int border = bits & 15;
2418 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2419 float dx = tex.s * .0625f; // 16 images/row
2420 float dy = tex.t * .5f ; // 2 images/column
2421
2009 HE *he; 2422 if (tex.name)
2010
2011 hv_iterinit (smooth);
2012 while ((he = hv_iternext (smooth)))
2013 { 2423 {
2014 smooth_key *skey = (smooth_key *)HeKEY (he); 2424 // this time avoiding texture state changes
2015 IV bits = SvIVX (HeVAL (he)); 2425 // save gobs of state changes.
2016 2426 if (key.texname != tex.name)
2017 if (!(bits & 0x1000)
2018 && skey->level == level
2019 && level > smooth_max [skey->x][skey->y])
2020 { 2427 {
2021 maptex tex = self->tex [skey->tile]; 2428 self->tex [skey.tile].unused = 0;
2022 int px = (((int)skey->x) - 1) * T;
2023 int py = (((int)skey->y) - 1) * T;
2024 int border = bits & 15;
2025 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2026 float dx = tex.s * .0625f; // 16 images/row
2027 float dy = tex.t * .5f ; // 2 images/column
2028 2429
2029 if (tex.name)
2030 {
2031 // this time avoiding texture state changes
2032 // save gobs of state changes.
2033 if (key.texname != tex.name)
2034 {
2035 glEnd (); 2430 glEnd ();
2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2431 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2037 glBegin (GL_QUADS); 2432 glBegin (GL_QUADS);
2038 } 2433 }
2039 2434
2040 if (border) 2435 if (border)
2041 { 2436 {
2042 float ox = border * dx; 2437 float ox = border * dx;
2043 2438
2044 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2439 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2045 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2440 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2046 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2441 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2047 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2442 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2048 } 2443 }
2049 2444
2050 if (corner) 2445 if (corner)
2051 { 2446 {
2052 float ox = corner * dx; 2447 float ox = corner * dx;
2053 2448
2054 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2449 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2055 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2450 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2056 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2451 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2057 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2452 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2058 }
2059 }
2060 } 2453 }
2061 } 2454 }
2062 } 2455 }
2063 } 2456 }
2064 2457
2065 glEnd (); 2458 glEnd ();
2066 glDisable (GL_TEXTURE_2D); 2459 glDisable (GL_TEXTURE_2D);
2067 key.texname = -1; 2460 key.texname = -1;
2068 } 2461 }
2069
2070 hv_clear (smooth);
2071 } 2462 }
2072 2463
2073 if (pl_tex.name) 2464 if (pl_tex.name)
2074 { 2465 {
2075 maptex tex = pl_tex; 2466 maptex tex = pl_tex;
2076 int px = pl_x + pdx; 2467 int px = pl_x + sdx;
2077 int py = pl_y + pdy; 2468 int py = pl_y + sdy;
2078 2469
2079 key.texname = tex.name; 2470 key.texname = tex.name;
2080 arr = rc_array (rc, &key); 2471 arr = rc_array (rc, &key);
2081 2472
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2473 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2476 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2086 2477
2087 rc_draw (rc); 2478 rc_draw (rc);
2088 } 2479 }
2089 2480
2481 rc_draw (rc_ov);
2482 rc_clear (rc_ov);
2483
2090 glDisable (GL_BLEND); 2484 glDisable (GL_BLEND);
2091 rc_free (rc); 2485 rc_free (rc);
2486 rc_free (rc_ov);
2092 2487
2093 // top layer: overlays such as the health bar 2488 // top layer: overlays such as the health bar
2094 for (y = 0; y < sh; y++) 2489 for (y = 0; y < sh; y++)
2095 if (0 <= y + my && y + my < self->rows) 2490 if (0 <= y + my && y + my < self->rows)
2096 { 2491 {
2099 for (x = 0; x < sw; x++) 2494 for (x = 0; x < sw; x++)
2100 if (row->c0 <= x + mx && x + mx < row->c1) 2495 if (row->c0 <= x + mx && x + mx < row->c1)
2101 { 2496 {
2102 mapcell *cell = row->col + (x + mx - row->c0); 2497 mapcell *cell = row->col + (x + mx - row->c0);
2103 2498
2104 int px = x * T; 2499 int px = x * Tw;
2105 int py = y * T; 2500 int py = y * Th;
2501
2502 if (expect_false (cell->player == player))
2503 {
2504 px += sdx;
2505 py += sdy;
2506 }
2106 2507
2107 if (cell->stat_hp) 2508 if (cell->stat_hp)
2108 { 2509 {
2109 int width = cell->stat_width * T; 2510 int width = cell->stat_width * Tw;
2110 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2511 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2111 2512
2112 glColor3ub (0, 0, 0); 2513 glColor3ub (0, 0, 0);
2113 glRectf (px + 1, py - thick - 2, 2514 glRectf (px + 1, py - thick - 2,
2114 px + width - 1, py); 2515 px + width - 1, py);
2115 2516
2121 } 2522 }
2122 } 2523 }
2123} 2524}
2124 2525
2125void 2526void
2126draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2527draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2127 CODE: 2528 CODE:
2128{ 2529{
2129 static float color[16][3] = { 2530 static float color[16][3] = {
2130 { 0.00F, 0.00F, 0.00F }, 2531 { 0.00f, 0.00f, 0.00f },
2131 { 1.00F, 1.00F, 1.00F }, 2532 { 1.00f, 1.00f, 1.00f },
2132 { 0.00F, 0.00F, 0.55F }, 2533 { 0.00f, 0.00f, 0.55f },
2133 { 1.00F, 0.00F, 0.00F }, 2534 { 1.00f, 0.00f, 0.00f },
2134 2535
2135 { 1.00F, 0.54F, 0.00F }, 2536 { 1.00f, 0.54f, 0.00f },
2136 { 0.11F, 0.56F, 1.00F }, 2537 { 0.11f, 0.56f, 1.00f },
2137 { 0.93F, 0.46F, 0.00F }, 2538 { 0.93f, 0.46f, 0.00f },
2138 { 0.18F, 0.54F, 0.34F }, 2539 { 0.18f, 0.54f, 0.34f },
2139 2540
2140 { 0.56F, 0.73F, 0.56F }, 2541 { 0.56f, 0.73f, 0.56f },
2141 { 0.80F, 0.80F, 0.80F }, 2542 { 0.80f, 0.80f, 0.80f },
2142 { 0.55F, 0.41F, 0.13F }, 2543 { 0.55f, 0.41f, 0.13f },
2143 { 0.99F, 0.77F, 0.26F }, 2544 { 0.99f, 0.77f, 0.26f },
2144 2545
2145 { 0.74F, 0.65F, 0.41F }, 2546 { 0.74f, 0.65f, 0.41f },
2146 2547
2147 { 0.00F, 1.00F, 1.00F }, 2548 { 0.00f, 1.00f, 1.00f },
2148 { 1.00F, 0.00F, 1.00F }, 2549 { 1.00f, 0.00f, 1.00f },
2149 { 1.00F, 1.00F, 0.00F }, 2550 { 1.00f, 1.00f, 0.00f },
2150 }; 2551 };
2151 2552
2152 int x, y; 2553 int x, y;
2153 2554
2154 glEnable (GL_TEXTURE_2D); 2555 glEnable (GL_TEXTURE_2D);
2556 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2557 * but the nvidia driver (185.18.14) mishandles alpha textures
2558 * and takes the colour from god knows where instead of using
2559 * Cp. MODULATE results in the same colour, but slightly different
2560 * alpha, but atcually gives us the correct colour with nvidia.
2561 */
2155 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2562 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2156 glEnable (GL_BLEND); 2563 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2564 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glBegin (GL_QUADS); 2565 glBegin (GL_QUADS);
2159 2566
2160 for (y = 0; y < h; y++) 2567 for (y = 0; y < h; y++)
2164 2571
2165 if (m) 2572 if (m)
2166 { 2573 {
2167 float *c = color [m & 15]; 2574 float *c = color [m & 15];
2168 2575
2169 float tx1 = m & 0x40 ? 0.5 : 0.; 2576 float tx1 = m & 0x40 ? 0.5f : 0.f;
2170 float tx2 = tx1 + 0.5; 2577 float tx2 = tx1 + 0.5f;
2171 2578
2172 glColor4f (c[0], c[1], c[2], 0.75); 2579 glColor4f (c[0], c[1], c[2], 1);
2173 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2580 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2174 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2581 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2175 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2582 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2176 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2583 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2177 } 2584 }
2185void 2592void
2186fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2593fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2187 PPCODE: 2594 PPCODE:
2188{ 2595{
2189 int x, y; 2596 int x, y;
2190 int sw1 = sw + 2; 2597 int sw1 = sw + 2;
2191 int sh1 = sh + 2; 2598 int sh1 = sh + 2;
2192 int sh3 = sh * 3; 2599 int sh3 = sh * 3;
2193 int sw34 = (sw * 3 + 3) & ~3; 2600 int sw3 = sw * 3;
2601 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2602 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2194 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2603 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2195 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2604 memset (darkness1, 0, sw1*sh1);
2196 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2197 2605
2198 SvPOK_only (darkness3_sv); 2606 SvPOK_only (darkness3_sv);
2199 SvCUR_set (darkness3_sv, sw34 * sh3); 2607 SvCUR_set (darkness3_sv, sw3 * sh3);
2200 2608
2201 mx += self->x - 1; 2609 mx += self->x - 1;
2202 my += self->y - 1; 2610 my += self->y - 1;
2203
2204 memset (darkness1, 255, sw1 * sh1);
2205 2611
2206 for (y = 0; y < sh1; y++) 2612 for (y = 0; y < sh1; y++)
2207 if (0 <= y + my && y + my < self->rows) 2613 if (0 <= y + my && y + my < self->rows)
2208 { 2614 {
2209 maprow *row = self->row + (y + my); 2615 maprow *row = self->row + (y + my);
2212 if (row->c0 <= x + mx && x + mx < row->c1) 2618 if (row->c0 <= x + mx && x + mx < row->c1)
2213 { 2619 {
2214 mapcell *cell = row->col + (x + mx - row->c0); 2620 mapcell *cell = row->col + (x + mx - row->c0);
2215 2621
2216 darkness1 [y * sw1 + x] = cell->darkness 2622 darkness1 [y * sw1 + x] = cell->darkness
2217 ? 255 - (cell->darkness - 1) 2623 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2218 : 255 - FOW_DARKNESS; 2624 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2219 } 2625 }
2220 } 2626 }
2221 2627
2222 for (y = 0; y < sh; ++y) 2628 for (y = 0; y < sh; ++y)
2223 for (x = 0; x < sw; ++x) 2629 for (x = 0; x < sw; ++x)
2242 2648
2243 uint8_t r13 = (d13 + d23 + d12) / 3; 2649 uint8_t r13 = (d13 + d23 + d12) / 3;
2244 uint8_t r23 = d23; 2650 uint8_t r23 = d23;
2245 uint8_t r33 = (d23 + d33 + d32) / 3; 2651 uint8_t r33 = (d23 + d33 + d32) / 3;
2246 2652
2247 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2653 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2248 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2654 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2249 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2655 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2250 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2656 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2251 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2657 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2252 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2658 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2253 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2659 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2254 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2660 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2255 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2661 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2256 } 2662 }
2257 2663
2258 free (darkness1); 2664 free (darkness1);
2259 2665
2260 EXTEND (SP, 3); 2666 EXTEND (SP, 3);
2261 PUSHs (sv_2mortal (newSViv (sw34))); 2667 PUSHs (sv_2mortal (newSViv (sw3)));
2262 PUSHs (sv_2mortal (newSViv (sh3))); 2668 PUSHs (sv_2mortal (newSViv (sh3)));
2263 PUSHs (darkness3_sv); 2669 PUSHs (darkness3_sv);
2264} 2670}
2265 2671
2266SV * 2672SV *
2329 else 2735 else
2330 *data++ = 0; 2736 *data++ = 0;
2331 } 2737 }
2332 } 2738 }
2333 2739
2334 /* if size is w*h + 5 then no data has been found */ 2740 /* if size is w*h + 5 then no data has been found */
2335 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2741 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2336 { 2742 {
2337 SvPOK_only (data_sv); 2743 SvPOK_only (data_sv);
2338 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2744 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2339 } 2745 }
2340 2746
2341 RETVAL = data_sv; 2747 RETVAL = data_sv;
2342} 2748}
2343 OUTPUT: 2749 OUTPUT:
2344 RETVAL 2750 RETVAL
2345 2751
2346void 2752void
2353 STRLEN len; 2759 STRLEN len;
2354 uint8_t *data, *end; 2760 uint8_t *data, *end;
2355 2761
2356 len = SvLEN (data_sv); 2762 len = SvLEN (data_sv);
2357 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2763 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2358 data = SvPVbyte_nolen (data_sv); 2764 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2359 end = data + len + 8; 2765 end = data + len + 8;
2360 2766
2361 if (len < 5) 2767 if (len < 5)
2362 XSRETURN_EMPTY; 2768 XSRETURN_EMPTY;
2363 2769
2424} 2830}
2425 2831
2426MODULE = Deliantra::Client PACKAGE = DC::RW 2832MODULE = Deliantra::Client PACKAGE = DC::RW
2427 2833
2428DC::RW 2834DC::RW
2429new (SV *class, SV *data_sv) 2835new (SV *klass, SV *data_sv)
2430 CODE: 2836 CODE:
2431{ 2837{
2432 STRLEN datalen; 2838 STRLEN datalen;
2433 char *data = SvPVbyte (data_sv, datalen); 2839 char *data = SvPVbyte (data_sv, datalen);
2434 2840
2436} 2842}
2437 OUTPUT: 2843 OUTPUT:
2438 RETVAL 2844 RETVAL
2439 2845
2440DC::RW 2846DC::RW
2441new_from_file (SV *class, const char *path, const char *mode = "rb") 2847new_from_file (SV *klass, const char *path, const char *mode = "rb")
2442 CODE: 2848 CODE:
2443 RETVAL = SDL_RWFromFile (path, mode); 2849 RETVAL = SDL_RWFromFile (path, mode);
2444 OUTPUT: 2850 OUTPUT:
2445 RETVAL 2851 RETVAL
2446 2852
2464 if (RETVAL < 0) 2870 if (RETVAL < 0)
2465 { 2871 {
2466 RETVAL = Mix_GroupOldest (-1); 2872 RETVAL = Mix_GroupOldest (-1);
2467 2873
2468 if (RETVAL < 0) 2874 if (RETVAL < 0)
2875 {
2876 // happens sometimes, maybe it just stopped playing(?)
2877 RETVAL = Mix_GroupAvailable (-1);
2878
2879 if (RETVAL < 0)
2469 XSRETURN_UNDEF; 2880 XSRETURN_UNDEF;
2470 2881 }
2882 else
2471 Mix_HaltChannel (RETVAL); 2883 Mix_HaltChannel (RETVAL);
2472 } 2884 }
2473 2885
2474 Mix_UnregisterAllEffects (RETVAL); 2886 Mix_UnregisterAllEffects (RETVAL);
2475 Mix_Volume (RETVAL, 128); 2887 Mix_Volume (RETVAL, 128);
2476} 2888}
2523void 2935void
2524set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2936set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2525 CODE: 2937 CODE:
2526{ 2938{
2527 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2939 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2528 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2940 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2529 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2941 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2530} 2942}
2531 2943
2532void 2944void
2533set_reverse_stereo (DC::Channel self, int flip) 2945set_reverse_stereo (DC::Channel self, int flip)
2536 2948
2537MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2949MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2538 2950
2539PROTOTYPES: DISABLE 2951PROTOTYPES: DISABLE
2540 2952
2953void
2954decoders ()
2955 PPCODE:
2956#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2957 int i, num = Mix_GetNumChunkDecoders ();
2958 EXTEND (SP, num);
2959 for (i = 0; i < num; ++i)
2960 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2961#else
2962 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2963#endif
2964
2541DC::MixChunk 2965DC::MixChunk
2542new (SV *class, DC::RW rwops) 2966new (SV *klass, DC::RW rwops)
2543 CODE: 2967 CODE:
2544 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2968 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2545 OUTPUT: 2969 OUTPUT:
2546 RETVAL 2970 RETVAL
2547 2971
2577 OUTPUT: 3001 OUTPUT:
2578 RETVAL 3002 RETVAL
2579 3003
2580MODULE = Deliantra::Client PACKAGE = DC::MixMusic 3004MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2581 3005
3006void
3007decoders ()
3008 PPCODE:
3009#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
3010 int i, num = Mix_GetNumMusicDecoders ();
3011 EXTEND (SP, num);
3012 for (i = 0; i < num; ++i)
3013 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3014#else
3015 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3016#endif
3017
2582int 3018int
2583volume (int volume = -1) 3019volume (int volume = -1)
2584 PROTOTYPE: ;$ 3020 PROTOTYPE: ;$
2585 CODE: 3021 CODE:
2586 if (items > 0) 3022 if (items > 0)
2597void 3033void
2598halt () 3034halt ()
2599 CODE: 3035 CODE:
2600 Mix_HaltMusic (); 3036 Mix_HaltMusic ();
2601 3037
3038int
3039playing ()
3040 CODE:
3041 RETVAL = Mix_PlayingMusic ();
3042 OUTPUT:
3043 RETVAL
3044
2602DC::MixMusic 3045DC::MixMusic
2603new (SV *class, DC::RW rwops) 3046new (SV *klass, DC::RW rwops)
2604 CODE: 3047 CODE:
2605 RETVAL = Mix_LoadMUS_RW (rwops); 3048 RETVAL = Mix_LoadMUS_RW (rwops);
2606 OUTPUT: 3049 OUTPUT:
2607 RETVAL 3050 RETVAL
2608 3051
2636 } *civ, const_iv[] = { 3079 } *civ, const_iv[] = {
2637# define const_iv(name) { # name, (IV)name } 3080# define const_iv(name) { # name, (IV)name }
2638 const_iv (GL_VENDOR), 3081 const_iv (GL_VENDOR),
2639 const_iv (GL_VERSION), 3082 const_iv (GL_VERSION),
2640 const_iv (GL_EXTENSIONS), 3083 const_iv (GL_EXTENSIONS),
3084 const_iv (GL_MAX_TEXTURE_UNITS),
2641 const_iv (GL_COLOR_MATERIAL), 3085 const_iv (GL_COLOR_MATERIAL),
2642 const_iv (GL_SMOOTH), 3086 const_iv (GL_SMOOTH),
2643 const_iv (GL_FLAT), 3087 const_iv (GL_FLAT),
2644 const_iv (GL_DITHER), 3088 const_iv (GL_DITHER),
2645 const_iv (GL_BLEND), 3089 const_iv (GL_BLEND),
2657 const_iv (GL_ZERO), 3101 const_iv (GL_ZERO),
2658 const_iv (GL_SRC_ALPHA), 3102 const_iv (GL_SRC_ALPHA),
2659 const_iv (GL_DST_ALPHA), 3103 const_iv (GL_DST_ALPHA),
2660 const_iv (GL_ONE_MINUS_SRC_ALPHA), 3104 const_iv (GL_ONE_MINUS_SRC_ALPHA),
2661 const_iv (GL_ONE_MINUS_DST_ALPHA), 3105 const_iv (GL_ONE_MINUS_DST_ALPHA),
3106 const_iv (GL_SRC_COLOR),
3107 const_iv (GL_DST_COLOR),
3108 const_iv (GL_ONE_MINUS_SRC_COLOR),
3109 const_iv (GL_ONE_MINUS_DST_COLOR),
2662 const_iv (GL_SRC_ALPHA_SATURATE), 3110 const_iv (GL_SRC_ALPHA_SATURATE),
2663 const_iv (GL_RGB), 3111 const_iv (GL_RGB),
2664 const_iv (GL_RGBA), 3112 const_iv (GL_RGBA),
2665 const_iv (GL_RGBA4), 3113 const_iv (GL_RGBA4),
2666 const_iv (GL_RGBA8), 3114 const_iv (GL_RGBA8),
2734 const_iv (GL_NICEST), 3182 const_iv (GL_NICEST),
2735 const_iv (GL_V2F), 3183 const_iv (GL_V2F),
2736 const_iv (GL_V3F), 3184 const_iv (GL_V3F),
2737 const_iv (GL_T2F_V3F), 3185 const_iv (GL_T2F_V3F),
2738 const_iv (GL_T2F_N3F_V3F), 3186 const_iv (GL_T2F_N3F_V3F),
3187 const_iv (GL_FUNC_ADD),
3188 const_iv (GL_FUNC_SUBTRACT),
3189 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2739# undef const_iv 3190# undef const_iv
2740 }; 3191 };
2741 3192
2742 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3193 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2743 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3194 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2744 3195
2745 texture_av = newAV (); 3196 texture_av = newAV ();
2746 AvREAL_off (texture_av); 3197 AvREAL_off (texture_av);
2747} 3198}
2748 3199
2750disable_GL_EXT_blend_func_separate () 3201disable_GL_EXT_blend_func_separate ()
2751 CODE: 3202 CODE:
2752 gl.BlendFuncSeparate = 0; 3203 gl.BlendFuncSeparate = 0;
2753 gl.BlendFuncSeparateEXT = 0; 3204 gl.BlendFuncSeparateEXT = 0;
2754 3205
2755char * 3206void
3207apple_nvidia_bug (int enable)
3208
3209const char *
2756gl_vendor () 3210gl_vendor ()
2757 CODE: 3211 CODE:
2758 RETVAL = (char *)glGetString (GL_VENDOR); 3212 RETVAL = (const char *)glGetString (GL_VENDOR);
2759 OUTPUT: 3213 OUTPUT:
2760 RETVAL 3214 RETVAL
2761 3215
2762char * 3216const char *
2763gl_version () 3217gl_version ()
2764 CODE: 3218 CODE:
2765 RETVAL = (char *)glGetString (GL_VERSION); 3219 RETVAL = (const char *)glGetString (GL_VERSION);
2766 OUTPUT: 3220 OUTPUT:
2767 RETVAL 3221 RETVAL
2768 3222
2769char * 3223const char *
2770gl_extensions () 3224gl_extensions ()
2771 CODE: 3225 CODE:
2772 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3226 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2773 OUTPUT: 3227 OUTPUT:
2774 RETVAL 3228 RETVAL
2775 3229
2776const char *glGetString (GLenum pname) 3230const char *glGetString (GLenum pname)
3231 CODE:
3232 RETVAL = (const char *)glGetString (pname);
3233 OUTPUT:
3234 RETVAL
2777 3235
2778GLint glGetInteger (GLenum pname) 3236GLint glGetInteger (GLenum pname)
2779 CODE: 3237 CODE:
2780 glGetIntegerv (pname, &RETVAL); 3238 glGetIntegerv (pname, &RETVAL);
2781 OUTPUT: 3239 OUTPUT:
2789 3247
2790int glGetError () 3248int glGetError ()
2791 3249
2792void glFinish () 3250void glFinish ()
2793 3251
3252void glFlush ()
3253
2794void glClear (int mask) 3254void glClear (int mask)
2795 3255
2796void glClearColor (float r, float g, float b, float a = 1.0) 3256void glClearColor (float r, float g, float b, float a = 1.0)
2797 PROTOTYPE: @ 3257 PROTOTYPE: @
2798 3258
2807void glBlendFunc (int sfactor, int dfactor) 3267void glBlendFunc (int sfactor, int dfactor)
2808 3268
2809void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3269void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2810 CODE: 3270 CODE:
2811 gl_BlendFuncSeparate (sa, da, saa, daa); 3271 gl_BlendFuncSeparate (sa, da, saa, daa);
3272
3273# void glBlendEquation (int se)
2812 3274
2813void glDepthMask (int flag) 3275void glDepthMask (int flag)
2814 3276
2815void glLogicOp (int opcode) 3277void glLogicOp (int opcode)
2816 3278
2851void glRotate (float angle, float x, float y, float z) 3313void glRotate (float angle, float x, float y, float z)
2852 CODE: 3314 CODE:
2853 glRotatef (angle, x, y, z); 3315 glRotatef (angle, x, y, z);
2854 3316
2855void glColor (float r, float g, float b, float a = 1.0) 3317void glColor (float r, float g, float b, float a = 1.0)
3318 PROTOTYPE: @
2856 ALIAS: 3319 ALIAS:
2857 glColor_premultiply = 1 3320 glColor_premultiply = 1
2858 CODE: 3321 CODE:
2859 if (ix) 3322 if (ix)
2860 { 3323 {
2966 3429
2967void glEndList () 3430void glEndList ()
2968 3431
2969void glCallList (int list) 3432void glCallList (int list)
2970 3433
3434void c_init ()
3435 CODE:
3436 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3437 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3438
2971MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3439MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2972 3440
2973PROTOTYPES: DISABLE 3441PROTOTYPES: DISABLE
2974 3442
2975void 3443void
2976find_widget (SV *self, NV x, NV y) 3444find_widget (SV *self, NV x, NV y)
2977 PPCODE: 3445 PPCODE:
2978{ 3446{
2979 if (within_widget (self, x, y)) 3447 if (within_widget (self, x, y))
2980 XPUSHs (self); 3448 XPUSHs (self);
2981} 3449}
2982 3450
2983BOOT: 3451BOOT:
2984{ 3452{
2992 3460
2993void 3461void
2994draw (SV *self) 3462draw (SV *self)
2995 CODE: 3463 CODE:
2996{ 3464{
2997 HV *hv; 3465 HV *hv;
2998 SV **svp; 3466 SV **svp;
2999 NV x, y, w, h; 3467 NV x, y, w, h;
3000 SV *draw_x_sv = GvSV (draw_x_gv); 3468 SV *draw_x_sv = GvSV (draw_x_gv);
3001 SV *draw_y_sv = GvSV (draw_y_gv); 3469 SV *draw_y_sv = GvSV (draw_y_gv);
3002 SV *draw_w_sv = GvSV (draw_w_gv); 3470 SV *draw_w_sv = GvSV (draw_w_gv);
3003 SV *draw_h_sv = GvSV (draw_h_gv); 3471 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines