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.160 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 2008 UTC

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

Diff Legend

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