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.159 by root, Sun Oct 8 21:22:29 2006 UTC vs.
Revision 1.269 by root, Sun Jul 20 03:46:02 2008 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
9#endif
10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
8#endif 14#endif
9 15
10#include "EXTERN.h" 16#include "EXTERN.h"
11#include "perl.h" 17#include "perl.h"
12#include "XSUB.h" 18#include "XSUB.h"
13 19
14#ifdef _WIN32 20#ifdef _WIN32
15# 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
16#endif 27#endif
17 28
29#include <assert.h>
18#include <math.h> 30#include <math.h>
19#include <string.h> 31#include <string.h>
20#include <stdio.h> 32#include <stdio.h>
21#include <stdlib.h> 33#include <stdlib.h>
22 34
35#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36
23#include <SDL.h> 37#include <SDL.h>
38#include <SDL_thread.h>
24#include <SDL_endian.h> 39#include <SDL_endian.h>
25#include <SDL_image.h> 40#include <SDL_image.h>
26#include <SDL_mixer.h> 41#include <SDL_mixer.h>
27#include <SDL_opengl.h> 42#include <SDL_opengl.h>
28 43
… …
30#define G_DISABLE_CAST_CHECKS 45#define G_DISABLE_CAST_CHECKS
31 46
32#include <glib/gmacros.h> 47#include <glib/gmacros.h>
33 48
34#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
35 61
36#ifndef _WIN32 62#ifndef _WIN32
37# include <sys/types.h> 63# include <sys/types.h>
38# include <sys/socket.h> 64# include <sys/socket.h>
39# include <netinet/in.h> 65# include <netinet/in.h>
40# include <netinet/tcp.h> 66# include <netinet/tcp.h>
41# include <inttypes.h> 67# include <inttypes.h>
68#endif
69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
42#else 72#else
43 typedef unsigned char uint8_t; 73# define expect(expr,value) (expr)
44 typedef unsigned short uint16_t;
45 typedef unsigned int uint32_t;
46 typedef signed char int8_t;
47 typedef signed short int16_t;
48 typedef signed int int32_t;
49#endif 74#endif
50 75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52 80
53#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
54 82
55#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
56#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
57 85
58#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
59 87
60#if 0 88/* mask out modifiers we are not interested in */
61# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
62#else 90
63# define PARACHUTE 0 91static AV *texture_av;
64#endif
65 92
66static struct 93static struct
67{ 94{
68#define GL_FUNC(ptr,name) ptr name; 95#define GL_FUNC(ptr,name) ptr name;
69#include "glfunc.h" 96#include "glfunc.h"
70#undef GL_FUNC 97#undef GL_FUNC
71} gl; 98} gl;
72 99
100static void
73static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 101gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
74{ 102{
75 if (gl.BlendFuncSeparate) 103 if (gl.BlendFuncSeparate)
76 gl.BlendFuncSeparate (sa, da, saa, daa); 104 gl.BlendFuncSeparate (sa, da, saa, daa);
77 else if (gl.BlendFuncSeparateEXT) 105 else if (gl.BlendFuncSeparateEXT)
78 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 106 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
79 else 107 else
80 glBlendFunc (sa, da); 108 glBlendFunc (sa, da);
81} 109}
82 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
83#include "texcache.c" 135#include "texcache.c"
136#include "rendercache.c"
84 137
85#include "pango-font.c" 138#include "pango-font.c"
86#include "pango-fontmap.c" 139#include "pango-fontmap.c"
87#include "pango-render.c" 140#include "pango-render.c"
88 141
142typedef IV DC__Channel;
143typedef SDL_RWops *DC__RW;
89typedef Mix_Chunk *CFPlus__MixChunk; 144typedef Mix_Chunk *DC__MixChunk;
90typedef Mix_Music *CFPlus__MixMusic; 145typedef Mix_Music *DC__MixMusic;
91 146
92typedef PangoFontDescription *CFPlus__Font; 147typedef PangoFontDescription *DC__Font;
93 148
94static int 149static int
95shape_attr_p (PangoLayoutRun *run) 150shape_attr_p (PangoLayoutRun *run)
96{ 151{
97 GSList *attrs = run->item->analysis.extra_attrs; 152 GSList *attrs = run->item->analysis.extra_attrs;
… …
111 166
112typedef struct cf_layout { 167typedef struct cf_layout {
113 PangoLayout *pl; 168 PangoLayout *pl;
114 float r, g, b, a; // default color for rgba mode 169 float r, g, b, a; // default color for rgba mode
115 int base_height; 170 int base_height;
116 CFPlus__Font font; 171 DC__Font font;
172 rc_t *rc;
117} *CFPlus__Layout; 173} *DC__Layout;
118 174
119static CFPlus__Font default_font; 175static DC__Font default_font;
120static PangoContext *opengl_context; 176static PangoContext *opengl_context;
121static PangoFontMap *opengl_fontmap; 177static PangoFontMap *opengl_fontmap;
122 178
123static void 179static void
124substitute_func (FcPattern *pattern, gpointer data) 180substitute_func (FcPattern *pattern, gpointer data)
… …
129#endif 185#endif
130 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 186 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
131} 187}
132 188
133static void 189static void
134layout_update_font (CFPlus__Layout self) 190layout_update_font (DC__Layout self)
135{ 191{
136 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
137 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
138 */ 194 */
139 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
140 196
141 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
142 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
143 199
144 pango_layout_set_font_description (self->pl, font); 200 pango_layout_set_font_description (self->pl, font);
145} 201}
146 202
147static void 203static void
148layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 204layout_get_pixel_size (DC__Layout self, int *w, int *h)
149{ 205{
150 PangoRectangle rect; 206 PangoRectangle rect;
151 207
152 // get_pixel_* wrongly rounds down 208 // get_pixel_* wrongly rounds down
153 pango_layout_get_extents (self->pl, 0, &rect); 209 pango_layout_get_extents (self->pl, 0, &rect);
… …
160 216
161 *w = rect.width; 217 *w = rect.width;
162 *h = rect.height; 218 *h = rect.height;
163} 219}
164 220
221typedef uint16_t tileid;
165typedef uint16_t mapface; 222typedef uint16_t faceid;
166 223
167typedef struct { 224typedef struct {
168 GLint name; 225 GLuint name;
169 int w, h; 226 int w, h;
170 float s, t; 227 float s, t;
171 uint8_t r, g, b, a; 228 uint8_t r, g, b, a;
229 tileid smoothtile;
230 uint8_t smoothlevel;
172} maptex; 231} maptex;
173 232
174typedef struct { 233typedef struct {
175 uint32_t player; 234 uint32_t player;
176 mapface face[3]; 235 tileid tile[3];
177 uint16_t darkness; 236 uint16_t darkness;
178 uint8_t stat_width, stat_hp, flags; 237 uint8_t stat_width, stat_hp, flags, smoothmax;
179} mapcell; 238} mapcell;
180 239
181typedef struct { 240typedef struct {
182 int32_t c0, c1; 241 int32_t c0, c1;
183 mapcell *col; 242 mapcell *col;
184} maprow; 243} maprow;
185 244
186typedef struct map { 245typedef struct map {
187 int x, y, w, h; 246 int x, y, w, h;
188 int ox, oy; /* offset to virtual global coordinate system */ 247 int ox, oy; /* offset to virtual global coordinate system */
189 int faces; 248 int faces; tileid *face2tile; // [faceid]
190 mapface *face; 249 int texs; maptex *tex; // [tileid]
191
192 int texs;
193 maptex *tex;
194 250
195 int32_t rows; 251 int32_t rows;
196 maprow *row; 252 maprow *row;
197} *CFPlus__Map; 253} *DC__Map;
198 254
199static char * 255static char *
200prepend (char *ptr, int sze, int inc) 256prepend (char *ptr, int sze, int inc)
201{ 257{
202 char *p; 258 char *p;
… …
219} 275}
220 276
221#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))
222#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))
223 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
224static maprow * 300static maprow *
225map_get_row (CFPlus__Map self, int y) 301map_get_row (DC__Map self, int y)
226{ 302{
227 if (0 > y) 303 if (0 > y)
228 { 304 {
229 int extend = - y + MAP_EXTEND_Y; 305 int extend = - y + MAP_EXTEND_Y;
230 Prepend (maprow, self->row, self->rows, extend); 306 Prepend (maprow, self->row, self->rows, extend);
… …
268 344
269 return row->col + (x - row->c0); 345 return row->col + (x - row->c0);
270} 346}
271 347
272static mapcell * 348static mapcell *
273map_get_cell (CFPlus__Map self, int x, int y) 349map_get_cell (DC__Map self, int x, int y)
274{ 350{
275 return row_get_cell (map_get_row (self, y), x); 351 return row_get_cell (map_get_row (self, y), x);
276} 352}
277 353
278static void 354static void
279map_clear (CFPlus__Map self) 355map_clear (DC__Map self)
280{ 356{
281 int r; 357 int r;
282 358
283 for (r = 0; r < self->rows; r++) 359 for (r = 0; r < self->rows; r++)
284 Safefree (self->row[r].col); 360 Safefree (self->row[r].col);
… …
291 self->oy = 0; 367 self->oy = 0;
292 self->row = 0; 368 self->row = 0;
293 self->rows = 0; 369 self->rows = 0;
294} 370}
295 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
296static void 382static void
297map_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)
298{ 384{
299 int x, y; 385 int x, y;
300 maprow *row; 386 maprow *row;
301 mapcell *cell; 387 mapcell *cell;
302 388
… …
314 if (x >= row->c1) 400 if (x >= row->c1)
315 break; 401 break;
316 402
317 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
318 404
319 cell->darkness = 0; 405 CELL_CLEAR (cell);
320 cell->stat_hp = 0;
321 cell->flags = 0;
322 cell->player = 0;
323 } 406 }
324 } 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);
325} 424}
326 425
327static void 426static void
328music_finished (void) 427music_finished (void)
329{ 428{
… …
365 n |= n >> 16; 464 n |= n >> 16;
366 465
367 return n + 1; 466 return n + 1;
368} 467}
369 468
370MODULE = 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
371 528
372PROTOTYPES: ENABLE 529PROTOTYPES: ENABLE
373 530
374BOOT: 531BOOT:
375{ 532{
376 HV *stash = gv_stashpv ("CFPlus", 1); 533 HV *stash = gv_stashpv ("DC", 1);
377 static const struct { 534 static const struct {
378 const char *name; 535 const char *name;
379 IV iv; 536 IV iv;
380 } *civ, const_iv[] = { 537 } *civ, const_iv[] = {
381# 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
382 const_iv (SDL_ACTIVEEVENT), 542 const_iv (SDL_ACTIVEEVENT),
383 const_iv (SDL_KEYDOWN), 543 const_iv (SDL_KEYDOWN),
384 const_iv (SDL_KEYUP), 544 const_iv (SDL_KEYUP),
385 const_iv (SDL_MOUSEMOTION), 545 const_iv (SDL_MOUSEMOTION),
386 const_iv (SDL_MOUSEBUTTONDOWN), 546 const_iv (SDL_MOUSEBUTTONDOWN),
… …
395 const_iv (SDL_EVENT_RESERVEDA), 555 const_iv (SDL_EVENT_RESERVEDA),
396 const_iv (SDL_EVENT_RESERVEDB), 556 const_iv (SDL_EVENT_RESERVEDB),
397 const_iv (SDL_VIDEORESIZE), 557 const_iv (SDL_VIDEORESIZE),
398 const_iv (SDL_VIDEOEXPOSE), 558 const_iv (SDL_VIDEOEXPOSE),
399 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),
400 const_iv (SDLK_KP0), 567 const_iv (SDLK_KP0),
401 const_iv (SDLK_KP1), 568 const_iv (SDLK_KP1),
402 const_iv (SDLK_KP2), 569 const_iv (SDLK_KP2),
403 const_iv (SDLK_KP3), 570 const_iv (SDLK_KP3),
404 const_iv (SDLK_KP4), 571 const_iv (SDLK_KP4),
… …
459 const_iv (SDLK_BREAK), 626 const_iv (SDLK_BREAK),
460 const_iv (SDLK_MENU), 627 const_iv (SDLK_MENU),
461 const_iv (SDLK_POWER), 628 const_iv (SDLK_POWER),
462 const_iv (SDLK_EURO), 629 const_iv (SDLK_EURO),
463 const_iv (SDLK_UNDO), 630 const_iv (SDLK_UNDO),
631
464 const_iv (KMOD_NONE), 632 const_iv (KMOD_NONE),
633 const_iv (KMOD_SHIFT),
465 const_iv (KMOD_LSHIFT), 634 const_iv (KMOD_LSHIFT),
466 const_iv (KMOD_RSHIFT), 635 const_iv (KMOD_RSHIFT),
636 const_iv (KMOD_CTRL),
467 const_iv (KMOD_LCTRL), 637 const_iv (KMOD_LCTRL),
468 const_iv (KMOD_RCTRL), 638 const_iv (KMOD_RCTRL),
639 const_iv (KMOD_ALT),
469 const_iv (KMOD_LALT), 640 const_iv (KMOD_LALT),
470 const_iv (KMOD_RALT), 641 const_iv (KMOD_RALT),
642 const_iv (KMOD_META),
471 const_iv (KMOD_LMETA), 643 const_iv (KMOD_LMETA),
472 const_iv (KMOD_RMETA), 644 const_iv (KMOD_RMETA),
473 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
474 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
475 const_iv (KMOD_MODE), 647 const_iv (KMOD_MODE),
476 const_iv (KMOD_CTRL), 648
477 const_iv (KMOD_SHIFT), 649 const_iv (MIX_DEFAULT_FORMAT),
478 const_iv (KMOD_ALT), 650
479 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)
480# undef const_iv 679# undef const_iv
481 }; 680 };
482 681
483 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; )
484 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);
485} 687}
688
689void
690weaken (SV *rv)
691 PROTOTYPE: $
692 CODE:
693 sv_rvweaken (rv);
486 694
487int 695int
488in_destruct () 696in_destruct ()
489 CODE: 697 CODE:
490 RETVAL = PL_main_cv == Nullcv; 698 RETVAL = PL_main_cv == Nullcv;
… …
492 RETVAL 700 RETVAL
493 701
494NV floor (NV x) 702NV floor (NV x)
495 703
496NV ceil (NV x) 704NV ceil (NV x)
705
706IV minpot (UV n)
707
708IV popcount (UV n)
497 709
498void 710void
499pango_init () 711pango_init ()
500 CODE: 712 CODE:
501{ 713{
502 opengl_fontmap = pango_opengl_font_map_new (); 714 opengl_fontmap = pango_opengl_font_map_new ();
503 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);
504 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
505} 722}
506 723
507int 724char *SDL_GetError ()
508SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
509 725
510void 726int SDL_Init (U32 flags)
727
728int SDL_InitSubSystem (U32 flags)
729
730void SDL_QuitSubSystem (U32 flags)
731
511SDL_Quit () 732void SDL_Quit ()
512 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
513void 743void
514SDL_ListModes () 744SDL_ListModes (int rgb, int alpha)
515 PPCODE: 745 PPCODE:
516{ 746{
517 SDL_Rect **m; 747 SDL_Rect **m;
518 748
519 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 749 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
520 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 750 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
521 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 751 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
522 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 752 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
523 753
524 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 754 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
525 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 755 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
526 756
527 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 757 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
528 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 758 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
529 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 759 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
530 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 760 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
531 761
532 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 762 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
533#if SDL_VERSION_ATLEAST(1,2,10)
534 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
535 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 763 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
536#endif
537
538 SDL_EnableUNICODE (1);
539 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
540 764
541 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 765 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
542 766
543 if (m && m != (SDL_Rect **)-1) 767 if (m && m != (SDL_Rect **)-1)
544 while (*m) 768 while (*m)
545 { 769 {
770 if ((*m)->w >= 400 && (*m)->h >= 300)
771 {
546 AV *av = newAV (); 772 AV *av = newAV ();
547 av_push (av, newSViv ((*m)->w)); 773 av_push (av, newSViv ((*m)->w));
548 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));
549 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 777 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
778 }
550 779
551 ++m; 780 ++m;
552 } 781 }
553} 782}
554 783
555char *
556SDL_GetError ()
557
558int 784int
559SDL_SetVideoMode (int w, int h, int fullscreen) 785SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
560 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
561 RETVAL = !!SDL_SetVideoMode ( 796 RETVAL = !!SDL_SetVideoMode (
562 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 797 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
563 ); 798 );
799
564 if (RETVAL) 800 if (RETVAL)
565 { 801 {
566 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 802 av_clear (texture_av);
803
804 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
567# 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);
568# include "glfunc.h" 806#include "glfunc.h"
569# undef GL_FUNC 807#undef GL_FUNC
570 } 808 }
809}
571 OUTPUT: 810 OUTPUT:
572 RETVAL 811 RETVAL
573 812
574void 813void
575SDL_GL_SwapBuffers () 814SDL_GL_SwapBuffers ()
576 815
577char * 816char *
578SDL_GetKeyName (int sym) 817SDL_GetKeyName (int sym)
579 818
819int
820SDL_GetAppState ()
821
822int
823SDL_GetModState ()
824
580void 825void
581SDL_PollEvent () 826poll_events ()
582 PPCODE: 827 PPCODE:
583{ 828{
584 SDL_Event ev; 829 SDL_Event ev;
585 830
586 while (SDL_PollEvent (&ev)) 831 SDL_PumpEvents ();
832 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
587 { 833 {
588 HV *hv = newHV (); 834 HV *hv = newHV ();
589 hv_store (hv, "type", 4, newSViv (ev.type), 0); 835 hv_store (hv, "type", 4, newSViv (ev.type), 0);
590 836
591 switch (ev.type) 837 switch (ev.type)
592 { 838 {
593 case SDL_KEYDOWN: 839 case SDL_KEYDOWN:
594 case SDL_KEYUP: 840 case SDL_KEYUP:
595 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 841 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
596 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 842 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
597 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 */
598 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 845 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
599 break; 846 break;
600 847
601 case SDL_ACTIVEEVENT: 848 case SDL_ACTIVEEVENT:
602 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 849 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
603 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 850 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
604 break; 851 break;
605 852
606 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
607 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 872 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
608
609 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 873 hv_store (hv, "state", 5, newSViv (state), 0);
610 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 874 hv_store (hv, "x", 1, newSViv (x), 0);
611 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 875 hv_store (hv, "y", 1, newSViv (y), 0);
612 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 876 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
613 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 877 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
878 }
614 break; 879 break;
615 880
616 case SDL_MOUSEBUTTONDOWN: 881 case SDL_MOUSEBUTTONDOWN:
617 case SDL_MOUSEBUTTONUP: 882 case SDL_MOUSEBUTTONUP:
618 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 883 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
619 884
620 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 885 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
621 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
622 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 887 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
623 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 888 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
628 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 893 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
629 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 894 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
630 break; 895 break;
631 } 896 }
632 897
633 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))));
634 } 899 }
635} 900}
636 901
637int 902int
638Mix_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)
639 POSTCALL: 904 POSTCALL:
640 Mix_HookMusicFinished (music_finished); 905 Mix_HookMusicFinished (music_finished);
641 Mix_ChannelFinished (channel_finished); 906 Mix_ChannelFinished (channel_finished);
642 907
643void 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
644Mix_CloseAudio () 925Mix_CloseAudio ()
645 926
646int 927int
647Mix_AllocateChannels (int numchans = -1) 928Mix_AllocateChannels (int numchans = -1)
648 929
930const char *
931Mix_GetError ()
932
649void 933void
650lowdelay (int fd, int val = 1) 934lowdelay (int fd, int val = 1)
651 CODE: 935 CODE:
652#ifndef _WIN32
653 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 936 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
654#endif
655 937
656void 938void
657win32_proxy_info () 939win32_proxy_info ()
658 PPCODE: 940 PPCODE:
659{ 941{
… …
680 } 962 }
681 } 963 }
682#endif 964#endif
683} 965}
684 966
685void 967int
686add_font (char *file) 968add_font (char *file)
687 CODE: 969 CODE:
688 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 970 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
971 OUTPUT:
972 RETVAL
689 973
690void 974void
691load_image_inline (SV *image_) 975load_image_inline (SV *image_)
692 ALIAS: 976 ALIAS:
693 load_image_file = 1 977 load_image_file = 1
… …
696 STRLEN image_len; 980 STRLEN image_len;
697 char *image = (char *)SvPVbyte (image_, image_len); 981 char *image = (char *)SvPVbyte (image_, image_len);
698 SDL_Surface *surface, *surface2; 982 SDL_Surface *surface, *surface2;
699 SDL_PixelFormat fmt; 983 SDL_PixelFormat fmt;
700 SDL_RWops *rw = ix 984 SDL_RWops *rw = ix
701 ? SDL_RWFromFile (image, "r") 985 ? SDL_RWFromFile (image, "rb")
702 : SDL_RWFromConstMem (image, image_len); 986 : SDL_RWFromConstMem (image, image_len);
703 987
704 if (!rw) 988 if (!rw)
705 croak ("load_image: %s", SDL_GetError ()); 989 croak ("load_image: %s", SDL_GetError ());
706 990
… …
779void 1063void
780error (char *message) 1064error (char *message)
781 CODE: 1065 CODE:
782 fprintf (stderr, "ERROR: %s\n", message); 1066 fprintf (stderr, "ERROR: %s\n", message);
783#ifdef _WIN32 1067#ifdef _WIN32
784 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR); 1068 MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
785#endif 1069#endif
786 1070
787void 1071void
788fatal (char *message) 1072fatal (char *message)
789 CODE: 1073 CODE:
790 fprintf (stderr, "FATAL: %s\n", message); 1074 fprintf (stderr, "FATAL: %s\n", message);
791#ifdef _WIN32 1075#ifdef _WIN32
792 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 1076 MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
793#endif 1077#endif
794 _exit (1); 1078 _exit (1);
795 1079
796void 1080void
797_exit (int retval = 0) 1081_exit (int retval = 0)
798 CODE: 1082 CODE:
1083#ifdef WIN32
1084 ExitThread (retval); // unclean, please beam me up
1085#else
799 _exit (retval); 1086 _exit (retval);
1087#endif
800 1088
801MODULE = CFPlus PACKAGE = CFPlus::Font 1089void
1090debug ()
1091 CODE:
1092{
1093#if DEBUG
1094 VALGRIND_DO_LEAK_CHECK;
1095#endif
1096}
802 1097
803CFPlus::Font 1098MODULE = Deliantra::Client PACKAGE = DC::Font
1099
1100PROTOTYPES: DISABLE
1101
1102DC::Font
804new_from_file (SV *class, char *path, int id = 0) 1103new_from_file (SV *class, char *path, int id = 0)
805 CODE: 1104 CODE:
806{ 1105{
807 int count; 1106 int count;
808 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1107 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
… …
811} 1110}
812 OUTPUT: 1111 OUTPUT:
813 RETVAL 1112 RETVAL
814 1113
815void 1114void
816DESTROY (CFPlus::Font self) 1115DESTROY (DC::Font self)
817 CODE: 1116 CODE:
818 pango_font_description_free (self); 1117 pango_font_description_free (self);
819 1118
820void 1119void
821make_default (CFPlus::Font self) 1120make_default (DC::Font self)
1121 PROTOTYPE: $
822 CODE: 1122 CODE:
823 default_font = self; 1123 default_font = self;
824 1124
825MODULE = CFPlus PACKAGE = CFPlus::Layout 1125MODULE = Deliantra::Client PACKAGE = DC::Layout
826 1126
1127PROTOTYPES: DISABLE
1128
827void 1129void
828reset_glyph_cache () 1130glyph_cache_backup ()
1131 PROTOTYPE:
829 CODE: 1132 CODE:
1133 tc_backup ();
1134
1135void
1136glyph_cache_restore ()
1137 PROTOTYPE:
1138 CODE:
830 tc_clear (); 1139 tc_restore ();
831 1140
832CFPlus::Layout 1141DC::Layout
833new (SV *class) 1142new (SV *class)
834 CODE: 1143 CODE:
835 New (0, RETVAL, 1, struct cf_layout); 1144 New (0, RETVAL, 1, struct cf_layout);
836 1145
837 RETVAL->pl = pango_layout_new (opengl_context); 1146 RETVAL->pl = pango_layout_new (opengl_context);
… …
839 RETVAL->g = 1.; 1148 RETVAL->g = 1.;
840 RETVAL->b = 1.; 1149 RETVAL->b = 1.;
841 RETVAL->a = 1.; 1150 RETVAL->a = 1.;
842 RETVAL->base_height = MIN_FONT_HEIGHT; 1151 RETVAL->base_height = MIN_FONT_HEIGHT;
843 RETVAL->font = 0; 1152 RETVAL->font = 0;
1153 RETVAL->rc = rc_alloc ();
844 1154
845 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 1155 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
846 layout_update_font (RETVAL); 1156 layout_update_font (RETVAL);
847 OUTPUT: 1157 OUTPUT:
848 RETVAL 1158 RETVAL
849 1159
850void 1160void
851DESTROY (CFPlus::Layout self) 1161DESTROY (DC::Layout self)
852 CODE: 1162 CODE:
853 g_object_unref (self->pl); 1163 g_object_unref (self->pl);
1164 rc_free (self->rc);
854 Safefree (self); 1165 Safefree (self);
855 1166
856void 1167void
857set_text (CFPlus::Layout self, SV *text_) 1168set_text (DC::Layout self, SV *text_)
858 CODE: 1169 CODE:
859{ 1170{
860 STRLEN textlen; 1171 STRLEN textlen;
861 char *text = SvPVutf8 (text_, textlen); 1172 char *text = SvPVutf8 (text_, textlen);
862 1173
863 pango_layout_set_text (self->pl, text, textlen); 1174 pango_layout_set_text (self->pl, text, textlen);
864} 1175}
865 1176
866void 1177void
867set_markup (CFPlus::Layout self, SV *text_) 1178set_markup (DC::Layout self, SV *text_)
868 CODE: 1179 CODE:
869{ 1180{
870 STRLEN textlen; 1181 STRLEN textlen;
871 char *text = SvPVutf8 (text_, textlen); 1182 char *text = SvPVutf8 (text_, textlen);
872 1183
873 pango_layout_set_markup (self->pl, text, textlen); 1184 pango_layout_set_markup (self->pl, text, textlen);
874} 1185}
875 1186
876void 1187void
877set_shapes (CFPlus::Layout self, ...) 1188set_shapes (DC::Layout self, ...)
878 CODE: 1189 CODE:
879{ 1190{
880 PangoAttrList *attrs = 0; 1191 PangoAttrList *attrs = 0;
881 const char *text = pango_layout_get_text (self->pl); 1192 const char *text = pango_layout_get_text (self->pl);
882 const char *pos = text; 1193 const char *pos = text;
… …
917 if (attrs) 1228 if (attrs)
918 pango_layout_set_attributes (self->pl, attrs); 1229 pango_layout_set_attributes (self->pl, attrs);
919} 1230}
920 1231
921void 1232void
922get_shapes (CFPlus::Layout self) 1233get_shapes (DC::Layout self)
923 PPCODE: 1234 PPCODE:
924{ 1235{
925 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1236 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
926 1237
927 do 1238 do
928 { 1239 {
929 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1240 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
930 1241
931 if (run && shape_attr_p (run)) 1242 if (run && shape_attr_p (run))
932 { 1243 {
933 PangoRectangle extents; 1244 PangoRectangle extents;
934 pango_layout_iter_get_run_extents (iter, 0, &extents); 1245 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
942 1253
943 pango_layout_iter_free (iter); 1254 pango_layout_iter_free (iter);
944} 1255}
945 1256
946int 1257int
947has_wrapped (CFPlus::Layout self) 1258has_wrapped (DC::Layout self)
948 CODE: 1259 CODE:
949{ 1260{
950 int lines = 1; 1261 int lines = 1;
951 const char *text = pango_layout_get_text (self->pl); 1262 const char *text = pango_layout_get_text (self->pl);
952 1263
… …
957} 1268}
958 OUTPUT: 1269 OUTPUT:
959 RETVAL 1270 RETVAL
960 1271
961SV * 1272SV *
962get_text (CFPlus::Layout self) 1273get_text (DC::Layout self)
963 CODE: 1274 CODE:
964 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1275 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
965 sv_utf8_decode (RETVAL); 1276 sv_utf8_decode (RETVAL);
966 OUTPUT: 1277 OUTPUT:
967 RETVAL 1278 RETVAL
968 1279
969void 1280void
970set_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.)
971 CODE: 1282 CODE:
972 self->r = r; 1283 self->r = r;
973 self->g = g; 1284 self->g = g;
974 self->b = b; 1285 self->b = b;
975 self->a = a; 1286 self->a = a;
976 1287
977void 1288void
978set_font (CFPlus::Layout self, CFPlus::Font font = 0) 1289set_font (DC::Layout self, DC::Font font = 0)
979 CODE: 1290 CODE:
980 if (self->font != font) 1291 if (self->font != font)
981 { 1292 {
982 self->font = font; 1293 self->font = font;
983 layout_update_font (self); 1294 layout_update_font (self);
984 } 1295 }
985 1296
986void 1297void
987set_height (CFPlus::Layout self, int base_height) 1298set_height (DC::Layout self, int base_height)
988 CODE: 1299 CODE:
989 if (self->base_height != base_height) 1300 if (self->base_height != base_height)
990 { 1301 {
991 self->base_height = base_height; 1302 self->base_height = base_height;
992 layout_update_font (self); 1303 layout_update_font (self);
993 } 1304 }
994 1305
995void 1306void
996set_width (CFPlus::Layout self, int max_width = -1) 1307set_width (DC::Layout self, int max_width = -1)
997 CODE: 1308 CODE:
998 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);
999 1310
1000void 1311void
1001set_indent (CFPlus::Layout self, int indent) 1312set_indent (DC::Layout self, int indent)
1002 CODE: 1313 CODE:
1003 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1314 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1004 1315
1005void 1316void
1006set_spacing (CFPlus::Layout self, int spacing) 1317set_spacing (DC::Layout self, int spacing)
1007 CODE: 1318 CODE:
1008 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1319 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1009 1320
1010void 1321void
1011set_ellipsise (CFPlus::Layout self, int ellipsise) 1322set_ellipsise (DC::Layout self, int ellipsise)
1012 CODE: 1323 CODE:
1013 pango_layout_set_ellipsize (self->pl, 1324 pango_layout_set_ellipsize (self->pl,
1014 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1325 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1015 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1326 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1016 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1327 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1017 : PANGO_ELLIPSIZE_NONE 1328 : PANGO_ELLIPSIZE_NONE
1018 ); 1329 );
1019 1330
1020void 1331void
1021set_single_paragraph_mode (CFPlus::Layout self, int spm) 1332set_single_paragraph_mode (DC::Layout self, int spm)
1022 CODE: 1333 CODE:
1023 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1334 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1024 1335
1025void 1336void
1026size (CFPlus::Layout self) 1337size (DC::Layout self)
1027 PPCODE: 1338 PPCODE:
1028{ 1339{
1029 int w, h; 1340 int w, h;
1030 1341
1031 layout_get_pixel_size (self, &w, &h); 1342 layout_get_pixel_size (self, &w, &h);
… …
1034 PUSHs (sv_2mortal (newSViv (w))); 1345 PUSHs (sv_2mortal (newSViv (w)));
1035 PUSHs (sv_2mortal (newSViv (h))); 1346 PUSHs (sv_2mortal (newSViv (h)));
1036} 1347}
1037 1348
1038int 1349int
1039descent (CFPlus::Layout self) 1350descent (DC::Layout self)
1040 CODE: 1351 CODE:
1041{ 1352{
1042 PangoRectangle rect; 1353 PangoRectangle rect;
1043 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1354 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1044 pango_layout_line_get_pixel_extents (line, 0, &rect); 1355 pango_layout_line_get_pixel_extents (line, 0, &rect);
1045 RETVAL = PANGO_DESCENT (rect); 1356 RETVAL = PANGO_DESCENT (rect);
1046} 1357}
1047 OUTPUT: 1358 OUTPUT:
1048 RETVAL 1359 RETVAL
1049 1360
1050int 1361int
1051xy_to_index (CFPlus::Layout self, int x, int y) 1362xy_to_index (DC::Layout self, int x, int y)
1052 CODE: 1363 CODE:
1053{ 1364{
1054 int index, trailing; 1365 int index, trailing;
1055 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);
1056 RETVAL = index; 1367 RETVAL = index + trailing;
1057} 1368}
1058 OUTPUT: 1369 OUTPUT:
1059 RETVAL 1370 RETVAL
1060 1371
1061void 1372void
1062cursor_pos (CFPlus::Layout self, int index) 1373cursor_pos (DC::Layout self, int index)
1063 PPCODE: 1374 PPCODE:
1064{ 1375{
1065 PangoRectangle strong_pos; 1376 PangoRectangle pos;
1066 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1377 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1067 1378
1068 EXTEND (SP, 3); 1379 EXTEND (SP, 3);
1069 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1380 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1070 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1381 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1071 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1382 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1072} 1383}
1073 1384
1074void 1385void
1075render (CFPlus::Layout self, float x, float y, int flags = 0) 1386index_to_line_x (DC::Layout self, int index, int trailing = 0)
1076 PPCODE: 1387 PPCODE:
1388{
1389 int line, x;
1390
1391 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1392#if !PANGO_VERSION_CHECK (1, 17, 3)
1393 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1394 --line;
1395#endif
1396 EXTEND (SP, 2);
1397 PUSHs (sv_2mortal (newSViv (line)));
1398 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1399}
1400
1401void
1402line_x_to_index (DC::Layout self, int line, int x)
1403 PPCODE:
1404{
1405 PangoLayoutLine *lp;
1406 int index, trailing;
1407
1408 if (line < 0)
1409 XSRETURN_EMPTY;
1410
1411 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1412 XSRETURN_EMPTY; /* do better */
1413
1414 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1415
1416 EXTEND (SP, 2);
1417 if (GIMME_V == G_SCALAR)
1418 PUSHs (sv_2mortal (newSViv (index + trailing)));
1419 else
1420 {
1421 PUSHs (sv_2mortal (newSViv (index)));
1422 PUSHs (sv_2mortal (newSViv (trailing)));
1423 }
1424}
1425
1426void
1427render (DC::Layout self, float x, float y, int flags = 0)
1428 CODE:
1429 rc_clear (self->rc);
1077 pango_opengl_render_layout_subpixel ( 1430 pango_opengl_render_layout_subpixel (
1078 self->pl, 1431 self->pl,
1432 self->rc,
1079 x * PANGO_SCALE, y * PANGO_SCALE, 1433 x * PANGO_SCALE, y * PANGO_SCALE,
1080 self->r, self->g, self->b, self->a, 1434 self->r, self->g, self->b, self->a,
1081 flags 1435 flags
1082 ); 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);
1083 1440
1084MODULE = CFPlus PACKAGE = CFPlus::Texture
1085
1086void 1441void
1087pad2pot (SV *data_, SV *w_, SV *h_) 1442draw (DC::Layout self)
1088 CODE: 1443 CODE:
1089{ 1444{
1090 int ow = SvIV (w_); 1445 glEnable (GL_TEXTURE_2D);
1091 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);
1092 1452
1093 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_))
1094 { 1469 {
1095 int nw = minpot (ow);
1096 int nh = minpot (oh);
1097
1098 if (nw != ow || nh != oh)
1099 {
1100 if (SvOK (data_))
1101 {
1102 STRLEN datalen; 1470 STRLEN datalen;
1103 char *data = SvPVbyte (data_, datalen); 1471 char *data = SvPVbyte (data_, datalen);
1104 int bpp = datalen / (ow * oh); 1472 int bpp = datalen / (ow * oh);
1105 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1473 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1106 1474
1107 SvPOK_only (result_); 1475 SvPOK_only (result_);
1108 SvCUR_set (result_, nw * nh * bpp); 1476 SvCUR_set (result_, nw * nh * bpp);
1109 1477
1110 memset (SvPVX (result_), 0, nw * nh * bpp); 1478 memset (SvPVX (result_), 0, nw * nh * bpp);
1111 while (oh--) 1479 while (oh--)
1112 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);
1113 1481
1114 sv_setsv (data_, result_); 1482 sv_setsv (data_, result_);
1115 }
1116
1117 sv_setiv (w_, nw);
1118 sv_setiv (h_, nh);
1119 }
1120 } 1483 }
1121} 1484}
1122 1485
1123void 1486void
1124draw_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.)
… …
1130{ 1493{
1131 HV *hv = (HV *)SvRV (self); 1494 HV *hv = (HV *)SvRV (self);
1132 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1495 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1133 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1496 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1134 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;
1135 1501
1136 if (items < 5) 1502 if (items < 5)
1137 { 1503 {
1138 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1504 w = SvNV (*hv_fetch (hv, "w", 1, 1));
1139 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1505 h = SvNV (*hv_fetch (hv, "h", 1, 1));
… …
1167 glDisable (GL_ALPHA_TEST); 1533 glDisable (GL_ALPHA_TEST);
1168 glDisable (GL_BLEND); 1534 glDisable (GL_BLEND);
1169 } 1535 }
1170} 1536}
1171 1537
1172MODULE = 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
1173 1548
1174CFPlus::Map 1549MODULE = Deliantra::Client PACKAGE = DC::Map
1175new (SV *class, int map_width, int map_height) 1550
1551PROTOTYPES: DISABLE
1552
1553DC::Map
1554new (SV *class)
1176 CODE: 1555 CODE:
1177 New (0, RETVAL, 1, struct map); 1556 New (0, RETVAL, 1, struct map);
1178 RETVAL->x = 0; 1557 RETVAL->x = 0;
1179 RETVAL->y = 0; 1558 RETVAL->y = 0;
1180 RETVAL->w = map_width; 1559 RETVAL->w = 0;
1181 RETVAL->h = map_height; 1560 RETVAL->h = 0;
1182 RETVAL->ox = 0; 1561 RETVAL->ox = 0;
1183 RETVAL->oy = 0; 1562 RETVAL->oy = 0;
1184 RETVAL->faces = 8192; 1563 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1185 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1564 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1186 RETVAL->texs = 8192;
1187 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1188 RETVAL->rows = 0; 1565 RETVAL->rows = 0;
1189 RETVAL->row = 0; 1566 RETVAL->row = 0;
1190 OUTPUT: 1567 OUTPUT:
1191 RETVAL 1568 RETVAL
1192 1569
1193void 1570void
1194DESTROY (CFPlus::Map self) 1571DESTROY (DC::Map self)
1195 CODE: 1572 CODE:
1196{ 1573{
1197 map_clear (self); 1574 map_clear (self);
1198 Safefree (self->face); 1575 Safefree (self->face2tile);
1199 Safefree (self->tex); 1576 Safefree (self->tex);
1200 Safefree (self); 1577 Safefree (self);
1201} 1578}
1202 1579
1203void 1580void
1581resize (DC::Map self, int map_width, int map_height)
1582 CODE:
1583 self->w = map_width;
1584 self->h = map_height;
1585
1586void
1204clear (CFPlus::Map self) 1587clear (DC::Map self)
1205 CODE: 1588 CODE:
1206 map_clear (self); 1589 map_clear (self);
1207 1590
1208void 1591void
1209set_face (CFPlus::Map self, int face, int texid) 1592set_tileid (DC::Map self, int face, int tile)
1210 CODE: 1593 CODE:
1211{ 1594{
1212 while (self->faces <= face) 1595 need_facenum (self, face); self->face2tile [face] = tile;
1213 { 1596 need_texid (self, tile);
1214 Append (mapface, self->face, self->faces, self->faces);
1215 self->faces *= 2;
1216 }
1217
1218 self->face [face] = texid;
1219} 1597}
1220 1598
1221void 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
1222set_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)
1223 CODE: 1624 CODE:
1224{ 1625{
1225 while (self->texs <= texid) 1626 need_texid (self, texid);
1226 {
1227 Append (maptex, self->tex, self->texs, self->texs);
1228 self->texs *= 2;
1229 }
1230 1627
1231 { 1628 {
1232 maptex *tex = self->tex + texid; 1629 maptex *tex = self->tex + texid;
1233 1630
1234 tex->name = name; 1631 tex->name = name;
… …
1251 // from transparent color bleeding and ugly wrapping effects. 1648 // from transparent color bleeding and ugly wrapping effects.
1252 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1649 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1253} 1650}
1254 1651
1255int 1652int
1256ox (CFPlus::Map self) 1653ox (DC::Map self)
1257 ALIAS: 1654 ALIAS:
1258 oy = 1 1655 oy = 1
1259 x = 2 1656 x = 2
1260 y = 3 1657 y = 3
1261 w = 4 1658 w = 4
… …
1272 } 1669 }
1273 OUTPUT: 1670 OUTPUT:
1274 RETVAL 1671 RETVAL
1275 1672
1276void 1673void
1277scroll (CFPlus::Map self, int dx, int dy) 1674scroll (DC::Map self, int dx, int dy)
1278 CODE: 1675 CODE:
1279{ 1676{
1280 if (dx > 0) 1677 if (dx > 0)
1281 map_blank (self, self->x, self->y, dx, self->h); 1678 map_blank (self, self->x, self->y, dx, self->h);
1282 else if (dx < 0) 1679 else if (dx < 0)
1283 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);
1284 1681
1285 if (dy > 0) 1682 if (dy > 0)
1286 map_blank (self, self->x, self->y, self->w, dy); 1683 map_blank (self, self->x, self->y, self->w, dy);
1287 else if (dy < 0) 1684 else if (dy < 0)
1288 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);
1289 1686
1290 self->ox += dx; self->x += dx; 1687 self->ox += dx; self->x += dx;
1291 self->oy += dy; self->y += dy; 1688 self->oy += dy; self->y += dy;
1292 1689
1293 while (self->y < 0) 1690 while (self->y < 0)
… …
1297 self->rows += MAP_EXTEND_Y; 1694 self->rows += MAP_EXTEND_Y;
1298 self->y += MAP_EXTEND_Y; 1695 self->y += MAP_EXTEND_Y;
1299 } 1696 }
1300} 1697}
1301 1698
1302void 1699SV *
1303map1a_update (CFPlus::Map self, SV *data_, int extmap) 1700map1a_update (DC::Map self, SV *data_, int extmap)
1304 CODE: 1701 CODE:
1305{ 1702{
1306 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1703 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1307 uint8_t *data_end = (uint8_t *)SvEND (data_); 1704 uint8_t *data_end = (uint8_t *)SvEND (data_);
1308 mapcell *cell; 1705 mapcell *cell;
1309 int x, y, flags; 1706 int x, y, z, flags;
1707 AV *missing = newAV ();
1708 RETVAL = newRV_noinc ((SV *)missing);
1310 1709
1311 while (data < data_end - 1) 1710 while (data < data_end - 1)
1312 { 1711 {
1313 flags = (data [0] << 8) + data [1]; data += 2; 1712 flags = (data [0] << 8) + data [1]; data += 2;
1314 1713
… …
1334 uint8_t ext, cmd; 1733 uint8_t ext, cmd;
1335 1734
1336 do 1735 do
1337 { 1736 {
1338 ext = *data++; 1737 ext = *data++;
1339 cmd = ext & 0x3f; 1738 cmd = ext & 0x7f;
1340 1739
1341 if (cmd < 4) 1740 if (cmd < 4)
1342 cell->darkness = 255 - ext * 64 + 1; 1741 cell->darkness = 255 - ext * 64 + 1;
1343 else if (cmd == 5) // health 1742 else if (cmd == 5) // health
1344 { 1743 {
1345 cell->stat_width = 1; 1744 cell->stat_width = 1;
1346 cell->stat_hp = *data++; 1745 cell->stat_hp = *data++;
1347 } 1746 }
1348 else if (cmd == 6) // monster width 1747 else if (cmd == 6) // monster width
1349 cell->stat_width = *data++ + 1; 1748 cell->stat_width = *data++ + 1;
1350 else if (cmd == 0x47) // monster width 1749 else if (cmd == 0x47)
1351 { 1750 {
1352 if (*data == 4) 1751 if (*data == 1) cell->player = data [1];
1353 ; // 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);
1354 1755
1355 data += *data + 1; 1756 data += *data + 1;
1356 } 1757 }
1357 else if (cmd == 8) // cell flags 1758 else if (cmd == 8) // cell flags
1358 cell->flags = *data++; 1759 cell->flags = *data++;
… …
1365 } 1766 }
1366 else 1767 else
1367 cell->darkness = *data++ + 1; 1768 cell->darkness = *data++ + 1;
1368 } 1769 }
1369 1770
1771 for (z = 0; z <= 2; ++z)
1370 if (flags & 4) 1772 if (flags & (4 >> z))
1371 { 1773 {
1372 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 }
1373 } 1791 }
1374
1375 if (flags & 2)
1376 {
1377 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;
1378 }
1379
1380 if (flags & 1)
1381 {
1382 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1383 }
1384 } 1792 }
1385 else 1793 else
1386 cell->darkness = 0; 1794 CELL_CLEAR (cell);
1387 } 1795 }
1388} 1796}
1797 OUTPUT:
1798 RETVAL
1389 1799
1390SV * 1800SV *
1391mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1801mapmap (DC::Map self, int x0, int y0, int w, int h)
1392 CODE: 1802 CODE:
1393{ 1803{
1394 int x1, x; 1804 int x1, x;
1395 int y1, y; 1805 int y1, y;
1396 int z; 1806 int z;
… …
1417 { 1827 {
1418 mapcell *cell = row->col + (x - row->c0); 1828 mapcell *cell = row->col + (x - row->c0);
1419 1829
1420 for (z = 0; z <= 0; z++) 1830 for (z = 0; z <= 0; z++)
1421 { 1831 {
1422 mapface face = cell->face [z];
1423
1424 if (face)
1425 {
1426 maptex tex = self->tex [face]; 1832 maptex tex = self->tex [cell->tile [z]];
1427 int a0 = 255 - tex.a; 1833 int a0 = 255 - tex.a;
1428 int a1 = tex.a; 1834 int a1 = tex.a;
1429 1835
1430 r = (r * a0 + tex.r * a1) / 255; 1836 r = (r * a0 + tex.r * a1) / 255;
1431 g = (g * a0 + tex.g * a1) / 255; 1837 g = (g * a0 + tex.g * a1) / 255;
1432 b = (b * a0 + tex.b * a1) / 255; 1838 b = (b * a0 + tex.b * a1) / 255;
1433 a = (a * a0 + tex.a * a1) / 255; 1839 a = (a * a0 + tex.a * a1) / 255;
1434 }
1435 } 1840 }
1436 } 1841 }
1437 1842
1438 *map++ = (r ) 1843 *map++ = (r )
1439 | (g << 8) 1844 | (g << 8)
… …
1446} 1851}
1447 OUTPUT: 1852 OUTPUT:
1448 RETVAL 1853 RETVAL
1449 1854
1450void 1855void
1451draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1856draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1452 CODE: 1857 CODE:
1453{ 1858{
1454 int vx, vy;
1455 int x, y, z; 1859 int x, y, z;
1456 int last_name;
1457 mapface face;
1458 1860
1459 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1460 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1862 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1863 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1864 smooth_key skey;
1865 int pl_x, pl_y;
1866 maptex pl_tex;
1867 rc_t *rc = rc_alloc ();
1868 rc_key_t key;
1869 rc_array_t *arr;
1461 1870
1462 /* 1871 pl_tex.name = 0;
1463 int vx = self->vx = self->w >= sw
1464 ? self->x + (self->w - sw) / 2
1465 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1466 1872
1467 int vy = self->vy = self->h >= sh 1873 // thats current max. sorry.
1468 ? self->y + (self->h - sh) / 2 1874 if (sw > 255) sw = 255;
1469 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1875 if (sh > 255) sh = 255;
1470 */
1471 1876
1472 glColor4ub (255, 255, 255, 255); 1877 // clear key, in case of extra padding
1878 memset (&skey, 0, sizeof (skey));
1879
1880 memset (&key, 0, sizeof (key));
1881 key.r = 255;
1882 key.g = 255;
1883 key.b = 255;
1884 key.a = 255;
1885 key.mode = GL_QUADS;
1886 key.format = GL_T2F_V3F;
1887 key.texname = -1;
1888
1889 mx += self->x;
1890 my += self->y;
1891
1892 // first pass: determine smooth_max
1893 // rather ugly, if you ask me
1894 // could also be stored inside mapcell and updated on change
1895 memset (smooth_max, 0, sizeof (smooth_max));
1896
1897 for (y = 0; y < sh; y++)
1898 if (0 <= y + my && y + my < self->rows)
1899 {
1900 maprow *row = self->row + (y + my);
1901
1902 for (x = 0; x < sw; x++)
1903 if (row->c0 <= x + mx && x + mx < row->c1)
1904 {
1905 mapcell *cell = row->col + (x + mx - row->c0);
1906
1907 smooth_max[x + 1][y + 1] =
1908 MAX (self->tex [cell->tile [0]].smoothlevel,
1909 MAX (self->tex [cell->tile [1]].smoothlevel,
1910 self->tex [cell->tile [2]].smoothlevel));
1911 }
1912 }
1473 1913
1474 glEnable (GL_BLEND); 1914 glEnable (GL_BLEND);
1475 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1915 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1476 glEnable (GL_TEXTURE_2D);
1477 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1916 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1478 1917
1479 glBegin (GL_QUADS);
1480
1481 last_name = 0;
1482
1483 for (z = 0; z < 3; z++) 1918 for (z = 0; z <= 2; z++)
1919 {
1920 memset (smooth_level, 0, sizeof (smooth_level));
1921
1484 for (y = 0; y < sh; y++) 1922 for (y = 0; y < sh; y++)
1485 if (0 <= y + vy && y + vy < self->rows) 1923 if (0 <= y + my && y + my < self->rows)
1486 { 1924 {
1487 maprow *row = self->row + (y + vy); 1925 maprow *row = self->row + (y + my);
1488 1926
1489 for (x = 0; x < sw; x++) 1927 for (x = 0; x < sw; x++)
1490 if (row->c0 <= x + vx && x + vx < row->c1) 1928 if (row->c0 <= x + mx && x + mx < row->c1)
1491 { 1929 {
1492 mapcell *cell = row->col + (x + vx - row->c0); 1930 mapcell *cell = row->col + (x + mx - row->c0);
1493
1494 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;
1495 1938
1496 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))
1497 { 2044 {
1498 maptex tex = self->tex [face]; 2045 int level = (w << 5) | b;
1499 int px = (x + 1) * 32 - tex.w; 2046 HE *he;
1500 int py = (y + 1) * 32 - tex.h;
1501 2047
1502 if (last_name != tex.name) 2048 hv_iterinit (smooth);
2049 while ((he = hv_iternext (smooth)))
1503 { 2050 {
1504 glEnd (); 2051 smooth_key *skey = (smooth_key *)HeKEY (he);
1505 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2052 IV bits = SvIVX (HeVAL (he));
1506 glBegin (GL_QUADS);
1507 }
1508 2053
1509 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1510 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1511 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1512 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1513 }
1514
1515 if (cell->flags && z == 2)
1516 {
1517 if (cell->flags & 1) 2054 if (!(bits & 0x1000)
2055 && skey->level == level
2056 && level > smooth_max [skey->x][skey->y])
1518 { 2057 {
1519 maptex tex = self->tex [1]; 2058 maptex tex = self->tex [skey->tile];
1520 int px = (x + 1) * 32 - tex.w + 2; 2059 int px = (((int)skey->x) - 1) * T;
1521 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
1522 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 {
1523 glEnd (); 2072 glEnd ();
1524 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 2073 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1525 glBegin (GL_QUADS); 2074 glBegin (GL_QUADS);
2075 }
1526 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
1527 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 2091 glTexCoord2f (ox , dy ); glVertex2i (px , py );
1528 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 2092 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1529 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 2093 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1530 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 2094 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
2095 }
2096 }
2097 }
1531 } 2098 }
1532 } 2099 }
1533 }
1534 } 2100 }
1535 2101
1536 glEnd (); 2102 glEnd ();
1537
1538 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
1539 glDisable (GL_BLEND); 2127 glDisable (GL_BLEND);
2128 rc_free (rc);
1540 2129
1541 // top layer: overlays such as the health bar 2130 // top layer: overlays such as the health bar
1542 for (y = 0; y < sh; y++) 2131 for (y = 0; y < sh; y++)
1543 if (0 <= y + vy && y + vy < self->rows) 2132 if (0 <= y + my && y + my < self->rows)
1544 { 2133 {
1545 maprow *row = self->row + (y + vy); 2134 maprow *row = self->row + (y + my);
1546 2135
1547 for (x = 0; x < sw; x++) 2136 for (x = 0; x < sw; x++)
1548 if (row->c0 <= x + vx && x + vx < row->c1) 2137 if (row->c0 <= x + mx && x + mx < row->c1)
1549 { 2138 {
1550 mapcell *cell = row->col + (x + vx - row->c0); 2139 mapcell *cell = row->col + (x + mx - row->c0);
1551 2140
1552 int px = x * 32; 2141 int px = x * T;
1553 int py = y * 32; 2142 int py = y * T;
1554 2143
1555 if (cell->stat_hp) 2144 if (cell->stat_hp)
1556 { 2145 {
1557 int width = cell->stat_width * 32; 2146 int width = cell->stat_width * T;
1558 int thick = sh / 28 + 1 + cell->stat_width; 2147 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1559 2148
1560 glColor3ub (0, 0, 0); 2149 glColor3ub (0, 0, 0);
1561 glRectf (px + 1, py - thick - 2, 2150 glRectf (px + 1, py - thick - 2,
1562 px + width - 1, py); 2151 px + width - 1, py);
1563 2152
… …
1569 } 2158 }
1570 } 2159 }
1571} 2160}
1572 2161
1573void 2162void
1574draw_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)
1575 CODE: 2164 CODE:
1576{ 2165{
1577 static float color[16][3] = { 2166 static float color[16][3] = {
1578 { 0.00F, 0.00F, 0.00F }, 2167 { 0.00F, 0.00F, 0.00F },
1579 { 1.00F, 1.00F, 1.00F }, 2168 { 1.00F, 1.00F, 1.00F },
… …
1629 glDisable (GL_BLEND); 2218 glDisable (GL_BLEND);
1630 glDisable (GL_TEXTURE_2D); 2219 glDisable (GL_TEXTURE_2D);
1631} 2220}
1632 2221
1633void 2222void
1634fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 2223fow_texture (DC::Map self, int mx, int my, int sw, int sh)
1635 PPCODE: 2224 PPCODE:
1636{ 2225{
1637 int vx, vy;
1638 int x, y; 2226 int x, y;
2227 int sw1 = sw + 2;
2228 int sh1 = sh + 2;
2229 int sh3 = sh * 3;
1639 int sw4 = (sw + 3) & ~3; 2230 int sw34 = (sw * 3 + 3) & ~3;
2231 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1640 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 2232 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1641 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 2233 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1642 2234
1643 memset (darkness, 255, sw4 * sh);
1644 SvPOK_only (darkness_sv); 2235 SvPOK_only (darkness3_sv);
1645 SvCUR_set (darkness_sv, sw4 * sh); 2236 SvCUR_set (darkness3_sv, sw34 * sh3);
1646 2237
1647 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 2238 mx += self->x - 1;
1648 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 2239 my += self->y - 1;
1649 2240
2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2242
1650 for (y = 0; y < sh; y++) 2243 for (y = 0; y < sh1; y++)
1651 if (0 <= y + vy && y + vy < self->rows) 2244 if (0 <= y + my && y + my < self->rows)
1652 { 2245 {
1653 maprow *row = self->row + (y + vy); 2246 maprow *row = self->row + (y + my);
1654 2247
1655 for (x = 0; x < sw; x++) 2248 for (x = 0; x < sw1; x++)
1656 if (row->c0 <= x + vx && x + vx < row->c1) 2249 if (row->c0 <= x + mx && x + mx < row->c1)
1657 { 2250 {
1658 mapcell *cell = row->col + (x + vx - row->c0); 2251 mapcell *cell = row->col + (x + mx - row->c0);
1659 2252
1660 darkness[y * sw4 + x] = cell->darkness 2253 darkness1 [y * sw1 + x] = cell->darkness
1661 ? 255 - (cell->darkness - 1) 2254 ? 255 - (cell->darkness - 1)
1662 : 255 - FOW_DARKNESS; 2255 : 255 - FOW_DARKNESS;
1663 } 2256 }
1664 } 2257 }
1665 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
1666 EXTEND (SP, 3); 2297 EXTEND (SP, 3);
1667 PUSHs (sv_2mortal (newSViv (sw4))); 2298 PUSHs (sv_2mortal (newSViv (sw34)));
1668 PUSHs (sv_2mortal (newSViv (sh))); 2299 PUSHs (sv_2mortal (newSViv (sh3)));
1669 PUSHs (darkness_sv); 2300 PUSHs (darkness3_sv);
1670} 2301}
1671 2302
1672SV * 2303SV *
1673get_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)
1674 CODE: 2305 CODE:
1675{ 2306{
1676 int x, y, x1, y1; 2307 int x, y, x1, y1;
1677 SV *data_sv = newSV (w * h * 7 + 5); 2308 SV *data_sv = newSV (w * h * 7 + 5);
1678 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2309 uint8_t *data = (uint8_t *)SvPVX (data_sv);
… …
1703 if (row && row->c0 <= x && x < row->c1) 2334 if (row && row->c0 <= x && x < row->c1)
1704 { 2335 {
1705 mapcell *cell = row->col + (x - row->c0); 2336 mapcell *cell = row->col + (x - row->c0);
1706 uint8_t flags = 0; 2337 uint8_t flags = 0;
1707 2338
1708 if (cell->face [0]) flags |= 1; 2339 if (cell->tile [0]) flags |= 1;
1709 if (cell->face [1]) flags |= 2; 2340 if (cell->tile [1]) flags |= 2;
1710 if (cell->face [2]) flags |= 4; 2341 if (cell->tile [2]) flags |= 4;
1711 2342
1712 *data++ = flags; 2343 *data++ = flags;
1713 2344
1714 if (flags & 1) 2345 if (flags & 1)
1715 { 2346 {
2347 tileid tile = cell->tile [0];
1716 *data++ = cell->face [0] >> 8; 2348 *data++ = tile >> 8;
1717 *data++ = cell->face [0]; 2349 *data++ = tile;
1718 } 2350 }
1719 2351
1720 if (flags & 2) 2352 if (flags & 2)
1721 { 2353 {
2354 tileid tile = cell->tile [1];
1722 *data++ = cell->face [1] >> 8; 2355 *data++ = tile >> 8;
1723 *data++ = cell->face [1]; 2356 *data++ = tile;
1724 } 2357 }
1725 2358
1726 if (flags & 4) 2359 if (flags & 4)
1727 { 2360 {
2361 tileid tile = cell->tile [2];
1728 *data++ = cell->face [2] >> 8; 2362 *data++ = tile >> 8;
1729 *data++ = cell->face [2]; 2363 *data++ = tile;
1730 } 2364 }
1731 } 2365 }
1732 else 2366 else
1733 *data++ = 0; 2367 *data++ = 0;
1734 } 2368 }
1735 } 2369 }
1736 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 {
1737 SvPOK_only (data_sv); 2374 SvPOK_only (data_sv);
1738 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2375 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2376 }
2377
1739 RETVAL = data_sv; 2378 RETVAL = data_sv;
1740} 2379}
1741 OUTPUT: 2380 OUTPUT:
1742 RETVAL 2381 RETVAL
1743 2382
1744void 2383void
1745set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data) 2384set_rect (DC::Map self, int x0, int y0, SV *data_sv)
1746 PPCODE: 2385 PPCODE:
1747{ 2386{
1748 int x, y, z; 2387 int x, y, z;
1749 int w, h; 2388 int w, h;
1750 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;
1751 2400
1752 if (*data++ != 0) 2401 if (*data++ != 0)
1753 return; /* version mismatch */ 2402 XSRETURN_EMPTY; /* version mismatch */
1754 2403
1755 w = *data++ << 8; w |= *data++; 2404 w = *data++ << 8; w |= *data++;
1756 h = *data++ << 8; h |= *data++; 2405 h = *data++ << 8; h |= *data++;
1757 2406
1758 // 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
… …
1770 { 2419 {
1771 maprow *row = map_get_row (self, y); 2420 maprow *row = map_get_row (self, y);
1772 2421
1773 for (x = x0; x < x1; x++) 2422 for (x = x0; x < x1; x++)
1774 { 2423 {
2424 uint8_t flags;
2425
2426 if (data + 7 >= end)
2427 XSRETURN_EMPTY;
2428
1775 uint8_t flags = *data++; 2429 flags = *data++;
1776 2430
1777 if (flags) 2431 if (flags)
1778 { 2432 {
1779 mapface face[3] = { 0, 0, 0 };
1780
1781 mapcell *cell = row_get_cell (row, x); 2433 mapcell *cell = row_get_cell (row, x);
2434 tileid tile[3] = { 0, 0, 0 };
1782 2435
1783 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2436 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1784 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2437 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1785 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2438 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1786 2439
1787 if (cell->darkness == 0) 2440 if (cell->darkness == 0)
1788 { 2441 {
1789 cell->darkness = 0; 2442 /*cell->darkness = 0;*/
2443 EXTEND (SP, 3);
1790 2444
1791 for (z = 0; z <= 2; z++) 2445 for (z = 0; z <= 2; z++)
1792 { 2446 {
1793 cell->face[z] = face[z]; 2447 tileid t = tile [z];
1794 2448
1795 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2449 if (t >= self->texs || (t && !self->tex [t].name))
2450 {
1796 XPUSHs (sv_2mortal (newSViv (face[z]))); 2451 PUSHs (sv_2mortal (newSViv (t)));
2452 need_texid (self, t);
2453 }
2454
2455 cell->tile [z] = t;
1797 } 2456 }
1798 } 2457 }
1799 } 2458 }
1800 } 2459 }
1801 } 2460 }
1802} 2461}
1803 2462
1804MODULE = CFPlus PACKAGE = CFPlus::MixChunk 2463MODULE = Deliantra::Client PACKAGE = DC::RW
1805 2464
1806CFPlus::MixChunk 2465DC::RW
1807new_from_file (SV *class, char *path) 2466new (SV *class, SV *data_sv)
1808 CODE: 2467 CODE:
1809 RETVAL = Mix_LoadWAV (path); 2468{
2469 STRLEN datalen;
2470 char *data = SvPVbyte (data_sv, datalen);
2471
2472 RETVAL = SDL_RWFromConstMem (data, datalen);
2473}
1810 OUTPUT: 2474 OUTPUT:
1811 RETVAL 2475 RETVAL
1812 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 : '('
1813void 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
1814DESTROY (CFPlus::MixChunk self) 2586DESTROY (DC::MixChunk self)
1815 CODE: 2587 CODE:
1816 Mix_FreeChunk (self); 2588 Mix_FreeChunk (self);
1817 2589
1818int 2590int
1819volume (CFPlus::MixChunk self, int volume = -1) 2591volume (DC::MixChunk self, int volume = -1)
1820 CODE: 2592 CODE:
2593 if (items > 1)
2594 volume = CLAMP (volume, 0, 128);
1821 RETVAL = Mix_VolumeChunk (self, volume); 2595 RETVAL = Mix_VolumeChunk (self, volume);
1822 OUTPUT: 2596 OUTPUT:
1823 RETVAL 2597 RETVAL
1824 2598
1825int 2599DC::Channel
1826play (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)
1827 CODE: 2601 CODE:
2602{
1828 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}
1829 OUTPUT: 2614 OUTPUT:
1830 RETVAL 2615 RETVAL
1831 2616
1832MODULE = CFPlus PACKAGE = CFPlus::MixMusic 2617MODULE = Deliantra::Client PACKAGE = DC::MixMusic
1833 2618
1834int 2619int
1835volume (int volume = -1) 2620volume (int volume = -1)
2621 PROTOTYPE: ;$
1836 CODE: 2622 CODE:
2623 if (items > 0)
2624 volume = CLAMP (volume, 0, 128);
1837 RETVAL = Mix_VolumeMusic (volume); 2625 RETVAL = Mix_VolumeMusic (volume);
1838 OUTPUT: 2626 OUTPUT:
1839 RETVAL 2627 RETVAL
1840 2628
2629void
2630fade_out (int ms)
2631 CODE:
2632 Mix_FadeOutMusic (ms);
2633
2634void
2635halt ()
2636 CODE:
2637 Mix_HaltMusic ();
2638
1841CFPlus::MixMusic 2639DC::MixMusic
1842new_from_file (SV *class, char *path) 2640new (SV *class, DC::RW rwops)
1843 CODE: 2641 CODE:
1844 RETVAL = Mix_LoadMUS (path); 2642 RETVAL = Mix_LoadMUS_RW (rwops);
1845 OUTPUT: 2643 OUTPUT:
1846 RETVAL 2644 RETVAL
1847 2645
1848void 2646void
1849DESTROY (CFPlus::MixMusic self) 2647DESTROY (DC::MixMusic self)
1850 CODE: 2648 CODE:
1851 Mix_FreeMusic (self); 2649 Mix_FreeMusic (self);
1852 2650
1853int 2651int
1854play (CFPlus::MixMusic self, int loops = -1) 2652play (DC::MixMusic self, int loops = -1)
1855 CODE: 2653 CODE:
1856 RETVAL = Mix_PlayMusic (self, loops); 2654 RETVAL = Mix_PlayMusic (self, loops);
1857 OUTPUT: 2655 OUTPUT:
1858 RETVAL 2656 RETVAL
1859 2657
1860MODULE = 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
1861 2666
1862BOOT: 2667BOOT:
1863{ 2668{
1864 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1); 2669 HV *stash = gv_stashpv ("DC::OpenGL", 1);
1865 static const struct { 2670 static const struct {
1866 const char *name; 2671 const char *name;
1867 IV iv; 2672 IV iv;
1868 } *civ, const_iv[] = { 2673 } *civ, const_iv[] = {
1869# 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),
1870 const_iv (GL_COLOR_MATERIAL), 2678 const_iv (GL_COLOR_MATERIAL),
1871 const_iv (GL_SMOOTH), 2679 const_iv (GL_SMOOTH),
1872 const_iv (GL_FLAT), 2680 const_iv (GL_FLAT),
1873 const_iv (GL_DITHER), 2681 const_iv (GL_DITHER),
1874 const_iv (GL_BLEND), 2682 const_iv (GL_BLEND),
… …
1878 const_iv (GL_ALPHA_TEST), 2686 const_iv (GL_ALPHA_TEST),
1879 const_iv (GL_NORMALIZE), 2687 const_iv (GL_NORMALIZE),
1880 const_iv (GL_RESCALE_NORMAL), 2688 const_iv (GL_RESCALE_NORMAL),
1881 const_iv (GL_FRONT), 2689 const_iv (GL_FRONT),
1882 const_iv (GL_BACK), 2690 const_iv (GL_BACK),
2691 const_iv (GL_AUX0),
1883 const_iv (GL_AND), 2692 const_iv (GL_AND),
1884 const_iv (GL_ONE), 2693 const_iv (GL_ONE),
1885 const_iv (GL_ZERO), 2694 const_iv (GL_ZERO),
1886 const_iv (GL_SRC_ALPHA), 2695 const_iv (GL_SRC_ALPHA),
1887 const_iv (GL_DST_ALPHA), 2696 const_iv (GL_DST_ALPHA),
… …
1900 const_iv (GL_INTENSITY), 2709 const_iv (GL_INTENSITY),
1901 const_iv (GL_LUMINANCE), 2710 const_iv (GL_LUMINANCE),
1902 const_iv (GL_LUMINANCE_ALPHA), 2711 const_iv (GL_LUMINANCE_ALPHA),
1903 const_iv (GL_FLOAT), 2712 const_iv (GL_FLOAT),
1904 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),
1905 const_iv (GL_COMPILE), 2720 const_iv (GL_COMPILE),
2721 const_iv (GL_PROXY_TEXTURE_1D),
2722 const_iv (GL_PROXY_TEXTURE_2D),
1906 const_iv (GL_TEXTURE_1D), 2723 const_iv (GL_TEXTURE_1D),
1907 const_iv (GL_TEXTURE_2D), 2724 const_iv (GL_TEXTURE_2D),
1908 const_iv (GL_TEXTURE_ENV), 2725 const_iv (GL_TEXTURE_ENV),
1909 const_iv (GL_TEXTURE_MAG_FILTER), 2726 const_iv (GL_TEXTURE_MAG_FILTER),
1910 const_iv (GL_TEXTURE_MIN_FILTER), 2727 const_iv (GL_TEXTURE_MIN_FILTER),
… …
1931 const_iv (GL_COLOR_LOGIC_OP), 2748 const_iv (GL_COLOR_LOGIC_OP),
1932 const_iv (GL_SEPARABLE_2D), 2749 const_iv (GL_SEPARABLE_2D),
1933 const_iv (GL_CONVOLUTION_2D), 2750 const_iv (GL_CONVOLUTION_2D),
1934 const_iv (GL_CONVOLUTION_BORDER_MODE), 2751 const_iv (GL_CONVOLUTION_BORDER_MODE),
1935 const_iv (GL_CONSTANT_BORDER), 2752 const_iv (GL_CONSTANT_BORDER),
2753 const_iv (GL_POINTS),
1936 const_iv (GL_LINES), 2754 const_iv (GL_LINES),
1937 const_iv (GL_LINE_STRIP), 2755 const_iv (GL_LINE_STRIP),
1938 const_iv (GL_LINE_LOOP), 2756 const_iv (GL_LINE_LOOP),
1939 const_iv (GL_QUADS), 2757 const_iv (GL_QUADS),
1940 const_iv (GL_QUAD_STRIP), 2758 const_iv (GL_QUAD_STRIP),
1941 const_iv (GL_TRIANGLES), 2759 const_iv (GL_TRIANGLES),
1942 const_iv (GL_TRIANGLE_STRIP), 2760 const_iv (GL_TRIANGLE_STRIP),
1943 const_iv (GL_TRIANGLE_FAN), 2761 const_iv (GL_TRIANGLE_FAN),
2762 const_iv (GL_POLYGON),
1944 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),
1945 const_iv (GL_FASTEST), 2769 const_iv (GL_FASTEST),
2770 const_iv (GL_DONT_CARE),
2771 const_iv (GL_NICEST),
1946 const_iv (GL_V2F), 2772 const_iv (GL_V2F),
1947 const_iv (GL_V3F), 2773 const_iv (GL_V3F),
1948 const_iv (GL_T2F_V3F), 2774 const_iv (GL_T2F_V3F),
1949 const_iv (GL_T2F_N3F_V3F), 2775 const_iv (GL_T2F_N3F_V3F),
1950# undef const_iv 2776# undef const_iv
1951 }; 2777 };
1952 2778
1953 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; )
1954 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);
1955} 2784}
2785
2786void
2787disable_GL_EXT_blend_func_separate ()
2788 CODE:
2789 gl.BlendFuncSeparate = 0;
2790 gl.BlendFuncSeparateEXT = 0;
1956 2791
1957char * 2792char *
1958gl_vendor () 2793gl_vendor ()
1959 CODE: 2794 CODE:
1960 RETVAL = (char *)glGetString (GL_VENDOR); 2795 RETVAL = (char *)glGetString (GL_VENDOR);
… …
1973 CODE: 2808 CODE:
1974 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2809 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1975 OUTPUT: 2810 OUTPUT:
1976 RETVAL 2811 RETVAL
1977 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
1978int glGetError () 2827int glGetError ()
1979 2828
1980void glFinish () 2829void glFinish ()
1981 2830
1982void glClear (int mask) 2831void glClear (int mask)
… …
2019# near_ and far_ are due to microsofts buggy "c" compiler 2868# near_ and far_ are due to microsofts buggy "c" compiler
2020void 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_)
2021 2870
2022# near_ and far_ are due to microsofts buggy "c" compiler 2871# near_ and far_ are due to microsofts buggy "c" compiler
2023void 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
2024 2875
2025void glViewport (int x, int y, int width, int height) 2876void glViewport (int x, int y, int width, int height)
2026 2877
2027void glScissor (int x, int y, int width, int height) 2878void glScissor (int x, int y, int width, int height)
2028 2879
… …
2036 2887
2037void glRotate (float angle, float x, float y, float z) 2888void glRotate (float angle, float x, float y, float z)
2038 CODE: 2889 CODE:
2039 glRotatef (angle, x, y, z); 2890 glRotatef (angle, x, y, z);
2040 2891
2041void glBegin (int mode)
2042
2043void glEnd ()
2044
2045void glColor (float r, float g, float b, float a = 1.0) 2892void glColor (float r, float g, float b, float a = 1.0)
2046 PROTOTYPE: @
2047 ALIAS: 2893 ALIAS:
2048 glColor_premultiply = 1 2894 glColor_premultiply = 1
2049 CODE: 2895 CODE:
2050 if (ix) 2896 if (ix)
2051 { 2897 {
… …
2054 b *= a; 2900 b *= a;
2055 } 2901 }
2056 // microsoft visual "c" rounds instead of truncating... 2902 // microsoft visual "c" rounds instead of truncating...
2057 glColor4f (r, g, b, a); 2903 glColor4f (r, g, b, a);
2058 2904
2059void glInterleavedArrays (int format, int stride, char *data)
2060
2061void glDrawElements (int mode, int count, int type, char *indices)
2062
2063# 1.2 void glDrawRangeElements (int mode, int start, int end
2064
2065void glRasterPos (float x, float y, float z = 0.) 2905void glRasterPos (float x, float y, float z = 0.)
2066 CODE: 2906 CODE:
2067 glRasterPos3f (0, 0, z); 2907 glRasterPos3f (0, 0, z);
2068 glBitmap (0, 0, 0, 0, x, y, 0); 2908 glBitmap (0, 0, 0, 0, x, y, 0);
2069 2909
… …
2073 2913
2074void glTexCoord (float s, float t) 2914void glTexCoord (float s, float t)
2075 CODE: 2915 CODE:
2076 glTexCoord2f (s, t); 2916 glTexCoord2f (s, t);
2077 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
2078void glTexEnv (int target, int pname, float param) 2947void glTexEnv (int target, int pname, float param)
2079 CODE: 2948 CODE:
2080 glTexEnvf (target, pname, param); 2949 glTexEnvf (target, pname, param);
2081 2950
2082void glTexParameter (int target, int pname, float param) 2951void glTexParameter (int target, int pname, float param)
… …
2098void 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)
2099 CODE: 2968 CODE:
2100 if (gl.SeparableFilter2D) 2969 if (gl.SeparableFilter2D)
2101 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2970 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2102 2971
2103void 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)
2104 2973
2105void 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)
2106 2975
2107void 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)
2108 2979
2109void 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)
2110 2981
2111int glGenTexture () 2982int glGenTexture ()
2112 CODE: 2983 CODE:
2113{ 2984 RETVAL = gen_texture ();
2114 GLuint name;
2115 glGenTextures (1, &name);
2116 RETVAL = name;
2117}
2118 OUTPUT: 2985 OUTPUT:
2119 RETVAL 2986 RETVAL
2120 2987
2121void glDeleteTexture (int name) 2988void glDeleteTexture (int name)
2122 CODE: 2989 CODE:
2123{
2124 GLuint name_ = name;
2125 glDeleteTextures (1, &name_); 2990 del_texture (name);
2126} 2991
2127
2128int glGenList () 2992int glGenList ()
2129 CODE: 2993 CODE:
2130 RETVAL = glGenLists (1); 2994 RETVAL = glGenLists (1);
2131 OUTPUT: 2995 OUTPUT:
2132 RETVAL 2996 RETVAL
… …
2139 3003
2140void glEndList () 3004void glEndList ()
2141 3005
2142void glCallList (int list) 3006void glCallList (int list)
2143 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