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

Diff Legend

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