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.140 by root, Mon Aug 14 03:41:25 2006 UTC vs.
Revision 1.270 by root, Sun Jul 20 15:05:13 2008 UTC

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

Diff Legend

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