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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines