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

Diff Legend

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