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.134 by root, Fri Aug 4 16:49:58 2006 UTC vs.
Revision 1.268 by root, Sun Jul 20 02:57:43 2008 UTC

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

Diff Legend

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