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

Diff Legend

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