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.133 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.271 by root, Sun Jul 20 15:09:29 2008 UTC

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

Diff Legend

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