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

Diff Legend

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