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

Diff Legend

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