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

Diff Legend

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