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

Diff Legend

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