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.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.278 by root, Wed Sep 3 10:36:25 2008 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# undef pipe 21# undef pipe
22// microsoft vs. C
23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f
17#endif 27#endif
18 28
29#include <assert.h>
19#include <math.h> 30#include <math.h>
20#include <string.h> 31#include <string.h>
21#include <stdio.h> 32#include <stdio.h>
22#include <stdlib.h> 33#include <stdlib.h>
23 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
24#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
25#include <SDL_endian.h> 39#include <SDL_endian.h>
26#include <SDL_image.h> 40#include <SDL_image.h>
27#include <SDL_mixer.h> 41#include <SDL_mixer.h>
28#include <SDL_opengl.h> 42#include <SDL_opengl.h>
29 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
30#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
31#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
32 51
33#include <glib/gmacros.h> 52#include <glib/gmacros.h>
34 53
35#include <pango/pango.h> 54#include <pango/pango.h>
55
56#ifndef PANGO_VERSION_CHECK
57# define PANGO_VERSION_CHECK(a,b,c) 0
58#endif
59
60#if !PANGO_VERSION_CHECK (1, 15, 2)
61# define pango_layout_get_line_readonly pango_layout_get_line
62# define pango_layout_get_lines_readonly pango_layout_get_lines
63# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
64# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
65#endif
36 66
37#ifndef _WIN32 67#ifndef _WIN32
38# include <sys/types.h> 68# include <sys/types.h>
39# include <sys/socket.h> 69# include <sys/socket.h>
40# include <netinet/in.h> 70# include <netinet/in.h>
41# include <netinet/tcp.h> 71# include <netinet/tcp.h>
42# include <inttypes.h> 72# include <inttypes.h>
43#endif 73#endif
44 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
46 85
47#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
48 87
49#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
50#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
51 90
52#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
53 92
54#if 0 93/* mask out modifiers we are not interested in */
55# define PARACHUTE SDL_INIT_NOPARACHUTE 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
56#else 95
57# define PARACHUTE 0 96#define KMOD_LRAM 0x10000 // our extension
58#endif 97
98static AV *texture_av;
59 99
60static struct 100static struct
61{ 101{
62#define GL_FUNC(ptr,name) ptr name; 102#define GL_FUNC(ptr,name) ptr name;
63#include "glfunc.h" 103#include "glfunc.h"
64#undef GL_FUNC 104#undef GL_FUNC
65} gl; 105} gl;
66 106
107static void
67static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 108gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68{ 109{
69 if (gl.BlendFuncSeparate) 110 if (gl.BlendFuncSeparate)
70 gl.BlendFuncSeparate (sa, da, saa, daa); 111 gl.BlendFuncSeparate (sa, da, saa, daa);
71 else if (gl.BlendFuncSeparateEXT) 112 else if (gl.BlendFuncSeparateEXT)
72 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 113 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73 else 114 else
74 glBlendFunc (sa, da); 115 glBlendFunc (sa, da);
75} 116}
76 117
118static GLuint
119gen_texture ()
120{
121 GLuint name;
122
123 if (AvFILL (texture_av) >= 0)
124 name = (GLuint)(size_t)av_pop (texture_av);
125 else
126 glGenTextures (1, &name);
127
128 return name;
129}
130
131static void
132del_texture (GLuint name)
133{
134 /* make a half-assed attempt at returning the memory used by the texture */
135 /* textures are frequently being reused by cfplus anyway */
136 /*glBindTexture (GL_TEXTURE_2D, name);*/
137 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
138 av_push (texture_av, (SV *)(size_t)name);
139 glDeleteTextures (1, &name);
140}
141
77#include "texcache.c" 142#include "texcache.c"
143#include "rendercache.c"
78 144
79#include "pango-font.c" 145#include "pango-font.c"
80#include "pango-fontmap.c" 146#include "pango-fontmap.c"
81#include "pango-render.c" 147#include "pango-render.c"
82 148
149typedef IV DC__Channel;
150typedef SDL_RWops *DC__RW;
83typedef Mix_Chunk *CFPlus__MixChunk; 151typedef Mix_Chunk *DC__MixChunk;
84typedef Mix_Music *CFPlus__MixMusic; 152typedef Mix_Music *DC__MixMusic;
85 153
86typedef PangoFontDescription *CFPlus__Font; 154typedef PangoFontDescription *DC__Font;
87 155
88static int 156static int
89shape_attr_p (PangoLayoutRun *run) 157shape_attr_p (PangoLayoutRun *run)
90{ 158{
91 GSList *attrs = run->item->analysis.extra_attrs; 159 GSList *attrs = run->item->analysis.extra_attrs;
… …
105 173
106typedef struct cf_layout { 174typedef struct cf_layout {
107 PangoLayout *pl; 175 PangoLayout *pl;
108 float r, g, b, a; // default color for rgba mode 176 float r, g, b, a; // default color for rgba mode
109 int base_height; 177 int base_height;
110 CFPlus__Font font; 178 DC__Font font;
179 rc_t *rc;
111} *CFPlus__Layout; 180} *DC__Layout;
112 181
113static CFPlus__Font default_font; 182static DC__Font default_font;
114static PangoContext *opengl_context; 183static PangoContext *opengl_context;
115static PangoFontMap *opengl_fontmap; 184static PangoFontMap *opengl_fontmap;
116 185
117static void 186static void
118substitute_func (FcPattern *pattern, gpointer data) 187substitute_func (FcPattern *pattern, gpointer data)
… …
123#endif 192#endif
124 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 193 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
125} 194}
126 195
127static void 196static void
128layout_update_font (CFPlus__Layout self) 197layout_update_font (DC__Layout self)
129{ 198{
130 /* use a random scale factor to account for unknown descenders, 0.8 works 199 /* use a random scale factor to account for unknown descenders, 0.8 works
131 * reasonably well with bitstream vera 200 * reasonably well with dejavu/bistream fonts
132 */ 201 */
133 PangoFontDescription *font = self->font ? self->font : default_font; 202 PangoFontDescription *font = self->font ? self->font : default_font;
134 203
135 pango_font_description_set_absolute_size (font, 204 pango_font_description_set_absolute_size (font,
136 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 205 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
137 206
138 pango_layout_set_font_description (self->pl, font); 207 pango_layout_set_font_description (self->pl, font);
139} 208}
140 209
141static void 210static void
142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 211layout_get_pixel_size (DC__Layout self, int *w, int *h)
143{ 212{
144 PangoRectangle rect; 213 PangoRectangle rect;
145 214
146 // get_pixel_* wrongly rounds down 215 // get_pixel_* wrongly rounds down
147 pango_layout_get_extents (self->pl, 0, &rect); 216 pango_layout_get_extents (self->pl, 0, &rect);
… …
154 223
155 *w = rect.width; 224 *w = rect.width;
156 *h = rect.height; 225 *h = rect.height;
157} 226}
158 227
228typedef uint16_t tileid;
159typedef uint16_t mapface; 229typedef uint16_t faceid;
160 230
161typedef struct { 231typedef struct {
162 GLint name; 232 GLuint name;
163 int w, h; 233 int w, h;
164 float s, t; 234 float s, t;
165 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
236 tileid smoothtile;
237 uint8_t smoothlevel;
166} maptex; 238} maptex;
167 239
168typedef struct { 240typedef struct {
169 uint32_t player; 241 uint32_t player;
170 mapface face[3]; 242 tileid tile[3];
171 uint16_t darkness; 243 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags; 244 uint8_t stat_width, stat_hp, flags, smoothmax;
173} mapcell; 245} mapcell;
174 246
175typedef struct { 247typedef struct {
176 int32_t c0, c1; 248 int32_t c0, c1;
177 mapcell *col; 249 mapcell *col;
178} maprow; 250} maprow;
179 251
180typedef struct map { 252typedef struct map {
181 int x, y, w, h; 253 int x, y, w, h;
182 int ox, oy; /* offset to virtual global coordinate system */ 254 int ox, oy; /* offset to virtual global coordinate system */
183 int faces; 255 int faces; tileid *face2tile; // [faceid]
184 mapface *face; 256 int texs; maptex *tex; // [tileid]
185
186 int texs;
187 maptex *tex;
188 257
189 int32_t rows; 258 int32_t rows;
190 maprow *row; 259 maprow *row;
191} *CFPlus__Map; 260} *DC__Map;
192 261
193static char * 262static char *
194prepend (char *ptr, int sze, int inc) 263prepend (char *ptr, int sze, int inc)
195{ 264{
196 char *p; 265 char *p;
… …
213} 282}
214 283
215#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 284#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 285#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
217 286
287static void
288need_facenum (struct map *self, faceid face)
289{
290 while (self->faces <= face)
291 {
292 Append (tileid, self->face2tile, self->faces, self->faces);
293 self->faces *= 2;
294 }
295}
296
297static void
298need_texid (struct map *self, int texid)
299{
300 while (self->texs <= texid)
301 {
302 Append (maptex, self->tex, self->texs, self->texs);
303 self->texs *= 2;
304 }
305}
306
218static maprow * 307static maprow *
219map_get_row (CFPlus__Map self, int y) 308map_get_row (DC__Map self, int y)
220{ 309{
221 if (0 > y) 310 if (0 > y)
222 { 311 {
223 int extend = - y + MAP_EXTEND_Y; 312 int extend = - y + MAP_EXTEND_Y;
224 Prepend (maprow, self->row, self->rows, extend); 313 Prepend (maprow, self->row, self->rows, extend);
… …
262 351
263 return row->col + (x - row->c0); 352 return row->col + (x - row->c0);
264} 353}
265 354
266static mapcell * 355static mapcell *
267map_get_cell (CFPlus__Map self, int x, int y) 356map_get_cell (DC__Map self, int x, int y)
268{ 357{
269 return row_get_cell (map_get_row (self, y), x); 358 return row_get_cell (map_get_row (self, y), x);
270} 359}
271 360
272static void 361static void
273map_clear (CFPlus__Map self) 362map_clear (DC__Map self)
274{ 363{
275 int r; 364 int r;
276 365
277 for (r = 0; r < self->rows; r++) 366 for (r = 0; r < self->rows; r++)
278 Safefree (self->row[r].col); 367 Safefree (self->row[r].col);
… …
285 self->oy = 0; 374 self->oy = 0;
286 self->row = 0; 375 self->row = 0;
287 self->rows = 0; 376 self->rows = 0;
288} 377}
289 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
290static void 389static void
291map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
292{ 391{
293 int x, y; 392 int x, y;
294 maprow *row; 393 maprow *row;
295 mapcell *cell; 394 mapcell *cell;
296 395
… …
308 if (x >= row->c1) 407 if (x >= row->c1)
309 break; 408 break;
310 409
311 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
312 411
313 cell->darkness = 0; 412 CELL_CLEAR (cell);
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
317 } 413 }
318 } 414 }
415}
416
417typedef struct {
418 tileid tile;
419 uint8_t x, y, level;
420} smooth_key;
421
422static void
423smooth_or_bits (HV *hv, smooth_key *key, IV bits)
424{
425 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
426
427 if (SvIOK (*sv))
428 SvIV_set (*sv, SvIVX (*sv) | bits);
429 else
430 sv_setiv (*sv, bits);
319} 431}
320 432
321static void 433static void
322music_finished (void) 434music_finished (void)
323{ 435{
… …
359 n |= n >> 16; 471 n |= n >> 16;
360 472
361 return n + 1; 473 return n + 1;
362} 474}
363 475
476static unsigned int
477popcount (unsigned int n)
478{
479 n -= (n >> 1) & 0x55555555U;
480 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
481 n = ((n >> 4) + n) & 0x0f0f0f0fU;
482 n *= 0x01010101U;
483
484 return n >> 24;
485}
486
364/* SDL should provide this, really. */ 487/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300 488#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314 489#define SDLK_MODIFIER_MAX 314
367 490
368MODULE = CFPlus PACKAGE = CFPlus 491/******************************************************************************/
492
493static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
494static GV *hover_gv;
495
496static int
497within_widget (SV *widget, NV x, NV y)
498{
499 HV *self;
500 SV **svp;
501 NV wx, ww, wy, wh;
502
503 if (!SvROK (widget))
504 return 0;
505
506 self = (HV *)SvRV (widget);
507
508 if (SvTYPE (self) != SVt_PVHV)
509 return 0;
510
511 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
512 if (y < wy)
513 return 0;
514
515 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
516 if (y >= wy + wh)
517 return 0;
518
519 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
520 if (x < wx)
521 return 0;
522
523 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
524 if (x >= wx + ww)
525 return 0;
526
527 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
528 if (!svp || !SvTRUE (*svp))
529 return 0;
530
531 return 1;
532}
533
534/******************************************************************************/
535
536/* process keyboard modifiers */
537static int
538mod_munge (int mod)
539{
540 mod &= MOD_MASK;
541
542 if (mod & (KMOD_META | KMOD_ALT))
543 mod |= KMOD_LRAM;
544
545 return mod;
546}
547
548static void
549deliantra_main ()
550{
551 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv);
553}
554
555#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back.
561 */
562 extern C_LINKAGE int
563 main (int argc, char *argv[])
564 {
565 deliantra_main ();
566 }
567
568 #undef main
569
570 extern C_LINKAGE int main (int argc, char *argv[]);
571
572 static void
573 SDL_braino (void)
574 {
575 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv);
577 }
578#else
579 static void
580 SDL_braino (void)
581 {
582 deliantra_main ();
583 }
584#endif
585
586MODULE = Deliantra::Client PACKAGE = DC
369 587
370PROTOTYPES: ENABLE 588PROTOTYPES: ENABLE
371 589
372BOOT: 590BOOT:
373{ 591{
374 HV *stash = gv_stashpv ("CFPlus", 1); 592 HV *stash = gv_stashpv ("DC", 1);
375 static const struct { 593 static const struct {
376 const char *name; 594 const char *name;
377 IV iv; 595 IV iv;
378 } *civ, const_iv[] = { 596 } *civ, const_iv[] = {
379# define const_iv(name) { # name, (IV)name } 597# define const_iv(name) { # name, (IV)name }
… …
401 619
402 const_iv (SDL_APPINPUTFOCUS), 620 const_iv (SDL_APPINPUTFOCUS),
403 const_iv (SDL_APPMOUSEFOCUS), 621 const_iv (SDL_APPMOUSEFOCUS),
404 const_iv (SDL_APPACTIVE), 622 const_iv (SDL_APPACTIVE),
405 623
624
625 const_iv (SDLK_UNKNOWN),
626 const_iv (SDLK_FIRST),
627 const_iv (SDLK_BACKSPACE),
628 const_iv (SDLK_TAB),
629 const_iv (SDLK_CLEAR),
630 const_iv (SDLK_RETURN),
631 const_iv (SDLK_PAUSE),
632 const_iv (SDLK_ESCAPE),
633 const_iv (SDLK_SPACE),
634 const_iv (SDLK_EXCLAIM),
635 const_iv (SDLK_QUOTEDBL),
636 const_iv (SDLK_HASH),
637 const_iv (SDLK_DOLLAR),
638 const_iv (SDLK_AMPERSAND),
639 const_iv (SDLK_QUOTE),
640 const_iv (SDLK_LEFTPAREN),
641 const_iv (SDLK_RIGHTPAREN),
642 const_iv (SDLK_ASTERISK),
643 const_iv (SDLK_PLUS),
644 const_iv (SDLK_COMMA),
645 const_iv (SDLK_MINUS),
646 const_iv (SDLK_PERIOD),
647 const_iv (SDLK_SLASH),
648 const_iv (SDLK_0),
649 const_iv (SDLK_1),
650 const_iv (SDLK_2),
651 const_iv (SDLK_3),
652 const_iv (SDLK_4),
653 const_iv (SDLK_5),
654 const_iv (SDLK_6),
655 const_iv (SDLK_7),
656 const_iv (SDLK_8),
657 const_iv (SDLK_9),
658 const_iv (SDLK_COLON),
659 const_iv (SDLK_SEMICOLON),
660 const_iv (SDLK_LESS),
661 const_iv (SDLK_EQUALS),
662 const_iv (SDLK_GREATER),
663 const_iv (SDLK_QUESTION),
664 const_iv (SDLK_AT),
665
666 const_iv (SDLK_LEFTBRACKET),
667 const_iv (SDLK_BACKSLASH),
668 const_iv (SDLK_RIGHTBRACKET),
669 const_iv (SDLK_CARET),
670 const_iv (SDLK_UNDERSCORE),
671 const_iv (SDLK_BACKQUOTE),
672 const_iv (SDLK_DELETE),
673
674 const_iv (SDLK_FIRST),
675 const_iv (SDLK_LAST),
406 const_iv (SDLK_KP0), 676 const_iv (SDLK_KP0),
407 const_iv (SDLK_KP1), 677 const_iv (SDLK_KP1),
408 const_iv (SDLK_KP2), 678 const_iv (SDLK_KP2),
409 const_iv (SDLK_KP3), 679 const_iv (SDLK_KP3),
410 const_iv (SDLK_KP4), 680 const_iv (SDLK_KP4),
… …
482 const_iv (KMOD_LMETA), 752 const_iv (KMOD_LMETA),
483 const_iv (KMOD_RMETA), 753 const_iv (KMOD_RMETA),
484 const_iv (KMOD_NUM), 754 const_iv (KMOD_NUM),
485 const_iv (KMOD_CAPS), 755 const_iv (KMOD_CAPS),
486 const_iv (KMOD_MODE), 756 const_iv (KMOD_MODE),
757
758 const_iv (KMOD_LRAM),
759
760 const_iv (MIX_DEFAULT_FORMAT),
761
762 const_iv (SDL_INIT_TIMER),
763 const_iv (SDL_INIT_AUDIO),
764 const_iv (SDL_INIT_VIDEO),
765 const_iv (SDL_INIT_CDROM),
766 const_iv (SDL_INIT_JOYSTICK),
767 const_iv (SDL_INIT_EVERYTHING),
768 const_iv (SDL_INIT_NOPARACHUTE),
769 const_iv (SDL_INIT_EVENTTHREAD),
770
771 const_iv (SDL_GL_RED_SIZE),
772 const_iv (SDL_GL_GREEN_SIZE),
773 const_iv (SDL_GL_BLUE_SIZE),
774 const_iv (SDL_GL_ALPHA_SIZE),
775 const_iv (SDL_GL_DOUBLEBUFFER),
776 const_iv (SDL_GL_BUFFER_SIZE),
777 const_iv (SDL_GL_DEPTH_SIZE),
778 const_iv (SDL_GL_STENCIL_SIZE),
779 const_iv (SDL_GL_ACCUM_RED_SIZE),
780 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
781 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
782 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
783 const_iv (SDL_GL_STEREO),
784 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
785 const_iv (SDL_GL_MULTISAMPLESAMPLES),
786 const_iv (SDL_GL_ACCELERATED_VISUAL),
787 const_iv (SDL_GL_SWAP_CONTROL),
788
789 const_iv (FOW_DARKNESS)
487# undef const_iv 790# undef const_iv
488 }; 791 };
489 792
490 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
491 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
492 795
493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 796 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 797 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
495} 798}
496 799
800void
801weaken (SV *rv)
802 PROTOTYPE: $
803 CODE:
804 sv_rvweaken (rv);
805
497int 806int
498in_destruct () 807in_destruct ()
499 CODE: 808 CODE:
500 RETVAL = PL_main_cv == Nullcv; 809 RETVAL = PL_main_cv == Nullcv;
501 OUTPUT: 810 OUTPUT:
… …
503 812
504NV floor (NV x) 813NV floor (NV x)
505 814
506NV ceil (NV x) 815NV ceil (NV x)
507 816
817IV minpot (UV n)
818
819IV popcount (UV n)
820
508void 821void
509pango_init () 822pango_init ()
510 CODE: 823 CODE:
511{ 824{
512 opengl_fontmap = pango_opengl_font_map_new (); 825 opengl_fontmap = pango_opengl_font_map_new ();
513 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 826 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
514 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 827 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
828 /*pango_context_set_font_description (opengl_context, default_font);*/
829#if PANGO_VERSION_CHECK (1, 15, 2)
830 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
831 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
832#endif
515} 833}
516 834
517int 835char *SDL_GetError ()
518SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
519 836
520void 837void SDL_braino ()
838
839int SDL_Init (U32 flags)
840
841int SDL_InitSubSystem (U32 flags)
842
843void SDL_QuitSubSystem (U32 flags)
844
521SDL_Quit () 845void SDL_Quit ()
522 846
847int SDL_GL_SetAttribute (int attr, int value)
848
849int SDL_GL_GetAttribute (int attr)
850 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL))
852 XSRETURN_UNDEF;
853 OUTPUT:
854 RETVAL
855
523void 856void
524SDL_ListModes () 857SDL_ListModes (int rgb, int alpha)
525 PPCODE: 858 PPCODE:
526{ 859{
527 SDL_Rect **m; 860 SDL_Rect **m;
528 861
529 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 862 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
530 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 863 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
531 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 864 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
532 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 865 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
533 866
534 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 867 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
535 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 868 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
536 869
537 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 870 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
538 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
539 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
540 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
541 874
542 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 875 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
543#if SDL_VERSION_ATLEAST(1,2,10)
544 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
545 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 876 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
546#endif
547
548 SDL_EnableUNICODE (1);
549 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
550 877
551 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
552 879
553 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
554 while (*m) 881 while (*m)
555 { 882 {
883 if ((*m)->w >= 400 && (*m)->h >= 300)
884 {
556 AV *av = newAV (); 885 AV *av = newAV ();
557 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
558 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
888 av_push (av, newSViv (rgb));
889 av_push (av, newSViv (alpha));
559 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 890 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
891 }
560 892
561 ++m; 893 ++m;
562 } 894 }
563} 895}
564 896
565char *
566SDL_GetError ()
567
568int 897int
569SDL_SetVideoMode (int w, int h, int fullscreen) 898SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
570 CODE: 899 CODE:
900{
901 SDL_EnableUNICODE (1);
902 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
903
904 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
905 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
906 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
907 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
908
571 RETVAL = !!SDL_SetVideoMode ( 909 RETVAL = !!SDL_SetVideoMode (
572 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 910 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
573 ); 911 );
912
574 if (RETVAL) 913 if (RETVAL)
575 { 914 {
576 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 915 av_clear (texture_av);
916
917 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
577# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 918#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
578# include "glfunc.h" 919#include "glfunc.h"
579# undef GL_FUNC 920#undef GL_FUNC
580 } 921 }
922}
581 OUTPUT: 923 OUTPUT:
582 RETVAL 924 RETVAL
583 925
584void 926void
585SDL_GL_SwapBuffers () 927SDL_GL_SwapBuffers ()
586 928
587char * 929char *
588SDL_GetKeyName (int sym) 930SDL_GetKeyName (int sym)
589 931
932int
933SDL_GetAppState ()
934
935int
936SDL_GetModState ()
937
590void 938void
591SDL_PollEvent () 939poll_events ()
592 PPCODE: 940 PPCODE:
593{ 941{
594 SDL_Event ev; 942 SDL_Event ev;
595 943
596 while (SDL_PollEvent (&ev)) 944 SDL_PumpEvents ();
945 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
597 { 946 {
598 HV *hv = newHV (); 947 HV *hv = newHV ();
599 hv_store (hv, "type", 4, newSViv (ev.type), 0); 948 hv_store (hv, "type", 4, newSViv (ev.type), 0);
600 949
601 switch (ev.type) 950 switch (ev.type)
602 { 951 {
603 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
604 case SDL_KEYUP: 953 case SDL_KEYUP:
605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
607 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 956 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
608 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 957 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
610 break; 959 break;
611 960
612 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
614 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 963 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
615 break; 964 break;
616 965
617 case SDL_MOUSEMOTION: 966 case SDL_MOUSEMOTION:
967 {
968 int state = ev.motion.state;
969 int x = ev.motion.x;
970 int y = ev.motion.y;
971 int xrel = ev.motion.xrel;
972 int yrel = ev.motion.yrel;
973
974 /* do simplistic event compression */
975 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
976 && state == ev.motion.state)
977 {
978 xrel += ev.motion.xrel;
979 yrel += ev.motion.yrel;
980 x = ev.motion.x;
981 y = ev.motion.y;
982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
983 }
984
618 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
619
620 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
621 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
622 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
623 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
624 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
991 }
625 break; 992 break;
626 993
627 case SDL_MOUSEBUTTONDOWN: 994 case SDL_MOUSEBUTTONDOWN:
628 case SDL_MOUSEBUTTONUP: 995 case SDL_MOUSEBUTTONUP:
629 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 996 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
630 997
631 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 998 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
632 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 999 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
633 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 1000 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
634 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 1001 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
639 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 1006 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
640 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 1007 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
641 break; 1008 break;
642 } 1009 }
643 1010
644 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1)))); 1011 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
645 } 1012 }
646} 1013}
647 1014
648int 1015int
649Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 1016Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
650 POSTCALL: 1017 POSTCALL:
651 Mix_HookMusicFinished (music_finished); 1018 Mix_HookMusicFinished (music_finished);
652 Mix_ChannelFinished (channel_finished); 1019 Mix_ChannelFinished (channel_finished);
653 1020
654void 1021void
1022Mix_QuerySpec ()
1023 PPCODE:
1024{
1025 int freq, channels;
1026 Uint16 format;
1027
1028 if (Mix_QuerySpec (&freq, &format, &channels))
1029 {
1030 EXTEND (SP, 3);
1031 PUSHs (sv_2mortal (newSViv (freq)));
1032 PUSHs (sv_2mortal (newSViv (format)));
1033 PUSHs (sv_2mortal (newSViv (channels)));
1034 }
1035}
1036
1037void
655Mix_CloseAudio () 1038Mix_CloseAudio ()
656 1039
657int 1040int
658Mix_AllocateChannels (int numchans = -1) 1041Mix_AllocateChannels (int numchans = -1)
659 1042
1043const char *
1044Mix_GetError ()
1045
660void 1046void
661lowdelay (int fd, int val = 1) 1047lowdelay (int fd, int val = 1)
662 CODE: 1048 CODE:
663#ifndef _WIN32
664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 1049 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
665#endif
666 1050
667void 1051void
668win32_proxy_info () 1052win32_proxy_info ()
669 PPCODE: 1053 PPCODE:
670{ 1054{
… …
691 } 1075 }
692 } 1076 }
693#endif 1077#endif
694} 1078}
695 1079
696void 1080int
697add_font (char *file) 1081add_font (char *file)
698 CODE: 1082 CODE:
699 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1083 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084 OUTPUT:
1085 RETVAL
700 1086
701void 1087void
702load_image_inline (SV *image_) 1088load_image_inline (SV *image_)
703 ALIAS: 1089 ALIAS:
704 load_image_file = 1 1090 load_image_file = 1
… …
707 STRLEN image_len; 1093 STRLEN image_len;
708 char *image = (char *)SvPVbyte (image_, image_len); 1094 char *image = (char *)SvPVbyte (image_, image_len);
709 SDL_Surface *surface, *surface2; 1095 SDL_Surface *surface, *surface2;
710 SDL_PixelFormat fmt; 1096 SDL_PixelFormat fmt;
711 SDL_RWops *rw = ix 1097 SDL_RWops *rw = ix
712 ? SDL_RWFromFile (image, "r") 1098 ? SDL_RWFromFile (image, "rb")
713 : SDL_RWFromConstMem (image, image_len); 1099 : SDL_RWFromConstMem (image, image_len);
714 1100
715 if (!rw) 1101 if (!rw)
716 croak ("load_image: %s", SDL_GetError ()); 1102 croak ("load_image: %s", SDL_GetError ());
717 1103
… …
790void 1176void
791error (char *message) 1177error (char *message)
792 CODE: 1178 CODE:
793 fprintf (stderr, "ERROR: %s\n", message); 1179 fprintf (stderr, "ERROR: %s\n", message);
794#ifdef _WIN32 1180#ifdef _WIN32
795 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1181 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
796#endif 1182#endif
797 1183
798void 1184void
799fatal (char *message) 1185fatal (char *message)
800 CODE: 1186 CODE:
801 fprintf (stderr, "FATAL: %s\n", message); 1187 fprintf (stderr, "FATAL: %s\n", message);
802#ifdef _WIN32 1188#ifdef _WIN32
803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1189 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
804#endif 1190#endif
805 _exit (1); 1191 _exit (1);
806 1192
807void 1193void
808_exit (int retval = 0) 1194_exit (int retval = 0)
… …
811 ExitThread (retval); // unclean, please beam me up 1197 ExitThread (retval); // unclean, please beam me up
812#else 1198#else
813 _exit (retval); 1199 _exit (retval);
814#endif 1200#endif
815 1201
816MODULE = CFPlus PACKAGE = CFPlus::Font 1202void
1203debug ()
1204 CODE:
1205{
1206#if DEBUG
1207 VALGRIND_DO_LEAK_CHECK;
1208#endif
1209}
817 1210
818CFPlus::Font 1211MODULE = Deliantra::Client PACKAGE = DC::Font
1212
1213PROTOTYPES: DISABLE
1214
1215DC::Font
819new_from_file (SV *class, char *path, int id = 0) 1216new_from_file (SV *class, char *path, int id = 0)
820 CODE: 1217 CODE:
821{ 1218{
822 int count; 1219 int count;
823 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1220 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
826} 1223}
827 OUTPUT: 1224 OUTPUT:
828 RETVAL 1225 RETVAL
829 1226
830void 1227void
831DESTROY (CFPlus::Font self) 1228DESTROY (DC::Font self)
832 CODE: 1229 CODE:
833 pango_font_description_free (self); 1230 pango_font_description_free (self);
834 1231
835void 1232void
836make_default (CFPlus::Font self) 1233make_default (DC::Font self)
1234 PROTOTYPE: $
837 CODE: 1235 CODE:
838 default_font = self; 1236 default_font = self;
839 1237
840MODULE = CFPlus PACKAGE = CFPlus::Layout 1238MODULE = Deliantra::Client PACKAGE = DC::Layout
841 1239
1240PROTOTYPES: DISABLE
1241
842void 1242void
843reset_glyph_cache () 1243glyph_cache_backup ()
1244 PROTOTYPE:
844 CODE: 1245 CODE:
1246 tc_backup ();
1247
1248void
1249glyph_cache_restore ()
1250 PROTOTYPE:
1251 CODE:
845 tc_clear (); 1252 tc_restore ();
846 1253
847CFPlus::Layout 1254DC::Layout
848new (SV *class) 1255new (SV *class)
849 CODE: 1256 CODE:
850 New (0, RETVAL, 1, struct cf_layout); 1257 New (0, RETVAL, 1, struct cf_layout);
851 1258
852 RETVAL->pl = pango_layout_new (opengl_context); 1259 RETVAL->pl = pango_layout_new (opengl_context);
… …
854 RETVAL->g = 1.; 1261 RETVAL->g = 1.;
855 RETVAL->b = 1.; 1262 RETVAL->b = 1.;
856 RETVAL->a = 1.; 1263 RETVAL->a = 1.;
857 RETVAL->base_height = MIN_FONT_HEIGHT; 1264 RETVAL->base_height = MIN_FONT_HEIGHT;
858 RETVAL->font = 0; 1265 RETVAL->font = 0;
1266 RETVAL->rc = rc_alloc ();
859 1267
860 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1268 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
861 layout_update_font (RETVAL); 1269 layout_update_font (RETVAL);
862 OUTPUT: 1270 OUTPUT:
863 RETVAL 1271 RETVAL
864 1272
865void 1273void
866DESTROY (CFPlus::Layout self) 1274DESTROY (DC::Layout self)
867 CODE: 1275 CODE:
868 g_object_unref (self->pl); 1276 g_object_unref (self->pl);
1277 rc_free (self->rc);
869 Safefree (self); 1278 Safefree (self);
870 1279
871void 1280void
872set_text (CFPlus::Layout self, SV *text_) 1281set_text (DC::Layout self, SV *text_)
873 CODE: 1282 CODE:
874{ 1283{
875 STRLEN textlen; 1284 STRLEN textlen;
876 char *text = SvPVutf8 (text_, textlen); 1285 char *text = SvPVutf8 (text_, textlen);
877 1286
878 pango_layout_set_text (self->pl, text, textlen); 1287 pango_layout_set_text (self->pl, text, textlen);
879} 1288}
880 1289
881void 1290void
882set_markup (CFPlus::Layout self, SV *text_) 1291set_markup (DC::Layout self, SV *text_)
883 CODE: 1292 CODE:
884{ 1293{
885 STRLEN textlen; 1294 STRLEN textlen;
886 char *text = SvPVutf8 (text_, textlen); 1295 char *text = SvPVutf8 (text_, textlen);
887 1296
888 pango_layout_set_markup (self->pl, text, textlen); 1297 pango_layout_set_markup (self->pl, text, textlen);
889} 1298}
890 1299
891void 1300void
892set_shapes (CFPlus::Layout self, ...) 1301set_shapes (DC::Layout self, ...)
893 CODE: 1302 CODE:
894{ 1303{
895 PangoAttrList *attrs = 0; 1304 PangoAttrList *attrs = 0;
896 const char *text = pango_layout_get_text (self->pl); 1305 const char *text = pango_layout_get_text (self->pl);
897 const char *pos = text; 1306 const char *pos = text;
… …
932 if (attrs) 1341 if (attrs)
933 pango_layout_set_attributes (self->pl, attrs); 1342 pango_layout_set_attributes (self->pl, attrs);
934} 1343}
935 1344
936void 1345void
937get_shapes (CFPlus::Layout self) 1346get_shapes (DC::Layout self)
938 PPCODE: 1347 PPCODE:
939{ 1348{
940 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1349 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
941 1350
942 do 1351 do
943 { 1352 {
944 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1353 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
945 1354
946 if (run && shape_attr_p (run)) 1355 if (run && shape_attr_p (run))
947 { 1356 {
948 PangoRectangle extents; 1357 PangoRectangle extents;
949 pango_layout_iter_get_run_extents (iter, 0, &extents); 1358 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
957 1366
958 pango_layout_iter_free (iter); 1367 pango_layout_iter_free (iter);
959} 1368}
960 1369
961int 1370int
962has_wrapped (CFPlus::Layout self) 1371has_wrapped (DC::Layout self)
963 CODE: 1372 CODE:
964{ 1373{
965 int lines = 1; 1374 int lines = 1;
966 const char *text = pango_layout_get_text (self->pl); 1375 const char *text = pango_layout_get_text (self->pl);
967 1376
… …
972} 1381}
973 OUTPUT: 1382 OUTPUT:
974 RETVAL 1383 RETVAL
975 1384
976SV * 1385SV *
977get_text (CFPlus::Layout self) 1386get_text (DC::Layout self)
978 CODE: 1387 CODE:
979 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1388 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
980 sv_utf8_decode (RETVAL); 1389 sv_utf8_decode (RETVAL);
981 OUTPUT: 1390 OUTPUT:
982 RETVAL 1391 RETVAL
983 1392
984void 1393void
985set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.) 1394set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
986 CODE: 1395 CODE:
987 self->r = r; 1396 self->r = r;
988 self->g = g; 1397 self->g = g;
989 self->b = b; 1398 self->b = b;
990 self->a = a; 1399 self->a = a;
991 1400
992void 1401void
993set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1402set_font (DC::Layout self, DC::Font font = 0)
994 CODE: 1403 CODE:
995 if (self->font != font) 1404 if (self->font != font)
996 { 1405 {
997 self->font = font; 1406 self->font = font;
998 layout_update_font (self); 1407 layout_update_font (self);
999 } 1408 }
1000 1409
1001void 1410void
1002set_height (CFPlus::Layout self, int base_height) 1411set_height (DC::Layout self, int base_height)
1003 CODE: 1412 CODE:
1004 if (self->base_height != base_height) 1413 if (self->base_height != base_height)
1005 { 1414 {
1006 self->base_height = base_height; 1415 self->base_height = base_height;
1007 layout_update_font (self); 1416 layout_update_font (self);
1008 } 1417 }
1009 1418
1010void 1419void
1011set_width (CFPlus::Layout self, int max_width = -1) 1420set_width (DC::Layout self, int max_width = -1)
1012 CODE: 1421 CODE:
1013 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1422 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1014 1423
1015void 1424void
1016set_indent (CFPlus::Layout self, int indent) 1425set_indent (DC::Layout self, int indent)
1017 CODE: 1426 CODE:
1018 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1427 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1019 1428
1020void 1429void
1021set_spacing (CFPlus::Layout self, int spacing) 1430set_spacing (DC::Layout self, int spacing)
1022 CODE: 1431 CODE:
1023 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1432 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1024 1433
1025void 1434void
1026set_ellipsise (CFPlus::Layout self, int ellipsise) 1435set_ellipsise (DC::Layout self, int ellipsise)
1027 CODE: 1436 CODE:
1028 pango_layout_set_ellipsize (self->pl, 1437 pango_layout_set_ellipsize (self->pl,
1029 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1438 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1030 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1439 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1031 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1440 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1032 : PANGO_ELLIPSIZE_NONE 1441 : PANGO_ELLIPSIZE_NONE
1033 ); 1442 );
1034 1443
1035void 1444void
1036set_single_paragraph_mode (CFPlus::Layout self, int spm) 1445set_single_paragraph_mode (DC::Layout self, int spm)
1037 CODE: 1446 CODE:
1038 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1447 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1039 1448
1040void 1449void
1041size (CFPlus::Layout self) 1450size (DC::Layout self)
1042 PPCODE: 1451 PPCODE:
1043{ 1452{
1044 int w, h; 1453 int w, h;
1045 1454
1046 layout_get_pixel_size (self, &w, &h); 1455 layout_get_pixel_size (self, &w, &h);
… …
1049 PUSHs (sv_2mortal (newSViv (w))); 1458 PUSHs (sv_2mortal (newSViv (w)));
1050 PUSHs (sv_2mortal (newSViv (h))); 1459 PUSHs (sv_2mortal (newSViv (h)));
1051} 1460}
1052 1461
1053int 1462int
1054descent (CFPlus::Layout self) 1463descent (DC::Layout self)
1055 CODE: 1464 CODE:
1056{ 1465{
1057 PangoRectangle rect; 1466 PangoRectangle rect;
1058 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1467 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1059 pango_layout_line_get_pixel_extents (line, 0, &rect); 1468 pango_layout_line_get_pixel_extents (line, 0, &rect);
1060 RETVAL = PANGO_DESCENT (rect); 1469 RETVAL = PANGO_DESCENT (rect);
1061} 1470}
1062 OUTPUT: 1471 OUTPUT:
1063 RETVAL 1472 RETVAL
1064 1473
1065int 1474int
1066xy_to_index (CFPlus::Layout self, int x, int y) 1475xy_to_index (DC::Layout self, int x, int y)
1067 CODE: 1476 CODE:
1068{ 1477{
1069 int index, trailing; 1478 int index, trailing;
1070 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1479 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1071 RETVAL = index + trailing; 1480 RETVAL = index + trailing;
1072} 1481}
1073 OUTPUT: 1482 OUTPUT:
1074 RETVAL 1483 RETVAL
1075 1484
1076void 1485void
1077cursor_pos (CFPlus::Layout self, int index) 1486cursor_pos (DC::Layout self, int index)
1078 PPCODE: 1487 PPCODE:
1079{ 1488{
1080 PangoRectangle strong_pos; 1489 PangoRectangle pos;
1081 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1490 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1082 1491
1083 EXTEND (SP, 3); 1492 EXTEND (SP, 3);
1084 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1493 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1494 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1495 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1087} 1496}
1088 1497
1089void 1498void
1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0) 1499index_to_line_x (DC::Layout self, int index, int trailing = 0)
1091 PPCODE: 1500 PPCODE:
1092{ 1501{
1093 int line, x; 1502 int line, x;
1094 1503
1095 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1504 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1505#if !PANGO_VERSION_CHECK (1, 17, 3)
1096 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1506 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1097 1507 --line;
1508#endif
1098 EXTEND (SP, 2); 1509 EXTEND (SP, 2);
1099 PUSHs (sv_2mortal (newSViv (line - 1))); 1510 PUSHs (sv_2mortal (newSViv (line)));
1100 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1511 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1101} 1512}
1102 1513
1103void 1514void
1104line_x_to_index (CFPlus::Layout self, int line, int x) 1515line_x_to_index (DC::Layout self, int line, int x)
1105 PPCODE: 1516 PPCODE:
1106{ 1517{
1107 PangoLayoutLine *lp; 1518 PangoLayoutLine *lp;
1108 int index, trailing; 1519 int index, trailing;
1109 1520
1110 if (line < 0) 1521 if (line < 0)
1111 XSRETURN_EMPTY; 1522 XSRETURN_EMPTY;
1112 1523
1113 if (!(lp = pango_layout_get_line (self->pl, line))) 1524 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1114 XSRETURN_EMPTY; /* do better */ 1525 XSRETURN_EMPTY; /* do better */
1115 1526
1116 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1527 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1117 1528
1118 EXTEND (SP, 2); 1529 EXTEND (SP, 2);
… …
1124 PUSHs (sv_2mortal (newSViv (trailing))); 1535 PUSHs (sv_2mortal (newSViv (trailing)));
1125 } 1536 }
1126} 1537}
1127 1538
1128void 1539void
1129render (CFPlus::Layout self, float x, float y, int flags = 0) 1540render (DC::Layout self, float x, float y, int flags = 0)
1130 PPCODE: 1541 CODE:
1542 rc_clear (self->rc);
1131 pango_opengl_render_layout_subpixel ( 1543 pango_opengl_render_layout_subpixel (
1132 self->pl, 1544 self->pl,
1545 self->rc,
1133 x * PANGO_SCALE, y * PANGO_SCALE, 1546 x * PANGO_SCALE, y * PANGO_SCALE,
1134 self->r, self->g, self->b, self->a, 1547 self->r, self->g, self->b, self->a,
1135 flags 1548 flags
1136 ); 1549 );
1550 // we assume that context_change actually clears/frees stuff
1551 // and does not do any recomputation...
1552 pango_layout_context_changed (self->pl);
1137 1553
1138MODULE = CFPlus PACKAGE = CFPlus::Texture
1139
1140void 1554void
1141pad2pot (SV *data_, SV *w_, SV *h_) 1555draw (DC::Layout self)
1142 CODE: 1556 CODE:
1143{ 1557{
1144 int ow = SvIV (w_); 1558 glEnable (GL_TEXTURE_2D);
1145 int oh = SvIV (h_); 1559 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1560 glEnable (GL_BLEND);
1561 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1562 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1563 glEnable (GL_ALPHA_TEST);
1564 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1146 1565
1147 if (ow && oh) 1566 rc_draw (self->rc);
1567
1568 glDisable (GL_ALPHA_TEST);
1569 glDisable (GL_BLEND);
1570 glDisable (GL_TEXTURE_2D);
1571}
1572
1573MODULE = Deliantra::Client PACKAGE = DC::Texture
1574
1575PROTOTYPES: ENABLE
1576
1577void
1578pad (SV *data_, int ow, int oh, int nw, int nh)
1579 CODE:
1580{
1581 if ((nw != ow || nh != oh) && SvOK (data_))
1148 { 1582 {
1149 int nw = minpot (ow);
1150 int nh = minpot (oh);
1151
1152 if (nw != ow || nh != oh)
1153 {
1154 if (SvOK (data_))
1155 {
1156 STRLEN datalen; 1583 STRLEN datalen;
1157 char *data = SvPVbyte (data_, datalen); 1584 char *data = SvPVbyte (data_, datalen);
1158 int bpp = datalen / (ow * oh); 1585 int bpp = datalen / (ow * oh);
1159 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1586 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1160 1587
1161 SvPOK_only (result_); 1588 SvPOK_only (result_);
1162 SvCUR_set (result_, nw * nh * bpp); 1589 SvCUR_set (result_, nw * nh * bpp);
1163 1590
1164 memset (SvPVX (result_), 0, nw * nh * bpp); 1591 memset (SvPVX (result_), 0, nw * nh * bpp);
1165 while (oh--) 1592 while (oh--)
1166 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1593 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1167 1594
1168 sv_setsv (data_, result_); 1595 sv_setsv (data_, result_);
1169 }
1170
1171 sv_setiv (w_, nw);
1172 sv_setiv (h_, nh);
1173 }
1174 } 1596 }
1175} 1597}
1176 1598
1177void 1599void
1178draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1600draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1184{ 1606{
1185 HV *hv = (HV *)SvRV (self); 1607 HV *hv = (HV *)SvRV (self);
1186 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1608 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1187 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1609 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1188 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1610 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1611
1612 if (name <= 0)
1613 XSRETURN_EMPTY;
1189 1614
1190 if (items < 5) 1615 if (items < 5)
1191 { 1616 {
1192 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1617 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1193 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1618 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1221 glDisable (GL_ALPHA_TEST); 1646 glDisable (GL_ALPHA_TEST);
1222 glDisable (GL_BLEND); 1647 glDisable (GL_BLEND);
1223 } 1648 }
1224} 1649}
1225 1650
1226MODULE = CFPlus PACKAGE = CFPlus::Map 1651IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652 CODE:
1653{
1654 GLint width;
1655 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1656 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1657 RETVAL = width > 0;
1658}
1659 OUTPUT:
1660 RETVAL
1227 1661
1228CFPlus::Map 1662MODULE = Deliantra::Client PACKAGE = DC::Map
1663
1664PROTOTYPES: DISABLE
1665
1666DC::Map
1229new (SV *class) 1667new (SV *class)
1230 CODE: 1668 CODE:
1231 New (0, RETVAL, 1, struct map); 1669 New (0, RETVAL, 1, struct map);
1232 RETVAL->x = 0; 1670 RETVAL->x = 0;
1233 RETVAL->y = 0; 1671 RETVAL->y = 0;
1234 RETVAL->w = 0; 1672 RETVAL->w = 0;
1235 RETVAL->h = 0; 1673 RETVAL->h = 0;
1236 RETVAL->ox = 0; 1674 RETVAL->ox = 0;
1237 RETVAL->oy = 0; 1675 RETVAL->oy = 0;
1238 RETVAL->faces = 8192; 1676 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1239 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1677 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1240 RETVAL->texs = 8192;
1241 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1242 RETVAL->rows = 0; 1678 RETVAL->rows = 0;
1243 RETVAL->row = 0; 1679 RETVAL->row = 0;
1244 OUTPUT: 1680 OUTPUT:
1245 RETVAL 1681 RETVAL
1246 1682
1247void 1683void
1248DESTROY (CFPlus::Map self) 1684DESTROY (DC::Map self)
1249 CODE: 1685 CODE:
1250{ 1686{
1251 map_clear (self); 1687 map_clear (self);
1252 Safefree (self->face); 1688 Safefree (self->face2tile);
1253 Safefree (self->tex); 1689 Safefree (self->tex);
1254 Safefree (self); 1690 Safefree (self);
1255} 1691}
1256 1692
1257void 1693void
1258resize (CFPlus::Map self, int map_width, int map_height) 1694resize (DC::Map self, int map_width, int map_height)
1259 CODE: 1695 CODE:
1260 self->w = map_width; 1696 self->w = map_width;
1261 self->h = map_height; 1697 self->h = map_height;
1262 1698
1263void 1699void
1264clear (CFPlus::Map self) 1700clear (DC::Map self)
1265 CODE: 1701 CODE:
1266 map_clear (self); 1702 map_clear (self);
1267 1703
1268void 1704void
1269set_face (CFPlus::Map self, int face, int texid) 1705set_tileid (DC::Map self, int face, int tile)
1270 CODE: 1706 CODE:
1271{ 1707{
1272 while (self->faces <= face) 1708 need_facenum (self, face); self->face2tile [face] = tile;
1273 { 1709 need_texid (self, tile);
1274 Append (mapface, self->face, self->faces, self->faces);
1275 self->faces *= 2;
1276 }
1277
1278 self->face [face] = texid;
1279} 1710}
1280 1711
1281void 1712void
1713set_smooth (DC::Map self, int face, int smooth, int level)
1714 CODE:
1715{
1716 tileid texid;
1717 maptex *tex;
1718
1719 if (face < 0 || face >= self->faces)
1720 return;
1721
1722 if (smooth < 0 || smooth >= self->faces)
1723 return;
1724
1725 texid = self->face2tile [face];
1726
1727 if (!texid)
1728 return;
1729
1730 tex = self->tex + texid;
1731 tex->smoothtile = self->face2tile [smooth];
1732 tex->smoothlevel = level;
1733}
1734
1735void
1282set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1736set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1283 CODE: 1737 CODE:
1284{ 1738{
1285 while (self->texs <= texid) 1739 need_texid (self, texid);
1286 {
1287 Append (maptex, self->tex, self->texs, self->texs);
1288 self->texs *= 2;
1289 }
1290 1740
1291 { 1741 {
1292 maptex *tex = self->tex + texid; 1742 maptex *tex = self->tex + texid;
1293 1743
1294 tex->name = name; 1744 tex->name = name;
… …
1311 // from transparent color bleeding and ugly wrapping effects. 1761 // from transparent color bleeding and ugly wrapping effects.
1312 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1762 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1313} 1763}
1314 1764
1315int 1765int
1316ox (CFPlus::Map self) 1766ox (DC::Map self)
1317 ALIAS: 1767 ALIAS:
1318 oy = 1 1768 oy = 1
1319 x = 2 1769 x = 2
1320 y = 3 1770 y = 3
1321 w = 4 1771 w = 4
… …
1332 } 1782 }
1333 OUTPUT: 1783 OUTPUT:
1334 RETVAL 1784 RETVAL
1335 1785
1336void 1786void
1337scroll (CFPlus::Map self, int dx, int dy) 1787scroll (DC::Map self, int dx, int dy)
1338 CODE: 1788 CODE:
1339{ 1789{
1340 if (dx > 0) 1790 if (dx > 0)
1341 map_blank (self, self->x, self->y, dx, self->h); 1791 map_blank (self, self->x, self->y, dx, self->h);
1342 else if (dx < 0) 1792 else if (dx < 0)
1343 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1793 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1344 1794
1345 if (dy > 0) 1795 if (dy > 0)
1346 map_blank (self, self->x, self->y, self->w, dy); 1796 map_blank (self, self->x, self->y, self->w, dy);
1347 else if (dy < 0) 1797 else if (dy < 0)
1348 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1798 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1349 1799
1350 self->ox += dx; self->x += dx; 1800 self->ox += dx; self->x += dx;
1351 self->oy += dy; self->y += dy; 1801 self->oy += dy; self->y += dy;
1352 1802
1353 while (self->y < 0) 1803 while (self->y < 0)
… …
1357 self->rows += MAP_EXTEND_Y; 1807 self->rows += MAP_EXTEND_Y;
1358 self->y += MAP_EXTEND_Y; 1808 self->y += MAP_EXTEND_Y;
1359 } 1809 }
1360} 1810}
1361 1811
1362void 1812SV *
1363map1a_update (CFPlus::Map self, SV *data_, int extmap) 1813map1a_update (DC::Map self, SV *data_, int extmap)
1364 CODE: 1814 CODE:
1365{ 1815{
1366 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1816 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1367 uint8_t *data_end = (uint8_t *)SvEND (data_); 1817 uint8_t *data_end = (uint8_t *)SvEND (data_);
1368 mapcell *cell; 1818 mapcell *cell;
1369 int x, y, flags; 1819 int x, y, z, flags;
1820 AV *missing = newAV ();
1821 RETVAL = newRV_noinc ((SV *)missing);
1370 1822
1371 while (data < data_end - 1) 1823 while (data < data_end - 1)
1372 { 1824 {
1373 flags = (data [0] << 8) + data [1]; data += 2; 1825 flags = (data [0] << 8) + data [1]; data += 2;
1374 1826
… …
1394 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1395 1847
1396 do 1848 do
1397 { 1849 {
1398 ext = *data++; 1850 ext = *data++;
1399 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1400 1852
1401 if (cmd < 4) 1853 if (cmd < 4)
1402 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1403 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1404 { 1856 {
1405 cell->stat_width = 1; 1857 cell->stat_width = 1;
1406 cell->stat_hp = *data++; 1858 cell->stat_hp = *data++;
1407 } 1859 }
1408 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1409 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1410 else if (cmd == 0x47) // monster width 1862 else if (cmd == 0x47)
1411 { 1863 {
1412 if (*data == 4) 1864 if (*data == 1) cell->player = data [1];
1413 ; // decode player tag 1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1414 1868
1415 data += *data + 1; 1869 data += *data + 1;
1416 } 1870 }
1417 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1418 cell->flags = *data++; 1872 cell->flags = *data++;
… …
1425 } 1879 }
1426 else 1880 else
1427 cell->darkness = *data++ + 1; 1881 cell->darkness = *data++ + 1;
1428 } 1882 }
1429 1883
1884 for (z = 0; z <= 2; ++z)
1430 if (flags & 4) 1885 if (flags & (4 >> z))
1431 { 1886 {
1432 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1887 faceid face = (data [0] << 8) + data [1]; data += 2;
1888 need_facenum (self, face);
1889 cell->tile [z] = self->face2tile [face];
1890
1891 if (cell->tile [z])
1892 {
1893 maptex *tex = self->tex + cell->tile [z];
1894 if (!tex->name)
1895 av_push (missing, newSViv (cell->tile [z]));
1896
1897 if (tex->smoothtile)
1898 {
1899 maptex *smooth = self->tex + tex->smoothtile;
1900 if (!smooth->name)
1901 av_push (missing, newSViv (tex->smoothtile));
1902 }
1903 }
1433 } 1904 }
1434
1435 if (flags & 2)
1436 {
1437 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
1438 }
1439
1440 if (flags & 1)
1441 {
1442 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1443 }
1444 } 1905 }
1445 else 1906 else
1446 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1447 } 1908 }
1448} 1909}
1910 OUTPUT:
1911 RETVAL
1449 1912
1450SV * 1913SV *
1451mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1914mapmap (DC::Map self, int x0, int y0, int w, int h)
1452 CODE: 1915 CODE:
1453{ 1916{
1454 int x1, x; 1917 int x1, x;
1455 int y1, y; 1918 int y1, y;
1456 int z; 1919 int z;
… …
1477 { 1940 {
1478 mapcell *cell = row->col + (x - row->c0); 1941 mapcell *cell = row->col + (x - row->c0);
1479 1942
1480 for (z = 0; z <= 0; z++) 1943 for (z = 0; z <= 0; z++)
1481 { 1944 {
1482 mapface face = cell->face [z];
1483
1484 if (face)
1485 {
1486 maptex tex = self->tex [face]; 1945 maptex tex = self->tex [cell->tile [z]];
1487 int a0 = 255 - tex.a; 1946 int a0 = 255 - tex.a;
1488 int a1 = tex.a; 1947 int a1 = tex.a;
1489 1948
1490 r = (r * a0 + tex.r * a1) / 255; 1949 r = (r * a0 + tex.r * a1) / 255;
1491 g = (g * a0 + tex.g * a1) / 255; 1950 g = (g * a0 + tex.g * a1) / 255;
1492 b = (b * a0 + tex.b * a1) / 255; 1951 b = (b * a0 + tex.b * a1) / 255;
1493 a = (a * a0 + tex.a * a1) / 255; 1952 a = (a * a0 + tex.a * a1) / 255;
1494 }
1495 } 1953 }
1496 } 1954 }
1497 1955
1498 *map++ = (r ) 1956 *map++ = (r )
1499 | (g << 8) 1957 | (g << 8)
… …
1506} 1964}
1507 OUTPUT: 1965 OUTPUT:
1508 RETVAL 1966 RETVAL
1509 1967
1510void 1968void
1511draw (CFPlus::Map self, int mx, int my, int sw, int sh) 1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1512 CODE: 1970 CODE:
1513{ 1971{
1514 int x, y, z; 1972 int x, y, z;
1515 int last_name;
1516 mapface face;
1517 1973
1518 glColor4ub (255, 255, 255, 255); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1975 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1977 smooth_key skey;
1978 int pl_x, pl_y;
1979 maptex pl_tex;
1980 rc_t *rc = rc_alloc ();
1981 rc_key_t key;
1982 rc_array_t *arr;
1983
1984 pl_tex.name = 0;
1985
1986 // thats current max. sorry.
1987 if (sw > 255) sw = 255;
1988 if (sh > 255) sh = 255;
1989
1990 // clear key, in case of extra padding
1991 memset (&skey, 0, sizeof (skey));
1992
1993 memset (&key, 0, sizeof (key));
1994 key.r = 255;
1995 key.g = 255;
1996 key.b = 255;
1997 key.a = 255;
1998 key.mode = GL_QUADS;
1999 key.format = GL_T2F_V3F;
2000 key.texname = -1;
2001
2002 mx += self->x;
2003 my += self->y;
2004
2005 // first pass: determine smooth_max
2006 // rather ugly, if you ask me
2007 // could also be stored inside mapcell and updated on change
2008 memset (smooth_max, 0, sizeof (smooth_max));
2009
2010 for (y = 0; y < sh; y++)
2011 if (0 <= y + my && y + my < self->rows)
2012 {
2013 maprow *row = self->row + (y + my);
2014
2015 for (x = 0; x < sw; x++)
2016 if (row->c0 <= x + mx && x + mx < row->c1)
2017 {
2018 mapcell *cell = row->col + (x + mx - row->c0);
2019
2020 smooth_max[x + 1][y + 1] =
2021 MAX (self->tex [cell->tile [0]].smoothlevel,
2022 MAX (self->tex [cell->tile [1]].smoothlevel,
2023 self->tex [cell->tile [2]].smoothlevel));
2024 }
2025 }
1519 2026
1520 glEnable (GL_BLEND); 2027 glEnable (GL_BLEND);
1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2028 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1522 glEnable (GL_TEXTURE_2D);
1523 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2029 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1524 2030
1525 glBegin (GL_QUADS);
1526
1527 last_name = 0;
1528
1529 mx += self->x;
1530 my += self->y;
1531
1532 for (z = 0; z < 3; z++) 2031 for (z = 0; z <= 2; z++)
2032 {
2033 memset (smooth_level, 0, sizeof (smooth_level));
2034
1533 for (y = 0; y < sh; y++) 2035 for (y = 0; y < sh; y++)
1534 if (0 <= y + my && y + my < self->rows) 2036 if (0 <= y + my && y + my < self->rows)
1535 { 2037 {
1536 maprow *row = self->row + (y + my); 2038 maprow *row = self->row + (y + my);
1537 2039
1538 for (x = 0; x < sw; x++) 2040 for (x = 0; x < sw; x++)
1539 if (row->c0 <= x + mx && x + mx < row->c1) 2041 if (row->c0 <= x + mx && x + mx < row->c1)
1540 { 2042 {
1541 mapcell *cell = row->col + (x + mx - row->c0); 2043 mapcell *cell = row->col + (x + mx - row->c0);
1542
1543 face = cell->face [z]; 2044 tileid tile = cell->tile [z];
2045
2046 if (tile)
2047 {
2048 maptex tex = self->tex [tile];
2049 int px = (x + 1) * T - tex.w;
2050 int py = (y + 1) * T - tex.h;
1544 2051
1545 if (face && face < self->texs) 2052 if (key.texname != tex.name)
2053 {
2054 if (!tex.name)
2055 tex = self->tex [2]; /* missing, replace by noface */
2056
2057 key.texname = tex.name;
2058 arr = rc_array (rc, &key);
2059 }
2060
2061 if (expect_false (cell->player == player) && expect_false (z == 2))
2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
2068
2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073
2074 if (expect_false (cell->flags) && expect_false (z == 2))
2075 {
2076 // overlays such as the speech bubble, probably more to come
2077 if (cell->flags & 1)
2078 {
2079 maptex tex = self->tex [1];
2080 int px = x * T + T * 2 / 32;
2081 int py = y * T - T * 6 / 32;
2082
2083 if (tex.name)
2084 {
2085 if (key.texname != tex.name)
2086 {
2087 key.texname = tex.name;
2088 arr = rc_array (rc, &key);
2089 }
2090
2091 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095 }
2096 }
2097 }
2098
2099 // update smooth hash
2100 if (tex.smoothtile)
2101 {
2102 skey.tile = tex.smoothtile;
2103 skey.level = tex.smoothlevel;
2104
2105 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
2106
2107 // add bits to current tile and all neighbours. skey.x|y is
2108 // shifted +1|+1 so we always stay positive.
2109
2110 // bits is ___n cccc CCCC bbbb
2111 // n do not draw borders&corners
2112 // c draw these corners, but...
2113 // C ... not these
2114 // b draw these borders
2115
2116 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
2117 // ┃· ·· ·┃ ━━
2118
2119 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2120 // ·· ·· ·┏ ┓·
2121
2122 // full tile
2123 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
2124
2125 // borders
2126 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
2127 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
2128 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
2129 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
2130
2131 // corners
2132 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2133 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2134 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2135 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2136 }
2137 }
2138 }
2139 }
2140
2141 rc_draw (rc);
2142 rc_clear (rc);
2143
2144 // go through all smoothlevels, lowest to highest, then draw.
2145 // this is basically counting sort
2146 {
2147 int w, b;
2148
2149 glEnable (GL_TEXTURE_2D);
2150 glBegin (GL_QUADS);
2151 for (w = 0; w < 256 / 32; ++w)
2152 {
2153 uint32_t smask = smooth_level [w];
2154 if (smask)
2155 for (b = 0; b < 32; ++b)
2156 if (smask & (((uint32_t)1) << b))
1546 { 2157 {
1547 maptex tex = self->tex [face]; 2158 int level = (w << 5) | b;
1548 int px = (x + 1) * 32 - tex.w; 2159 HE *he;
1549 int py = (y + 1) * 32 - tex.h;
1550 2160
1551 if (last_name != tex.name) 2161 hv_iterinit (smooth);
2162 while ((he = hv_iternext (smooth)))
1552 { 2163 {
1553 glEnd (); 2164 smooth_key *skey = (smooth_key *)HeKEY (he);
1554 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2165 IV bits = SvIVX (HeVAL (he));
1555 glBegin (GL_QUADS);
1556 }
1557 2166
1558 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1559 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1560 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1561 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1562 }
1563
1564 if (cell->flags && z == 2)
1565 {
1566 if (cell->flags & 1) 2167 if (!(bits & 0x1000)
2168 && skey->level == level
2169 && level > smooth_max [skey->x][skey->y])
1567 { 2170 {
1568 maptex tex = self->tex [1]; 2171 maptex tex = self->tex [skey->tile];
1569 int px = (x + 1) * 32 - tex.w + 2; 2172 int px = (((int)skey->x) - 1) * T;
1570 int py = (y + 1) * 32 - tex.h - 6; 2173 int py = (((int)skey->y) - 1) * T;
2174 int border = bits & 15;
2175 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176 float dx = tex.s * .0625f; // 16 images/row
2177 float dy = tex.t * .5f ; // 2 images/column
1571 2178
2179 if (tex.name)
2180 {
2181 // this time avoiding texture state changes
2182 // save gobs of state changes.
2183 if (key.texname != tex.name)
2184 {
1572 glEnd (); 2185 glEnd ();
1573 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2186 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1574 glBegin (GL_QUADS); 2187 glBegin (GL_QUADS);
2188 }
1575 2189
2190 if (border)
2191 {
2192 float ox = border * dx;
2193
2194 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
2196 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
2197 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
2198 }
2199
2200 if (corner)
2201 {
2202 float ox = corner * dx;
2203
1576 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2204 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1577 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2205 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1578 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 2206 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1579 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 2207 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2208 }
2209 }
2210 }
1580 } 2211 }
1581 } 2212 }
1582 }
1583 } 2213 }
1584 2214
1585 glEnd (); 2215 glEnd ();
1586
1587 glDisable (GL_TEXTURE_2D); 2216 glDisable (GL_TEXTURE_2D);
2217 key.texname = -1;
2218 }
2219
2220 hv_clear (smooth);
2221 }
2222
2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
2228
2229 key.texname = tex.name;
2230 arr = rc_array (rc, &key);
2231
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236
2237 rc_draw (rc);
2238 }
2239
1588 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
2241 rc_free (rc);
1589 2242
1590 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
1591 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
1592 if (0 <= y + my && y + my < self->rows) 2245 if (0 <= y + my && y + my < self->rows)
1593 { 2246 {
… …
1596 for (x = 0; x < sw; x++) 2249 for (x = 0; x < sw; x++)
1597 if (row->c0 <= x + mx && x + mx < row->c1) 2250 if (row->c0 <= x + mx && x + mx < row->c1)
1598 { 2251 {
1599 mapcell *cell = row->col + (x + mx - row->c0); 2252 mapcell *cell = row->col + (x + mx - row->c0);
1600 2253
1601 int px = x * 32; 2254 int px = x * T;
1602 int py = y * 32; 2255 int py = y * T;
1603 2256
1604 if (cell->stat_hp) 2257 if (cell->stat_hp)
1605 { 2258 {
1606 int width = cell->stat_width * 32; 2259 int width = cell->stat_width * T;
1607 int thick = sh / 28 + 1 + cell->stat_width; 2260 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1608 2261
1609 glColor3ub (0, 0, 0); 2262 glColor3ub (0, 0, 0);
1610 glRectf (px + 1, py - thick - 2, 2263 glRectf (px + 1, py - thick - 2,
1611 px + width - 1, py); 2264 px + width - 1, py);
1612 2265
… …
1618 } 2271 }
1619 } 2272 }
1620} 2273}
1621 2274
1622void 2275void
1623draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 2276draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1624 CODE: 2277 CODE:
1625{ 2278{
1626 static float color[16][3] = { 2279 static float color[16][3] = {
1627 { 0.00F, 0.00F, 0.00F }, 2280 { 0.00F, 0.00F, 0.00F },
1628 { 1.00F, 1.00F, 1.00F }, 2281 { 1.00F, 1.00F, 1.00F },
… …
1678 glDisable (GL_BLEND); 2331 glDisable (GL_BLEND);
1679 glDisable (GL_TEXTURE_2D); 2332 glDisable (GL_TEXTURE_2D);
1680} 2333}
1681 2334
1682void 2335void
1683fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh) 2336fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1684 PPCODE: 2337 PPCODE:
1685{ 2338{
1686 int x, y; 2339 int x, y;
2340 int sw1 = sw + 2;
2341 int sh1 = sh + 2;
2342 int sh3 = sh * 3;
1687 int sw4 = (sw + 3) & ~3; 2343 int sw34 = (sw * 3 + 3) & ~3;
2344 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2345 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2346 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1690 2347
1691 memset (darkness, 255, sw4 * sh);
1692 SvPOK_only (darkness_sv); 2348 SvPOK_only (darkness3_sv);
1693 SvCUR_set (darkness_sv, sw4 * sh); 2349 SvCUR_set (darkness3_sv, sw34 * sh3);
1694 2350
1695 mx += self->x; 2351 mx += self->x - 1;
1696 my += self->y; 2352 my += self->y - 1;
1697 2353
2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2355
1698 for (y = 0; y < sh; y++) 2356 for (y = 0; y < sh1; y++)
1699 if (0 <= y + my && y + my < self->rows) 2357 if (0 <= y + my && y + my < self->rows)
1700 { 2358 {
1701 maprow *row = self->row + (y + my); 2359 maprow *row = self->row + (y + my);
1702 2360
1703 for (x = 0; x < sw; x++) 2361 for (x = 0; x < sw1; x++)
1704 if (row->c0 <= x + mx && x + mx < row->c1) 2362 if (row->c0 <= x + mx && x + mx < row->c1)
1705 { 2363 {
1706 mapcell *cell = row->col + (x + mx - row->c0); 2364 mapcell *cell = row->col + (x + mx - row->c0);
1707 2365
1708 darkness[y * sw4 + x] = cell->darkness 2366 darkness1 [y * sw1 + x] = cell->darkness
1709 ? 255 - (cell->darkness - 1) 2367 ? 255 - (cell->darkness - 1)
1710 : 255 - FOW_DARKNESS; 2368 : 255 - FOW_DARKNESS;
1711 } 2369 }
1712 } 2370 }
1713 2371
2372 for (y = 0; y < sh; ++y)
2373 for (x = 0; x < sw; ++x)
2374 {
2375 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2376 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2377 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2378 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2379 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2380 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2381 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2382 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2383 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2384
2385 uint8_t r11 = (d11 + d21 + d12) / 3;
2386 uint8_t r21 = d21;
2387 uint8_t r31 = (d21 + d31 + d32) / 3;
2388
2389 uint8_t r12 = d12;
2390 uint8_t r22 = d22;
2391 uint8_t r32 = d32;
2392
2393 uint8_t r13 = (d13 + d23 + d12) / 3;
2394 uint8_t r23 = d23;
2395 uint8_t r33 = (d23 + d33 + d32) / 3;
2396
2397 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2398 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2399 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2400 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2401 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2402 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2403 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2404 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2405 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2406 }
2407
2408 free (darkness1);
2409
1714 EXTEND (SP, 3); 2410 EXTEND (SP, 3);
1715 PUSHs (sv_2mortal (newSViv (sw4))); 2411 PUSHs (sv_2mortal (newSViv (sw34)));
1716 PUSHs (sv_2mortal (newSViv (sh))); 2412 PUSHs (sv_2mortal (newSViv (sh3)));
1717 PUSHs (darkness_sv); 2413 PUSHs (darkness3_sv);
1718} 2414}
1719 2415
1720SV * 2416SV *
1721get_rect (CFPlus::Map self, int x0, int y0, int w, int h) 2417get_rect (DC::Map self, int x0, int y0, int w, int h)
1722 CODE: 2418 CODE:
1723{ 2419{
1724 int x, y, x1, y1; 2420 int x, y, x1, y1;
1725 SV *data_sv = newSV (w * h * 7 + 5); 2421 SV *data_sv = newSV (w * h * 7 + 5);
1726 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2422 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1751 if (row && row->c0 <= x && x < row->c1) 2447 if (row && row->c0 <= x && x < row->c1)
1752 { 2448 {
1753 mapcell *cell = row->col + (x - row->c0); 2449 mapcell *cell = row->col + (x - row->c0);
1754 uint8_t flags = 0; 2450 uint8_t flags = 0;
1755 2451
1756 if (cell->face [0]) flags |= 1; 2452 if (cell->tile [0]) flags |= 1;
1757 if (cell->face [1]) flags |= 2; 2453 if (cell->tile [1]) flags |= 2;
1758 if (cell->face [2]) flags |= 4; 2454 if (cell->tile [2]) flags |= 4;
1759 2455
1760 *data++ = flags; 2456 *data++ = flags;
1761 2457
1762 if (flags & 1) 2458 if (flags & 1)
1763 { 2459 {
2460 tileid tile = cell->tile [0];
1764 *data++ = cell->face [0] >> 8; 2461 *data++ = tile >> 8;
1765 *data++ = cell->face [0]; 2462 *data++ = tile;
1766 } 2463 }
1767 2464
1768 if (flags & 2) 2465 if (flags & 2)
1769 { 2466 {
2467 tileid tile = cell->tile [1];
1770 *data++ = cell->face [1] >> 8; 2468 *data++ = tile >> 8;
1771 *data++ = cell->face [1]; 2469 *data++ = tile;
1772 } 2470 }
1773 2471
1774 if (flags & 4) 2472 if (flags & 4)
1775 { 2473 {
2474 tileid tile = cell->tile [2];
1776 *data++ = cell->face [2] >> 8; 2475 *data++ = tile >> 8;
1777 *data++ = cell->face [2]; 2476 *data++ = tile;
1778 } 2477 }
1779 } 2478 }
1780 else 2479 else
1781 *data++ = 0; 2480 *data++ = 0;
1782 } 2481 }
1783 } 2482 }
1784 2483
2484 /* if size is w*h + 5 then no data has been found */
2485 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2486 {
1785 SvPOK_only (data_sv); 2487 SvPOK_only (data_sv);
1786 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2488 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2489 }
2490
1787 RETVAL = data_sv; 2491 RETVAL = data_sv;
1788} 2492}
1789 OUTPUT: 2493 OUTPUT:
1790 RETVAL 2494 RETVAL
1791 2495
1792void 2496void
1793set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2497set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1794 PPCODE: 2498 PPCODE:
1795{ 2499{
1796 int x, y, z; 2500 int x, y, z;
1797 int w, h; 2501 int w, h;
1798 int x1, y1; 2502 int x1, y1;
2503 STRLEN len;
2504 uint8_t *data, *end;
2505
2506 len = SvLEN (data_sv);
2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2508 data = SvPVbyte_nolen (data_sv);
2509 end = data + len + 8;
2510
2511 if (len < 5)
2512 XSRETURN_EMPTY;
1799 2513
1800 if (*data++ != 0) 2514 if (*data++ != 0)
1801 return; /* version mismatch */ 2515 XSRETURN_EMPTY; /* version mismatch */
1802 2516
1803 w = *data++ << 8; w |= *data++; 2517 w = *data++ << 8; w |= *data++;
1804 h = *data++ << 8; h |= *data++; 2518 h = *data++ << 8; h |= *data++;
1805 2519
1806 // we need to do this 'cause we don't keep an absolute coord system for rows 2520 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
1818 { 2532 {
1819 maprow *row = map_get_row (self, y); 2533 maprow *row = map_get_row (self, y);
1820 2534
1821 for (x = x0; x < x1; x++) 2535 for (x = x0; x < x1; x++)
1822 { 2536 {
2537 uint8_t flags;
2538
2539 if (data + 7 >= end)
2540 XSRETURN_EMPTY;
2541
1823 uint8_t flags = *data++; 2542 flags = *data++;
1824 2543
1825 if (flags) 2544 if (flags)
1826 { 2545 {
1827 mapface face[3] = { 0, 0, 0 };
1828
1829 mapcell *cell = row_get_cell (row, x); 2546 mapcell *cell = row_get_cell (row, x);
2547 tileid tile[3] = { 0, 0, 0 };
1830 2548
1831 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2549 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1832 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2550 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1833 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2551 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1834 2552
1835 if (cell->darkness == 0) 2553 if (cell->darkness == 0)
1836 { 2554 {
1837 cell->darkness = 0; 2555 /*cell->darkness = 0;*/
2556 EXTEND (SP, 3);
1838 2557
1839 for (z = 0; z <= 2; z++) 2558 for (z = 0; z <= 2; z++)
1840 { 2559 {
1841 cell->face[z] = face[z]; 2560 tileid t = tile [z];
1842 2561
1843 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2562 if (t >= self->texs || (t && !self->tex [t].name))
2563 {
1844 XPUSHs (sv_2mortal (newSViv (face[z]))); 2564 PUSHs (sv_2mortal (newSViv (t)));
2565 need_texid (self, t);
2566 }
2567
2568 cell->tile [z] = t;
1845 } 2569 }
1846 } 2570 }
1847 } 2571 }
1848 } 2572 }
1849 } 2573 }
1850} 2574}
1851 2575
1852MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2576MODULE = Deliantra::Client PACKAGE = DC::RW
1853 2577
1854CFPlus::MixChunk 2578DC::RW
1855new_from_file (SV *class, char *path) 2579new (SV *class, SV *data_sv)
1856 CODE: 2580 CODE:
1857 RETVAL = Mix_LoadWAV (path); 2581{
2582 STRLEN datalen;
2583 char *data = SvPVbyte (data_sv, datalen);
2584
2585 RETVAL = SDL_RWFromConstMem (data, datalen);
2586}
1858 OUTPUT: 2587 OUTPUT:
1859 RETVAL 2588 RETVAL
1860 2589
2590DC::RW
2591new_from_file (SV *class, const char *path, const char *mode = "rb")
2592 CODE:
2593 RETVAL = SDL_RWFromFile (path, mode);
2594 OUTPUT:
2595 RETVAL
2596
2597# fails on win32:
2598# dc.xs(2268) : error C2059: syntax error : '('
1861void 2599#void
2600#close (DC::RW self)
2601# CODE:
2602# (self->(close)) (self);
2603
2604MODULE = Deliantra::Client PACKAGE = DC::Channel
2605
2606PROTOTYPES: DISABLE
2607
2608DC::Channel
2609find ()
2610 CODE:
2611{
2612 RETVAL = Mix_GroupAvailable (-1);
2613
2614 if (RETVAL < 0)
2615 {
2616 RETVAL = Mix_GroupOldest (-1);
2617
2618 if (RETVAL < 0)
2619 XSRETURN_UNDEF;
2620
2621 Mix_HaltChannel (RETVAL);
2622 }
2623
2624 Mix_UnregisterAllEffects (RETVAL);
2625 Mix_Volume (RETVAL, 128);
2626}
2627 OUTPUT:
2628 RETVAL
2629
2630void
2631halt (DC::Channel self)
2632 CODE:
2633 Mix_HaltChannel (self);
2634
2635void
2636expire (DC::Channel self, int ticks = -1)
2637 CODE:
2638 Mix_ExpireChannel (self, ticks);
2639
2640void
2641fade_out (DC::Channel self, int ticks = -1)
2642 CODE:
2643 Mix_FadeOutChannel (self, ticks);
2644
2645int
2646volume (DC::Channel self, int volume)
2647 CODE:
2648 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2649 OUTPUT:
2650 RETVAL
2651
2652void
2653unregister_all_effects (DC::Channel self)
2654 CODE:
2655 Mix_UnregisterAllEffects (self);
2656
2657void
2658set_panning (DC::Channel self, int left, int right)
2659 CODE:
2660 left = CLAMP (left , 0, 255);
2661 right = CLAMP (right, 0, 255);
2662 Mix_SetPanning (self, left, right);
2663
2664void
2665set_distance (DC::Channel self, int distance)
2666 CODE:
2667 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2668
2669void
2670set_position (DC::Channel self, int angle, int distance)
2671 CODE:
2672
2673void
2674set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2675 CODE:
2676{
2677 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2678 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2679 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680}
2681
2682void
2683set_reverse_stereo (DC::Channel self, int flip)
2684 CODE:
2685 Mix_SetReverseStereo (self, flip);
2686
2687MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2688
2689PROTOTYPES: DISABLE
2690
2691DC::MixChunk
2692new (SV *class, DC::RW rwops)
2693 CODE:
2694 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2695 OUTPUT:
2696 RETVAL
2697
2698void
1862DESTROY (CFPlus::MixChunk self) 2699DESTROY (DC::MixChunk self)
1863 CODE: 2700 CODE:
1864 Mix_FreeChunk (self); 2701 Mix_FreeChunk (self);
1865 2702
1866int 2703int
1867volume (CFPlus::MixChunk self, int volume = -1) 2704volume (DC::MixChunk self, int volume = -1)
1868 CODE: 2705 CODE:
2706 if (items > 1)
2707 volume = CLAMP (volume, 0, 128);
1869 RETVAL = Mix_VolumeChunk (self, volume); 2708 RETVAL = Mix_VolumeChunk (self, volume);
1870 OUTPUT: 2709 OUTPUT:
1871 RETVAL 2710 RETVAL
1872 2711
1873int 2712DC::Channel
1874play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2713play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
1875 CODE: 2714 CODE:
2715{
1876 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2716 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2717
2718 if (RETVAL < 0)
2719 XSRETURN_UNDEF;
2720
2721 if (channel < 0)
2722 {
2723 Mix_UnregisterAllEffects (RETVAL);
2724 Mix_Volume (RETVAL, 128);
2725 }
2726}
1877 OUTPUT: 2727 OUTPUT:
1878 RETVAL 2728 RETVAL
1879 2729
1880MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2730MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1881 2731
1882int 2732int
1883volume (int volume = -1) 2733volume (int volume = -1)
2734 PROTOTYPE: ;$
1884 CODE: 2735 CODE:
2736 if (items > 0)
2737 volume = CLAMP (volume, 0, 128);
1885 RETVAL = Mix_VolumeMusic (volume); 2738 RETVAL = Mix_VolumeMusic (volume);
1886 OUTPUT: 2739 OUTPUT:
1887 RETVAL 2740 RETVAL
1888 2741
2742void
2743fade_out (int ms)
2744 CODE:
2745 Mix_FadeOutMusic (ms);
2746
2747void
2748halt ()
2749 CODE:
2750 Mix_HaltMusic ();
2751
1889CFPlus::MixMusic 2752DC::MixMusic
1890new_from_file (SV *class, char *path) 2753new (SV *class, DC::RW rwops)
1891 CODE: 2754 CODE:
1892 RETVAL = Mix_LoadMUS (path); 2755 RETVAL = Mix_LoadMUS_RW (rwops);
1893 OUTPUT: 2756 OUTPUT:
1894 RETVAL 2757 RETVAL
1895 2758
1896void 2759void
1897DESTROY (CFPlus::MixMusic self) 2760DESTROY (DC::MixMusic self)
1898 CODE: 2761 CODE:
1899 Mix_FreeMusic (self); 2762 Mix_FreeMusic (self);
1900 2763
1901int 2764int
1902play (CFPlus::MixMusic self, int loops = -1) 2765play (DC::MixMusic self, int loops = -1)
1903 CODE: 2766 CODE:
1904 RETVAL = Mix_PlayMusic (self, loops); 2767 RETVAL = Mix_PlayMusic (self, loops);
1905 OUTPUT: 2768 OUTPUT:
1906 RETVAL 2769 RETVAL
1907 2770
1908MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2771void
2772fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2773 CODE:
2774 Mix_FadeInMusicPos (self, loops, ms, position);
2775
2776MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2777
2778PROTOTYPES: ENABLE
1909 2779
1910BOOT: 2780BOOT:
1911{ 2781{
1912 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2782 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1913 static const struct { 2783 static const struct {
1914 const char *name; 2784 const char *name;
1915 IV iv; 2785 IV iv;
1916 } *civ, const_iv[] = { 2786 } *civ, const_iv[] = {
1917# define const_iv(name) { # name, (IV)name } 2787# define const_iv(name) { # name, (IV)name }
2788 const_iv (GL_VENDOR),
2789 const_iv (GL_VERSION),
2790 const_iv (GL_EXTENSIONS),
1918 const_iv (GL_COLOR_MATERIAL), 2791 const_iv (GL_COLOR_MATERIAL),
1919 const_iv (GL_SMOOTH), 2792 const_iv (GL_SMOOTH),
1920 const_iv (GL_FLAT), 2793 const_iv (GL_FLAT),
1921 const_iv (GL_DITHER), 2794 const_iv (GL_DITHER),
1922 const_iv (GL_BLEND), 2795 const_iv (GL_BLEND),
… …
1926 const_iv (GL_ALPHA_TEST), 2799 const_iv (GL_ALPHA_TEST),
1927 const_iv (GL_NORMALIZE), 2800 const_iv (GL_NORMALIZE),
1928 const_iv (GL_RESCALE_NORMAL), 2801 const_iv (GL_RESCALE_NORMAL),
1929 const_iv (GL_FRONT), 2802 const_iv (GL_FRONT),
1930 const_iv (GL_BACK), 2803 const_iv (GL_BACK),
2804 const_iv (GL_AUX0),
1931 const_iv (GL_AND), 2805 const_iv (GL_AND),
1932 const_iv (GL_ONE), 2806 const_iv (GL_ONE),
1933 const_iv (GL_ZERO), 2807 const_iv (GL_ZERO),
1934 const_iv (GL_SRC_ALPHA), 2808 const_iv (GL_SRC_ALPHA),
1935 const_iv (GL_DST_ALPHA), 2809 const_iv (GL_DST_ALPHA),
… …
1948 const_iv (GL_INTENSITY), 2822 const_iv (GL_INTENSITY),
1949 const_iv (GL_LUMINANCE), 2823 const_iv (GL_LUMINANCE),
1950 const_iv (GL_LUMINANCE_ALPHA), 2824 const_iv (GL_LUMINANCE_ALPHA),
1951 const_iv (GL_FLOAT), 2825 const_iv (GL_FLOAT),
1952 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2826 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2827 const_iv (GL_COMPRESSED_ALPHA_ARB),
2828 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2829 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2830 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2831 const_iv (GL_COMPRESSED_RGB_ARB),
2832 const_iv (GL_COMPRESSED_RGBA_ARB),
1953 const_iv (GL_COMPILE), 2833 const_iv (GL_COMPILE),
2834 const_iv (GL_PROXY_TEXTURE_1D),
2835 const_iv (GL_PROXY_TEXTURE_2D),
1954 const_iv (GL_TEXTURE_1D), 2836 const_iv (GL_TEXTURE_1D),
1955 const_iv (GL_TEXTURE_2D), 2837 const_iv (GL_TEXTURE_2D),
1956 const_iv (GL_TEXTURE_ENV), 2838 const_iv (GL_TEXTURE_ENV),
1957 const_iv (GL_TEXTURE_MAG_FILTER), 2839 const_iv (GL_TEXTURE_MAG_FILTER),
1958 const_iv (GL_TEXTURE_MIN_FILTER), 2840 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1979 const_iv (GL_COLOR_LOGIC_OP), 2861 const_iv (GL_COLOR_LOGIC_OP),
1980 const_iv (GL_SEPARABLE_2D), 2862 const_iv (GL_SEPARABLE_2D),
1981 const_iv (GL_CONVOLUTION_2D), 2863 const_iv (GL_CONVOLUTION_2D),
1982 const_iv (GL_CONVOLUTION_BORDER_MODE), 2864 const_iv (GL_CONVOLUTION_BORDER_MODE),
1983 const_iv (GL_CONSTANT_BORDER), 2865 const_iv (GL_CONSTANT_BORDER),
2866 const_iv (GL_POINTS),
1984 const_iv (GL_LINES), 2867 const_iv (GL_LINES),
1985 const_iv (GL_LINE_STRIP), 2868 const_iv (GL_LINE_STRIP),
1986 const_iv (GL_LINE_LOOP), 2869 const_iv (GL_LINE_LOOP),
1987 const_iv (GL_QUADS), 2870 const_iv (GL_QUADS),
1988 const_iv (GL_QUAD_STRIP), 2871 const_iv (GL_QUAD_STRIP),
1989 const_iv (GL_TRIANGLES), 2872 const_iv (GL_TRIANGLES),
1990 const_iv (GL_TRIANGLE_STRIP), 2873 const_iv (GL_TRIANGLE_STRIP),
1991 const_iv (GL_TRIANGLE_FAN), 2874 const_iv (GL_TRIANGLE_FAN),
2875 const_iv (GL_POLYGON),
1992 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2876 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2877 const_iv (GL_POINT_SMOOTH_HINT),
2878 const_iv (GL_LINE_SMOOTH_HINT),
2879 const_iv (GL_POLYGON_SMOOTH_HINT),
2880 const_iv (GL_GENERATE_MIPMAP_HINT),
2881 const_iv (GL_TEXTURE_COMPRESSION_HINT),
1993 const_iv (GL_FASTEST), 2882 const_iv (GL_FASTEST),
2883 const_iv (GL_DONT_CARE),
2884 const_iv (GL_NICEST),
1994 const_iv (GL_V2F), 2885 const_iv (GL_V2F),
1995 const_iv (GL_V3F), 2886 const_iv (GL_V3F),
1996 const_iv (GL_T2F_V3F), 2887 const_iv (GL_T2F_V3F),
1997 const_iv (GL_T2F_N3F_V3F), 2888 const_iv (GL_T2F_N3F_V3F),
1998# undef const_iv 2889# undef const_iv
1999 }; 2890 };
2000 2891
2001 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2892 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2893 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2894
2895 texture_av = newAV ();
2896 AvREAL_off (texture_av);
2003} 2897}
2898
2899void
2900disable_GL_EXT_blend_func_separate ()
2901 CODE:
2902 gl.BlendFuncSeparate = 0;
2903 gl.BlendFuncSeparateEXT = 0;
2004 2904
2005char * 2905char *
2006gl_vendor () 2906gl_vendor ()
2007 CODE: 2907 CODE:
2008 RETVAL = (char *)glGetString (GL_VENDOR); 2908 RETVAL = (char *)glGetString (GL_VENDOR);
… …
2021 CODE: 2921 CODE:
2022 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2922 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2023 OUTPUT: 2923 OUTPUT:
2024 RETVAL 2924 RETVAL
2025 2925
2926const char *glGetString (GLenum pname)
2927
2928GLint glGetInteger (GLenum pname)
2929 CODE:
2930 glGetIntegerv (pname, &RETVAL);
2931 OUTPUT:
2932 RETVAL
2933
2934GLdouble glGetDouble (GLenum pname)
2935 CODE:
2936 glGetDoublev (pname, &RETVAL);
2937 OUTPUT:
2938 RETVAL
2939
2026int glGetError () 2940int glGetError ()
2027 2941
2028void glFinish () 2942void glFinish ()
2029 2943
2030void glClear (int mask) 2944void glClear (int mask)
… …
2067# near_ and far_ are due to microsofts buggy "c" compiler 2981# near_ and far_ are due to microsofts buggy "c" compiler
2068void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2982void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2069 2983
2070# near_ and far_ are due to microsofts buggy "c" compiler 2984# near_ and far_ are due to microsofts buggy "c" compiler
2071void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2985void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2986
2987PROTOTYPES: DISABLE
2072 2988
2073void glViewport (int x, int y, int width, int height) 2989void glViewport (int x, int y, int width, int height)
2074 2990
2075void glScissor (int x, int y, int width, int height) 2991void glScissor (int x, int y, int width, int height)
2076 2992
… …
2084 3000
2085void glRotate (float angle, float x, float y, float z) 3001void glRotate (float angle, float x, float y, float z)
2086 CODE: 3002 CODE:
2087 glRotatef (angle, x, y, z); 3003 glRotatef (angle, x, y, z);
2088 3004
2089void glBegin (int mode)
2090
2091void glEnd ()
2092
2093void glColor (float r, float g, float b, float a = 1.0) 3005void glColor (float r, float g, float b, float a = 1.0)
2094 PROTOTYPE: @ 3006 PROTOTYPE: @
2095 ALIAS: 3007 ALIAS:
2096 glColor_premultiply = 1 3008 glColor_premultiply = 1
2097 CODE: 3009 CODE:
2098 if (ix) 3010 if (ix)
2099 { 3011 {
… …
2102 b *= a; 3014 b *= a;
2103 } 3015 }
2104 // microsoft visual "c" rounds instead of truncating... 3016 // microsoft visual "c" rounds instead of truncating...
2105 glColor4f (r, g, b, a); 3017 glColor4f (r, g, b, a);
2106 3018
2107void glInterleavedArrays (int format, int stride, char *data)
2108
2109void glDrawElements (int mode, int count, int type, char *indices)
2110
2111# 1.2 void glDrawRangeElements (int mode, int start, int end
2112
2113void glRasterPos (float x, float y, float z = 0.) 3019void glRasterPos (float x, float y, float z = 0.)
2114 CODE: 3020 CODE:
2115 glRasterPos3f (0, 0, z); 3021 glRasterPos3f (0, 0, z);
2116 glBitmap (0, 0, 0, 0, x, y, 0); 3022 glBitmap (0, 0, 0, 0, x, y, 0);
2117 3023
… …
2121 3027
2122void glTexCoord (float s, float t) 3028void glTexCoord (float s, float t)
2123 CODE: 3029 CODE:
2124 glTexCoord2f (s, t); 3030 glTexCoord2f (s, t);
2125 3031
3032void glRect (float x1, float y1, float x2, float y2)
3033 CODE:
3034 glRectf (x1, y1, x2, y2);
3035
3036void glRect_lineloop (float x1, float y1, float x2, float y2)
3037 CODE:
3038 glBegin (GL_LINE_LOOP);
3039 glVertex2f (x1, y1);
3040 glVertex2f (x2, y1);
3041 glVertex2f (x2, y2);
3042 glVertex2f (x1, y2);
3043 glEnd ();
3044
3045PROTOTYPES: ENABLE
3046
3047void glBegin (int mode)
3048
3049void glEnd ()
3050
3051void glPointSize (GLfloat size)
3052
3053void glLineWidth (GLfloat width)
3054
3055void glInterleavedArrays (int format, int stride, char *data)
3056
3057void glDrawElements (int mode, int count, int type, char *indices)
3058
3059# 1.2 void glDrawRangeElements (int mode, int start, int end
3060
2126void glTexEnv (int target, int pname, float param) 3061void glTexEnv (int target, int pname, float param)
2127 CODE: 3062 CODE:
2128 glTexEnvf (target, pname, param); 3063 glTexEnvf (target, pname, param);
2129 3064
2130void glTexParameter (int target, int pname, float param) 3065void glTexParameter (int target, int pname, float param)
… …
2146void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 3081void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2147 CODE: 3082 CODE:
2148 if (gl.SeparableFilter2D) 3083 if (gl.SeparableFilter2D)
2149 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 3084 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2150 3085
2151void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 3086void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2152 3087
2153void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 3088void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2154 3089
2155void glDrawPixels (int width, int height, int format, int type, char *pixels) 3090void glDrawPixels (int width, int height, int format, int type, char *pixels)
3091
3092void glPixelZoom (float x, float y)
2156 3093
2157void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 3094void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2158 3095
2159int glGenTexture () 3096int glGenTexture ()
2160 CODE: 3097 CODE:
2161{ 3098 RETVAL = gen_texture ();
2162 GLuint name;
2163 glGenTextures (1, &name);
2164 RETVAL = name;
2165}
2166 OUTPUT: 3099 OUTPUT:
2167 RETVAL 3100 RETVAL
2168 3101
2169void glDeleteTexture (int name) 3102void glDeleteTexture (int name)
2170 CODE: 3103 CODE:
2171{
2172 GLuint name_ = name;
2173 glDeleteTextures (1, &name_); 3104 del_texture (name);
2174} 3105
2175
2176int glGenList () 3106int glGenList ()
2177 CODE: 3107 CODE:
2178 RETVAL = glGenLists (1); 3108 RETVAL = glGenLists (1);
2179 OUTPUT: 3109 OUTPUT:
2180 RETVAL 3110 RETVAL
… …
2187 3117
2188void glEndList () 3118void glEndList ()
2189 3119
2190void glCallList (int list) 3120void glCallList (int list)
2191 3121
3122MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3123
3124PROTOTYPES: DISABLE
3125
3126void
3127find_widget (SV *self, NV x, NV y)
3128 PPCODE:
3129{
3130 if (within_widget (self, x, y))
3131 XPUSHs (self);
3132}
3133
3134BOOT:
3135{
3136 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
3137
3138 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
3139 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
3140 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
3141 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
3142}
3143
3144void
3145draw (SV *self)
3146 CODE:
3147{
3148 HV *hv;
3149 SV **svp;
3150 NV x, y, w, h;
3151 SV *draw_x_sv = GvSV (draw_x_gv);
3152 SV *draw_y_sv = GvSV (draw_y_gv);
3153 SV *draw_w_sv = GvSV (draw_w_gv);
3154 SV *draw_h_sv = GvSV (draw_h_gv);
3155 double draw_x, draw_y;
3156
3157 if (!SvROK (self))
3158 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
3159
3160 hv = (HV *)SvRV (self);
3161
3162 if (SvTYPE (hv) != SVt_PVHV)
3163 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
3164
3165 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
3166 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
3167
3168 if (!h || !w)
3169 XSRETURN_EMPTY;
3170
3171 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
3172 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
3173
3174 draw_x = SvNV (draw_x_sv) + x;
3175 draw_y = SvNV (draw_y_sv) + y;
3176
3177 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
3178 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
3179 XSRETURN_EMPTY;
3180
3181 sv_setnv (draw_x_sv, draw_x);
3182 sv_setnv (draw_y_sv, draw_y);
3183
3184 glPushMatrix ();
3185 glTranslated (x, y, 0);
3186
3187 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
3188 {
3189 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
3190
3191 if (svp && SvTRUE (*svp))
3192 {
3193 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
3194 glEnable (GL_BLEND);
3195 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
3196 glBegin (GL_QUADS);
3197 glVertex2f (0, 0);
3198 glVertex2f (w, 0);
3199 glVertex2f (w, h);
3200 glVertex2f (0, h);
3201 glEnd ();
3202 glDisable (GL_BLEND);
3203 }
3204 }
3205#if 0
3206 // draw borders, for debugging
3207 glPushMatrix ();
3208 glColor4f (1., 1., 0., 1.);
3209 glTranslatef (.5, .5, 0.);
3210 glBegin (GL_LINE_LOOP);
3211 glVertex2f (0 , 0);
3212 glVertex2f (w - 1, 0);
3213 glVertex2f (w - 1, h - 1);
3214 glVertex2f (0 , h - 1);
3215 glEnd ();
3216 glPopMatrix ();
3217#endif
3218 PUSHMARK (SP);
3219 XPUSHs (self);
3220 PUTBACK;
3221 call_method ("_draw", G_VOID | G_DISCARD);
3222 SPAGAIN;
3223
3224 glPopMatrix ();
3225
3226 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3227 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3228}
3229

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines