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

Diff Legend

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