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.126 by root, Tue Jul 4 23:56:34 2006 UTC vs.
Revision 1.256 by root, Mon Mar 24 00:24:46 2008 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
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
27#endif
28
29#include <assert.h>
12#include <math.h> 30#include <math.h>
13#include <string.h> 31#include <string.h>
14#include <stdio.h> 32#include <stdio.h>
15#include <stdlib.h> 33#include <stdlib.h>
16 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
17#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
18#include <SDL_endian.h> 39#include <SDL_endian.h>
19#include <SDL_image.h> 40#include <SDL_image.h>
20#include <SDL_mixer.h> 41#include <SDL_mixer.h>
21#include <SDL_opengl.h> 42#include <SDL_opengl.h>
22 43
… …
24#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
25 46
26#include <glib/gmacros.h> 47#include <glib/gmacros.h>
27 48
28#include <pango/pango.h> 49#include <pango/pango.h>
50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
29 61
30#ifndef _WIN32 62#ifndef _WIN32
31# include <sys/types.h> 63# include <sys/types.h>
32# include <sys/socket.h> 64# include <sys/socket.h>
33# include <netinet/in.h> 65# include <netinet/in.h>
34# include <netinet/tcp.h> 66# include <netinet/tcp.h>
35# include <inttypes.h> 67# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 68#endif
44 69
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 71
49#define FOW_DARKNESS 32 72#define FOW_DARKNESS 32
50 73
51#define MAP_EXTEND_X 32 74#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 75#define MAP_EXTEND_Y 512
53 76
54#define MIN_FONT_HEIGHT 10 77#define MIN_FONT_HEIGHT 10
55 78
79/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
81
56#if 1 82#if 0
57# define PARACHUTE SDL_INIT_NOPARACHUTE 83# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 84#else
59# define PARACHUTE 0 85# define PARACHUTE 0
60#endif 86#endif
61 87
88static AV *texture_av;
89
62static struct 90static struct
63{ 91{
64#define GL_FUNC(ptr,name) ptr name; 92#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 93#include "glfunc.h"
66#undef GL_FUNC 94#undef GL_FUNC
67} gl; 95} gl;
68 96
97static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 98gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 99{
71 if (gl.BlendFuncSeparate) 100 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 101 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 102 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 103 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 104 else
76 glBlendFunc (sa, da); 105 glBlendFunc (sa, da);
77} 106}
78 107
108static GLuint
109gen_texture ()
110{
111 GLuint name;
112
113 if (AvFILL (texture_av) >= 0)
114 name = (GLuint)(size_t)av_pop (texture_av);
115 else
116 glGenTextures (1, &name);
117
118 return name;
119}
120
121static void
122del_texture (GLuint name)
123{
124 /* make a half-assed attempt at returning the memory used by the texture */
125 /* textures are frequently being reused by cfplus anyway */
126 /*glBindTexture (GL_TEXTURE_2D, name);*/
127 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
128 av_push (texture_av, (SV *)(size_t)name);
129 glDeleteTextures (1, &name);
130}
131
79#include "texcache.c" 132#include "texcache.c"
133#include "rendercache.c"
80 134
81#include "pango-font.c" 135#include "pango-font.c"
82#include "pango-fontmap.c" 136#include "pango-fontmap.c"
83#include "pango-render.c" 137#include "pango-render.c"
84 138
139typedef IV DC__Channel;
140typedef SDL_RWops *DC__RW;
85typedef Mix_Chunk *CFClient__MixChunk; 141typedef Mix_Chunk *DC__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 142typedef Mix_Music *DC__MixMusic;
87 143
88typedef PangoFontDescription *CFClient__Font; 144typedef PangoFontDescription *DC__Font;
89 145
90static int 146static int
91shape_attr_p (PangoLayoutRun *run) 147shape_attr_p (PangoLayoutRun *run)
92{ 148{
93 GSList *attrs = run->item->analysis.extra_attrs; 149 GSList *attrs = run->item->analysis.extra_attrs;
… …
107 163
108typedef struct cf_layout { 164typedef struct cf_layout {
109 PangoLayout *pl; 165 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 166 float r, g, b, a; // default color for rgba mode
111 int base_height; 167 int base_height;
112 CFClient__Font font; 168 DC__Font font;
169 rc_t *rc;
113} *CFClient__Layout; 170} *DC__Layout;
114 171
115static CFClient__Font default_font; 172static DC__Font default_font;
116static PangoContext *opengl_context; 173static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 174static PangoFontMap *opengl_fontmap;
118 175
119static void 176static void
120substitute_func (FcPattern *pattern, gpointer data) 177substitute_func (FcPattern *pattern, gpointer data)
… …
125#endif 182#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 183 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 184}
128 185
129static void 186static void
130layout_update_font (CFClient__Layout self) 187layout_update_font (DC__Layout self)
131{ 188{
132 /* use a random scale factor to account for unknown descenders, 0.8 works 189 /* use a random scale factor to account for unknown descenders, 0.8 works
133 * reasonably well with bitstream vera 190 * reasonably well with bitstream vera
134 */ 191 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 192 PangoFontDescription *font = self->font ? self->font : default_font;
… …
139 196
140 pango_layout_set_font_description (self->pl, font); 197 pango_layout_set_font_description (self->pl, font);
141} 198}
142 199
143static void 200static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 201layout_get_pixel_size (DC__Layout self, int *w, int *h)
145{ 202{
203 PangoRectangle rect;
204
205 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 206 pango_layout_get_extents (self->pl, 0, &rect);
147 207
148 if (!*w) *w = 1; 208 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 209 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 210
151 *w = (*w + 3) & ~3; 211 if (!rect.width) rect.width = 1;
152} 212 if (!rect.height) rect.height = 1;
153 213
214 *w = rect.width;
215 *h = rect.height;
216}
217
218typedef uint16_t tileid;
154typedef uint16_t mapface; 219typedef uint16_t faceid;
155 220
156typedef struct { 221typedef struct {
157 GLint name; 222 GLuint name;
158 int w, h; 223 int w, h;
159 float s, t; 224 float s, t;
160 uint8_t r, g, b, a; 225 uint8_t r, g, b, a;
226 tileid smoothtile;
227 uint8_t smoothlevel;
161} maptex; 228} maptex;
162 229
163typedef struct { 230typedef struct {
231 uint32_t player;
232 tileid tile[3];
164 int16_t darkness; 233 uint16_t darkness;
165 mapface face[3]; 234 uint8_t stat_width, stat_hp, flags, smoothmax;
166} mapcell; 235} mapcell;
167 236
168typedef struct { 237typedef struct {
169 int32_t c0, c1; 238 int32_t c0, c1;
170 mapcell *col; 239 mapcell *col;
171} maprow; 240} maprow;
172 241
173typedef struct map { 242typedef struct map {
174 int x, y, w, h; 243 int x, y, w, h;
175 int ox, oy; /* offset to virtual global coordinate system */ 244 int ox, oy; /* offset to virtual global coordinate system */
176 int faces; 245 int faces; tileid *face2tile; // [faceid]
177 mapface *face; 246 int texs; maptex *tex; // [tileid]
178
179 int texs;
180 maptex *tex;
181 247
182 int32_t rows; 248 int32_t rows;
183 maprow *row; 249 maprow *row;
184} *CFClient__Map; 250} *DC__Map;
185 251
186static char * 252static char *
187prepend (char *ptr, int sze, int inc) 253prepend (char *ptr, int sze, int inc)
188{ 254{
189 char *p; 255 char *p;
… …
206} 272}
207 273
208#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 274#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
209#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 275#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
210 276
277static void
278need_facenum (struct map *self, faceid face)
279{
280 while (self->faces <= face)
281 {
282 Append (tileid, self->face2tile, self->faces, self->faces);
283 self->faces *= 2;
284 }
285}
286
287static void
288need_texid (struct map *self, int texid)
289{
290 while (self->texs <= texid)
291 {
292 Append (maptex, self->tex, self->texs, self->texs);
293 self->texs *= 2;
294 }
295}
296
211static maprow * 297static maprow *
212map_get_row (CFClient__Map self, int y) 298map_get_row (DC__Map self, int y)
213{ 299{
214 if (0 > y) 300 if (0 > y)
215 { 301 {
216 int extend = - y + MAP_EXTEND_Y; 302 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 303 Prepend (maprow, self->row, self->rows, extend);
… …
255 341
256 return row->col + (x - row->c0); 342 return row->col + (x - row->c0);
257} 343}
258 344
259static mapcell * 345static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 346map_get_cell (DC__Map self, int x, int y)
261{ 347{
262 return row_get_cell (map_get_row (self, y), x); 348 return row_get_cell (map_get_row (self, y), x);
263} 349}
264 350
265static void 351static void
266map_clear (CFClient__Map self) 352map_clear (DC__Map self)
267{ 353{
268 int r; 354 int r;
269 355
270 for (r = 0; r < self->rows; r++) 356 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 357 Safefree (self->row[r].col);
… …
279 self->row = 0; 365 self->row = 0;
280 self->rows = 0; 366 self->rows = 0;
281} 367}
282 368
283static void 369static void
284map_blank (CFClient__Map self, int x0, int y0, int w, int h) 370map_blank (DC__Map self, int x0, int y0, int w, int h)
285{ 371{
286 int x, y; 372 int x, y;
287 maprow *row; 373 maprow *row;
374 mapcell *cell;
288 375
289 for (y = y0; y < y0 + h; y++) 376 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 377 if (y >= 0)
291 { 378 {
292 if (y >= self->rows) 379 if (y >= self->rows)
… …
298 if (x >= row->c0) 385 if (x >= row->c0)
299 { 386 {
300 if (x >= row->c1) 387 if (x >= row->c1)
301 break; 388 break;
302 389
303 row->col[x - row->c0].darkness = -1; 390 cell = row->col + x - row->c0;
391
392 cell->darkness = 0;
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
304 } 396 }
305 } 397 }
398}
399
400typedef struct {
401 tileid tile;
402 uint8_t x, y, level;
403} smooth_key;
404
405static void
406smooth_or_bits (HV *hv, smooth_key *key, IV bits)
407{
408 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
409
410 if (SvIOK (*sv))
411 SvIV_set (*sv, SvIVX (*sv) | bits);
412 else
413 sv_setiv (*sv, bits);
306} 414}
307 415
308static void 416static void
309music_finished (void) 417music_finished (void)
310{ 418{
… …
346 n |= n >> 16; 454 n |= n >> 16;
347 455
348 return n + 1; 456 return n + 1;
349} 457}
350 458
351MODULE = CFClient PACKAGE = CFClient 459static unsigned int
460popcount (unsigned int n)
461{
462 n -= (n >> 1) & 0x55555555U;
463 n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
464 n = ((n >> 4) + n) & 0x0f0f0f0fU;
465 n *= 0x01010101U;
466
467 return n >> 24;
468}
469
470/* SDL should provide this, really. */
471#define SDLK_MODIFIER_MIN 300
472#define SDLK_MODIFIER_MAX 314
473
474/******************************************************************************/
475
476static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
477static GV *hover_gv;
478
479static int
480within_widget (SV *widget, NV x, NV y)
481{
482 HV *self;
483 SV **svp;
484 NV wx, ww, wy, wh;
485
486 if (!SvROK (widget))
487 return 0;
488
489 self = (HV *)SvRV (widget);
490
491 if (SvTYPE (self) != SVt_PVHV)
492 return 0;
493
494 svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
495 if (y < wy)
496 return 0;
497
498 svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
499 if (y >= wy + wh)
500 return 0;
501
502 svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
503 if (x < wx)
504 return 0;
505
506 svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
507 if (x >= wx + ww)
508 return 0;
509
510 svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
511 if (!svp || !SvTRUE (*svp))
512 return 0;
513
514 return 1;
515}
516
517MODULE = Deliantra::Client PACKAGE = DC
352 518
353PROTOTYPES: ENABLE 519PROTOTYPES: ENABLE
354 520
355BOOT: 521BOOT:
356{ 522{
357 HV *stash = gv_stashpv ("CFClient", 1); 523 HV *stash = gv_stashpv ("DC", 1);
358 static const struct { 524 static const struct {
359 const char *name; 525 const char *name;
360 IV iv; 526 IV iv;
361 } *civ, const_iv[] = { 527 } *civ, const_iv[] = {
362# define const_iv(name) { # name, (IV)name } 528# define const_iv(name) { # name, (IV)name }
529 const_iv (SDLK_MODIFIER_MIN),
530 const_iv (SDLK_MODIFIER_MAX),
531
363 const_iv (SDL_ACTIVEEVENT), 532 const_iv (SDL_ACTIVEEVENT),
364 const_iv (SDL_KEYDOWN), 533 const_iv (SDL_KEYDOWN),
365 const_iv (SDL_KEYUP), 534 const_iv (SDL_KEYUP),
366 const_iv (SDL_MOUSEMOTION), 535 const_iv (SDL_MOUSEMOTION),
367 const_iv (SDL_MOUSEBUTTONDOWN), 536 const_iv (SDL_MOUSEBUTTONDOWN),
… …
376 const_iv (SDL_EVENT_RESERVEDA), 545 const_iv (SDL_EVENT_RESERVEDA),
377 const_iv (SDL_EVENT_RESERVEDB), 546 const_iv (SDL_EVENT_RESERVEDB),
378 const_iv (SDL_VIDEORESIZE), 547 const_iv (SDL_VIDEORESIZE),
379 const_iv (SDL_VIDEOEXPOSE), 548 const_iv (SDL_VIDEOEXPOSE),
380 const_iv (SDL_USEREVENT), 549 const_iv (SDL_USEREVENT),
550
551 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE),
554
555 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST),
381 const_iv (SDLK_KP0), 557 const_iv (SDLK_KP0),
382 const_iv (SDLK_KP1), 558 const_iv (SDLK_KP1),
383 const_iv (SDLK_KP2), 559 const_iv (SDLK_KP2),
384 const_iv (SDLK_KP3), 560 const_iv (SDLK_KP3),
385 const_iv (SDLK_KP4), 561 const_iv (SDLK_KP4),
… …
440 const_iv (SDLK_BREAK), 616 const_iv (SDLK_BREAK),
441 const_iv (SDLK_MENU), 617 const_iv (SDLK_MENU),
442 const_iv (SDLK_POWER), 618 const_iv (SDLK_POWER),
443 const_iv (SDLK_EURO), 619 const_iv (SDLK_EURO),
444 const_iv (SDLK_UNDO), 620 const_iv (SDLK_UNDO),
621
445 const_iv (KMOD_NONE), 622 const_iv (KMOD_NONE),
623 const_iv (KMOD_SHIFT),
446 const_iv (KMOD_LSHIFT), 624 const_iv (KMOD_LSHIFT),
447 const_iv (KMOD_RSHIFT), 625 const_iv (KMOD_RSHIFT),
626 const_iv (KMOD_CTRL),
448 const_iv (KMOD_LCTRL), 627 const_iv (KMOD_LCTRL),
449 const_iv (KMOD_RCTRL), 628 const_iv (KMOD_RCTRL),
629 const_iv (KMOD_ALT),
450 const_iv (KMOD_LALT), 630 const_iv (KMOD_LALT),
451 const_iv (KMOD_RALT), 631 const_iv (KMOD_RALT),
632 const_iv (KMOD_META),
452 const_iv (KMOD_LMETA), 633 const_iv (KMOD_LMETA),
453 const_iv (KMOD_RMETA), 634 const_iv (KMOD_RMETA),
454 const_iv (KMOD_NUM), 635 const_iv (KMOD_NUM),
455 const_iv (KMOD_CAPS), 636 const_iv (KMOD_CAPS),
456 const_iv (KMOD_MODE), 637 const_iv (KMOD_MODE),
457 const_iv (KMOD_CTRL), 638
458 const_iv (KMOD_SHIFT), 639 const_iv (MIX_DEFAULT_FORMAT),
459 const_iv (KMOD_ALT),
460 const_iv (KMOD_META)
461# undef const_iv 640# undef const_iv
462 }; 641 };
463 642
464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
645
646 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
647 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
466} 648}
649
650void
651weaken (SV *rv)
652 PROTOTYPE: $
653 CODE:
654 sv_rvweaken (rv);
655
656int
657in_destruct ()
658 CODE:
659 RETVAL = PL_main_cv == Nullcv;
660 OUTPUT:
661 RETVAL
467 662
468NV floor (NV x) 663NV floor (NV x)
469 664
470NV ceil (NV x) 665NV ceil (NV x)
666
667IV minpot (UV n)
668
669IV popcount (UV n)
471 670
472void 671void
473pango_init () 672pango_init ()
474 CODE: 673 CODE:
475{ 674{
476 opengl_fontmap = pango_opengl_font_map_new (); 675 opengl_fontmap = pango_opengl_font_map_new ();
477 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 676 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
478 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 677 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
678#if PANGO_VERSION_CHECK (1, 15, 2)
679 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
681#endif
479} 682}
683
684char *
685SDL_GetError ()
480 686
481int 687int
482SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 688SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
483 689
484void 690void
485SDL_Quit () 691SDL_Quit ()
486 692
487void 693void
488SDL_ListModes () 694SDL_ListModes (int rgb, int alpha)
489 PPCODE: 695 PPCODE:
490{ 696{
491 SDL_Rect **m; 697 SDL_Rect **m;
492 698
493 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 699 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
494 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 700 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
495 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 701 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
496 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 702 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
497 703
498 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 704 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
499 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 705 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
500 706
501 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 707 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 708 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 709 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 710 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 711
506 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 712 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
507 713#if SDL_VERSION_ATLEAST(1,2,10)
508 SDL_EnableUNICODE (1); 714 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 715 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716#endif
510 717
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 718 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
512 719
513 if (m && m != (SDL_Rect **)-1) 720 if (m && m != (SDL_Rect **)-1)
514 while (*m) 721 while (*m)
515 { 722 {
723 if ((*m)->w >= 800 && (*m)->h >= 480)
724 {
516 AV *av = newAV (); 725 AV *av = newAV ();
517 av_push (av, newSViv ((*m)->w)); 726 av_push (av, newSViv ((*m)->w));
518 av_push (av, newSViv ((*m)->h)); 727 av_push (av, newSViv ((*m)->h));
728 av_push (av, newSViv (rgb));
729 av_push (av, newSViv (alpha));
519 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 730 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
731 }
520 732
521 ++m; 733 ++m;
522 } 734 }
523} 735}
524 736
525char *
526SDL_GetError ()
527
528int 737int
529SDL_SetVideoMode (int w, int h, int fullscreen) 738SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
530 CODE: 739 CODE:
740{
741 SDL_EnableUNICODE (1);
742 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
743
744 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
745 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
746 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
747 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
748
531 RETVAL = !!SDL_SetVideoMode ( 749 RETVAL = !!SDL_SetVideoMode (
532 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 750 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
533 ); 751 );
752
534 if (RETVAL) 753 if (RETVAL)
535 { 754 {
536 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 755 av_clear (texture_av);
756
757 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
537# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 758#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
538# include "glfunc.h" 759#include "glfunc.h"
539# undef GL_FUNC 760#undef GL_FUNC
540 } 761 }
762}
541 OUTPUT: 763 OUTPUT:
542 RETVAL 764 RETVAL
543 765
544void 766void
545SDL_GL_SwapBuffers () 767SDL_GL_SwapBuffers ()
546 768
547char * 769char *
548SDL_GetKeyName (int sym) 770SDL_GetKeyName (int sym)
549 771
772int
773SDL_GetAppState ()
774
775int
776SDL_GetModState ()
777
550void 778void
551SDL_PollEvent () 779poll_events ()
552 PPCODE: 780 PPCODE:
553{ 781{
554 SDL_Event ev; 782 SDL_Event ev;
555 783
556 while (SDL_PollEvent (&ev)) 784 SDL_PumpEvents ();
785 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
557 { 786 {
558 HV *hv = newHV (); 787 HV *hv = newHV ();
559 hv_store (hv, "type", 4, newSViv (ev.type), 0); 788 hv_store (hv, "type", 4, newSViv (ev.type), 0);
560 789
561 switch (ev.type) 790 switch (ev.type)
562 { 791 {
563 case SDL_KEYDOWN: 792 case SDL_KEYDOWN:
564 case SDL_KEYUP: 793 case SDL_KEYUP:
565 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 794 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
566 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 795 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
567 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 796 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
797 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
568 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 798 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
569 break; 799 break;
570 800
571 case SDL_ACTIVEEVENT: 801 case SDL_ACTIVEEVENT:
572 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 802 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
573 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 803 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
574 break; 804 break;
575 805
576 case SDL_MOUSEMOTION: 806 case SDL_MOUSEMOTION:
807 {
808 int state = ev.motion.state;
809 int x = ev.motion.x;
810 int y = ev.motion.y;
811 int xrel = ev.motion.xrel;
812 int yrel = ev.motion.yrel;
813
814 /* do simplistic event compression */
815 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
816 && state == ev.motion.state)
817 {
818 xrel += ev.motion.xrel;
819 yrel += ev.motion.yrel;
820 x = ev.motion.x;
821 y = ev.motion.y;
822 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
823 }
824
577 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 825 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
578
579 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 826 hv_store (hv, "state", 5, newSViv (state), 0);
580 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 827 hv_store (hv, "x", 1, newSViv (x), 0);
581 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 828 hv_store (hv, "y", 1, newSViv (y), 0);
582 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 829 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
583 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 830 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
831 }
584 break; 832 break;
585 833
586 case SDL_MOUSEBUTTONDOWN: 834 case SDL_MOUSEBUTTONDOWN:
587 case SDL_MOUSEBUTTONUP: 835 case SDL_MOUSEBUTTONUP:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
589 837
590 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 838 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
591 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 839 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
592 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 840 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
593 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 841 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 846 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 847 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 848 break;
601 } 849 }
602 850
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 851 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
604 } 852 }
605} 853}
606 854
607int 855int
608Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 856Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
609 POSTCALL: 857 POSTCALL:
610 Mix_HookMusicFinished (music_finished); 858 Mix_HookMusicFinished (music_finished);
611 Mix_ChannelFinished (channel_finished); 859 Mix_ChannelFinished (channel_finished);
612 860
613void 861void
862Mix_QuerySpec ()
863 PPCODE:
864{
865 int freq, channels;
866 Uint16 format;
867
868 if (Mix_QuerySpec (&freq, &format, &channels))
869 {
870 EXTEND (SP, 3);
871 PUSHs (sv_2mortal (newSViv (freq)));
872 PUSHs (sv_2mortal (newSViv (format)));
873 PUSHs (sv_2mortal (newSViv (channels)));
874 }
875}
876
877void
614Mix_CloseAudio () 878Mix_CloseAudio ()
615 879
616int 880int
617Mix_AllocateChannels (int numchans = -1) 881Mix_AllocateChannels (int numchans = -1)
618 882
883const char *
884Mix_GetError ()
885
619void 886void
620lowdelay (int fd, int val = 1) 887lowdelay (int fd, int val = 1)
621 CODE: 888 CODE:
889 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
890
891void
892win32_proxy_info ()
893 PPCODE:
894{
622#ifndef _WIN32 895#ifdef _WIN32
623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 896 char buffer[2048];
897 DWORD buflen;
898
899 EXTEND (SP, 3);
900
901 buflen = sizeof (buffer);
902 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
903 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
904 {
905 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
906
907 buflen = sizeof (buffer);
908 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
909 {
910 PUSHs (newSVpv (buffer, 0));
911
912 buflen = sizeof (buffer);
913 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
914 PUSHs (newSVpv (buffer, 0));
915 }
916 }
624#endif 917#endif
918}
625 919
626void 920void
627add_font (char *file) 921add_font (char *file)
628 CODE: 922 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 923 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630 924
631void 925void
632load_image_inline (SV *image_) 926load_image_inline (SV *image_)
633 ALIAS: 927 ALIAS:
634 load_image_file = 1 928 load_image_file = 1
… …
637 STRLEN image_len; 931 STRLEN image_len;
638 char *image = (char *)SvPVbyte (image_, image_len); 932 char *image = (char *)SvPVbyte (image_, image_len);
639 SDL_Surface *surface, *surface2; 933 SDL_Surface *surface, *surface2;
640 SDL_PixelFormat fmt; 934 SDL_PixelFormat fmt;
641 SDL_RWops *rw = ix 935 SDL_RWops *rw = ix
642 ? SDL_RWFromFile (image, "r") 936 ? SDL_RWFromFile (image, "rb")
643 : SDL_RWFromConstMem (image, image_len); 937 : SDL_RWFromConstMem (image, image_len);
644 938
645 if (!rw) 939 if (!rw)
646 croak ("load_image: %s", SDL_GetError ()); 940 croak ("load_image: %s", SDL_GetError ());
647 941
… …
676 970
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 971 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 972
679 assert (surface2->pitch == surface2->w * 4); 973 assert (surface2->pitch == surface2->w * 4);
680 974
975 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 976 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 977 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 978 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 979 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 980 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 981 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 982 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
983 SDL_UnlockSurface (surface2);
690 984
691 SDL_FreeSurface (surface); 985 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 986 SDL_FreeSurface (surface2);
693} 987}
694 988
… …
720void 1014void
721error (char *message) 1015error (char *message)
722 CODE: 1016 CODE:
723 fprintf (stderr, "ERROR: %s\n", message); 1017 fprintf (stderr, "ERROR: %s\n", message);
724#ifdef _WIN32 1018#ifdef _WIN32
725 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1019 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
726#endif 1020#endif
727 1021
728void 1022void
729fatal (char *message) 1023fatal (char *message)
730 CODE: 1024 CODE:
731 fprintf (stderr, "FATAL: %s\n", message); 1025 fprintf (stderr, "FATAL: %s\n", message);
732#ifdef _WIN32 1026#ifdef _WIN32
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1027 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
734#endif 1028#endif
735 _exit (1); 1029 _exit (1);
736 1030
737void 1031void
738_exit (int retval) 1032_exit (int retval = 0)
739 CODE: 1033 CODE:
1034#ifdef WIN32
1035 ExitThread (retval); // unclean, please beam me up
1036#else
740 _exit (retval); 1037 _exit (retval);
1038#endif
741 1039
1040void
1041debug ()
1042 CODE:
1043{
1044#if DEBUG
1045 VALGRIND_DO_LEAK_CHECK;
1046#endif
1047}
1048
742MODULE = CFClient PACKAGE = CFClient::Font 1049MODULE = Deliantra::Client PACKAGE = DC::Font
743 1050
744CFClient::Font 1051PROTOTYPES: DISABLE
1052
1053DC::Font
745new_from_file (SV *class, char *path, int id = 0) 1054new_from_file (SV *class, char *path, int id = 0)
746 CODE: 1055 CODE:
747{ 1056{
748 int count; 1057 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1058 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
752} 1061}
753 OUTPUT: 1062 OUTPUT:
754 RETVAL 1063 RETVAL
755 1064
756void 1065void
757DESTROY (CFClient::Font self) 1066DESTROY (DC::Font self)
758 CODE: 1067 CODE:
759 pango_font_description_free (self); 1068 pango_font_description_free (self);
760 1069
761void 1070void
762make_default (CFClient::Font self) 1071make_default (DC::Font self)
1072 PROTOTYPE: $
763 CODE: 1073 CODE:
764 default_font = self; 1074 default_font = self;
765 1075
766MODULE = CFClient PACKAGE = CFClient::Layout 1076MODULE = Deliantra::Client PACKAGE = DC::Layout
767 1077
1078PROTOTYPES: DISABLE
1079
768void 1080void
769clear_font_cache () 1081glyph_cache_backup ()
1082 PROTOTYPE:
770 CODE: 1083 CODE:
1084 tc_backup ();
1085
1086void
1087glyph_cache_restore ()
1088 PROTOTYPE:
1089 CODE:
771 tc_clear (); 1090 tc_restore ();
772 1091
773CFClient::Layout 1092DC::Layout
774new (SV *class, int type = 0) 1093new (SV *class)
775 CODE: 1094 CODE:
776 New (0, RETVAL, 1, struct cf_layout); 1095 New (0, RETVAL, 1, struct cf_layout);
777 1096
778 RETVAL->pl = pango_layout_new (opengl_context); 1097 RETVAL->pl = pango_layout_new (opengl_context);
779 RETVAL->r = 1.; 1098 RETVAL->r = 1.;
780 RETVAL->g = 1.; 1099 RETVAL->g = 1.;
781 RETVAL->b = 1.; 1100 RETVAL->b = 1.;
782 RETVAL->a = 1.; 1101 RETVAL->a = 1.;
783 RETVAL->base_height = MIN_FONT_HEIGHT; 1102 RETVAL->base_height = MIN_FONT_HEIGHT;
784 RETVAL->font = 0; 1103 RETVAL->font = 0;
1104 RETVAL->rc = rc_alloc ();
785 1105
786 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1106 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
787 layout_update_font (RETVAL); 1107 layout_update_font (RETVAL);
788 OUTPUT: 1108 OUTPUT:
789 RETVAL 1109 RETVAL
790 1110
791void 1111void
792DESTROY (CFClient::Layout self) 1112DESTROY (DC::Layout self)
793 CODE: 1113 CODE:
794 g_object_unref (self->pl); 1114 g_object_unref (self->pl);
1115 rc_free (self->rc);
795 Safefree (self); 1116 Safefree (self);
796 1117
797void 1118void
798set_text (CFClient::Layout self, SV *text_) 1119set_text (DC::Layout self, SV *text_)
799 CODE: 1120 CODE:
800{ 1121{
801 STRLEN textlen; 1122 STRLEN textlen;
802 char *text = SvPVutf8 (text_, textlen); 1123 char *text = SvPVutf8 (text_, textlen);
803 1124
804 pango_layout_set_text (self->pl, text, textlen); 1125 pango_layout_set_text (self->pl, text, textlen);
805} 1126}
806 1127
807void 1128void
808set_markup (CFClient::Layout self, SV *text_) 1129set_markup (DC::Layout self, SV *text_)
809 CODE: 1130 CODE:
810{ 1131{
811 STRLEN textlen; 1132 STRLEN textlen;
812 char *text = SvPVutf8 (text_, textlen); 1133 char *text = SvPVutf8 (text_, textlen);
813 1134
814 pango_layout_set_markup (self->pl, text, textlen); 1135 pango_layout_set_markup (self->pl, text, textlen);
815} 1136}
816 1137
817void 1138void
818set_shapes (CFClient::Layout self, ...) 1139set_shapes (DC::Layout self, ...)
819 CODE: 1140 CODE:
820{ 1141{
821 PangoAttrList *attrs = 0; 1142 PangoAttrList *attrs = 0;
822 const char *text = pango_layout_get_text (self->pl); 1143 const char *text = pango_layout_get_text (self->pl);
823 const char *pos = text; 1144 const char *pos = text;
… …
858 if (attrs) 1179 if (attrs)
859 pango_layout_set_attributes (self->pl, attrs); 1180 pango_layout_set_attributes (self->pl, attrs);
860} 1181}
861 1182
862void 1183void
863get_shapes (CFClient::Layout self) 1184get_shapes (DC::Layout self)
864 PPCODE: 1185 PPCODE:
865{ 1186{
866 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1187 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
867 1188
868 do 1189 do
869 { 1190 {
870 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1191 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
871 1192
872 if (run && shape_attr_p (run)) 1193 if (run && shape_attr_p (run))
873 { 1194 {
874 PangoRectangle extents; 1195 PangoRectangle extents;
875 pango_layout_iter_get_run_extents (iter, 0, &extents); 1196 pango_layout_iter_get_run_extents (iter, 0, &extents);
876 1197
1198 EXTEND (SP, 2);
877 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1199 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1200 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
879 } 1201 }
880 } 1202 }
881 while (pango_layout_iter_next_run (iter)); 1203 while (pango_layout_iter_next_run (iter));
882 1204
883 pango_layout_iter_free (iter); 1205 pango_layout_iter_free (iter);
884} 1206}
885 1207
886int 1208int
887has_wrapped (CFClient::Layout self) 1209has_wrapped (DC::Layout self)
888 CODE: 1210 CODE:
889{ 1211{
890 int lines = 1; 1212 int lines = 1;
891 const char *text = pango_layout_get_text (self->pl); 1213 const char *text = pango_layout_get_text (self->pl);
892 1214
… …
897} 1219}
898 OUTPUT: 1220 OUTPUT:
899 RETVAL 1221 RETVAL
900 1222
901SV * 1223SV *
902get_text (CFClient::Layout self) 1224get_text (DC::Layout self)
903 CODE: 1225 CODE:
904 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1226 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
905 sv_utf8_decode (RETVAL); 1227 sv_utf8_decode (RETVAL);
906 OUTPUT: 1228 OUTPUT:
907 RETVAL 1229 RETVAL
908 1230
909void 1231void
910set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1232set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
911 CODE: 1233 CODE:
912 self->r = r; 1234 self->r = r;
913 self->g = g; 1235 self->g = g;
914 self->b = b; 1236 self->b = b;
915 self->a = a; 1237 self->a = a;
916 1238
917void 1239void
918set_font (CFClient::Layout self, CFClient::Font font = 0) 1240set_font (DC::Layout self, DC::Font font = 0)
919 CODE: 1241 CODE:
920 if (self->font != font) 1242 if (self->font != font)
921 { 1243 {
922 self->font = font; 1244 self->font = font;
923 layout_update_font (self); 1245 layout_update_font (self);
924 } 1246 }
925 1247
926void 1248void
927set_height (CFClient::Layout self, int base_height) 1249set_height (DC::Layout self, int base_height)
928 CODE: 1250 CODE:
929 if (self->base_height != base_height) 1251 if (self->base_height != base_height)
930 { 1252 {
931 self->base_height = base_height; 1253 self->base_height = base_height;
932 layout_update_font (self); 1254 layout_update_font (self);
933 } 1255 }
934 1256
935void 1257void
936set_width (CFClient::Layout self, int max_width = -1) 1258set_width (DC::Layout self, int max_width = -1)
937 CODE: 1259 CODE:
938 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1260 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
939 1261
940void 1262void
941set_indent (CFClient::Layout self, int indent) 1263set_indent (DC::Layout self, int indent)
942 CODE: 1264 CODE:
943 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1265 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
944 1266
945void 1267void
946set_spacing (CFClient::Layout self, int spacing) 1268set_spacing (DC::Layout self, int spacing)
947 CODE: 1269 CODE:
948 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1270 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
949 1271
950void 1272void
951set_ellipsise (CFClient::Layout self, int ellipsise) 1273set_ellipsise (DC::Layout self, int ellipsise)
952 CODE: 1274 CODE:
953 pango_layout_set_ellipsize (self->pl, 1275 pango_layout_set_ellipsize (self->pl,
954 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1276 ellipsise == 1 ? PANGO_ELLIPSIZE_START
955 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1277 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
956 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1278 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
957 : PANGO_ELLIPSIZE_NONE 1279 : PANGO_ELLIPSIZE_NONE
958 ); 1280 );
959 1281
960void 1282void
961set_single_paragraph_mode (CFClient::Layout self, int spm) 1283set_single_paragraph_mode (DC::Layout self, int spm)
962 CODE: 1284 CODE:
963 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1285 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
964 1286
965void 1287void
966size (CFClient::Layout self) 1288size (DC::Layout self)
967 PPCODE: 1289 PPCODE:
968{ 1290{
969 int w, h; 1291 int w, h;
970 1292
971 layout_get_pixel_size (self, &w, &h); 1293 layout_get_pixel_size (self, &w, &h);
… …
974 PUSHs (sv_2mortal (newSViv (w))); 1296 PUSHs (sv_2mortal (newSViv (w)));
975 PUSHs (sv_2mortal (newSViv (h))); 1297 PUSHs (sv_2mortal (newSViv (h)));
976} 1298}
977 1299
978int 1300int
979descent (CFClient::Layout self) 1301descent (DC::Layout self)
980 CODE: 1302 CODE:
981{ 1303{
982 PangoRectangle rect; 1304 PangoRectangle rect;
983 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1305 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
984 pango_layout_line_get_pixel_extents (line, 0, &rect); 1306 pango_layout_line_get_pixel_extents (line, 0, &rect);
985 RETVAL = PANGO_DESCENT (rect); 1307 RETVAL = PANGO_DESCENT (rect);
986} 1308}
987 OUTPUT: 1309 OUTPUT:
988 RETVAL 1310 RETVAL
989 1311
990int 1312int
991xy_to_index (CFClient::Layout self, int x, int y) 1313xy_to_index (DC::Layout self, int x, int y)
992 CODE: 1314 CODE:
993{ 1315{
994 int index, trailing; 1316 int index, trailing;
995 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1317 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996 RETVAL = index; 1318 RETVAL = index + trailing;
997} 1319}
998 OUTPUT: 1320 OUTPUT:
999 RETVAL 1321 RETVAL
1000 1322
1001void 1323void
1002cursor_pos (CFClient::Layout self, int index) 1324cursor_pos (DC::Layout self, int index)
1003 PPCODE: 1325 PPCODE:
1004{ 1326{
1005 PangoRectangle strong_pos; 1327 PangoRectangle pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1328 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1007 1329
1008 EXTEND (SP, 3); 1330 EXTEND (SP, 3);
1009 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1331 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1332 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1333 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1012} 1334}
1013 1335
1014void 1336void
1015render (CFClient::Layout self, float x, float y) 1337index_to_line_x (DC::Layout self, int index, int trailing = 0)
1016 PPCODE: 1338 PPCODE:
1339{
1340 int line, x;
1341
1342 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1343#if !PANGO_VERSION_CHECK (1, 17, 3)
1344 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1345 --line;
1346#endif
1347 EXTEND (SP, 2);
1348 PUSHs (sv_2mortal (newSViv (line)));
1349 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1350}
1351
1352void
1353line_x_to_index (DC::Layout self, int line, int x)
1354 PPCODE:
1355{
1356 PangoLayoutLine *lp;
1357 int index, trailing;
1358
1359 if (line < 0)
1360 XSRETURN_EMPTY;
1361
1362 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1363 XSRETURN_EMPTY; /* do better */
1364
1365 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1366
1367 EXTEND (SP, 2);
1368 if (GIMME_V == G_SCALAR)
1369 PUSHs (sv_2mortal (newSViv (index + trailing)));
1370 else
1371 {
1372 PUSHs (sv_2mortal (newSViv (index)));
1373 PUSHs (sv_2mortal (newSViv (trailing)));
1374 }
1375}
1376
1377void
1378render (DC::Layout self, float x, float y, int flags = 0)
1379 CODE:
1380 rc_clear (self->rc);
1017 pango_opengl_render_layout_subpixel ( 1381 pango_opengl_render_layout_subpixel (
1018 self->pl, 1382 self->pl,
1383 self->rc,
1019 x * PANGO_SCALE, y * PANGO_SCALE, 1384 x * PANGO_SCALE, y * PANGO_SCALE,
1020 self->r, self->g, self->b, self->a 1385 self->r, self->g, self->b, self->a,
1386 flags
1021 ); 1387 );
1388 // we assume that context_change actually clears/frees stuff
1389 // and does not do any recomputation...
1390 pango_layout_context_changed (self->pl);
1022 1391
1392void
1393draw (DC::Layout self)
1394 CODE:
1395{
1396 glEnable (GL_TEXTURE_2D);
1397 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1398 glEnable (GL_BLEND);
1399 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1400 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1401 glEnable (GL_ALPHA_TEST);
1402 glAlphaFunc (GL_GREATER, 7.f / 255.f);
1403
1404 rc_draw (self->rc);
1405
1406 glDisable (GL_ALPHA_TEST);
1407 glDisable (GL_BLEND);
1408 glDisable (GL_TEXTURE_2D);
1409}
1410
1023MODULE = CFClient PACKAGE = CFClient::Texture 1411MODULE = Deliantra::Client PACKAGE = DC::Texture
1024 1412
1025void 1413PROTOTYPES: ENABLE
1026pad2pot (SV *data_, SV *w_, SV *h_)
1027 CODE:
1028{
1029 int ow = SvIV (w_);
1030 int oh = SvIV (h_);
1031 1414
1032 if (ow && oh) 1415void
1416pad (SV *data_, int ow, int oh, int nw, int nh)
1417 CODE:
1418{
1419 if ((nw != ow || nh != oh) && SvOK (data_))
1033 { 1420 {
1034 int nw = minpot (ow);
1035 int nh = minpot (oh);
1036
1037 if (nw != ow || nh != oh)
1038 {
1039 if (SvOK (data_))
1040 {
1041 STRLEN datalen; 1421 STRLEN datalen;
1042 char *data = SvPVbyte (data_, datalen); 1422 char *data = SvPVbyte (data_, datalen);
1043 int bpp = datalen / (ow * oh); 1423 int bpp = datalen / (ow * oh);
1044 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1424 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1045 1425
1046 SvPOK_only (result_); 1426 SvPOK_only (result_);
1047 SvCUR_set (result_, nw * nh * bpp); 1427 SvCUR_set (result_, nw * nh * bpp);
1048 1428
1049 memset (SvPVX (result_), 0, nw * nh * bpp); 1429 memset (SvPVX (result_), 0, nw * nh * bpp);
1050 while (oh--) 1430 while (oh--)
1051 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1431 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1052 1432
1053 sv_setsv (data_, result_); 1433 sv_setsv (data_, result_);
1054 }
1055
1056 sv_setiv (w_, nw);
1057 sv_setiv (h_, nh);
1058 }
1059 } 1434 }
1060} 1435}
1061 1436
1062void 1437void
1063draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1438draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
… …
1069{ 1444{
1070 HV *hv = (HV *)SvRV (self); 1445 HV *hv = (HV *)SvRV (self);
1071 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1446 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1072 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1447 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1073 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1448 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1449
1450 if (name <= 0)
1451 XSRETURN_EMPTY;
1074 1452
1075 if (items < 5) 1453 if (items < 5)
1076 { 1454 {
1077 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1455 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1078 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1456 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1106 glDisable (GL_ALPHA_TEST); 1484 glDisable (GL_ALPHA_TEST);
1107 glDisable (GL_BLEND); 1485 glDisable (GL_BLEND);
1108 } 1486 }
1109} 1487}
1110 1488
1489IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1490 CODE:
1491{
1492 GLint width;
1493 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1494 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1495 RETVAL = width > 0;
1496}
1497 OUTPUT:
1498 RETVAL
1499
1111MODULE = CFClient PACKAGE = CFClient::Map 1500MODULE = Deliantra::Client PACKAGE = DC::Map
1112 1501
1113CFClient::Map 1502PROTOTYPES: DISABLE
1114new (SV *class, int map_width, int map_height) 1503
1504DC::Map
1505new (SV *class)
1115 CODE: 1506 CODE:
1116 New (0, RETVAL, 1, struct map); 1507 New (0, RETVAL, 1, struct map);
1117 RETVAL->x = 0; 1508 RETVAL->x = 0;
1118 RETVAL->y = 0; 1509 RETVAL->y = 0;
1119 RETVAL->w = map_width; 1510 RETVAL->w = 0;
1120 RETVAL->h = map_height; 1511 RETVAL->h = 0;
1121 RETVAL->ox = 0; 1512 RETVAL->ox = 0;
1122 RETVAL->oy = 0; 1513 RETVAL->oy = 0;
1123 RETVAL->faces = 8192; 1514 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1124 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1515 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1125 RETVAL->texs = 8192;
1126 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1127 RETVAL->rows = 0; 1516 RETVAL->rows = 0;
1128 RETVAL->row = 0; 1517 RETVAL->row = 0;
1129 OUTPUT: 1518 OUTPUT:
1130 RETVAL 1519 RETVAL
1131 1520
1132void 1521void
1133DESTROY (CFClient::Map self) 1522DESTROY (DC::Map self)
1134 CODE: 1523 CODE:
1135{ 1524{
1136 map_clear (self); 1525 map_clear (self);
1137 Safefree (self->face); 1526 Safefree (self->face2tile);
1138 Safefree (self->tex); 1527 Safefree (self->tex);
1139 Safefree (self); 1528 Safefree (self);
1140} 1529}
1141 1530
1142void 1531void
1532resize (DC::Map self, int map_width, int map_height)
1533 CODE:
1534 self->w = map_width;
1535 self->h = map_height;
1536
1537void
1143clear (CFClient::Map self) 1538clear (DC::Map self)
1144 CODE: 1539 CODE:
1145 map_clear (self); 1540 map_clear (self);
1146 1541
1147void 1542void
1148set_face (CFClient::Map self, int face, int texid) 1543set_tileid (DC::Map self, int face, int tile)
1149 CODE: 1544 CODE:
1150{ 1545{
1151 while (self->faces <= face) 1546 need_facenum (self, face); self->face2tile [face] = tile;
1152 { 1547 need_texid (self, tile);
1153 Append (mapface, self->face, self->faces, self->faces);
1154 self->faces *= 2;
1155 }
1156
1157 self->face [face] = texid;
1158} 1548}
1159 1549
1160void 1550void
1551set_smooth (DC::Map self, int face, int smooth, int level)
1552 CODE:
1553{
1554 tileid texid;
1555 maptex *tex;
1556
1557 if (face < 0 || face >= self->faces)
1558 return;
1559
1560 if (smooth < 0 || smooth >= self->faces)
1561 return;
1562
1563 texid = self->face2tile [face];
1564
1565 if (!texid)
1566 return;
1567
1568 tex = self->tex + texid;
1569 tex->smoothtile = self->face2tile [smooth];
1570 tex->smoothlevel = level;
1571}
1572
1573void
1161set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1574set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1162 CODE: 1575 CODE:
1163{ 1576{
1164 while (self->texs <= texid) 1577 need_texid (self, texid);
1165 {
1166 Append (maptex, self->tex, self->texs, self->texs);
1167 self->texs *= 2;
1168 }
1169 1578
1170 { 1579 {
1171 maptex *tex = self->tex + texid; 1580 maptex *tex = self->tex + texid;
1172 1581
1173 tex->name = name; 1582 tex->name = name;
… …
1190 // from transparent color bleeding and ugly wrapping effects. 1599 // from transparent color bleeding and ugly wrapping effects.
1191 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1600 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1192} 1601}
1193 1602
1194int 1603int
1195ox (CFClient::Map self) 1604ox (DC::Map self)
1196 ALIAS: 1605 ALIAS:
1197 oy = 1 1606 oy = 1
1198 x = 2 1607 x = 2
1199 y = 3 1608 y = 3
1200 w = 4 1609 w = 4
… …
1211 } 1620 }
1212 OUTPUT: 1621 OUTPUT:
1213 RETVAL 1622 RETVAL
1214 1623
1215void 1624void
1216scroll (CFClient::Map self, int dx, int dy) 1625scroll (DC::Map self, int dx, int dy)
1217 CODE: 1626 CODE:
1218{ 1627{
1219 if (dx > 0) 1628 if (dx > 0)
1220 map_blank (self, self->x, self->y, dx - 1, self->h); 1629 map_blank (self, self->x, self->y, dx, self->h);
1221 else if (dx < 0) 1630 else if (dx < 0)
1222 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1631 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1223 1632
1224 if (dy > 0) 1633 if (dy > 0)
1225 map_blank (self, self->x, self->y, self->w, dy - 1); 1634 map_blank (self, self->x, self->y, self->w, dy);
1226 else if (dy < 0) 1635 else if (dy < 0)
1227 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1636 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1228 1637
1229 self->ox += dx; self->x += dx; 1638 self->ox += dx; self->x += dx;
1230 self->oy += dy; self->y += dy; 1639 self->oy += dy; self->y += dy;
1231 1640
1232 while (self->y < 0) 1641 while (self->y < 0)
… …
1236 self->rows += MAP_EXTEND_Y; 1645 self->rows += MAP_EXTEND_Y;
1237 self->y += MAP_EXTEND_Y; 1646 self->y += MAP_EXTEND_Y;
1238 } 1647 }
1239} 1648}
1240 1649
1241void 1650SV *
1242map1a_update (CFClient::Map self, SV *data_) 1651map1a_update (DC::Map self, SV *data_, int extmap)
1243 CODE: 1652 CODE:
1244{ 1653{
1245 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1654 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1246 uint8_t *data_end = (uint8_t *)SvEND (data_); 1655 uint8_t *data_end = (uint8_t *)SvEND (data_);
1247 mapcell *cell; 1656 mapcell *cell;
1248 int x, y, flags; 1657 int x, y, z, flags;
1658 AV *missing = newAV ();
1659 RETVAL = newRV_noinc ((SV *)missing);
1249 1660
1250 while (data < data_end) 1661 while (data < data_end - 1)
1251 { 1662 {
1252 flags = (data [0] << 8) + data [1]; data += 2; 1663 flags = (data [0] << 8) + data [1]; data += 2;
1253 1664
1254 x = self->x + ((flags >> 10) & 63); 1665 x = self->x + ((flags >> 10) & 63);
1255 y = self->y + ((flags >> 4) & 63); 1666 y = self->y + ((flags >> 4) & 63);
1256 1667
1257 cell = map_get_cell (self, x, y); 1668 cell = map_get_cell (self, x, y);
1258 1669
1259 if (flags & 15) 1670 if (flags & 15)
1260 { 1671 {
1261 if (cell->darkness < 0) 1672 if (!cell->darkness)
1262 { 1673 {
1674 memset (cell, 0, sizeof (*cell));
1263 cell->darkness = 0; 1675 cell->darkness = 256;
1264 cell->face [0] = 0;
1265 cell->face [1] = 0;
1266 cell->face [2] = 0;
1267 } 1676 }
1268 1677
1269 cell->darkness = flags & 8 ? *data++ : 255;
1270
1271 //TODO: don't trust server data to be in-range(!) 1678 //TODO: don't trust server data to be in-range(!)
1272 1679
1273 if (flags & 4) 1680 if (flags & 8)
1274 { 1681 {
1275 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1682 if (extmap)
1683 {
1684 uint8_t ext, cmd;
1685
1686 do
1687 {
1688 ext = *data++;
1689 cmd = ext & 0x3f;
1690
1691 if (cmd < 4)
1692 cell->darkness = 255 - ext * 64 + 1;
1693 else if (cmd == 5) // health
1694 {
1695 cell->stat_width = 1;
1696 cell->stat_hp = *data++;
1697 }
1698 else if (cmd == 6) // monster width
1699 cell->stat_width = *data++ + 1;
1700 else if (cmd == 0x47)
1701 {
1702 if (*data == 4)
1703 ; // decode player count
1704
1705 data += *data + 1;
1706 }
1707 else if (cmd == 8) // cell flags
1708 cell->flags = *data++;
1709 else if (ext & 0x40) // unknown, multibyte => skip
1710 data += *data + 1;
1711 else
1712 data++;
1713 }
1714 while (ext & 0x80);
1715 }
1716 else
1717 cell->darkness = *data++ + 1;
1276 } 1718 }
1277 1719
1720 for (z = 0; z <= 2; ++z)
1278 if (flags & 2) 1721 if (flags & (4 >> z))
1279 { 1722 {
1280 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1723 faceid face = (data [0] << 8) + data [1]; data += 2;
1724 need_facenum (self, face);
1725 cell->tile [z] = self->face2tile [face];
1726
1727 if (cell->tile [z])
1728 {
1729 maptex *tex = self->tex + cell->tile [z];
1730 if (!tex->name)
1731 av_push (missing, newSViv (cell->tile [z]));
1732
1733 if (tex->smoothtile)
1734 {
1735 maptex *smooth = self->tex + tex->smoothtile;
1736 if (!smooth->name)
1737 av_push (missing, newSViv (tex->smoothtile));
1738 }
1739 }
1281 } 1740 }
1282
1283 if (flags & 1)
1284 {
1285 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1286 }
1287 } 1741 }
1288 else 1742 else
1289 cell->darkness = -1; 1743 cell->darkness = 0;
1290 } 1744 }
1291} 1745}
1746 OUTPUT:
1747 RETVAL
1292 1748
1293SV * 1749SV *
1294mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1750mapmap (DC::Map self, int x0, int y0, int w, int h)
1295 CODE: 1751 CODE:
1296{ 1752{
1297 int x1, x; 1753 int x1, x;
1298 int y1, y; 1754 int y1, y;
1299 int z; 1755 int z;
… …
1320 { 1776 {
1321 mapcell *cell = row->col + (x - row->c0); 1777 mapcell *cell = row->col + (x - row->c0);
1322 1778
1323 for (z = 0; z <= 0; z++) 1779 for (z = 0; z <= 0; z++)
1324 { 1780 {
1325 mapface face = cell->face [z];
1326
1327 if (face)
1328 {
1329 maptex tex = self->tex [face]; 1781 maptex tex = self->tex [cell->tile [z]];
1330 int a0 = 255 - tex.a; 1782 int a0 = 255 - tex.a;
1331 int a1 = tex.a; 1783 int a1 = tex.a;
1332 1784
1333 r = (r * a0 + tex.r * a1) / 255; 1785 r = (r * a0 + tex.r * a1) / 255;
1334 g = (g * a0 + tex.g * a1) / 255; 1786 g = (g * a0 + tex.g * a1) / 255;
1335 b = (b * a0 + tex.b * a1) / 255; 1787 b = (b * a0 + tex.b * a1) / 255;
1336 a = (a * a0 + tex.a * a1) / 255; 1788 a = (a * a0 + tex.a * a1) / 255;
1337 }
1338 } 1789 }
1339 } 1790 }
1340 1791
1341 *map++ = (r ) 1792 *map++ = (r )
1342 | (g << 8) 1793 | (g << 8)
… …
1349} 1800}
1350 OUTPUT: 1801 OUTPUT:
1351 RETVAL 1802 RETVAL
1352 1803
1353void 1804void
1354draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1805draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1355 CODE: 1806 CODE:
1356{ 1807{
1357 int vx, vy;
1358 int x, y, z; 1808 int x, y, z;
1359 int last_name;
1360 mapface face;
1361 1809
1362 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1810 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1363 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1811 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1812 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1813 smooth_key skey;
1364 1814
1365 /* 1815 rc_t *rc = rc_alloc ();
1366 int vx = self->vx = self->w >= sw 1816 rc_key_t key;
1367 ? self->x + (self->w - sw) / 2 1817 rc_array_t *arr;
1368 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1369 1818
1370 int vy = self->vy = self->h >= sh 1819 // thats current max. sorry.
1371 ? self->y + (self->h - sh) / 2 1820 if (sw > 255) sw = 255;
1372 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1821 if (sh > 255) sh = 255;
1373 */
1374 1822
1375 glColor4ub (255, 255, 255, 255); 1823 // clear key, in case of extra padding
1824 memset (&skey, 0, sizeof (skey));
1825
1826 memset (&key, 0, sizeof (key));
1827 key.r = 255;
1828 key.g = 255;
1829 key.b = 255;
1830 key.a = 255;
1831 key.mode = GL_QUADS;
1832 key.format = GL_T2F_V3F;
1833 key.texname = -1;
1834
1835 mx += self->x;
1836 my += self->y;
1837
1838 // first pass: determine smooth_max
1839 // rather ugly, if you ask me
1840 // could also be stored inside mapcell and updated on change
1841 memset (smooth_max, 0, sizeof (smooth_max));
1842
1843 for (y = 0; y < sh; y++)
1844 if (0 <= y + my && y + my < self->rows)
1845 {
1846 maprow *row = self->row + (y + my);
1847
1848 for (x = 0; x < sw; x++)
1849 if (row->c0 <= x + mx && x + mx < row->c1)
1850 {
1851 mapcell *cell = row->col + (x + mx - row->c0);
1852
1853 smooth_max[x + 1][y + 1] =
1854 MAX (self->tex [cell->tile [0]].smoothlevel,
1855 MAX (self->tex [cell->tile [1]].smoothlevel,
1856 self->tex [cell->tile [2]].smoothlevel));
1857 }
1858 }
1376 1859
1377 glEnable (GL_BLEND); 1860 glEnable (GL_BLEND);
1378 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1861 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1379 glEnable (GL_TEXTURE_2D);
1380 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1862 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1381 1863
1382 glBegin (GL_QUADS);
1383
1384 last_name = 0;
1385
1386 for (z = 0; z < 3; z++) 1864 for (z = 0; z <= 2; z++)
1865 {
1866 memset (smooth_level, 0, sizeof (smooth_level));
1867
1387 for (y = 0; y < sh; y++) 1868 for (y = 0; y < sh; y++)
1388 if (0 <= y + vy && y + vy < self->rows) 1869 if (0 <= y + my && y + my < self->rows)
1389 { 1870 {
1390 maprow *row = self->row + (y + vy); 1871 maprow *row = self->row + (y + my);
1391 1872
1392 for (x = 0; x < sw; x++) 1873 for (x = 0; x < sw; x++)
1393 if (row->c0 <= x + vx && x + vx < row->c1) 1874 if (row->c0 <= x + mx && x + mx < row->c1)
1394 { 1875 {
1395 mapcell *cell = row->col + (x + vx - row->c0); 1876 mapcell *cell = row->col + (x + mx - row->c0);
1396
1397 face = cell->face [z]; 1877 tileid tile = cell->tile [z];
1398 1878
1399 if (face) 1879 if (tile)
1880 {
1881 maptex tex = self->tex [tile];
1882 int px, py;
1883
1884 if (key.texname != tex.name)
1885 {
1886 if (!tex.name)
1887 tex = self->tex [2]; /* missing, replace by noface */
1888
1889 key.texname = tex.name;
1890 arr = rc_array (rc, &key);
1891 }
1892
1893 px = (x + 1) * T - tex.w;
1894 py = (y + 1) * T - tex.h;
1895
1896 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1897 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1898 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1899 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1900
1901 if (cell->flags && z == 2)
1902 {
1903 // overlays such as the speech bubble, probably more to come
1904 if (cell->flags & 1)
1905 {
1906 maptex tex = self->tex [1];
1907 int px = x * T + T * 2 / 32;
1908 int py = y * T - T * 6 / 32;
1909
1910 if (tex.name)
1911 {
1912 if (key.texname != tex.name)
1913 {
1914 key.texname = tex.name;
1915 arr = rc_array (rc, &key);
1916 }
1917
1918 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1919 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1920 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1921 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1922 }
1923 }
1924 }
1925
1926 // update smooth hash
1927 if (tex.smoothtile)
1928 {
1929 skey.tile = tex.smoothtile;
1930 skey.level = tex.smoothlevel;
1931
1932 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1933
1934 // add bits to current tile and all neighbours. skey.x|y is
1935 // shifted +1|+1 so we always stay positive.
1936
1937 // bits is ___n cccc CCCC bbbb
1938 // n do not draw borders&corners
1939 // c draw these corners, but...
1940 // C ... not these
1941 // b draw these borders
1942
1943 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1944 // ┃· ·· ·┃ ━━
1945
1946 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1947 // ·· ·· ·┏ ┓·
1948
1949 // full tile
1950 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1951
1952 // borders
1953 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1954 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1955 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1956 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1957
1958 // corners
1959 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1960 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1961 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1962 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1963 }
1964 }
1965 }
1966 }
1967
1968 rc_draw (rc);
1969 rc_clear (rc);
1970
1971 // go through all smoothlevels, lowest to highest, then draw.
1972 // this is basically counting sort
1973 {
1974 int w, b;
1975
1976 glEnable (GL_TEXTURE_2D);
1977 glBegin (GL_QUADS);
1978 for (w = 0; w < 256 / 32; ++w)
1979 {
1980 uint32_t smask = smooth_level [w];
1981 if (smask)
1982 for (b = 0; b < 32; ++b)
1983 if (smask & (((uint32_t)1) << b))
1400 { 1984 {
1401 maptex tex = self->tex [face]; 1985 int level = (w << 5) | b;
1986 HE *he;
1402 1987
1403 int px = (x + 1) * 32 - tex.w; 1988 hv_iterinit (smooth);
1404 int py = (y + 1) * 32 - tex.h; 1989 while ((he = hv_iternext (smooth)))
1405
1406 if (last_name != tex.name)
1407 { 1990 {
1991 smooth_key *skey = (smooth_key *)HeKEY (he);
1992 IV bits = SvIVX (HeVAL (he));
1993
1994 if (!(bits & 0x1000)
1995 && skey->level == level
1996 && level > smooth_max [skey->x][skey->y])
1997 {
1998 maptex tex = self->tex [skey->tile];
1999 int px = (((int)skey->x) - 1) * T;
2000 int py = (((int)skey->y) - 1) * T;
2001 int border = bits & 15;
2002 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2003 float dx = tex.s * .0625f; // 16 images/row
2004 float dy = tex.t * .5f ; // 2 images/column
2005
2006 if (tex.name)
2007 {
2008 // this time avoiding texture state changes
2009 // save gobs of state changes.
2010 if (key.texname != tex.name)
2011 {
1408 glEnd (); 2012 glEnd ();
1409 last_name = tex.name;
1410 glBindTexture (GL_TEXTURE_2D, last_name); 2013 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1411 glBegin (GL_QUADS); 2014 glBegin (GL_QUADS);
2015 }
2016
2017 if (border)
2018 {
2019 float ox = border * dx;
2020
2021 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2022 glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
2023 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
2024 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
2025 }
2026
2027 if (corner)
2028 {
2029 float ox = corner * dx;
2030
2031 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2032 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
2033 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
2034 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2035 }
2036 }
2037 }
1412 } 2038 }
1413
1414 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1415 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1416 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1417 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1418 } 2039 }
1419 }
1420 } 2040 }
1421 2041
1422 glEnd (); 2042 glEnd ();
1423
1424 glDisable (GL_TEXTURE_2D); 2043 glDisable (GL_TEXTURE_2D);
2044 key.texname = -1;
2045 }
2046
2047 hv_clear (smooth);
2048 }
2049
1425 glDisable (GL_BLEND); 2050 glDisable (GL_BLEND);
1426} 2051 rc_free (rc);
1427 2052
2053 // top layer: overlays such as the health bar
2054 for (y = 0; y < sh; y++)
2055 if (0 <= y + my && y + my < self->rows)
2056 {
2057 maprow *row = self->row + (y + my);
2058
2059 for (x = 0; x < sw; x++)
2060 if (row->c0 <= x + mx && x + mx < row->c1)
2061 {
2062 mapcell *cell = row->col + (x + mx - row->c0);
2063
2064 int px = x * T;
2065 int py = y * T;
2066
2067 if (cell->stat_hp)
2068 {
2069 int width = cell->stat_width * T;
2070 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
2071
2072 glColor3ub (0, 0, 0);
2073 glRectf (px + 1, py - thick - 2,
2074 px + width - 1, py);
2075
2076 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
2077 glRectf (px + 2,
2078 py - thick - 1,
2079 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
2080 }
2081 }
2082 }
2083}
2084
1428void 2085void
1429draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 2086draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1430 CODE: 2087 CODE:
1431{ 2088{
1432 static float color[16][3] = { 2089 static float color[16][3] = {
1433 { 0.00F, 0.00F, 0.00F }, 2090 { 0.00F, 0.00F, 0.00F },
1434 { 1.00F, 1.00F, 1.00F }, 2091 { 1.00F, 1.00F, 1.00F },
… …
1484 glDisable (GL_BLEND); 2141 glDisable (GL_BLEND);
1485 glDisable (GL_TEXTURE_2D); 2142 glDisable (GL_TEXTURE_2D);
1486} 2143}
1487 2144
1488void 2145void
1489fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2146fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1490 PPCODE: 2147 PPCODE:
1491{ 2148{
1492 int vx, vy;
1493 int x, y; 2149 int x, y;
2150 int sw1 = sw + 2;
2151 int sh1 = sh + 2;
2152 int sh3 = sh * 3;
1494 int sw4 = (sw + 3) & ~3; 2153 int sw34 = (sw * 3 + 3) & ~3;
2154 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1495 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2155 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1496 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2156 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1497 2157
1498 memset (darkness, 255, sw4 * sh);
1499 SvPOK_only (darkness_sv); 2158 SvPOK_only (darkness3_sv);
1500 SvCUR_set (darkness_sv, sw4 * sh); 2159 SvCUR_set (darkness3_sv, sw34 * sh3);
1501 2160
1502 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2161 mx += self->x - 1;
1503 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2162 my += self->y - 1;
1504 2163
2164 memset (darkness1, 255, sw1 * sh1);
2165
1505 for (y = 0; y < sh; y++) 2166 for (y = 0; y < sh1; y++)
1506 if (0 <= y + vy && y + vy < self->rows) 2167 if (0 <= y + my && y + my < self->rows)
1507 { 2168 {
1508 maprow *row = self->row + (y + vy); 2169 maprow *row = self->row + (y + my);
1509 2170
1510 for (x = 0; x < sw; x++) 2171 for (x = 0; x < sw1; x++)
1511 if (row->c0 <= x + vx && x + vx < row->c1) 2172 if (row->c0 <= x + mx && x + mx < row->c1)
1512 { 2173 {
1513 mapcell *cell = row->col + (x + vx - row->c0); 2174 mapcell *cell = row->col + (x + mx - row->c0);
1514 2175
1515 darkness[y * sw4 + x] = cell->darkness < 0 2176 darkness1 [y * sw1 + x] = cell->darkness
2177 ? 255 - (cell->darkness - 1)
1516 ? 255 - FOW_DARKNESS 2178 : 255 - FOW_DARKNESS;
1517 : 255 - cell->darkness;
1518 } 2179 }
1519 } 2180 }
1520 2181
2182 for (y = 0; y < sh; ++y)
2183 for (x = 0; x < sw; ++x)
2184 {
2185 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2186 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2187 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2188 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2189 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2190 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2191 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2192 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2193 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2194
2195 uint8_t r11 = (d11 + d21 + d12) / 3;
2196 uint8_t r21 = d21;
2197 uint8_t r31 = (d21 + d31 + d32) / 3;
2198
2199 uint8_t r12 = d12;
2200 uint8_t r22 = d22;
2201 uint8_t r32 = d32;
2202
2203 uint8_t r13 = (d13 + d23 + d12) / 3;
2204 uint8_t r23 = d23;
2205 uint8_t r33 = (d23 + d33 + d32) / 3;
2206
2207 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2208 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2209 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2210 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2211 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2212 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2213 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2214 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2215 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2216 }
2217
2218 free (darkness1);
2219
1521 EXTEND (SP, 3); 2220 EXTEND (SP, 3);
1522 PUSHs (sv_2mortal (newSViv (sw4))); 2221 PUSHs (sv_2mortal (newSViv (sw34)));
1523 PUSHs (sv_2mortal (newSViv (sh))); 2222 PUSHs (sv_2mortal (newSViv (sh3)));
1524 PUSHs (darkness_sv); 2223 PUSHs (darkness3_sv);
1525} 2224}
1526 2225
1527SV * 2226SV *
1528get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2227get_rect (DC::Map self, int x0, int y0, int w, int h)
1529 CODE: 2228 CODE:
1530{ 2229{
1531 int x, y, x1, y1; 2230 int x, y, x1, y1;
1532 SV *data_sv = newSV (w * h * 7 + 5); 2231 SV *data_sv = newSV (w * h * 7 + 5);
1533 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2232 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1558 if (row && row->c0 <= x && x < row->c1) 2257 if (row && row->c0 <= x && x < row->c1)
1559 { 2258 {
1560 mapcell *cell = row->col + (x - row->c0); 2259 mapcell *cell = row->col + (x - row->c0);
1561 uint8_t flags = 0; 2260 uint8_t flags = 0;
1562 2261
1563 if (cell->face [0]) flags |= 1; 2262 if (cell->tile [0]) flags |= 1;
1564 if (cell->face [1]) flags |= 2; 2263 if (cell->tile [1]) flags |= 2;
1565 if (cell->face [2]) flags |= 4; 2264 if (cell->tile [2]) flags |= 4;
1566 2265
1567 *data++ = flags; 2266 *data++ = flags;
1568 2267
1569 if (flags & 1) 2268 if (flags & 1)
1570 { 2269 {
2270 tileid tile = cell->tile [0];
1571 *data++ = cell->face [0] >> 8; 2271 *data++ = tile >> 8;
1572 *data++ = cell->face [0]; 2272 *data++ = tile;
1573 } 2273 }
1574 2274
1575 if (flags & 2) 2275 if (flags & 2)
1576 { 2276 {
2277 tileid tile = cell->tile [1];
1577 *data++ = cell->face [1] >> 8; 2278 *data++ = tile >> 8;
1578 *data++ = cell->face [1]; 2279 *data++ = tile;
1579 } 2280 }
1580 2281
1581 if (flags & 4) 2282 if (flags & 4)
1582 { 2283 {
2284 tileid tile = cell->tile [2];
1583 *data++ = cell->face [2] >> 8; 2285 *data++ = tile >> 8;
1584 *data++ = cell->face [2]; 2286 *data++ = tile;
1585 } 2287 }
1586 } 2288 }
1587 else 2289 else
1588 *data++ = 0; 2290 *data++ = 0;
1589 } 2291 }
… …
1595} 2297}
1596 OUTPUT: 2298 OUTPUT:
1597 RETVAL 2299 RETVAL
1598 2300
1599void 2301void
1600set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2302set_rect (DC::Map self, int x0, int y0, uint8_t *data)
1601 PPCODE: 2303 PPCODE:
1602{ 2304{
1603 int x, y, z; 2305 int x, y, z;
1604 int w, h; 2306 int w, h;
1605 int x1, y1; 2307 int x1, y1;
1606 2308
1607 if (*data++ != 0) 2309 if (*data++ != 0)
1608 return; /* version mismatch */ 2310 XSRETURN_EMPTY; /* version mismatch */
1609 2311
1610 w = *data++ << 8; w |= *data++; 2312 w = *data++ << 8; w |= *data++;
1611 h = *data++ << 8; h |= *data++; 2313 h = *data++ << 8; h |= *data++;
1612 2314
1613 // we need to do this 'cause we don't keep an absolute coord system for rows 2315 // we need to do this 'cause we don't keep an absolute coord system for rows
… …
1629 { 2331 {
1630 uint8_t flags = *data++; 2332 uint8_t flags = *data++;
1631 2333
1632 if (flags) 2334 if (flags)
1633 { 2335 {
1634 mapface face[3] = { 0, 0, 0 };
1635
1636 mapcell *cell = row_get_cell (row, x); 2336 mapcell *cell = row_get_cell (row, x);
2337 tileid tile[3] = { 0, 0, 0 };
1637 2338
1638 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2339 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1639 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2340 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1640 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2341 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1641 2342
1642 if (cell->darkness <= 0) 2343 if (cell->darkness == 0)
1643 { 2344 {
1644 cell->darkness = -1; 2345 cell->darkness = 0;
1645 2346
1646 for (z = 0; z <= 2; z++) 2347 for (z = 0; z <= 2; z++)
1647 { 2348 {
1648 cell->face[z] = face[z]; 2349 tileid t = tile [z];
1649 2350
1650 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2351 if (t >= self->texs || (t && !self->tex [t].name))
2352 {
1651 XPUSHs (sv_2mortal (newSViv (face[z]))); 2353 XPUSHs (sv_2mortal (newSViv (t)));
2354 need_texid (self, t);
2355 }
2356
2357 cell->tile [z] = t;
1652 } 2358 }
1653 } 2359 }
1654 } 2360 }
1655 } 2361 }
1656 } 2362 }
1657} 2363}
1658 2364
1659MODULE = CFClient PACKAGE = CFClient::MixChunk 2365MODULE = Deliantra::Client PACKAGE = DC::RW
1660 2366
1661CFClient::MixChunk 2367DC::RW
1662new_from_file (SV *class, char *path) 2368new (SV *class, SV *data_sv)
1663 CODE: 2369 CODE:
1664 RETVAL = Mix_LoadWAV (path); 2370{
2371 STRLEN datalen;
2372 char *data = SvPVbyte (data_sv, datalen);
2373
2374 RETVAL = SDL_RWFromConstMem (data, datalen);
2375}
1665 OUTPUT: 2376 OUTPUT:
1666 RETVAL 2377 RETVAL
1667 2378
2379DC::RW
2380new_from_file (SV *class, const char *path, const char *mode = "rb")
2381 CODE:
2382 RETVAL = SDL_RWFromFile (path, mode);
2383 OUTPUT:
2384 RETVAL
2385
2386# fails on win32:
2387# dc.xs(2268) : error C2059: syntax error : '('
1668void 2388#void
2389#close (DC::RW self)
2390# CODE:
2391# (self->(close)) (self);
2392
2393MODULE = Deliantra::Client PACKAGE = DC::Channel
2394
2395PROTOTYPES: DISABLE
2396
2397DC::Channel
2398find ()
2399 CODE:
2400{
2401 RETVAL = Mix_GroupAvailable (-1);
2402
2403 if (RETVAL < 0)
2404 {
2405 RETVAL = Mix_GroupOldest (-1);
2406
2407 if (RETVAL < 0)
2408 XSRETURN_UNDEF;
2409
2410 Mix_HaltChannel (RETVAL);
2411 }
2412
2413 Mix_UnregisterAllEffects (RETVAL);
2414 Mix_Volume (RETVAL, 128);
2415}
2416 OUTPUT:
2417 RETVAL
2418
2419void
2420halt (DC::Channel self)
2421 CODE:
2422 Mix_HaltChannel (self);
2423
2424void
2425expire (DC::Channel self, int ticks = -1)
2426 CODE:
2427 Mix_ExpireChannel (self, ticks);
2428
2429void
2430fade_out (DC::Channel self, int ticks = -1)
2431 CODE:
2432 Mix_FadeOutChannel (self, ticks);
2433
2434int
2435volume (DC::Channel self, int volume)
2436 CODE:
2437 RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2438 OUTPUT:
2439 RETVAL
2440
2441void
2442unregister_all_effects (DC::Channel self)
2443 CODE:
2444 Mix_UnregisterAllEffects (self);
2445
2446void
2447set_panning (DC::Channel self, int left, int right)
2448 CODE:
2449 left = CLAMP (left , 0, 255);
2450 right = CLAMP (right, 0, 255);
2451 Mix_SetPanning (self, left, right);
2452
2453void
2454set_distance (DC::Channel self, int distance)
2455 CODE:
2456 Mix_SetDistance (self, CLAMP (distance, 0, 255));
2457
2458void
2459set_position (DC::Channel self, int angle, int distance)
2460 CODE:
2461
2462void
2463set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2464 CODE:
2465{
2466 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2467 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2468 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2469}
2470
2471void
2472set_reverse_stereo (DC::Channel self, int flip)
2473 CODE:
2474 Mix_SetReverseStereo (self, flip);
2475
2476MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2477
2478PROTOTYPES: DISABLE
2479
2480DC::MixChunk
2481new (SV *class, DC::RW rwops)
2482 CODE:
2483 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2484 OUTPUT:
2485 RETVAL
2486
2487void
1669DESTROY (CFClient::MixChunk self) 2488DESTROY (DC::MixChunk self)
1670 CODE: 2489 CODE:
1671 Mix_FreeChunk (self); 2490 Mix_FreeChunk (self);
1672 2491
1673int 2492int
1674volume (CFClient::MixChunk self, int volume = -1) 2493volume (DC::MixChunk self, int volume = -1)
1675 CODE: 2494 CODE:
2495 if (items > 1)
2496 volume = CLAMP (volume, 0, 128);
1676 RETVAL = Mix_VolumeChunk (self, volume); 2497 RETVAL = Mix_VolumeChunk (self, volume);
1677 OUTPUT: 2498 OUTPUT:
1678 RETVAL 2499 RETVAL
1679 2500
1680int 2501DC::Channel
1681play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2502play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
1682 CODE: 2503 CODE:
2504{
1683 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2505 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2506
2507 if (RETVAL < 0)
2508 XSRETURN_UNDEF;
2509
2510 if (channel < 0)
2511 {
2512 Mix_UnregisterAllEffects (RETVAL);
2513 Mix_Volume (RETVAL, 128);
2514 }
2515}
1684 OUTPUT: 2516 OUTPUT:
1685 RETVAL 2517 RETVAL
1686 2518
1687MODULE = CFClient PACKAGE = CFClient::MixMusic 2519MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1688 2520
1689int 2521int
1690volume (int volume = -1) 2522volume (int volume = -1)
2523 PROTOTYPE: ;$
1691 CODE: 2524 CODE:
2525 if (items > 0)
2526 volume = CLAMP (volume, 0, 128);
1692 RETVAL = Mix_VolumeMusic (volume); 2527 RETVAL = Mix_VolumeMusic (volume);
1693 OUTPUT: 2528 OUTPUT:
1694 RETVAL 2529 RETVAL
1695 2530
1696CFClient::MixMusic 2531void
1697new_from_file (SV *class, char *path) 2532fade_out (int ms)
1698 CODE: 2533 CODE:
2534 Mix_FadeOutMusic (ms);
2535
2536void
2537halt ()
2538 CODE:
2539 Mix_HaltMusic ();
2540
2541DC::MixMusic
2542new (SV *class, DC::RW rwops)
2543 CODE:
1699 RETVAL = Mix_LoadMUS (path); 2544 RETVAL = Mix_LoadMUS_RW (rwops);
1700 OUTPUT: 2545 OUTPUT:
1701 RETVAL 2546 RETVAL
1702 2547
1703void 2548void
1704DESTROY (CFClient::MixMusic self) 2549DESTROY (DC::MixMusic self)
1705 CODE: 2550 CODE:
1706 Mix_FreeMusic (self); 2551 Mix_FreeMusic (self);
1707 2552
1708int 2553int
1709play (CFClient::MixMusic self, int loops = -1) 2554play (DC::MixMusic self, int loops = -1)
1710 CODE: 2555 CODE:
1711 RETVAL = Mix_PlayMusic (self, loops); 2556 RETVAL = Mix_PlayMusic (self, loops);
1712 OUTPUT: 2557 OUTPUT:
1713 RETVAL 2558 RETVAL
1714 2559
2560void
2561fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2562 CODE:
2563 Mix_FadeInMusicPos (self, loops, ms, position);
2564
1715MODULE = CFClient PACKAGE = CFClient::OpenGL 2565MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2566
2567PROTOTYPES: ENABLE
1716 2568
1717BOOT: 2569BOOT:
1718{ 2570{
1719 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2571 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1720 static const struct { 2572 static const struct {
1721 const char *name; 2573 const char *name;
1722 IV iv; 2574 IV iv;
1723 } *civ, const_iv[] = { 2575 } *civ, const_iv[] = {
1724# define const_iv(name) { # name, (IV)name } 2576# define const_iv(name) { # name, (IV)name }
2577 const_iv (GL_VENDOR),
2578 const_iv (GL_VERSION),
2579 const_iv (GL_EXTENSIONS),
1725 const_iv (GL_COLOR_MATERIAL), 2580 const_iv (GL_COLOR_MATERIAL),
1726 const_iv (GL_SMOOTH), 2581 const_iv (GL_SMOOTH),
1727 const_iv (GL_FLAT), 2582 const_iv (GL_FLAT),
1728 const_iv (GL_DITHER), 2583 const_iv (GL_DITHER),
1729 const_iv (GL_BLEND), 2584 const_iv (GL_BLEND),
… …
1733 const_iv (GL_ALPHA_TEST), 2588 const_iv (GL_ALPHA_TEST),
1734 const_iv (GL_NORMALIZE), 2589 const_iv (GL_NORMALIZE),
1735 const_iv (GL_RESCALE_NORMAL), 2590 const_iv (GL_RESCALE_NORMAL),
1736 const_iv (GL_FRONT), 2591 const_iv (GL_FRONT),
1737 const_iv (GL_BACK), 2592 const_iv (GL_BACK),
2593 const_iv (GL_AUX0),
1738 const_iv (GL_AND), 2594 const_iv (GL_AND),
1739 const_iv (GL_ONE), 2595 const_iv (GL_ONE),
1740 const_iv (GL_ZERO), 2596 const_iv (GL_ZERO),
1741 const_iv (GL_SRC_ALPHA), 2597 const_iv (GL_SRC_ALPHA),
1742 const_iv (GL_DST_ALPHA), 2598 const_iv (GL_DST_ALPHA),
… …
1755 const_iv (GL_INTENSITY), 2611 const_iv (GL_INTENSITY),
1756 const_iv (GL_LUMINANCE), 2612 const_iv (GL_LUMINANCE),
1757 const_iv (GL_LUMINANCE_ALPHA), 2613 const_iv (GL_LUMINANCE_ALPHA),
1758 const_iv (GL_FLOAT), 2614 const_iv (GL_FLOAT),
1759 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2615 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2616 const_iv (GL_COMPRESSED_ALPHA_ARB),
2617 const_iv (GL_COMPRESSED_LUMINANCE_ARB),
2618 const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
2619 const_iv (GL_COMPRESSED_INTENSITY_ARB),
2620 const_iv (GL_COMPRESSED_RGB_ARB),
2621 const_iv (GL_COMPRESSED_RGBA_ARB),
1760 const_iv (GL_COMPILE), 2622 const_iv (GL_COMPILE),
2623 const_iv (GL_PROXY_TEXTURE_1D),
2624 const_iv (GL_PROXY_TEXTURE_2D),
1761 const_iv (GL_TEXTURE_1D), 2625 const_iv (GL_TEXTURE_1D),
1762 const_iv (GL_TEXTURE_2D), 2626 const_iv (GL_TEXTURE_2D),
1763 const_iv (GL_TEXTURE_ENV), 2627 const_iv (GL_TEXTURE_ENV),
1764 const_iv (GL_TEXTURE_MAG_FILTER), 2628 const_iv (GL_TEXTURE_MAG_FILTER),
1765 const_iv (GL_TEXTURE_MIN_FILTER), 2629 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1786 const_iv (GL_COLOR_LOGIC_OP), 2650 const_iv (GL_COLOR_LOGIC_OP),
1787 const_iv (GL_SEPARABLE_2D), 2651 const_iv (GL_SEPARABLE_2D),
1788 const_iv (GL_CONVOLUTION_2D), 2652 const_iv (GL_CONVOLUTION_2D),
1789 const_iv (GL_CONVOLUTION_BORDER_MODE), 2653 const_iv (GL_CONVOLUTION_BORDER_MODE),
1790 const_iv (GL_CONSTANT_BORDER), 2654 const_iv (GL_CONSTANT_BORDER),
2655 const_iv (GL_POINTS),
1791 const_iv (GL_LINES), 2656 const_iv (GL_LINES),
2657 const_iv (GL_LINE_STRIP),
1792 const_iv (GL_LINE_LOOP), 2658 const_iv (GL_LINE_LOOP),
1793 const_iv (GL_QUADS), 2659 const_iv (GL_QUADS),
1794 const_iv (GL_QUAD_STRIP), 2660 const_iv (GL_QUAD_STRIP),
1795 const_iv (GL_TRIANGLES), 2661 const_iv (GL_TRIANGLES),
1796 const_iv (GL_TRIANGLE_STRIP), 2662 const_iv (GL_TRIANGLE_STRIP),
1797 const_iv (GL_TRIANGLE_FAN), 2663 const_iv (GL_TRIANGLE_FAN),
2664 const_iv (GL_POLYGON),
1798 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2665 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2666 const_iv (GL_POINT_SMOOTH_HINT),
2667 const_iv (GL_LINE_SMOOTH_HINT),
2668 const_iv (GL_POLYGON_SMOOTH_HINT),
2669 const_iv (GL_GENERATE_MIPMAP_HINT),
2670 const_iv (GL_TEXTURE_COMPRESSION_HINT),
1799 const_iv (GL_FASTEST), 2671 const_iv (GL_FASTEST),
2672 const_iv (GL_DONT_CARE),
2673 const_iv (GL_NICEST),
1800 const_iv (GL_V2F), 2674 const_iv (GL_V2F),
1801 const_iv (GL_V3F), 2675 const_iv (GL_V3F),
1802 const_iv (GL_T2F_V3F), 2676 const_iv (GL_T2F_V3F),
1803 const_iv (GL_T2F_N3F_V3F), 2677 const_iv (GL_T2F_N3F_V3F),
1804# undef const_iv 2678# undef const_iv
1805 }; 2679 };
1806 2680
1807 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2681 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1808 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2682 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2683
2684 texture_av = newAV ();
2685 AvREAL_off (texture_av);
1809} 2686}
2687
2688void
2689disable_GL_EXT_blend_func_separate ()
2690 CODE:
2691 gl.BlendFuncSeparate = 0;
2692 gl.BlendFuncSeparateEXT = 0;
1810 2693
1811char * 2694char *
1812gl_vendor () 2695gl_vendor ()
1813 CODE: 2696 CODE:
1814 RETVAL = (char *)glGetString (GL_VENDOR); 2697 RETVAL = (char *)glGetString (GL_VENDOR);
… …
1827 CODE: 2710 CODE:
1828 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2711 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1829 OUTPUT: 2712 OUTPUT:
1830 RETVAL 2713 RETVAL
1831 2714
2715const char *glGetString (GLenum pname)
2716
2717GLint glGetInteger (GLenum pname)
2718 CODE:
2719 glGetIntegerv (pname, &RETVAL);
2720 OUTPUT:
2721 RETVAL
2722
2723GLdouble glGetDouble (GLenum pname)
2724 CODE:
2725 glGetDoublev (pname, &RETVAL);
2726 OUTPUT:
2727 RETVAL
2728
1832int glGetError () 2729int glGetError ()
1833 2730
1834void glFinish () 2731void glFinish ()
1835 2732
1836void glClear (int mask) 2733void glClear (int mask)
… …
1873# near_ and far_ are due to microsofts buggy "c" compiler 2770# near_ and far_ are due to microsofts buggy "c" compiler
1874void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2771void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1875 2772
1876# near_ and far_ are due to microsofts buggy "c" compiler 2773# near_ and far_ are due to microsofts buggy "c" compiler
1877void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 2774void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2775
2776PROTOTYPES: DISABLE
1878 2777
1879void glViewport (int x, int y, int width, int height) 2778void glViewport (int x, int y, int width, int height)
1880 2779
1881void glScissor (int x, int y, int width, int height) 2780void glScissor (int x, int y, int width, int height)
1882 2781
… …
1890 2789
1891void glRotate (float angle, float x, float y, float z) 2790void glRotate (float angle, float x, float y, float z)
1892 CODE: 2791 CODE:
1893 glRotatef (angle, x, y, z); 2792 glRotatef (angle, x, y, z);
1894 2793
1895void glBegin (int mode)
1896
1897void glEnd ()
1898
1899void glColor (float r, float g, float b, float a = 1.0) 2794void glColor (float r, float g, float b, float a = 1.0)
1900 PROTOTYPE: @
1901 ALIAS: 2795 ALIAS:
1902 glColor_premultiply = 1 2796 glColor_premultiply = 1
1903 CODE: 2797 CODE:
1904 if (ix) 2798 if (ix)
1905 { 2799 {
1906 r *= a; 2800 r *= a;
1907 g *= a; 2801 g *= a;
1908 b *= a; 2802 b *= a;
1909 } 2803 }
1910 // microsoft visual "c" rounds instead of truncating... 2804 // microsoft visual "c" rounds instead of truncating...
1911 glColor4ub (MIN ((int)(r * 256.f), 255), 2805 glColor4f (r, g, b, a);
1912 MIN ((int)(g * 256.f), 255),
1913 MIN ((int)(b * 256.f), 255),
1914 MIN ((int)(a * 256.f), 255));
1915
1916void glInterleavedArrays (int format, int stride, char *data)
1917
1918void glDrawElements (int mode, int count, int type, char *indices)
1919
1920# 1.2 void glDrawRangeElements (int mode, int start, int end
1921 2806
1922void glRasterPos (float x, float y, float z = 0.) 2807void glRasterPos (float x, float y, float z = 0.)
1923 CODE: 2808 CODE:
1924 glRasterPos3f (0, 0, z); 2809 glRasterPos3f (0, 0, z);
1925 glBitmap (0, 0, 0, 0, x, y, 0); 2810 glBitmap (0, 0, 0, 0, x, y, 0);
… …
1930 2815
1931void glTexCoord (float s, float t) 2816void glTexCoord (float s, float t)
1932 CODE: 2817 CODE:
1933 glTexCoord2f (s, t); 2818 glTexCoord2f (s, t);
1934 2819
2820void glRect (float x1, float y1, float x2, float y2)
2821 CODE:
2822 glRectf (x1, y1, x2, y2);
2823
2824void glRect_lineloop (float x1, float y1, float x2, float y2)
2825 CODE:
2826 glBegin (GL_LINE_LOOP);
2827 glVertex2f (x1, y1);
2828 glVertex2f (x2, y1);
2829 glVertex2f (x2, y2);
2830 glVertex2f (x1, y2);
2831 glEnd ();
2832
2833PROTOTYPES: ENABLE
2834
2835void glBegin (int mode)
2836
2837void glEnd ()
2838
2839void glPointSize (GLfloat size)
2840
2841void glLineWidth (GLfloat width)
2842
2843void glInterleavedArrays (int format, int stride, char *data)
2844
2845void glDrawElements (int mode, int count, int type, char *indices)
2846
2847# 1.2 void glDrawRangeElements (int mode, int start, int end
2848
1935void glTexEnv (int target, int pname, float param) 2849void glTexEnv (int target, int pname, float param)
1936 CODE: 2850 CODE:
1937 glTexEnvf (target, pname, param); 2851 glTexEnvf (target, pname, param);
1938 2852
1939void glTexParameter (int target, int pname, float param) 2853void glTexParameter (int target, int pname, float param)
… …
1955void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2869void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1956 CODE: 2870 CODE:
1957 if (gl.SeparableFilter2D) 2871 if (gl.SeparableFilter2D)
1958 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2872 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1959 2873
1960void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2874void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
1961 2875
1962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2876void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1963 2877
1964void glDrawPixels (int width, int height, int format, int type, char *pixels) 2878void glDrawPixels (int width, int height, int format, int type, char *pixels)
2879
2880void glPixelZoom (float x, float y)
1965 2881
1966void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2882void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1967 2883
1968int glGenTexture () 2884int glGenTexture ()
1969 CODE: 2885 CODE:
1970{ 2886 RETVAL = gen_texture ();
1971 GLuint name;
1972 glGenTextures (1, &name);
1973 RETVAL = name;
1974}
1975 OUTPUT: 2887 OUTPUT:
1976 RETVAL 2888 RETVAL
1977 2889
1978void glDeleteTexture (int name) 2890void glDeleteTexture (int name)
1979 CODE: 2891 CODE:
1980{
1981 GLuint name_ = name;
1982 glDeleteTextures (1, &name_); 2892 del_texture (name);
1983} 2893
1984
1985int glGenList () 2894int glGenList ()
1986 CODE: 2895 CODE:
1987 RETVAL = glGenLists (1); 2896 RETVAL = glGenLists (1);
1988 OUTPUT: 2897 OUTPUT:
1989 RETVAL 2898 RETVAL
… …
1996 2905
1997void glEndList () 2906void glEndList ()
1998 2907
1999void glCallList (int list) 2908void glCallList (int list)
2000 2909
2910MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2001 2911
2912PROTOTYPES: DISABLE
2913
2914void
2915find_widget (SV *self, NV x, NV y)
2916 PPCODE:
2917{
2918 if (within_widget (self, x, y))
2919 XPUSHs (self);
2920}
2921
2922BOOT:
2923{
2924 hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2925
2926 draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2927 draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2928 draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2929 draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2930}
2931
2932void
2933draw (SV *self)
2934 CODE:
2935{
2936 HV *hv;
2937 SV **svp;
2938 NV x, y, w, h;
2939 SV *draw_x_sv = GvSV (draw_x_gv);
2940 SV *draw_y_sv = GvSV (draw_y_gv);
2941 SV *draw_w_sv = GvSV (draw_w_gv);
2942 SV *draw_h_sv = GvSV (draw_h_gv);
2943 double draw_x, draw_y;
2944
2945 if (!SvROK (self))
2946 croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2947
2948 hv = (HV *)SvRV (self);
2949
2950 if (SvTYPE (hv) != SVt_PVHV)
2951 croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2952
2953 svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2954 svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2955
2956 if (!h || !w)
2957 XSRETURN_EMPTY;
2958
2959 svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
2960 svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
2961
2962 draw_x = SvNV (draw_x_sv) + x;
2963 draw_y = SvNV (draw_y_sv) + y;
2964
2965 if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
2966 || draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
2967 XSRETURN_EMPTY;
2968
2969 sv_setnv (draw_x_sv, draw_x);
2970 sv_setnv (draw_y_sv, draw_y);
2971
2972 glPushMatrix ();
2973 glTranslated (x, y, 0);
2974
2975 if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
2976 {
2977 svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2978
2979 if (svp && SvTRUE (*svp))
2980 {
2981 glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2982 glEnable (GL_BLEND);
2983 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2984 glBegin (GL_QUADS);
2985 glVertex2f (0, 0);
2986 glVertex2f (w, 0);
2987 glVertex2f (w, h);
2988 glVertex2f (0, h);
2989 glEnd ();
2990 glDisable (GL_BLEND);
2991 }
2992 }
2993#if 0
2994 // draw borders, for debugging
2995 glPushMatrix ();
2996 glColor4f (1., 1., 0., 1.);
2997 glTranslatef (.5, .5, 0.);
2998 glBegin (GL_LINE_LOOP);
2999 glVertex2f (0 , 0);
3000 glVertex2f (w - 1, 0);
3001 glVertex2f (w - 1, h - 1);
3002 glVertex2f (0 , h - 1);
3003 glEnd ();
3004 glPopMatrix ();
3005#endif
3006 PUSHMARK (SP);
3007 XPUSHs (self);
3008 PUTBACK;
3009 call_method ("_draw", G_VOID | G_DISCARD);
3010 SPAGAIN;
3011
3012 glPopMatrix ();
3013
3014 draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
3015 draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
3016}
3017

Diff Legend

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