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

Diff Legend

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