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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines