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.140 by root, Mon Aug 14 03:41:25 2006 UTC vs.
Revision 1.269 by root, Sun Jul 20 03:46:02 2008 UTC

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

Diff Legend

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