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.105 by root, Mon Jun 5 03:33:09 2006 UTC vs.
Revision 1.202 by root, Tue Jul 17 18:34:24 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3# include <malloc.h> 4# include <malloc.h>
4# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
5# 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>
6#endif 14#endif
7 15
8#include "EXTERN.h" 16#include "EXTERN.h"
9#include "perl.h" 17#include "perl.h"
10#include "XSUB.h" 18#include "XSUB.h"
11 19
20#ifdef _WIN32
21# undef pipe
22#endif
23
24#include <assert.h>
12#include <math.h> 25#include <math.h>
13#include <string.h> 26#include <string.h>
14#include <stdio.h> 27#include <stdio.h>
28#include <stdlib.h>
15 29
16#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
17#include <SDL_endian.h> 32#include <SDL_endian.h>
18#include <SDL_image.h> 33#include <SDL_image.h>
19#include <SDL_mixer.h> 34#include <SDL_mixer.h>
20#include <SDL_opengl.h> 35#include <SDL_opengl.h>
21 36
37#define PANGO_ENABLE_BACKEND
38#define G_DISABLE_CAST_CHECKS
39
22#include <glib/gmacros.h> 40#include <glib/gmacros.h>
23 41
24#include <pango/pango.h> 42#include <pango/pango.h>
25#include <pango/pangofc-fontmap.h>
26#include <pango/pangoft2.h>
27#include <pango/pangocairo.h>
28 43
29#ifndef _WIN32 44#ifndef _WIN32
30# include <sys/types.h> 45# include <sys/types.h>
31# include <sys/socket.h> 46# include <sys/socket.h>
32# include <netinet/in.h> 47# include <netinet/in.h>
33# include <netinet/tcp.h> 48# include <netinet/tcp.h>
34# include <inttypes.h> 49# include <inttypes.h>
35#else
36 typedef unsigned char uint8_t;
37 typedef unsigned short uint16_t;
38 typedef unsigned int uint32_t;
39 typedef signed char int8_t;
40 typedef signed short int16_t;
41 typedef signed int int32_t;
42#endif 50#endif
43 51
44#include "glext.h" 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45 53
46#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
47 55
48#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
49#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
50 58
51#define MIN_FONT_HEIGHT 10 59#define MIN_FONT_HEIGHT 10
60
61#if 0
62# define PARACHUTE SDL_INIT_NOPARACHUTE
63#else
64# define PARACHUTE 0
65#endif
66
67static AV *texture_av;
52 68
53static struct 69static struct
54{ 70{
55#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
56#include "glfunc.h" 72#include "glfunc.h"
57#undef GL_FUNC 73#undef GL_FUNC
58} gl; 74} gl;
59 75
76static void
60static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61{ 78{
62 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
63 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
64 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
65 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66 else 83 else
67 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
68} 85}
69 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
111#include "texcache.c"
112
113#include "pango-font.c"
114#include "pango-fontmap.c"
115#include "pango-render.c"
116
70typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
71typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
72 119
73typedef PangoFontDescription *CFClient__Font; 120typedef PangoFontDescription *CFPlus__Font;
121
122static int
123shape_attr_p (PangoLayoutRun *run)
124{
125 GSList *attrs = run->item->analysis.extra_attrs;
126
127 while (attrs)
128 {
129 PangoAttribute *attr = attrs->data;
130
131 if (attr->klass->type == PANGO_ATTR_SHAPE)
132 return 1;
133
134 attrs = attrs->next;
135 }
136
137 return 0;
138}
74 139
75typedef struct cf_layout { 140typedef struct cf_layout {
76 PangoLayout *pl; // either derived from a cairo or ft2 context 141 PangoLayout *pl;
77 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
79 int base_height; 143 int base_height;
80 CFClient__Font font; 144 CFPlus__Font font;
81} *CFClient__Layout; 145} *CFPlus__Layout;
82 146
83static CFClient__Font default_font; 147static CFPlus__Font default_font;
84static PangoContext *ft2_context, *cairo_context; 148static PangoContext *opengl_context;
85static PangoFontMap *ft2_fontmap, *cairo_fontmap; 149static PangoFontMap *opengl_fontmap;
86 150
87static void 151static void
88substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
89{ 153{
90 FcPatternAddBool (pattern, FC_HINTING , 1); 154 FcPatternAddBool (pattern, FC_HINTING, 1);
155#ifdef FC_HINT_STYLE
91 //FcPatternAddBool (pattern, FC_AUTOHINT, 1); 156 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
157#endif
92 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93} 159}
94 160
95static void 161static void
96layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
97{ 163{
98 /* use a random scale factor to account for unknown descenders, 0.8 works 164 /* use a random scale factor to account for unknown descenders, 0.8 works
99 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
100 */ 166 */
101 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
105 171
106 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
107} 173}
108 174
109static void 175static void
110layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
111{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
112 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
113 182
114 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
115 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
116 185
117 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
118} 187 if (!rect.height) rect.height = 1;
119 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
120typedef uint16_t mapface; 194typedef uint16_t faceid;
121 195
122typedef struct { 196typedef struct {
123 GLint name; 197 int name;
124 int w, h; 198 int w, h;
125 float s, t; 199 float s, t;
126 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
127} maptex; 203} maptex;
128 204
129typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
130 int16_t darkness; 208 uint16_t darkness;
131 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
132} mapcell; 210} mapcell;
133 211
134typedef struct { 212typedef struct {
135 int32_t c0, c1; 213 int32_t c0, c1;
136 mapcell *col; 214 mapcell *col;
137} maprow; 215} maprow;
138 216
139typedef struct map { 217typedef struct map {
140 int x, y, w, h; 218 int x, y, w, h;
141 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
142 int faces; 220 int faces; tileid *face2tile; // [faceid]
143 mapface *face; 221 int texs; maptex *tex; // [tileid]
144
145 int texs;
146 maptex *tex;
147 222
148 int32_t rows; 223 int32_t rows;
149 maprow *row; 224 maprow *row;
150} *CFClient__Map; 225} *CFPlus__Map;
151 226
152static char * 227static char *
153prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
154{ 229{
155 char *p; 230 char *p;
172} 247}
173 248
174#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
175#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176 251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
271
177static maprow * 272static maprow *
178map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
179{ 274{
180 if (0 > y) 275 if (0 > y)
181 { 276 {
182 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
183 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
221 316
222 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
223} 318}
224 319
225static mapcell * 320static mapcell *
226map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
227{ 322{
228 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
229} 324}
230 325
231static void 326static void
232map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
233{ 328{
234 int r; 329 int r;
235 330
236 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
237 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
245 self->row = 0; 340 self->row = 0;
246 self->rows = 0; 341 self->rows = 0;
247} 342}
248 343
249static void 344static void
250map_blank (CFClient__Map self, int x0, int y0, int w, int h) 345map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
251{ 346{
252 int x, y; 347 int x, y;
253 maprow *row; 348 maprow *row;
349 mapcell *cell;
254 350
255 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
256 if (y >= 0) 352 if (y >= 0)
257 { 353 {
258 if (y >= self->rows) 354 if (y >= self->rows)
264 if (x >= row->c0) 360 if (x >= row->c0)
265 { 361 {
266 if (x >= row->c1) 362 if (x >= row->c1)
267 break; 363 break;
268 364
269 row->col[x - row->c0].darkness = -1; 365 cell = row->col + x - row->c0;
366
367 cell->darkness = 0;
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
270 } 371 }
271 } 372 }
373}
374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
272} 389}
273 390
274static void 391static void
275music_finished (void) 392music_finished (void)
276{ 393{
295 ev.data2 = 0; 412 ev.data2 = 0;
296 413
297 SDL_PushEvent ((SDL_Event *)&ev); 414 SDL_PushEvent ((SDL_Event *)&ev);
298} 415}
299 416
417static unsigned int
418minpot (unsigned int n)
419{
420 if (!n)
421 return 0;
422
423 --n;
424
425 n |= n >> 1;
426 n |= n >> 2;
427 n |= n >> 4;
428 n |= n >> 8;
429 n |= n >> 16;
430
431 return n + 1;
432}
433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
437
300MODULE = CFClient PACKAGE = CFClient 438MODULE = CFPlus PACKAGE = CFPlus
301 439
302PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
303 441
304BOOT: 442BOOT:
305{ 443{
306 HV *stash = gv_stashpv ("CFClient", 1); 444 HV *stash = gv_stashpv ("CFPlus", 1);
307 static const struct { 445 static const struct {
308 const char *name; 446 const char *name;
309 IV iv; 447 IV iv;
310 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
311# define const_iv(name) { # name, (IV)name } 449# define const_iv(name) { # name, (IV)name }
450 const_iv (SDLK_MODIFIER_MIN),
451 const_iv (SDLK_MODIFIER_MAX),
452
312 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
313 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
314 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
315 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
316 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
325 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
326 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
327 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
328 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
329 const_iv (SDL_USEREVENT), 470 const_iv (SDL_USEREVENT),
471
472 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE),
475
330 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
331 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
332 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
333 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
334 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
389 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
390 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
391 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
392 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
393 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
394 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
395 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
396 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
397 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
398 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
399 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
400 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
401 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
402 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
403 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
404 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
405 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
406 const_iv (KMOD_CTRL),
407 const_iv (KMOD_SHIFT),
408 const_iv (KMOD_ALT),
409 const_iv (KMOD_META)
410# undef const_iv 557# undef const_iv
411 }; 558 };
412 559
413 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
414 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
562
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
415} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
572
573int
574in_destruct ()
575 CODE:
576 RETVAL = PL_main_cv == Nullcv;
577 OUTPUT:
578 RETVAL
579
580NV floor (NV x)
581
582NV ceil (NV x)
416 583
417void 584void
418pango_init () 585pango_init ()
419 CODE: 586 CODE:
420 // delayed, so it can pick up new fonts added by AddFontResourceEx
421{ 587{
422 {
423 ft2_fontmap = pango_ft2_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426 }
427
428 {
429 cairo_font_options_t *fopt = cairo_font_options_create ();
430 cairo_fontmap = pango_cairo_font_map_get_default ();
431 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
432 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
433 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
434 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
435 pango_cairo_context_set_font_options (cairo_context, fopt);
436 cairo_font_options_destroy (fopt);
437 }
438} 591}
592
593char *
594SDL_GetError ()
439 595
440int 596int
441SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
442 598
443void 599void
444SDL_Quit () 600SDL_Quit ()
445 601
446void 602void
447SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
448 PPCODE: 604 PPCODE:
449{ 605{
450 SDL_Rect **m; 606 SDL_Rect **m;
451 607
452 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
453 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
454 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
455 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
456 612
457 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
458 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
459 615
460 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
461 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
462 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
463 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
464 620
465 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
466 622#if SDL_VERSION_ATLEAST(1,2,10)
467 SDL_EnableUNICODE (1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
468 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
469 626
470 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
471 628
472 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
473 while (*m) 630 while (*m)
474 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
475 AV *av = newAV (); 634 AV *av = newAV ();
476 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
477 av_push (av, newSViv ((*m)->h)); 636 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb));
638 av_push (av, newSViv (alpha));
478 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
479 641
480 ++m; 642 ++m;
481 } 643 }
482} 644}
483 645
484char *
485SDL_GetError ()
486
487int 646int
488SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
489 CODE: 648 CODE:
649{
650 SDL_EnableUNICODE (1);
651 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
652
653 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
654 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
655 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
656 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
657
490 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
491 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
492 ); 660 );
661
493 if (RETVAL) 662 if (RETVAL)
494 { 663 {
664 av_clear (texture_av);
665
495 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
496# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
497# include "glfunc.h" 668#include "glfunc.h"
498# undef GL_FUNC 669#undef GL_FUNC
499 } 670 }
671}
500 OUTPUT: 672 OUTPUT:
501 RETVAL 673 RETVAL
502 674
503void 675void
504SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
505 677
506char * 678char *
507SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
508 680
681int
682SDL_GetAppState ()
683
509void 684void
510SDL_PollEvent () 685poll_events ()
511 PPCODE: 686 PPCODE:
512{ 687{
513 SDL_Event ev; 688 SDL_Event ev;
514 689
515 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
516 { 692 {
517 HV *hv = newHV (); 693 HV *hv = newHV ();
518 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
519 695
520 switch (ev.type) 696 switch (ev.type)
522 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
523 case SDL_KEYUP: 699 case SDL_KEYUP:
524 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
525 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
526 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
527 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
528 break; 705 break;
529 706
530 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
531 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
532 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
533 break; 710 break;
534 711
535 case SDL_MOUSEMOTION: 712 case SDL_MOUSEMOTION:
713 {
714 int state = ev.motion.state;
715 int x = ev.motion.x;
716 int y = ev.motion.y;
717 int xrel = ev.motion.xrel;
718 int yrel = ev.motion.yrel;
719
720 /* do simplistic event compression */
721 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
722 && state == ev.motion.state)
723 {
724 xrel += ev.motion.xrel;
725 yrel += ev.motion.yrel;
726 x = ev.motion.x;
727 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 }
730
536 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
537
538 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
539 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
540 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
541 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
542 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
543 break; 738 break;
544 739
545 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
546 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
547 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
557 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
558 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
559 break; 754 break;
560 } 755 }
561 756
562 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
563 } 758 }
564} 759}
565 760
566int 761int
567Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
576Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
577 772
578void 773void
579lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
580 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
581#ifndef _WIN32 782#ifdef _WIN32
582 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 783 char buffer[2048];
784 DWORD buflen;
785
786 EXTEND (SP, 3);
787
788 buflen = sizeof (buffer);
789 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
790 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
791 {
792 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
793
794 buflen = sizeof (buffer);
795 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
796 {
797 PUSHs (newSVpv (buffer, 0));
798
799 buflen = sizeof (buffer);
800 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
801 PUSHs (newSVpv (buffer, 0));
802 }
803 }
583#endif 804#endif
805}
584 806
585void 807void
586add_font (char *file) 808add_font (char *file)
587 CODE: 809 CODE:
588 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
589#ifdef _WIN32
590 // cairo... sigh... requires win2000
591 AddFontResourceEx (file, FR_PRIVATE, 0);
592#endif
593 811
594void 812void
595load_image_inline (SV *image_) 813load_image_inline (SV *image_)
596 ALIAS: 814 ALIAS:
597 load_image_file = 1 815 load_image_file = 1
639 857
640 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 858 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
641 859
642 assert (surface2->pitch == surface2->w * 4); 860 assert (surface2->pitch == surface2->w * 4);
643 861
862 SDL_LockSurface (surface2);
644 EXTEND (SP, 5); 863 EXTEND (SP, 6);
645 PUSHs (sv_2mortal (newSViv (surface2->w))); 864 PUSHs (sv_2mortal (newSViv (surface2->w)));
646 PUSHs (sv_2mortal (newSViv (surface2->h))); 865 PUSHs (sv_2mortal (newSViv (surface2->h)));
647 SDL_LockSurface (surface2);
648 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 866 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
649 SDL_UnlockSurface (surface2);
650 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 867 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
651 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 868 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
652 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 869 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
870 SDL_UnlockSurface (surface2);
653 871
654 SDL_FreeSurface (surface); 872 SDL_FreeSurface (surface);
655 SDL_FreeSurface (surface2); 873 SDL_FreeSurface (surface2);
656} 874}
657 875
693 CODE: 911 CODE:
694 fprintf (stderr, "FATAL: %s\n", message); 912 fprintf (stderr, "FATAL: %s\n", message);
695#ifdef _WIN32 913#ifdef _WIN32
696 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
697#endif 915#endif
698 exit (1); 916 _exit (1);
699 917
918void
919_exit (int retval = 0)
920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
924 _exit (retval);
925#endif
926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
935
700MODULE = CFClient PACKAGE = CFClient::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
701 937
702CFClient::Font 938CFPlus::Font
703new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
704 CODE: 940 CODE:
705{ 941{
706 int count; 942 int count;
707 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
710} 946}
711 OUTPUT: 947 OUTPUT:
712 RETVAL 948 RETVAL
713 949
714void 950void
715DESTROY (CFClient::Font self) 951DESTROY (CFPlus::Font self)
716 CODE: 952 CODE:
717 pango_font_description_free (self); 953 pango_font_description_free (self);
718 954
719void 955void
720make_default (CFClient::Font self) 956make_default (CFPlus::Font self)
721 CODE: 957 CODE:
722 default_font = self; 958 default_font = self;
723 959
724MODULE = CFClient PACKAGE = CFClient::Layout 960MODULE = CFPlus PACKAGE = CFPlus::Layout
725 961
726CFClient::Layout 962void
727new (SV *class, int rgba = 0) 963reset_glyph_cache ()
728 CODE: 964 CODE:
729#if _WIN32 965 tc_clear ();
730 //rgba = 0;//D makes text nicer, breaks TextView 966
731#endif 967CFPlus::Layout
732 rgba=1;//D 968new (SV *class)
969 CODE:
733 New (0, RETVAL, 1, struct cf_layout); 970 New (0, RETVAL, 1, struct cf_layout);
734 971
735 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 972 RETVAL->pl = pango_layout_new (opengl_context);
736 RETVAL->rgba = rgba;
737 RETVAL->r = 1.; 973 RETVAL->r = 1.;
738 RETVAL->g = 1.; 974 RETVAL->g = 1.;
739 RETVAL->b = 1.; 975 RETVAL->b = 1.;
740 RETVAL->a = 1.; 976 RETVAL->a = 1.;
741 RETVAL->base_height = MIN_FONT_HEIGHT; 977 RETVAL->base_height = MIN_FONT_HEIGHT;
745 layout_update_font (RETVAL); 981 layout_update_font (RETVAL);
746 OUTPUT: 982 OUTPUT:
747 RETVAL 983 RETVAL
748 984
749void 985void
750DESTROY (CFClient::Layout self) 986DESTROY (CFPlus::Layout self)
751 CODE: 987 CODE:
752 g_object_unref (self->pl); 988 g_object_unref (self->pl);
753 Safefree (self); 989 Safefree (self);
754 990
755int
756is_rgba (CFClient::Layout self)
757 CODE:
758 RETVAL = self->rgba;
759 OUTPUT:
760 RETVAL
761
762void 991void
763set_text (CFClient::Layout self, SV *text_) 992set_text (CFPlus::Layout self, SV *text_)
764 CODE: 993 CODE:
765{ 994{
766 STRLEN textlen; 995 STRLEN textlen;
767 char *text = SvPVutf8 (text_, textlen); 996 char *text = SvPVutf8 (text_, textlen);
768 997
769 pango_layout_set_text (self->pl, text, textlen); 998 pango_layout_set_text (self->pl, text, textlen);
770} 999}
771 1000
772void 1001void
773set_markup (CFClient::Layout self, SV *text_) 1002set_markup (CFPlus::Layout self, SV *text_)
774 CODE: 1003 CODE:
775{ 1004{
776 STRLEN textlen; 1005 STRLEN textlen;
777 char *text = SvPVutf8 (text_, textlen); 1006 char *text = SvPVutf8 (text_, textlen);
778 1007
779 pango_layout_set_markup (self->pl, text, textlen); 1008 pango_layout_set_markup (self->pl, text, textlen);
780} 1009}
781 1010
1011void
1012set_shapes (CFPlus::Layout self, ...)
1013 CODE:
1014{
1015 PangoAttrList *attrs = 0;
1016 const char *text = pango_layout_get_text (self->pl);
1017 const char *pos = text;
1018 int arg = 4;
1019
1020 while (arg < items && (pos = strstr (pos, OBJ_STR)))
1021 {
1022 PangoRectangle inkrect, rect;
1023 PangoAttribute *attr;
1024
1025 int x = SvIV (ST (arg - 3));
1026 int y = SvIV (ST (arg - 2));
1027 int w = SvIV (ST (arg - 1));
1028 int h = SvIV (ST (arg ));
1029
1030 inkrect.x = 0;
1031 inkrect.y = 0;
1032 inkrect.width = 0;
1033 inkrect.height = 0;
1034
1035 rect.x = x * PANGO_SCALE;
1036 rect.y = y * PANGO_SCALE;
1037 rect.width = w * PANGO_SCALE;
1038 rect.height = h * PANGO_SCALE;
1039
1040 if (!attrs)
1041 attrs = pango_layout_get_attributes (self->pl);
1042
1043 attr = pango_attr_shape_new (&inkrect, &rect);
1044 attr->start_index = pos - text;
1045 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1046 pango_attr_list_insert (attrs, attr);
1047
1048 arg += 4;
1049 pos += sizeof (OBJ_STR) - 1;
1050 }
1051
1052 if (attrs)
1053 pango_layout_set_attributes (self->pl, attrs);
1054}
1055
1056void
1057get_shapes (CFPlus::Layout self)
1058 PPCODE:
1059{
1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1061
1062 do
1063 {
1064 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1065
1066 if (run && shape_attr_p (run))
1067 {
1068 PangoRectangle extents;
1069 pango_layout_iter_get_run_extents (iter, 0, &extents);
1070
1071 EXTEND (SP, 2);
1072 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1073 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1074 }
1075 }
1076 while (pango_layout_iter_next_run (iter));
1077
1078 pango_layout_iter_free (iter);
1079}
1080
1081int
1082has_wrapped (CFPlus::Layout self)
1083 CODE:
1084{
1085 int lines = 1;
1086 const char *text = pango_layout_get_text (self->pl);
1087
1088 while (*text)
1089 lines += *text++ == '\n';
1090
1091 RETVAL = lines < pango_layout_get_line_count (self->pl);
1092}
1093 OUTPUT:
1094 RETVAL
1095
782SV * 1096SV *
783get_text (CFClient::Layout self) 1097get_text (CFPlus::Layout self)
784 CODE: 1098 CODE:
785 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
786 SvUTF8_on (RETVAL); 1100 sv_utf8_decode (RETVAL);
787 OUTPUT: 1101 OUTPUT:
788 RETVAL 1102 RETVAL
789 1103
790void 1104void
791set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1105set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
792 CODE: 1106 CODE:
793 self->r = r; 1107 self->r = r;
794 self->g = g; 1108 self->g = g;
795 self->b = b; 1109 self->b = b;
796 self->a = a; 1110 self->a = a;
797 1111
798void 1112void
799set_font (CFClient::Layout self, CFClient::Font font = 0) 1113set_font (CFPlus::Layout self, CFPlus::Font font = 0)
800 CODE: 1114 CODE:
801 if (self->font != font) 1115 if (self->font != font)
802 { 1116 {
803 self->font = font; 1117 self->font = font;
804 layout_update_font (self); 1118 layout_update_font (self);
805 } 1119 }
806 1120
807void 1121void
808set_height (CFClient::Layout self, int base_height) 1122set_height (CFPlus::Layout self, int base_height)
809 CODE: 1123 CODE:
810 if (self->base_height != base_height) 1124 if (self->base_height != base_height)
811 { 1125 {
812 self->base_height = base_height; 1126 self->base_height = base_height;
813 layout_update_font (self); 1127 layout_update_font (self);
814 } 1128 }
815 1129
816void 1130void
817set_width (CFClient::Layout self, int max_width = -1) 1131set_width (CFPlus::Layout self, int max_width = -1)
818 CODE: 1132 CODE:
819 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1133 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
820 1134
821void 1135void
822set_indent (CFClient::Layout self, int indent) 1136set_indent (CFPlus::Layout self, int indent)
823 CODE: 1137 CODE:
824 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
825 1139
826void 1140void
827set_spacing (CFClient::Layout self, int spacing) 1141set_spacing (CFPlus::Layout self, int spacing)
828 CODE: 1142 CODE:
829 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
830 1144
831void 1145void
832set_ellipsise (CFClient::Layout self, int ellipsise) 1146set_ellipsise (CFPlus::Layout self, int ellipsise)
833 CODE: 1147 CODE:
834 pango_layout_set_ellipsize (self->pl, 1148 pango_layout_set_ellipsize (self->pl,
835 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START
836 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
837 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
838 : PANGO_ELLIPSIZE_NONE 1152 : PANGO_ELLIPSIZE_NONE
839 ); 1153 );
840 1154
841void 1155void
842set_single_paragraph_mode (CFClient::Layout self, int spm) 1156set_single_paragraph_mode (CFPlus::Layout self, int spm)
843 CODE: 1157 CODE:
844 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
845 1159
846void 1160void
847size (CFClient::Layout self) 1161size (CFPlus::Layout self)
848 PPCODE: 1162 PPCODE:
849{ 1163{
850 int w, h; 1164 int w, h;
851 1165
852 layout_get_pixel_size (self, &w, &h); 1166 layout_get_pixel_size (self, &w, &h);
855 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (w)));
856 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (h)));
857} 1171}
858 1172
859int 1173int
1174descent (CFPlus::Layout self)
1175 CODE:
1176{
1177 PangoRectangle rect;
1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1179 pango_layout_line_get_pixel_extents (line, 0, &rect);
1180 RETVAL = PANGO_DESCENT (rect);
1181}
1182 OUTPUT:
1183 RETVAL
1184
1185int
860xy_to_index (CFClient::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
861 CODE: 1187 CODE:
862{ 1188{
863 int index, trailing; 1189 int index, trailing;
864 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
865 RETVAL = index; 1191 RETVAL = index + trailing;
866} 1192}
867 OUTPUT: 1193 OUTPUT:
868 RETVAL 1194 RETVAL
869 1195
870void 1196void
871cursor_pos (CFClient::Layout self, int index) 1197cursor_pos (CFPlus::Layout self, int index)
872 PPCODE: 1198 PPCODE:
873{ 1199{
874 PangoRectangle strong_pos; 1200 PangoRectangle strong_pos;
875 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
876 1202
879 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
880 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
881} 1207}
882 1208
883void 1209void
884render (CFClient::Layout self) 1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
885 PPCODE: 1211 PPCODE:
886{ 1212{
887 SV *retval; 1213 int line, x;
888 int w, h;
889 1214
890 layout_get_pixel_size (self, &w, &h); 1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
891 1217
892 if (self->rgba)
893 {
894 cairo_surface_t *surface;
895 cairo_t *cairo;
896
897 retval = newSV (w * h * 4);
898 SvPOK_only (retval);
899 SvCUR_set (retval, w * h * 4);
900
901 memset (SvPVX (retval), 0, w * h * 4);
902
903 surface = cairo_image_surface_create_for_data (
904 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
905 cairo = cairo_create (surface);
906 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
907
908 pango_cairo_show_layout (cairo, self->pl);
909
910 cairo_destroy (cairo);
911 cairo_surface_destroy (surface);
912
913 // what a mess, and its premultiplied, too :(
914 {
915 uint32_t *p = (uint32_t *)SvPVX (retval);
916 uint32_t *e = p + w * h;
917
918 while (p < e)
919 {
920 uint32_t rgba = *p;
921 rgba = (rgba >> 24) | (rgba << 8);
922#if 0
923#ifdef _WIN32
924 {//D
925 uint8_t r = rgba >> 24;
926 uint8_t g = rgba >> 16;
927 uint8_t b = rgba >> 8;
928 uint8_t a = rgba >> 0;
929
930 rgba = (rgba & 0xffffff00) | a;
931 }
932#endif
933#endif
934 rgba = SDL_SwapBE32 (rgba);
935 *p++ = rgba;
936 }
937 }
938
939 EXTEND (SP, 5); 1218 EXTEND (SP, 2);
940 PUSHs (sv_2mortal (newSViv (w))); 1219 PUSHs (sv_2mortal (newSViv (line - 1)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221}
1222
1223void
1224line_x_to_index (CFPlus::Layout self, int line, int x)
1225 PPCODE:
1226{
1227 PangoLayoutLine *lp;
1228 int index, trailing;
1229
1230 if (line < 0)
1231 XSRETURN_EMPTY;
1232
1233 if (!(lp = pango_layout_get_line (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */
1235
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237
1238 EXTEND (SP, 2);
1239 if (GIMME_V == G_SCALAR)
941 PUSHs (sv_2mortal (newSViv (h))); 1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
942 PUSHs (sv_2mortal (retval));
943 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
944 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
945 }
946 else 1241 else
947 { 1242 {
948 FT_Bitmap bitmap;
949
950 retval = newSV (w * h);
951 SvPOK_only (retval);
952 SvCUR_set (retval, w * h);
953
954 bitmap.rows = h;
955 bitmap.width = w;
956 bitmap.pitch = w;
957 bitmap.buffer = (unsigned char*)SvPVX (retval);
958 bitmap.num_grays = 256;
959 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
960
961 memset (bitmap.buffer, 0, w * h);
962
963 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
964
965 EXTEND (SP, 5);
966 PUSHs (sv_2mortal (newSViv (w))); 1243 PUSHs (sv_2mortal (newSViv (index)));
967 PUSHs (sv_2mortal (newSViv (h))); 1244 PUSHs (sv_2mortal (newSViv (trailing)));
968 PUSHs (sv_2mortal (retval));
969 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
970 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
971 } 1245 }
972} 1246}
973 1247
1248void
1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1250 PPCODE:
1251 pango_opengl_render_layout_subpixel (
1252 self->pl,
1253 x * PANGO_SCALE, y * PANGO_SCALE,
1254 self->r, self->g, self->b, self->a,
1255 flags
1256 );
1257
974MODULE = CFClient PACKAGE = CFClient::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
975 1259
1260int minpot (int n)
1261
976void 1262void
1263pad2pot (SV *data_, SV *w_, SV *h_)
1264 CODE:
1265{
1266 int ow = SvIV (w_);
1267 int oh = SvIV (h_);
1268
1269 if (ow && oh)
1270 {
1271 int nw = minpot (ow);
1272 int nh = minpot (oh);
1273
1274 if (nw != ow || nh != oh)
1275 {
1276 if (SvOK (data_))
1277 {
1278 STRLEN datalen;
1279 char *data = SvPVbyte (data_, datalen);
1280 int bpp = datalen / (ow * oh);
1281 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1282
1283 SvPOK_only (result_);
1284 SvCUR_set (result_, nw * nh * bpp);
1285
1286 memset (SvPVX (result_), 0, nw * nh * bpp);
1287 while (oh--)
1288 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1289
1290 sv_setsv (data_, result_);
1291 }
1292
1293 sv_setiv (w_, nw);
1294 sv_setiv (h_, nh);
1295 }
1296 }
1297}
1298
1299void
977draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1300draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
978 PROTOTYPE: $$$;$$ 1301 PROTOTYPE: $$$;$$
979 ALIAS: 1302 ALIAS:
980 draw_quad_alpha = 1 1303 draw_quad_alpha = 1
981 draw_quad_alpha_premultiplied = 2 1304 draw_quad_alpha_premultiplied = 2
982 CODE: 1305 CODE:
1020 glDisable (GL_ALPHA_TEST); 1343 glDisable (GL_ALPHA_TEST);
1021 glDisable (GL_BLEND); 1344 glDisable (GL_BLEND);
1022 } 1345 }
1023} 1346}
1024 1347
1348IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1349 CODE:
1350{
1351 GLint width;
1352 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1353 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1354 RETVAL = width > 0;
1355}
1356 OUTPUT:
1357 RETVAL
1358
1025MODULE = CFClient PACKAGE = CFClient::Map 1359MODULE = CFPlus PACKAGE = CFPlus::Map
1026 1360
1027CFClient::Map 1361CFPlus::Map
1028new (SV *class, int map_width, int map_height) 1362new (SV *class)
1029 CODE: 1363 CODE:
1030 New (0, RETVAL, 1, struct map); 1364 New (0, RETVAL, 1, struct map);
1031 RETVAL->x = 0; 1365 RETVAL->x = 0;
1032 RETVAL->y = 0; 1366 RETVAL->y = 0;
1033 RETVAL->w = map_width; 1367 RETVAL->w = 0;
1034 RETVAL->h = map_height; 1368 RETVAL->h = 0;
1035 RETVAL->ox = 0; 1369 RETVAL->ox = 0;
1036 RETVAL->oy = 0; 1370 RETVAL->oy = 0;
1037 RETVAL->faces = 8192; 1371 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1038 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1372 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1039 RETVAL->texs = 8192;
1040 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1041 RETVAL->rows = 0; 1373 RETVAL->rows = 0;
1042 RETVAL->row = 0; 1374 RETVAL->row = 0;
1043 OUTPUT: 1375 OUTPUT:
1044 RETVAL 1376 RETVAL
1045 1377
1046void 1378void
1047DESTROY (CFClient::Map self) 1379DESTROY (CFPlus::Map self)
1048 CODE: 1380 CODE:
1049{ 1381{
1050 map_clear (self); 1382 map_clear (self);
1051 Safefree (self->face); 1383 Safefree (self->face2tile);
1384 Safefree (self->tex);
1052 Safefree (self); 1385 Safefree (self);
1053} 1386}
1054 1387
1055void 1388void
1389resize (CFPlus::Map self, int map_width, int map_height)
1390 CODE:
1391 self->w = map_width;
1392 self->h = map_height;
1393
1394void
1056clear (CFClient::Map self) 1395clear (CFPlus::Map self)
1057 CODE: 1396 CODE:
1058 map_clear (self); 1397 map_clear (self);
1059 1398
1060void 1399void
1061set_face (CFClient::Map self, int face, int texid) 1400set_tileid (CFPlus::Map self, int face, int tile)
1062 CODE: 1401 CODE:
1063{ 1402{
1064 while (self->faces <= face) 1403 need_facenum (self, face); self->face2tile [face] = tile;
1065 { 1404 need_texid (self, tile);
1066 Append (mapface, self->face, self->faces, self->faces);
1067 self->faces *= 2;
1068 }
1069
1070 self->face [face] = texid;
1071} 1405}
1072 1406
1073void 1407void
1408set_smooth (CFPlus::Map self, int face, int smooth, int level)
1409 CODE:
1410{
1411 tileid texid;
1412 maptex *tex;
1413
1414 if (face < 0 || face >= self->faces)
1415 return;
1416
1417 if (smooth < 0 || smooth >= self->faces)
1418 return;
1419
1420 texid = self->face2tile [face];
1421
1422 if (!texid)
1423 return;
1424
1425 tex = self->tex + texid;
1426 tex->smoothtile = self->face2tile [smooth];
1427 tex->smoothlevel = level;
1428}
1429
1430void
1074set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1431set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1075 CODE: 1432 CODE:
1076{ 1433{
1077 while (self->texs <= texid) 1434 need_texid (self, texid);
1078 {
1079 Append (maptex, self->tex, self->texs, self->texs);
1080 self->texs *= 2;
1081 }
1082 1435
1083 { 1436 {
1084 maptex *tex = self->tex + texid; 1437 maptex *tex = self->tex + texid;
1085 1438
1086 tex->name = name; 1439 tex->name = name;
1103 // from transparent color bleeding and ugly wrapping effects. 1456 // from transparent color bleeding and ugly wrapping effects.
1104 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1457 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1105} 1458}
1106 1459
1107int 1460int
1108ox (CFClient::Map self) 1461ox (CFPlus::Map self)
1109 ALIAS: 1462 ALIAS:
1110 oy = 1 1463 oy = 1
1111 x = 2 1464 x = 2
1112 y = 3 1465 y = 3
1113 w = 4 1466 w = 4
1124 } 1477 }
1125 OUTPUT: 1478 OUTPUT:
1126 RETVAL 1479 RETVAL
1127 1480
1128void 1481void
1129scroll (CFClient::Map self, int dx, int dy) 1482scroll (CFPlus::Map self, int dx, int dy)
1130 CODE: 1483 CODE:
1131{ 1484{
1132 if (dx > 0) 1485 if (dx > 0)
1133 map_blank (self, self->x, self->y, dx - 1, self->h); 1486 map_blank (self, self->x, self->y, dx, self->h);
1134 else if (dx < 0) 1487 else if (dx < 0)
1135 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1488 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1136 1489
1137 if (dy > 0) 1490 if (dy > 0)
1138 map_blank (self, self->x, self->y, self->w, dy - 1); 1491 map_blank (self, self->x, self->y, self->w, dy);
1139 else if (dy < 0) 1492 else if (dy < 0)
1140 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1493 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1141 1494
1142 self->ox += dx; self->x += dx; 1495 self->ox += dx; self->x += dx;
1143 self->oy += dy; self->y += dy; 1496 self->oy += dy; self->y += dy;
1144 1497
1145 while (self->y < 0) 1498 while (self->y < 0)
1150 self->y += MAP_EXTEND_Y; 1503 self->y += MAP_EXTEND_Y;
1151 } 1504 }
1152} 1505}
1153 1506
1154void 1507void
1155map1a_update (CFClient::Map self, SV *data_) 1508map1a_update (CFPlus::Map self, SV *data_, int extmap)
1156 CODE: 1509 CODE:
1157{ 1510{
1158 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1511 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1159 uint8_t *data_end = (uint8_t *)SvEND (data_); 1512 uint8_t *data_end = (uint8_t *)SvEND (data_);
1160 mapcell *cell; 1513 mapcell *cell;
1161 int x, y, flags; 1514 int x, y, flags;
1162 1515
1163 while (data < data_end) 1516 while (data < data_end - 1)
1164 { 1517 {
1165 flags = (data [0] << 8) + data [1]; data += 2; 1518 flags = (data [0] << 8) + data [1]; data += 2;
1166 1519
1167 x = ((flags >> 10) & 63) + self->x; 1520 x = self->x + ((flags >> 10) & 63);
1168 y = ((flags >> 4) & 63) + self->y; 1521 y = self->y + ((flags >> 4) & 63);
1169 1522
1170 cell = map_get_cell (self, x, y); 1523 cell = map_get_cell (self, x, y);
1171 1524
1172 if (flags & 15) 1525 if (flags & 15)
1173 { 1526 {
1174 if (cell->darkness < 0) 1527 if (!cell->darkness)
1175 { 1528 {
1529 memset (cell, 0, sizeof (*cell));
1176 cell->darkness = 0; 1530 cell->darkness = 256;
1177 cell->face [0] = 0;
1178 cell->face [1] = 0;
1179 cell->face [2] = 0;
1180 } 1531 }
1181 1532
1182 cell->darkness = flags & 8 ? *data++ : 255;
1183
1184 //TODO: don't trust server data to be in-range(!) 1533 //TODO: don't trust server data to be in-range(!)
1534
1535 if (flags & 8)
1536 {
1537 if (extmap)
1538 {
1539 uint8_t ext, cmd;
1540
1541 do
1542 {
1543 ext = *data++;
1544 cmd = ext & 0x3f;
1545
1546 if (cmd < 4)
1547 cell->darkness = 255 - ext * 64 + 1;
1548 else if (cmd == 5) // health
1549 {
1550 cell->stat_width = 1;
1551 cell->stat_hp = *data++;
1552 }
1553 else if (cmd == 6) // monster width
1554 cell->stat_width = *data++ + 1;
1555 else if (cmd == 0x47)
1556 {
1557 if (*data == 4)
1558 ; // decode player count
1559
1560 data += *data + 1;
1561 }
1562 else if (cmd == 8) // cell flags
1563 cell->flags = *data++;
1564 else if (ext & 0x40) // unknown, multibyte => skip
1565 data += *data + 1;
1566 else
1567 data++;
1568 }
1569 while (ext & 0x80);
1570 }
1571 else
1572 cell->darkness = *data++ + 1;
1573 }
1185 1574
1186 if (flags & 4) 1575 if (flags & 4)
1187 { 1576 {
1188 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1577 faceid face = (data [0] << 8) + data [1]; data += 2;
1578 need_facenum (self, face);
1579 cell->tile [0] = self->face2tile [face];
1189 } 1580 }
1190 1581
1191 if (flags & 2) 1582 if (flags & 2)
1192 { 1583 {
1193 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1584 faceid face = (data [0] << 8) + data [1]; data += 2;
1585 need_facenum (self, face);
1586 cell->tile [1] = self->face2tile [face];
1194 } 1587 }
1195 1588
1196 if (flags & 1) 1589 if (flags & 1)
1197 { 1590 {
1198 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1591 faceid face = (data [0] << 8) + data [1]; data += 2;
1592 need_facenum (self, face);
1593 cell->tile [2] = self->face2tile [face];
1199 } 1594 }
1200 } 1595 }
1201 else 1596 else
1202 cell->darkness = -1; 1597 cell->darkness = 0;
1203 } 1598 }
1204} 1599}
1205 1600
1206SV * 1601SV *
1207mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1602mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1208 CODE: 1603 CODE:
1209{ 1604{
1210 int x1, x; 1605 int x1, x;
1211 int y1, y; 1606 int y1, y;
1212 int z; 1607 int z;
1233 { 1628 {
1234 mapcell *cell = row->col + (x - row->c0); 1629 mapcell *cell = row->col + (x - row->c0);
1235 1630
1236 for (z = 0; z <= 0; z++) 1631 for (z = 0; z <= 0; z++)
1237 { 1632 {
1238 mapface face = cell->face [z];
1239
1240 if (face)
1241 {
1242 maptex tex = self->tex [face]; 1633 maptex tex = self->tex [cell->tile [z]];
1243 int a0 = 255 - tex.a; 1634 int a0 = 255 - tex.a;
1244 int a1 = tex.a; 1635 int a1 = tex.a;
1245 1636
1246 r = (r * a0 + tex.r * a1) / 255; 1637 r = (r * a0 + tex.r * a1) / 255;
1247 g = (g * a0 + tex.g * a1) / 255; 1638 g = (g * a0 + tex.g * a1) / 255;
1248 b = (b * a0 + tex.b * a1) / 255; 1639 b = (b * a0 + tex.b * a1) / 255;
1249 a = (a * a0 + tex.a * a1) / 255; 1640 a = (a * a0 + tex.a * a1) / 255;
1250 }
1251 } 1641 }
1252 } 1642 }
1253 1643
1254 *map++ = (r ) 1644 *map++ = (r )
1255 | (g << 8) 1645 | (g << 8)
1262} 1652}
1263 OUTPUT: 1653 OUTPUT:
1264 RETVAL 1654 RETVAL
1265 1655
1266void 1656void
1267draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1657draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1268 PPCODE: 1658 CODE:
1269{ 1659{
1270 int vx, vy; 1660 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1661 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1662 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1663 smooth_key skey;
1271 int x, y, z; 1664 int x, y, z;
1272 int last_name; 1665 int last_name;
1273 mapface face; 1666
1667 // thats current max. sorry.
1668 if (sw > 255) sw = 255;
1669 if (sh > 255) sh = 255;
1670
1671 // clear key, in case of extra padding
1672 memset (&skey, 0, sizeof (skey));
1673
1674 glColor4ub (255, 255, 255, 255);
1675
1676 glEnable (GL_BLEND);
1677 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1678 glEnable (GL_TEXTURE_2D);
1679 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1680
1681 glBegin (GL_QUADS);
1682
1683 last_name = 0;
1684
1685 mx += self->x;
1686 my += self->y;
1687
1688 // first pass: determine smooth_max
1689 // rather ugly, if you ask me
1690 // could also be stored inside mapcell and updated on change
1691 memset (smooth_max, 0, sizeof (smooth_max));
1692
1693 for (y = 0; y < sh; y++)
1694 if (0 <= y + my && y + my < self->rows)
1695 {
1696 maprow *row = self->row + (y + my);
1697
1698 for (x = 0; x < sw; x++)
1699 if (row->c0 <= x + mx && x + mx < row->c1)
1700 {
1701 mapcell *cell = row->col + (x + mx - row->c0);
1702
1703 smooth_max[x + 1][y + 1] =
1704 MAX (self->tex [cell->tile [0]].smoothlevel,
1705 MAX (self->tex [cell->tile [1]].smoothlevel,
1706 self->tex [cell->tile [2]].smoothlevel));
1707 }
1708 }
1709
1710 for (z = 0; z <= 2; z++)
1711 {
1712 memset (smooth_level, 0, sizeof (smooth_level));
1713
1714 for (y = 0; y < sh; y++)
1715 if (0 <= y + my && y + my < self->rows)
1716 {
1717 maprow *row = self->row + (y + my);
1718
1719 for (x = 0; x < sw; x++)
1720 if (row->c0 <= x + mx && x + mx < row->c1)
1721 {
1722 mapcell *cell = row->col + (x + mx - row->c0);
1723 tileid tile = cell->tile [z];
1724
1725 if (tile)
1726 {
1727 maptex tex = self->tex [tile];
1728 int px = (x + 1) * T - tex.w;
1729 int py = (y + 1) * T - tex.h;
1730
1731 // suppressing texture state switches here
1732 // is only moderately effective, but worth the extra effort
1733 if (last_name != tex.name)
1734 {
1735 if (!tex.name)
1736 tex = self->tex [2]; /* missing, replace by noface */
1737
1738 glEnd ();
1739 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1740 glBegin (GL_QUADS);
1741 }
1742
1743 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1744 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1745 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1746 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1747
1748 if (cell->flags && z == 2)
1749 {
1750 if (cell->flags & 1)
1751 {
1752 maptex tex = self->tex [1];
1753 int px = x * T + T * 2 / 32;
1754 int py = y * T - T * 6 / 32;
1755
1756 glEnd ();
1757 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1758 glBegin (GL_QUADS);
1759
1760 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1761 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1762 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1763 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1764 }
1765 }
1766
1767 // update smooth hash
1768 if (tex.smoothtile)
1769 {
1770 skey.tile = tex.smoothtile;
1771 skey.level = tex.smoothlevel;
1772
1773 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1774
1775 // add bits to current tile and all neighbours. skey.x|y is
1776 // shifted +1|+1 so we always stay positive.
1777
1778 // bits is ___n cccc CCCC bbbb
1779 // n do not draw borders&corners
1780 // c draw these corners, but...
1781 // C ... not these
1782 // b draw these borders
1783
1784 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1785 // ┃· ·· ·┃ ━━
1786
1787 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1788 // ·· ·· ·┏ ┓·
1789
1790 // full tile
1791 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1792
1793 // borders
1794 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1795 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1796 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1797 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1798
1799 // corners
1800 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1801 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1802 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1803 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1804 }
1805 }
1806 }
1807 }
1808
1809 // go through all smoothlevels, lowest to highest, then draw.
1810 // this is basically counting sort
1811 {
1812 int w, b;
1813
1814 for (w = 0; w < 256 / 32; ++w)
1815 {
1816 uint32_t smask = smooth_level [w];
1817 if (smask)
1818 for (b = 0; b < 32; ++b)
1819 if (smask & (((uint32_t)1) << b))
1820 {
1821 int level = (w << 5) | b;
1822 HE *he;
1823
1824 hv_iterinit (smooth);
1825 while ((he = hv_iternext (smooth)))
1826 {
1827 smooth_key *skey = (smooth_key *)HeKEY (he);
1828 IV bits = SvIVX (HeVAL (he));
1829
1830 if (!(bits & 0x1000)
1831 && skey->level == level
1832 && level > smooth_max [skey->x][skey->y])
1833 {
1834 maptex tex = self->tex [skey->tile];
1835 int px = (((int)skey->x) - 1) * T;
1836 int py = (((int)skey->y) - 1) * T;
1837 int border = bits & 15;
1838 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1839 float dx = tex.s * .0625f; // 16 images/row
1840 float dy = tex.t * .5f ; // 2 images/column
1841
1842 // this time naively avoiding texture state changes
1843 // save gobs of state changes.
1844 if (last_name != tex.name)
1845 {
1846 if (!tex.name)
1847 continue; // smoothing not yet available
1848
1849 glEnd ();
1850 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1851 glBegin (GL_QUADS);
1852 }
1853
1854 if (border)
1855 {
1856 float ox = border * dx;
1857
1858 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1859 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1860 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1861 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1862 }
1863
1864 if (corner)
1865 {
1866 float ox = corner * dx;
1867
1868 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1869 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1870 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1871 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1872 }
1873 }
1874 }
1875 }
1876 }
1877 }
1878
1879 hv_clear (smooth);
1880 }
1881
1882 glEnd ();
1883
1884 glDisable (GL_TEXTURE_2D);
1885 glDisable (GL_BLEND);
1886
1887 // top layer: overlays such as the health bar
1888 for (y = 0; y < sh; y++)
1889 if (0 <= y + my && y + my < self->rows)
1890 {
1891 maprow *row = self->row + (y + my);
1892
1893 for (x = 0; x < sw; x++)
1894 if (row->c0 <= x + mx && x + mx < row->c1)
1895 {
1896 mapcell *cell = row->col + (x + mx - row->c0);
1897
1898 int px = x * T;
1899 int py = y * T;
1900
1901 if (cell->stat_hp)
1902 {
1903 int width = cell->stat_width * T;
1904 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1905
1906 glColor3ub (0, 0, 0);
1907 glRectf (px + 1, py - thick - 2,
1908 px + width - 1, py);
1909
1910 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1911 glRectf (px + 2,
1912 py - thick - 1,
1913 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1914 }
1915 }
1916 }
1917}
1918
1919void
1920draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1921 CODE:
1922{
1923 static float color[16][3] = {
1924 { 0.00F, 0.00F, 0.00F },
1925 { 1.00F, 1.00F, 1.00F },
1926 { 0.00F, 0.00F, 0.55F },
1927 { 1.00F, 0.00F, 0.00F },
1928
1929 { 1.00F, 0.54F, 0.00F },
1930 { 0.11F, 0.56F, 1.00F },
1931 { 0.93F, 0.46F, 0.00F },
1932 { 0.18F, 0.54F, 0.34F },
1933
1934 { 0.56F, 0.73F, 0.56F },
1935 { 0.80F, 0.80F, 0.80F },
1936 { 0.55F, 0.41F, 0.13F },
1937 { 0.99F, 0.77F, 0.26F },
1938
1939 { 0.74F, 0.65F, 0.41F },
1940
1941 { 0.00F, 1.00F, 1.00F },
1942 { 1.00F, 0.00F, 1.00F },
1943 { 1.00F, 1.00F, 0.00F },
1944 };
1945
1946 int x, y;
1947
1948 glEnable (GL_TEXTURE_2D);
1949 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1950 glEnable (GL_BLEND);
1951 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1952 glBegin (GL_QUADS);
1953
1954 for (y = 0; y < h; y++)
1955 for (x = 0; x < w; x++)
1956 {
1957 unsigned char m = data [x + y * w];
1958
1959 if (m)
1960 {
1961 float *c = color [m & 15];
1962
1963 float tx1 = m & 0x40 ? 0.5 : 0.;
1964 float tx2 = tx1 + 0.5;
1965
1966 glColor4f (c[0], c[1], c[2], 0.75);
1967 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1968 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1969 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1970 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1971 }
1972 }
1973
1974 glEnd ();
1975 glDisable (GL_BLEND);
1976 glDisable (GL_TEXTURE_2D);
1977}
1978
1979void
1980fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1981 PPCODE:
1982{
1983 int x, y;
1274 int sw4 = (sw + 3) & ~3; 1984 int sw4 = (sw + 3) & ~3;
1275 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1985 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1276 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1986 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1277 1987
1278 memset (darkness, 255, sw4 * sh); 1988 memset (darkness, 255, sw4 * sh);
1279 SvPOK_only (darkness_sv); 1989 SvPOK_only (darkness_sv);
1280 SvCUR_set (darkness_sv, sw4 * sh); 1990 SvCUR_set (darkness_sv, sw4 * sh);
1281 1991
1282 vx = self->x + (self->w - sw) / 2 - shift_x; 1992 mx += self->x;
1283 vy = self->y + (self->h - sh) / 2 - shift_y; 1993 my += self->y;
1284 1994
1285 /*
1286 int vx = self->vx = self->w >= sw
1287 ? self->x + (self->w - sw) / 2
1288 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1289
1290 int vy = self->vy = self->h >= sh
1291 ? self->y + (self->h - sh) / 2
1292 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1293 */
1294
1295 glColor4ub (255, 255, 255, 255);
1296
1297 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1298 glEnable (GL_BLEND);
1299 glEnable (GL_TEXTURE_2D);
1300 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1301
1302 glBegin (GL_QUADS);
1303
1304 last_name = 0;
1305
1306 for (z = 0; z < 3; z++)
1307 for (y = 0; y < sh; y++) 1995 for (y = 0; y < sh; y++)
1308 if (0 <= y + vy && y + vy < self->rows) 1996 if (0 <= y + my && y + my < self->rows)
1309 { 1997 {
1310 maprow *row = self->row + (y + vy); 1998 maprow *row = self->row + (y + my);
1311 1999
1312 for (x = 0; x < sw; x++) 2000 for (x = 0; x < sw; x++)
1313 if (row->c0 <= x + vx && x + vx < row->c1) 2001 if (row->c0 <= x + mx && x + mx < row->c1)
1314 { 2002 {
1315 mapcell *cell = row->col + (x + vx - row->c0); 2003 mapcell *cell = row->col + (x + mx - row->c0);
1316 2004
1317 darkness[y * sw4 + x] = cell->darkness < 0 2005 darkness[y * sw4 + x] = cell->darkness
2006 ? 255 - (cell->darkness - 1)
1318 ? 255 - FOW_DARKNESS 2007 : 255 - FOW_DARKNESS;
1319 : 255 - cell->darkness; 2008 }
2009 }
1320 2010
1321 face = cell->face [z]; 2011 if (smoothing)
2012 {
2013 SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
2014 uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
1322 2015
1323 if (face) 2016 SvPOK_only (darkness2_sv);
2017 SvCUR_set (darkness2_sv, sw4 * sh);
2018
2019 for (y = 0; y < sh; ++y)
2020 for (x = 0; x < sw4; ++x)
2021 {
2022 float *f = (float *)matrix;
2023 int dx, dy;
2024 float sum = 0.f;
2025
2026 for (dy = -1; dy <= 1; ++dy)
2027 for (dx = -1; dx <= 1; ++dx)
1324 { 2028 {
1325 maptex tex = self->tex [face]; 2029 unsigned int x2 = x + dx;
2030 unsigned int y2 = y + dy;
1326 2031
1327 int px = (x + 1) * 32 - tex.w; 2032 sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
1328 int py = (y + 1) * 32 - tex.h;
1329
1330 if (last_name != tex.name)
1331 {
1332 glEnd ();
1333 last_name = tex.name;
1334 glBindTexture (GL_TEXTURE_2D, last_name);
1335 glBegin (GL_QUADS);
1336 }
1337
1338 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1339 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1340 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1341 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1342 } 2033 }
1343 } 2034
2035 darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
1344 } 2036 }
1345 2037
1346 glEnd (); 2038 darkness_sv = darkness2_sv;
1347 2039 }
1348 glDisable (GL_TEXTURE_2D);
1349 glDisable (GL_BLEND);
1350 2040
1351 EXTEND (SP, 3); 2041 EXTEND (SP, 3);
1352 PUSHs (sv_2mortal (newSViv (sw4))); 2042 PUSHs (sv_2mortal (newSViv (sw4)));
1353 PUSHs (sv_2mortal (newSViv (sh))); 2043 PUSHs (sv_2mortal (newSViv (sh)));
1354 PUSHs (darkness_sv); 2044 PUSHs (darkness_sv);
1355} 2045}
1356 2046
1357SV * 2047SV *
1358get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2048get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1359 CODE: 2049 CODE:
1360{ 2050{
1361 int x, y, x1, y1; 2051 int x, y, x1, y1;
1362 SV *data_sv = newSV (w * h * 7 + 5); 2052 SV *data_sv = newSV (w * h * 7 + 5);
1363 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2053 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1388 if (row && row->c0 <= x && x < row->c1) 2078 if (row && row->c0 <= x && x < row->c1)
1389 { 2079 {
1390 mapcell *cell = row->col + (x - row->c0); 2080 mapcell *cell = row->col + (x - row->c0);
1391 uint8_t flags = 0; 2081 uint8_t flags = 0;
1392 2082
1393 if (cell->face [0]) flags |= 1; 2083 if (cell->tile [0]) flags |= 1;
1394 if (cell->face [1]) flags |= 2; 2084 if (cell->tile [1]) flags |= 2;
1395 if (cell->face [2]) flags |= 4; 2085 if (cell->tile [2]) flags |= 4;
1396 2086
1397 *data++ = flags; 2087 *data++ = flags;
1398 2088
1399 if (flags & 1) 2089 if (flags & 1)
1400 { 2090 {
2091 tileid tile = cell->tile [0];
1401 *data++ = cell->face [0] >> 8; 2092 *data++ = tile >> 8;
1402 *data++ = cell->face [0]; 2093 *data++ = tile;
1403 } 2094 }
1404 2095
1405 if (flags & 2) 2096 if (flags & 2)
1406 { 2097 {
2098 tileid tile = cell->tile [1];
1407 *data++ = cell->face [1] >> 8; 2099 *data++ = tile >> 8;
1408 *data++ = cell->face [1]; 2100 *data++ = tile;
1409 } 2101 }
1410 2102
1411 if (flags & 4) 2103 if (flags & 4)
1412 { 2104 {
2105 tileid tile = cell->tile [2];
1413 *data++ = cell->face [2] >> 8; 2106 *data++ = tile >> 8;
1414 *data++ = cell->face [2]; 2107 *data++ = tile;
1415 } 2108 }
1416 } 2109 }
1417 else 2110 else
1418 *data++ = 0; 2111 *data++ = 0;
1419 } 2112 }
1425} 2118}
1426 OUTPUT: 2119 OUTPUT:
1427 RETVAL 2120 RETVAL
1428 2121
1429void 2122void
1430set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2123set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1431 PPCODE: 2124 PPCODE:
1432{ 2125{
1433 int x, y, z; 2126 int x, y, z;
1434 int w, h; 2127 int w, h;
1435 int x1, y1; 2128 int x1, y1;
1459 { 2152 {
1460 uint8_t flags = *data++; 2153 uint8_t flags = *data++;
1461 2154
1462 if (flags) 2155 if (flags)
1463 { 2156 {
1464 mapface face[3] = { 0, 0, 0 };
1465
1466 mapcell *cell = row_get_cell (row, x); 2157 mapcell *cell = row_get_cell (row, x);
2158 tileid tile[3] = { 0, 0, 0 };
1467 2159
1468 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2160 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1469 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2161 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1470 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2162 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1471 2163
1472 if (cell->darkness <= 0) 2164 if (cell->darkness == 0)
1473 { 2165 {
1474 cell->darkness = -1; 2166 cell->darkness = 0;
1475 2167
1476 for (z = 0; z <= 2; z++) 2168 for (z = 0; z <= 2; z++)
1477 { 2169 {
1478 cell->face[z] = face[z]; 2170 tileid t = tile [z];
1479 2171
1480 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2172 if (t >= self->texs || (t && !self->tex [t].name))
2173 {
1481 XPUSHs (sv_2mortal (newSViv (face[z]))); 2174 XPUSHs (sv_2mortal (newSViv (t)));
2175 need_texid (self, t);
2176 }
2177
2178 cell->tile [z] = t;
1482 } 2179 }
1483 } 2180 }
1484 } 2181 }
1485 } 2182 }
1486 } 2183 }
1487} 2184}
1488 2185
1489MODULE = CFClient PACKAGE = CFClient::MixChunk 2186MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1490 2187
1491CFClient::MixChunk 2188CFPlus::MixChunk
1492new_from_file (SV *class, char *path) 2189new_from_file (SV *class, char *path)
1493 CODE: 2190 CODE:
1494 RETVAL = Mix_LoadWAV (path); 2191 RETVAL = Mix_LoadWAV (path);
1495 OUTPUT: 2192 OUTPUT:
1496 RETVAL 2193 RETVAL
1497 2194
1498void 2195void
1499DESTROY (CFClient::MixChunk self) 2196DESTROY (CFPlus::MixChunk self)
1500 CODE: 2197 CODE:
1501 Mix_FreeChunk (self); 2198 Mix_FreeChunk (self);
1502 2199
1503int 2200int
1504volume (CFClient::MixChunk self, int volume = -1) 2201volume (CFPlus::MixChunk self, int volume = -1)
1505 CODE: 2202 CODE:
1506 RETVAL = Mix_VolumeChunk (self, volume); 2203 RETVAL = Mix_VolumeChunk (self, volume);
1507 OUTPUT: 2204 OUTPUT:
1508 RETVAL 2205 RETVAL
1509 2206
1510int 2207int
1511play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2208play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1512 CODE: 2209 CODE:
1513 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2210 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1514 OUTPUT: 2211 OUTPUT:
1515 RETVAL 2212 RETVAL
1516 2213
1517MODULE = CFClient PACKAGE = CFClient::MixMusic 2214MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1518 2215
1519int 2216int
1520volume (int volume = -1) 2217volume (int volume = -1)
1521 CODE: 2218 CODE:
1522 RETVAL = Mix_VolumeMusic (volume); 2219 RETVAL = Mix_VolumeMusic (volume);
1523 OUTPUT: 2220 OUTPUT:
1524 RETVAL 2221 RETVAL
1525 2222
2223int
2224fade_out (int ms)
2225 CODE:
2226 RETVAL = Mix_FadeOutMusic (ms);
2227 OUTPUT:
2228 RETVAL
2229
1526CFClient::MixMusic 2230CFPlus::MixMusic
1527new_from_file (SV *class, char *path) 2231new_from_file (SV *class, char *path)
1528 CODE: 2232 CODE:
1529 RETVAL = Mix_LoadMUS (path); 2233 RETVAL = Mix_LoadMUS (path);
1530 OUTPUT: 2234 OUTPUT:
1531 RETVAL 2235 RETVAL
1532 2236
1533void 2237void
1534DESTROY (CFClient::MixMusic self) 2238DESTROY (CFPlus::MixMusic self)
1535 CODE: 2239 CODE:
1536 Mix_FreeMusic (self); 2240 Mix_FreeMusic (self);
1537 2241
1538int 2242int
1539play (CFClient::MixMusic self, int loops = -1) 2243play (CFPlus::MixMusic self, int loops = -1)
1540 CODE: 2244 CODE:
1541 RETVAL = Mix_PlayMusic (self, loops); 2245 RETVAL = Mix_PlayMusic (self, loops);
1542 OUTPUT: 2246 OUTPUT:
1543 RETVAL 2247 RETVAL
1544 2248
2249int
2250fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2251 CODE:
2252 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2253 OUTPUT:
2254 RETVAL
2255
1545MODULE = CFClient PACKAGE = CFClient::OpenGL 2256MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1546 2257
1547BOOT: 2258BOOT:
1548{ 2259{
1549 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2260 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1550 static const struct { 2261 static const struct {
1551 const char *name; 2262 const char *name;
1552 IV iv; 2263 IV iv;
1553 } *civ, const_iv[] = { 2264 } *civ, const_iv[] = {
1554# define const_iv(name) { # name, (IV)name } 2265# define const_iv(name) { # name, (IV)name }
2266 const_iv (GL_VENDOR),
2267 const_iv (GL_VERSION),
2268 const_iv (GL_EXTENSIONS),
1555 const_iv (GL_COLOR_MATERIAL), 2269 const_iv (GL_COLOR_MATERIAL),
1556 const_iv (GL_SMOOTH), 2270 const_iv (GL_SMOOTH),
1557 const_iv (GL_FLAT), 2271 const_iv (GL_FLAT),
1558 const_iv (GL_DITHER), 2272 const_iv (GL_DITHER),
1559 const_iv (GL_BLEND), 2273 const_iv (GL_BLEND),
1561 const_iv (GL_SCISSOR_TEST), 2275 const_iv (GL_SCISSOR_TEST),
1562 const_iv (GL_DEPTH_TEST), 2276 const_iv (GL_DEPTH_TEST),
1563 const_iv (GL_ALPHA_TEST), 2277 const_iv (GL_ALPHA_TEST),
1564 const_iv (GL_NORMALIZE), 2278 const_iv (GL_NORMALIZE),
1565 const_iv (GL_RESCALE_NORMAL), 2279 const_iv (GL_RESCALE_NORMAL),
2280 const_iv (GL_FRONT),
2281 const_iv (GL_BACK),
1566 const_iv (GL_AND), 2282 const_iv (GL_AND),
1567 const_iv (GL_ONE), 2283 const_iv (GL_ONE),
1568 const_iv (GL_ZERO), 2284 const_iv (GL_ZERO),
1569 const_iv (GL_SRC_ALPHA), 2285 const_iv (GL_SRC_ALPHA),
1570 const_iv (GL_DST_ALPHA), 2286 const_iv (GL_DST_ALPHA),
1571 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2287 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1572 const_iv (GL_ONE_MINUS_DST_ALPHA), 2288 const_iv (GL_ONE_MINUS_DST_ALPHA),
1573 const_iv (GL_SRC_ALPHA_SATURATE), 2289 const_iv (GL_SRC_ALPHA_SATURATE),
1574 const_iv (GL_RGB), 2290 const_iv (GL_RGB),
1575 const_iv (GL_RGBA), 2291 const_iv (GL_RGBA),
2292 const_iv (GL_RGBA4),
2293 const_iv (GL_RGBA8),
2294 const_iv (GL_RGB5_A1),
1576 const_iv (GL_UNSIGNED_BYTE), 2295 const_iv (GL_UNSIGNED_BYTE),
1577 const_iv (GL_UNSIGNED_SHORT), 2296 const_iv (GL_UNSIGNED_SHORT),
1578 const_iv (GL_UNSIGNED_INT), 2297 const_iv (GL_UNSIGNED_INT),
1579 const_iv (GL_ALPHA), 2298 const_iv (GL_ALPHA),
1580 const_iv (GL_INTENSITY), 2299 const_iv (GL_INTENSITY),
1581 const_iv (GL_LUMINANCE), 2300 const_iv (GL_LUMINANCE),
1582 const_iv (GL_LUMINANCE_ALPHA), 2301 const_iv (GL_LUMINANCE_ALPHA),
1583 const_iv (GL_FLOAT), 2302 const_iv (GL_FLOAT),
1584 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2303 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1585 const_iv (GL_COMPILE), 2304 const_iv (GL_COMPILE),
2305 const_iv (GL_PROXY_TEXTURE_1D),
2306 const_iv (GL_PROXY_TEXTURE_2D),
1586 const_iv (GL_TEXTURE_1D), 2307 const_iv (GL_TEXTURE_1D),
1587 const_iv (GL_TEXTURE_2D), 2308 const_iv (GL_TEXTURE_2D),
1588 const_iv (GL_TEXTURE_ENV), 2309 const_iv (GL_TEXTURE_ENV),
1589 const_iv (GL_TEXTURE_MAG_FILTER), 2310 const_iv (GL_TEXTURE_MAG_FILTER),
1590 const_iv (GL_TEXTURE_MIN_FILTER), 2311 const_iv (GL_TEXTURE_MIN_FILTER),
1612 const_iv (GL_SEPARABLE_2D), 2333 const_iv (GL_SEPARABLE_2D),
1613 const_iv (GL_CONVOLUTION_2D), 2334 const_iv (GL_CONVOLUTION_2D),
1614 const_iv (GL_CONVOLUTION_BORDER_MODE), 2335 const_iv (GL_CONVOLUTION_BORDER_MODE),
1615 const_iv (GL_CONSTANT_BORDER), 2336 const_iv (GL_CONSTANT_BORDER),
1616 const_iv (GL_LINES), 2337 const_iv (GL_LINES),
2338 const_iv (GL_LINE_STRIP),
1617 const_iv (GL_LINE_LOOP), 2339 const_iv (GL_LINE_LOOP),
1618 const_iv (GL_QUADS), 2340 const_iv (GL_QUADS),
1619 const_iv (GL_QUAD_STRIP), 2341 const_iv (GL_QUAD_STRIP),
1620 const_iv (GL_TRIANGLES), 2342 const_iv (GL_TRIANGLES),
1621 const_iv (GL_TRIANGLE_STRIP), 2343 const_iv (GL_TRIANGLE_STRIP),
1629# undef const_iv 2351# undef const_iv
1630 }; 2352 };
1631 2353
1632 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2354 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1633 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2355 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2356
2357 texture_av = newAV ();
2358 AvREAL_off (texture_av);
1634} 2359}
1635 2360
1636char * 2361char *
1637gl_vendor () 2362gl_vendor ()
1638 CODE: 2363 CODE:
1652 CODE: 2377 CODE:
1653 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2378 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1654 OUTPUT: 2379 OUTPUT:
1655 RETVAL 2380 RETVAL
1656 2381
2382const char *glGetString (GLenum pname)
2383
2384GLint glGetInteger (GLenum pname)
2385 CODE:
2386 glGetIntegerv (pname, &RETVAL);
2387 OUTPUT:
2388 RETVAL
2389
2390GLdouble glGetDouble (GLenum pname)
2391 CODE:
2392 glGetDoublev (pname, &RETVAL);
2393 OUTPUT:
2394 RETVAL
2395
1657int glGetError () 2396int glGetError ()
2397
2398void glFinish ()
1658 2399
1659void glClear (int mask) 2400void glClear (int mask)
1660 2401
1661void glClearColor (float r, float g, float b, float a = 1.0) 2402void glClearColor (float r, float g, float b, float a = 1.0)
1662 PROTOTYPE: @ 2403 PROTOTYPE: @
1686void glPushMatrix () 2427void glPushMatrix ()
1687 2428
1688void glPopMatrix () 2429void glPopMatrix ()
1689 2430
1690void glLoadIdentity () 2431void glLoadIdentity ()
2432
2433void glDrawBuffer (int buffer)
2434
2435void glReadBuffer (int buffer)
1691 2436
1692# near_ and far_ are due to microsofts buggy "c" compiler 2437# near_ and far_ are due to microsofts buggy "c" compiler
1693void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2438void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1694 2439
1695# near_ and far_ are due to microsofts buggy "c" compiler 2440# near_ and far_ are due to microsofts buggy "c" compiler
1725 r *= a; 2470 r *= a;
1726 g *= a; 2471 g *= a;
1727 b *= a; 2472 b *= a;
1728 } 2473 }
1729 // microsoft visual "c" rounds instead of truncating... 2474 // microsoft visual "c" rounds instead of truncating...
1730 glColor4ub (MIN ((int)(r * 256.f), 255), 2475 glColor4f (r, g, b, a);
1731 MIN ((int)(g * 256.f), 255),
1732 MIN ((int)(b * 256.f), 255),
1733 MIN ((int)(a * 256.f), 255));
1734 2476
1735void glInterleavedArrays (int format, int stride, char *data) 2477void glInterleavedArrays (int format, int stride, char *data)
1736 2478
1737void glDrawElements (int mode, int count, int type, char *indices) 2479void glDrawElements (int mode, int count, int type, char *indices)
1738 2480
1780 2522
1781void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2523void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1782 2524
1783void glDrawPixels (int width, int height, int format, int type, char *pixels) 2525void glDrawPixels (int width, int height, int format, int type, char *pixels)
1784 2526
2527void glPixelZoom (float x, float y)
2528
1785void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2529void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1786 2530
1787int glGenTexture () 2531int glGenTexture ()
1788 CODE: 2532 CODE:
1789{ 2533 RETVAL = gen_texture ();
1790 GLuint name;
1791 glGenTextures (1, &name);
1792 RETVAL = name;
1793}
1794 OUTPUT: 2534 OUTPUT:
1795 RETVAL 2535 RETVAL
1796 2536
1797void glDeleteTexture (int name) 2537void glDeleteTexture (int name)
1798 CODE: 2538 CODE:
1799{
1800 GLuint name_ = name;
1801 glDeleteTextures (1, &name_); 2539 del_texture (name);
1802} 2540
1803
1804int glGenList () 2541int glGenList ()
1805 CODE: 2542 CODE:
1806 RETVAL = glGenLists (1); 2543 RETVAL = glGenLists (1);
1807 OUTPUT: 2544 OUTPUT:
1808 RETVAL 2545 RETVAL
1815 2552
1816void glEndList () 2553void glEndList ()
1817 2554
1818void glCallList (int list) 2555void glCallList (int list)
1819 2556
1820

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines