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.197 by root, Sun Jul 15 21:08:40 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
513 664
514char * 665char *
515SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
516 667
517void 668void
518SDL_PollEvent () 669poll_events ()
519 PPCODE: 670 PPCODE:
520{ 671{
521 SDL_Event ev; 672 SDL_Event ev;
522 673
523 while (SDL_PollEvent (&ev)) 674 SDL_PumpEvents ();
675 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
524 { 676 {
525 HV *hv = newHV (); 677 HV *hv = newHV ();
526 hv_store (hv, "type", 4, newSViv (ev.type), 0); 678 hv_store (hv, "type", 4, newSViv (ev.type), 0);
527 679
528 switch (ev.type) 680 switch (ev.type)
530 case SDL_KEYDOWN: 682 case SDL_KEYDOWN:
531 case SDL_KEYUP: 683 case SDL_KEYUP:
532 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 684 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
533 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 685 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
534 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 686 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
687 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
535 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 688 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
536 break; 689 break;
537 690
538 case SDL_ACTIVEEVENT: 691 case SDL_ACTIVEEVENT:
539 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 692 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
540 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 693 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
541 break; 694 break;
542 695
543 case SDL_MOUSEMOTION: 696 case SDL_MOUSEMOTION:
697 {
698 int state = ev.motion.state;
699 int x = ev.motion.x;
700 int y = ev.motion.y;
701 int xrel = ev.motion.xrel;
702 int yrel = ev.motion.yrel;
703
704 /* do simplistic event compression */
705 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
706 && state == ev.motion.state)
707 {
708 xrel += ev.motion.xrel;
709 yrel += ev.motion.yrel;
710 x = ev.motion.x;
711 y = ev.motion.y;
712 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
713 }
714
544 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 715 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
545
546 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 716 hv_store (hv, "state", 5, newSViv (state), 0);
547 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 717 hv_store (hv, "x", 1, newSViv (x), 0);
548 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 718 hv_store (hv, "y", 1, newSViv (y), 0);
549 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 719 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
550 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 720 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
721 }
551 break; 722 break;
552 723
553 case SDL_MOUSEBUTTONDOWN: 724 case SDL_MOUSEBUTTONDOWN:
554 case SDL_MOUSEBUTTONUP: 725 case SDL_MOUSEBUTTONUP:
555 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 726 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
565 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 736 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
566 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 737 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
567 break; 738 break;
568 } 739 }
569 740
570 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 741 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
571 } 742 }
572} 743}
573 744
574int 745int
575Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 746Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
584Mix_AllocateChannels (int numchans = -1) 755Mix_AllocateChannels (int numchans = -1)
585 756
586void 757void
587lowdelay (int fd, int val = 1) 758lowdelay (int fd, int val = 1)
588 CODE: 759 CODE:
760 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
761
762void
763win32_proxy_info ()
764 PPCODE:
765{
589#ifndef _WIN32 766#ifdef _WIN32
590 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 767 char buffer[2048];
768 DWORD buflen;
769
770 EXTEND (SP, 3);
771
772 buflen = sizeof (buffer);
773 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
774 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
775 {
776 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
777
778 buflen = sizeof (buffer);
779 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
780 {
781 PUSHs (newSVpv (buffer, 0));
782
783 buflen = sizeof (buffer);
784 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
785 PUSHs (newSVpv (buffer, 0));
786 }
787 }
591#endif 788#endif
789}
592 790
593void 791void
594add_font (char *file) 792add_font (char *file)
595 CODE: 793 CODE:
596 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 794 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
597#ifdef _WIN32
598 // cairo... sigh... requires win2000
599 AddFontResourceEx (file, FR_PRIVATE, 0);
600#endif
601 795
602void 796void
603load_image_inline (SV *image_) 797load_image_inline (SV *image_)
604 ALIAS: 798 ALIAS:
605 load_image_file = 1 799 load_image_file = 1
647 841
648 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 842 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
649 843
650 assert (surface2->pitch == surface2->w * 4); 844 assert (surface2->pitch == surface2->w * 4);
651 845
846 SDL_LockSurface (surface2);
652 EXTEND (SP, 5); 847 EXTEND (SP, 6);
653 PUSHs (sv_2mortal (newSViv (surface2->w))); 848 PUSHs (sv_2mortal (newSViv (surface2->w)));
654 PUSHs (sv_2mortal (newSViv (surface2->h))); 849 PUSHs (sv_2mortal (newSViv (surface2->h)));
655 SDL_LockSurface (surface2);
656 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 850 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))); 851 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
659 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 852 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
660 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 853 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
854 SDL_UnlockSurface (surface2);
661 855
662 SDL_FreeSurface (surface); 856 SDL_FreeSurface (surface);
663 SDL_FreeSurface (surface2); 857 SDL_FreeSurface (surface2);
664} 858}
665 859
701 CODE: 895 CODE:
702 fprintf (stderr, "FATAL: %s\n", message); 896 fprintf (stderr, "FATAL: %s\n", message);
703#ifdef _WIN32 897#ifdef _WIN32
704 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 898 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
705#endif 899#endif
706 exit (1); 900 _exit (1);
707 901
902void
903_exit (int retval = 0)
904 CODE:
905#ifdef WIN32
906 ExitThread (retval); // unclean, please beam me up
907#else
908 _exit (retval);
909#endif
910
911void
912debug ()
913 CODE:
914{
915#if DEBUG
916 VALGRIND_DO_LEAK_CHECK;
917#endif
918}
919
708MODULE = CFClient PACKAGE = CFClient::Font 920MODULE = CFPlus PACKAGE = CFPlus::Font
709 921
710CFClient::Font 922CFPlus::Font
711new_from_file (SV *class, char *path, int id = 0) 923new_from_file (SV *class, char *path, int id = 0)
712 CODE: 924 CODE:
713{ 925{
714 int count; 926 int count;
715 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 927 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
718} 930}
719 OUTPUT: 931 OUTPUT:
720 RETVAL 932 RETVAL
721 933
722void 934void
723DESTROY (CFClient::Font self) 935DESTROY (CFPlus::Font self)
724 CODE: 936 CODE:
725 pango_font_description_free (self); 937 pango_font_description_free (self);
726 938
727void 939void
728make_default (CFClient::Font self) 940make_default (CFPlus::Font self)
729 CODE: 941 CODE:
730 default_font = self; 942 default_font = self;
731 943
732MODULE = CFClient PACKAGE = CFClient::Layout 944MODULE = CFPlus PACKAGE = CFPlus::Layout
733 945
734CFClient::Layout 946void
735new (SV *class, int rgba = 0) 947reset_glyph_cache ()
948 CODE:
949 tc_clear ();
950
951CFPlus::Layout
952new (SV *class)
736 CODE: 953 CODE:
737 New (0, RETVAL, 1, struct cf_layout); 954 New (0, RETVAL, 1, struct cf_layout);
738 955
739 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 956 RETVAL->pl = pango_layout_new (opengl_context);
740 RETVAL->rgba = rgba;
741 RETVAL->r = 1.; 957 RETVAL->r = 1.;
742 RETVAL->g = 1.; 958 RETVAL->g = 1.;
743 RETVAL->b = 1.; 959 RETVAL->b = 1.;
744 RETVAL->a = 1.; 960 RETVAL->a = 1.;
745 RETVAL->base_height = MIN_FONT_HEIGHT; 961 RETVAL->base_height = MIN_FONT_HEIGHT;
749 layout_update_font (RETVAL); 965 layout_update_font (RETVAL);
750 OUTPUT: 966 OUTPUT:
751 RETVAL 967 RETVAL
752 968
753void 969void
754DESTROY (CFClient::Layout self) 970DESTROY (CFPlus::Layout self)
755 CODE: 971 CODE:
756 g_object_unref (self->pl); 972 g_object_unref (self->pl);
757 Safefree (self); 973 Safefree (self);
758 974
975void
976set_text (CFPlus::Layout self, SV *text_)
977 CODE:
978{
979 STRLEN textlen;
980 char *text = SvPVutf8 (text_, textlen);
981
982 pango_layout_set_text (self->pl, text, textlen);
983}
984
985void
986set_markup (CFPlus::Layout self, SV *text_)
987 CODE:
988{
989 STRLEN textlen;
990 char *text = SvPVutf8 (text_, textlen);
991
992 pango_layout_set_markup (self->pl, text, textlen);
993}
994
995void
996set_shapes (CFPlus::Layout self, ...)
997 CODE:
998{
999 PangoAttrList *attrs = 0;
1000 const char *text = pango_layout_get_text (self->pl);
1001 const char *pos = text;
1002 int arg = 4;
1003
1004 while (arg < items && (pos = strstr (pos, OBJ_STR)))
1005 {
1006 PangoRectangle inkrect, rect;
1007 PangoAttribute *attr;
1008
1009 int x = SvIV (ST (arg - 3));
1010 int y = SvIV (ST (arg - 2));
1011 int w = SvIV (ST (arg - 1));
1012 int h = SvIV (ST (arg ));
1013
1014 inkrect.x = 0;
1015 inkrect.y = 0;
1016 inkrect.width = 0;
1017 inkrect.height = 0;
1018
1019 rect.x = x * PANGO_SCALE;
1020 rect.y = y * PANGO_SCALE;
1021 rect.width = w * PANGO_SCALE;
1022 rect.height = h * PANGO_SCALE;
1023
1024 if (!attrs)
1025 attrs = pango_layout_get_attributes (self->pl);
1026
1027 attr = pango_attr_shape_new (&inkrect, &rect);
1028 attr->start_index = pos - text;
1029 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
1030 pango_attr_list_insert (attrs, attr);
1031
1032 arg += 4;
1033 pos += sizeof (OBJ_STR) - 1;
1034 }
1035
1036 if (attrs)
1037 pango_layout_set_attributes (self->pl, attrs);
1038}
1039
1040void
1041get_shapes (CFPlus::Layout self)
1042 PPCODE:
1043{
1044 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1045
1046 do
1047 {
1048 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
1049
1050 if (run && shape_attr_p (run))
1051 {
1052 PangoRectangle extents;
1053 pango_layout_iter_get_run_extents (iter, 0, &extents);
1054
1055 EXTEND (SP, 2);
1056 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
1057 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
1058 }
1059 }
1060 while (pango_layout_iter_next_run (iter));
1061
1062 pango_layout_iter_free (iter);
1063}
1064
759int 1065int
760is_rgba (CFClient::Layout self) 1066has_wrapped (CFPlus::Layout self)
761 CODE: 1067 CODE:
762 RETVAL = self->rgba; 1068{
1069 int lines = 1;
1070 const char *text = pango_layout_get_text (self->pl);
1071
1072 while (*text)
1073 lines += *text++ == '\n';
1074
1075 RETVAL = lines < pango_layout_get_line_count (self->pl);
1076}
763 OUTPUT: 1077 OUTPUT:
764 RETVAL 1078 RETVAL
765 1079
766void
767set_text (CFClient::Layout self, SV *text_)
768 CODE:
769{
770 STRLEN textlen;
771 char *text = SvPVutf8 (text_, textlen);
772
773 pango_layout_set_text (self->pl, text, textlen);
774}
775
776void
777set_markup (CFClient::Layout self, SV *text_)
778 CODE:
779{
780 STRLEN textlen;
781 char *text = SvPVutf8 (text_, textlen);
782
783 pango_layout_set_markup (self->pl, text, textlen);
784}
785
786SV * 1080SV *
787get_text (CFClient::Layout self) 1081get_text (CFPlus::Layout self)
788 CODE: 1082 CODE:
789 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1083 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
790 sv_utf8_decode (RETVAL); 1084 sv_utf8_decode (RETVAL);
791 OUTPUT: 1085 OUTPUT:
792 RETVAL 1086 RETVAL
793 1087
794void 1088void
795set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1089set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
796 CODE: 1090 CODE:
797 self->r = r; 1091 self->r = r;
798 self->g = g; 1092 self->g = g;
799 self->b = b; 1093 self->b = b;
800 self->a = a; 1094 self->a = a;
801 1095
802void 1096void
803set_font (CFClient::Layout self, CFClient::Font font = 0) 1097set_font (CFPlus::Layout self, CFPlus::Font font = 0)
804 CODE: 1098 CODE:
805 if (self->font != font) 1099 if (self->font != font)
806 { 1100 {
807 self->font = font; 1101 self->font = font;
808 layout_update_font (self); 1102 layout_update_font (self);
809 } 1103 }
810 1104
811void 1105void
812set_height (CFClient::Layout self, int base_height) 1106set_height (CFPlus::Layout self, int base_height)
813 CODE: 1107 CODE:
814 if (self->base_height != base_height) 1108 if (self->base_height != base_height)
815 { 1109 {
816 self->base_height = base_height; 1110 self->base_height = base_height;
817 layout_update_font (self); 1111 layout_update_font (self);
818 } 1112 }
819 1113
820void 1114void
821set_width (CFClient::Layout self, int max_width = -1) 1115set_width (CFPlus::Layout self, int max_width = -1)
822 CODE: 1116 CODE:
823 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1117 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
824 1118
825void 1119void
826set_indent (CFClient::Layout self, int indent) 1120set_indent (CFPlus::Layout self, int indent)
827 CODE: 1121 CODE:
828 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1122 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
829 1123
830void 1124void
831set_spacing (CFClient::Layout self, int spacing) 1125set_spacing (CFPlus::Layout self, int spacing)
832 CODE: 1126 CODE:
833 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1127 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
834 1128
835void 1129void
836set_ellipsise (CFClient::Layout self, int ellipsise) 1130set_ellipsise (CFPlus::Layout self, int ellipsise)
837 CODE: 1131 CODE:
838 pango_layout_set_ellipsize (self->pl, 1132 pango_layout_set_ellipsize (self->pl,
839 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1133 ellipsise == 1 ? PANGO_ELLIPSIZE_START
840 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1134 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
841 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1135 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
842 : PANGO_ELLIPSIZE_NONE 1136 : PANGO_ELLIPSIZE_NONE
843 ); 1137 );
844 1138
845void 1139void
846set_single_paragraph_mode (CFClient::Layout self, int spm) 1140set_single_paragraph_mode (CFPlus::Layout self, int spm)
847 CODE: 1141 CODE:
848 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1142 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
849 1143
850void 1144void
851size (CFClient::Layout self) 1145size (CFPlus::Layout self)
852 PPCODE: 1146 PPCODE:
853{ 1147{
854 int w, h; 1148 int w, h;
855 1149
856 layout_get_pixel_size (self, &w, &h); 1150 layout_get_pixel_size (self, &w, &h);
859 PUSHs (sv_2mortal (newSViv (w))); 1153 PUSHs (sv_2mortal (newSViv (w)));
860 PUSHs (sv_2mortal (newSViv (h))); 1154 PUSHs (sv_2mortal (newSViv (h)));
861} 1155}
862 1156
863int 1157int
1158descent (CFPlus::Layout self)
1159 CODE:
1160{
1161 PangoRectangle rect;
1162 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1163 pango_layout_line_get_pixel_extents (line, 0, &rect);
1164 RETVAL = PANGO_DESCENT (rect);
1165}
1166 OUTPUT:
1167 RETVAL
1168
1169int
864xy_to_index (CFClient::Layout self, int x, int y) 1170xy_to_index (CFPlus::Layout self, int x, int y)
865 CODE: 1171 CODE:
866{ 1172{
867 int index, trailing; 1173 int index, trailing;
868 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1174 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
869 RETVAL = index; 1175 RETVAL = index + trailing;
870} 1176}
871 OUTPUT: 1177 OUTPUT:
872 RETVAL 1178 RETVAL
873 1179
874void 1180void
875cursor_pos (CFClient::Layout self, int index) 1181cursor_pos (CFPlus::Layout self, int index)
876 PPCODE: 1182 PPCODE:
877{ 1183{
878 PangoRectangle strong_pos; 1184 PangoRectangle strong_pos;
879 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1185 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
880 1186
883 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1189 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
884 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1190 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
885} 1191}
886 1192
887void 1193void
888render (CFClient::Layout self) 1194index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
889 PPCODE: 1195 PPCODE:
890{ 1196{
891 SV *retval; 1197 int line, x;
892 int w, h;
893 1198
894 layout_get_pixel_size (self, &w, &h); 1199 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1200 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
895 1201
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); 1202 EXTEND (SP, 2);
944 PUSHs (sv_2mortal (newSViv (w))); 1203 PUSHs (sv_2mortal (newSViv (line - 1)));
1204 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1205}
1206
1207void
1208line_x_to_index (CFPlus::Layout self, int line, int x)
1209 PPCODE:
1210{
1211 PangoLayoutLine *lp;
1212 int index, trailing;
1213
1214 if (line < 0)
1215 XSRETURN_EMPTY;
1216
1217 if (!(lp = pango_layout_get_line (self->pl, line)))
1218 XSRETURN_EMPTY; /* do better */
1219
1220 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1221
1222 EXTEND (SP, 2);
1223 if (GIMME_V == G_SCALAR)
945 PUSHs (sv_2mortal (newSViv (h))); 1224 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 1225 else
951 { 1226 {
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))); 1227 PUSHs (sv_2mortal (newSViv (index)));
971 PUSHs (sv_2mortal (newSViv (h))); 1228 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 } 1229 }
976} 1230}
977 1231
1232void
1233render (CFPlus::Layout self, float x, float y, int flags = 0)
1234 PPCODE:
1235 pango_opengl_render_layout_subpixel (
1236 self->pl,
1237 x * PANGO_SCALE, y * PANGO_SCALE,
1238 self->r, self->g, self->b, self->a,
1239 flags
1240 );
1241
978MODULE = CFClient PACKAGE = CFClient::Texture 1242MODULE = CFPlus PACKAGE = CFPlus::Texture
979 1243
980void 1244void
1245pad2pot (SV *data_, SV *w_, SV *h_)
1246 CODE:
1247{
1248 int ow = SvIV (w_);
1249 int oh = SvIV (h_);
1250
1251 if (ow && oh)
1252 {
1253 int nw = minpot (ow);
1254 int nh = minpot (oh);
1255
1256 if (nw != ow || nh != oh)
1257 {
1258 if (SvOK (data_))
1259 {
1260 STRLEN datalen;
1261 char *data = SvPVbyte (data_, datalen);
1262 int bpp = datalen / (ow * oh);
1263 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1264
1265 SvPOK_only (result_);
1266 SvCUR_set (result_, nw * nh * bpp);
1267
1268 memset (SvPVX (result_), 0, nw * nh * bpp);
1269 while (oh--)
1270 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1271
1272 sv_setsv (data_, result_);
1273 }
1274
1275 sv_setiv (w_, nw);
1276 sv_setiv (h_, nh);
1277 }
1278 }
1279}
1280
1281void
981draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1282draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
982 PROTOTYPE: $$$;$$ 1283 PROTOTYPE: $$$;$$
983 ALIAS: 1284 ALIAS:
984 draw_quad_alpha = 1 1285 draw_quad_alpha = 1
985 draw_quad_alpha_premultiplied = 2 1286 draw_quad_alpha_premultiplied = 2
986 CODE: 1287 CODE:
1024 glDisable (GL_ALPHA_TEST); 1325 glDisable (GL_ALPHA_TEST);
1025 glDisable (GL_BLEND); 1326 glDisable (GL_BLEND);
1026 } 1327 }
1027} 1328}
1028 1329
1029MODULE = CFClient PACKAGE = CFClient::Map 1330MODULE = CFPlus PACKAGE = CFPlus::Map
1030 1331
1031CFClient::Map 1332CFPlus::Map
1032new (SV *class, int map_width, int map_height) 1333new (SV *class)
1033 CODE: 1334 CODE:
1034 New (0, RETVAL, 1, struct map); 1335 New (0, RETVAL, 1, struct map);
1035 RETVAL->x = 0; 1336 RETVAL->x = 0;
1036 RETVAL->y = 0; 1337 RETVAL->y = 0;
1037 RETVAL->w = map_width; 1338 RETVAL->w = 0;
1038 RETVAL->h = map_height; 1339 RETVAL->h = 0;
1039 RETVAL->ox = 0; 1340 RETVAL->ox = 0;
1040 RETVAL->oy = 0; 1341 RETVAL->oy = 0;
1041 RETVAL->faces = 8192; 1342 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1042 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1343 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; 1344 RETVAL->rows = 0;
1046 RETVAL->row = 0; 1345 RETVAL->row = 0;
1047 OUTPUT: 1346 OUTPUT:
1048 RETVAL 1347 RETVAL
1049 1348
1050void 1349void
1051DESTROY (CFClient::Map self) 1350DESTROY (CFPlus::Map self)
1052 CODE: 1351 CODE:
1053{ 1352{
1054 map_clear (self); 1353 map_clear (self);
1055 Safefree (self->face); 1354 Safefree (self->face2tile);
1355 Safefree (self->tex);
1056 Safefree (self); 1356 Safefree (self);
1057} 1357}
1058 1358
1059void 1359void
1360resize (CFPlus::Map self, int map_width, int map_height)
1361 CODE:
1362 self->w = map_width;
1363 self->h = map_height;
1364
1365void
1060clear (CFClient::Map self) 1366clear (CFPlus::Map self)
1061 CODE: 1367 CODE:
1062 map_clear (self); 1368 map_clear (self);
1063 1369
1064void 1370void
1065set_face (CFClient::Map self, int face, int texid) 1371set_tileid (CFPlus::Map self, int face, int tile)
1066 CODE: 1372 CODE:
1067{ 1373{
1068 while (self->faces <= face) 1374 need_facenum (self, face); self->face2tile [face] = tile;
1069 { 1375 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} 1376}
1076 1377
1077void 1378void
1379set_smooth (CFPlus::Map self, int face, int smooth, int level)
1380 CODE:
1381{
1382 tileid texid;
1383 maptex *tex;
1384
1385 if (face < 0 || face >= self->faces)
1386 return;
1387
1388 if (smooth < 0 || smooth >= self->faces)
1389 return;
1390
1391 texid = self->face2tile [face];
1392
1393 if (!texid)
1394 return;
1395
1396 tex = self->tex + texid;
1397 tex->smoothtile = self->face2tile [smooth];
1398 tex->smoothlevel = level;
1399}
1400
1401void
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) 1402set_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: 1403 CODE:
1080{ 1404{
1081 while (self->texs <= texid) 1405 need_texid (self, texid);
1082 {
1083 Append (maptex, self->tex, self->texs, self->texs);
1084 self->texs *= 2;
1085 }
1086 1406
1087 { 1407 {
1088 maptex *tex = self->tex + texid; 1408 maptex *tex = self->tex + texid;
1089 1409
1090 tex->name = name; 1410 tex->name = name;
1107 // from transparent color bleeding and ugly wrapping effects. 1427 // from transparent color bleeding and ugly wrapping effects.
1108 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1428 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1109} 1429}
1110 1430
1111int 1431int
1112ox (CFClient::Map self) 1432ox (CFPlus::Map self)
1113 ALIAS: 1433 ALIAS:
1114 oy = 1 1434 oy = 1
1115 x = 2 1435 x = 2
1116 y = 3 1436 y = 3
1117 w = 4 1437 w = 4
1128 } 1448 }
1129 OUTPUT: 1449 OUTPUT:
1130 RETVAL 1450 RETVAL
1131 1451
1132void 1452void
1133scroll (CFClient::Map self, int dx, int dy) 1453scroll (CFPlus::Map self, int dx, int dy)
1134 CODE: 1454 CODE:
1135{ 1455{
1136 if (dx > 0) 1456 if (dx > 0)
1137 map_blank (self, self->x, self->y, dx - 1, self->h); 1457 map_blank (self, self->x, self->y, dx, self->h);
1138 else if (dx < 0) 1458 else if (dx < 0)
1139 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1459 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1140 1460
1141 if (dy > 0) 1461 if (dy > 0)
1142 map_blank (self, self->x, self->y, self->w, dy - 1); 1462 map_blank (self, self->x, self->y, self->w, dy);
1143 else if (dy < 0) 1463 else if (dy < 0)
1144 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1464 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1145 1465
1146 self->ox += dx; self->x += dx; 1466 self->ox += dx; self->x += dx;
1147 self->oy += dy; self->y += dy; 1467 self->oy += dy; self->y += dy;
1148 1468
1149 while (self->y < 0) 1469 while (self->y < 0)
1154 self->y += MAP_EXTEND_Y; 1474 self->y += MAP_EXTEND_Y;
1155 } 1475 }
1156} 1476}
1157 1477
1158void 1478void
1159map1a_update (CFClient::Map self, SV *data_) 1479map1a_update (CFPlus::Map self, SV *data_, int extmap)
1160 CODE: 1480 CODE:
1161{ 1481{
1162 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1482 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1163 uint8_t *data_end = (uint8_t *)SvEND (data_); 1483 uint8_t *data_end = (uint8_t *)SvEND (data_);
1164 mapcell *cell; 1484 mapcell *cell;
1165 int x, y, flags; 1485 int x, y, flags;
1166 1486
1167 while (data < data_end) 1487 while (data < data_end - 1)
1168 { 1488 {
1169 flags = (data [0] << 8) + data [1]; data += 2; 1489 flags = (data [0] << 8) + data [1]; data += 2;
1170 1490
1171 x = ((flags >> 10) & 63) + self->x; 1491 x = self->x + ((flags >> 10) & 63);
1172 y = ((flags >> 4) & 63) + self->y; 1492 y = self->y + ((flags >> 4) & 63);
1173 1493
1174 cell = map_get_cell (self, x, y); 1494 cell = map_get_cell (self, x, y);
1175 1495
1176 if (flags & 15) 1496 if (flags & 15)
1177 { 1497 {
1178 if (cell->darkness < 0) 1498 if (!cell->darkness)
1179 { 1499 {
1500 memset (cell, 0, sizeof (*cell));
1180 cell->darkness = 0; 1501 cell->darkness = 256;
1181 cell->face [0] = 0;
1182 cell->face [1] = 0;
1183 cell->face [2] = 0;
1184 } 1502 }
1185 1503
1186 cell->darkness = flags & 8 ? *data++ : 255;
1187
1188 //TODO: don't trust server data to be in-range(!) 1504 //TODO: don't trust server data to be in-range(!)
1505
1506 if (flags & 8)
1507 {
1508 if (extmap)
1509 {
1510 uint8_t ext, cmd;
1511
1512 do
1513 {
1514 ext = *data++;
1515 cmd = ext & 0x3f;
1516
1517 if (cmd < 4)
1518 cell->darkness = 255 - ext * 64 + 1;
1519 else if (cmd == 5) // health
1520 {
1521 cell->stat_width = 1;
1522 cell->stat_hp = *data++;
1523 }
1524 else if (cmd == 6) // monster width
1525 cell->stat_width = *data++ + 1;
1526 else if (cmd == 0x47)
1527 {
1528 if (*data == 4)
1529 ; // decode player count
1530
1531 data += *data + 1;
1532 }
1533 else if (cmd == 8) // cell flags
1534 cell->flags = *data++;
1535 else if (ext & 0x40) // unknown, multibyte => skip
1536 data += *data + 1;
1537 else
1538 data++;
1539 }
1540 while (ext & 0x80);
1541 }
1542 else
1543 cell->darkness = *data++ + 1;
1544 }
1189 1545
1190 if (flags & 4) 1546 if (flags & 4)
1191 { 1547 {
1192 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1548 faceid face = (data [0] << 8) + data [1]; data += 2;
1549 need_facenum (self, face);
1550 cell->tile [0] = self->face2tile [face];
1193 } 1551 }
1194 1552
1195 if (flags & 2) 1553 if (flags & 2)
1196 { 1554 {
1197 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1555 faceid face = (data [0] << 8) + data [1]; data += 2;
1556 need_facenum (self, face);
1557 cell->tile [1] = self->face2tile [face];
1198 } 1558 }
1199 1559
1200 if (flags & 1) 1560 if (flags & 1)
1201 { 1561 {
1202 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1562 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face);
1564 cell->tile [2] = self->face2tile [face];
1203 } 1565 }
1204 } 1566 }
1205 else 1567 else
1206 cell->darkness = -1; 1568 cell->darkness = 0;
1207 } 1569 }
1208} 1570}
1209 1571
1210SV * 1572SV *
1211mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1573mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1212 CODE: 1574 CODE:
1213{ 1575{
1214 int x1, x; 1576 int x1, x;
1215 int y1, y; 1577 int y1, y;
1216 int z; 1578 int z;
1237 { 1599 {
1238 mapcell *cell = row->col + (x - row->c0); 1600 mapcell *cell = row->col + (x - row->c0);
1239 1601
1240 for (z = 0; z <= 0; z++) 1602 for (z = 0; z <= 0; z++)
1241 { 1603 {
1242 mapface face = cell->face [z];
1243
1244 if (face)
1245 {
1246 maptex tex = self->tex [face]; 1604 maptex tex = self->tex [cell->tile [z]];
1247 int a0 = 255 - tex.a; 1605 int a0 = 255 - tex.a;
1248 int a1 = tex.a; 1606 int a1 = tex.a;
1249 1607
1250 r = (r * a0 + tex.r * a1) / 255; 1608 r = (r * a0 + tex.r * a1) / 255;
1251 g = (g * a0 + tex.g * a1) / 255; 1609 g = (g * a0 + tex.g * a1) / 255;
1252 b = (b * a0 + tex.b * a1) / 255; 1610 b = (b * a0 + tex.b * a1) / 255;
1253 a = (a * a0 + tex.a * a1) / 255; 1611 a = (a * a0 + tex.a * a1) / 255;
1254 }
1255 } 1612 }
1256 } 1613 }
1257 1614
1258 *map++ = (r ) 1615 *map++ = (r )
1259 | (g << 8) 1616 | (g << 8)
1266} 1623}
1267 OUTPUT: 1624 OUTPUT:
1268 RETVAL 1625 RETVAL
1269 1626
1270void 1627void
1271draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1628draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1272 PPCODE: 1629 CODE:
1273{ 1630{
1274 int vx, vy; 1631 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1632 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1633 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1634 smooth_key skey;
1275 int x, y, z; 1635 int x, y, z;
1276 int last_name; 1636 int last_name;
1277 mapface face; 1637
1638 // thats current max. sorry.
1639 if (sw > 255) sw = 255;
1640 if (sh > 255) sh = 255;
1641
1642 // clear key, in case of extra padding
1643 memset (&skey, 0, sizeof (skey));
1644
1645 glColor4ub (255, 255, 255, 255);
1646
1647 glEnable (GL_BLEND);
1648 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1649 glEnable (GL_TEXTURE_2D);
1650 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1651
1652 glBegin (GL_QUADS);
1653
1654 last_name = 0;
1655
1656 mx += self->x;
1657 my += self->y;
1658
1659 // first pass: determine smooth_max
1660 // rather ugly, if you ask me
1661 // could also be stored inside mapcell and updated on change
1662 memset (smooth_max, 0, sizeof (smooth_max));
1663
1664 for (y = 0; y < sh; y++)
1665 if (0 <= y + my && y + my < self->rows)
1666 {
1667 maprow *row = self->row + (y + my);
1668
1669 for (x = 0; x < sw; x++)
1670 if (row->c0 <= x + mx && x + mx < row->c1)
1671 {
1672 mapcell *cell = row->col + (x + mx - row->c0);
1673
1674 smooth_max[x + 1][y + 1] =
1675 MAX (self->tex [cell->tile [0]].smoothlevel,
1676 MAX (self->tex [cell->tile [1]].smoothlevel,
1677 self->tex [cell->tile [2]].smoothlevel));
1678 }
1679 }
1680
1681 for (z = 0; z <= 2; z++)
1682 {
1683 memset (smooth_level, 0, sizeof (smooth_level));
1684
1685 for (y = 0; y < sh; y++)
1686 if (0 <= y + my && y + my < self->rows)
1687 {
1688 maprow *row = self->row + (y + my);
1689
1690 for (x = 0; x < sw; x++)
1691 if (row->c0 <= x + mx && x + mx < row->c1)
1692 {
1693 mapcell *cell = row->col + (x + mx - row->c0);
1694 tileid tile = cell->tile [z];
1695
1696 if (tile)
1697 {
1698 maptex tex = self->tex [tile];
1699 int px = (x + 1) * T - tex.w;
1700 int py = (y + 1) * T - tex.h;
1701
1702 // suppressing texture state switches here
1703 // is only moderately effective, but worth the extra effort
1704 if (last_name != tex.name)
1705 {
1706 if (!tex.name)
1707 tex = self->tex [2]; /* missing, replace by noface */
1708
1709 glEnd ();
1710 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1711 glBegin (GL_QUADS);
1712 }
1713
1714 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1715 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1716 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1717 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1718
1719 if (cell->flags && z == 2)
1720 {
1721 if (cell->flags & 1)
1722 {
1723 maptex tex = self->tex [1];
1724 int px = x * T + T * 2 / 32;
1725 int py = y * T - T * 6 / 32;
1726
1727 glEnd ();
1728 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1729 glBegin (GL_QUADS);
1730
1731 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1732 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1733 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1734 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1735 }
1736 }
1737
1738 // update smooth hash
1739 if (tex.smoothtile)
1740 {
1741 skey.tile = tex.smoothtile;
1742 skey.level = tex.smoothlevel;
1743
1744 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1745
1746 // add bits to current tile and all neighbours. skey.x|y is
1747 // shifted +1|+1 so we always stay positive.
1748
1749 // bits is ___n cccc CCCC bbbb
1750 // n do not draw borders&corners
1751 // c draw these corners, but...
1752 // C ... not these
1753 // b draw these borders
1754
1755 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1756 // ┃· ·· ·┃ ━━
1757
1758 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1759 // ·· ·· ·┏ ┓·
1760
1761 // full tile
1762 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1763
1764 // borders
1765 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1766 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1767 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1768 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1769
1770 // corners
1771 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1772 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1773 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1774 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1775 }
1776 }
1777 }
1778 }
1779
1780 // go through all smoothlevels, lowest to highest, then draw.
1781 // this is basically counting sort
1782 {
1783 int w, b;
1784
1785 for (w = 0; w < 256 / 32; ++w)
1786 {
1787 uint32_t smask = smooth_level [w];
1788 if (smask)
1789 for (b = 0; b < 32; ++b)
1790 if (smask & (((uint32_t)1) << b))
1791 {
1792 int level = (w << 5) | b;
1793 HE *he;
1794
1795 hv_iterinit (smooth);
1796 while ((he = hv_iternext (smooth)))
1797 {
1798 smooth_key *skey = (smooth_key *)HeKEY (he);
1799 IV bits = SvIVX (HeVAL (he));
1800
1801 if (!(bits & 0x1000)
1802 && skey->level == level
1803 && level > smooth_max [skey->x][skey->y])
1804 {
1805 maptex tex = self->tex [skey->tile];
1806 int px = (((int)skey->x) - 1) * T;
1807 int py = (((int)skey->y) - 1) * T;
1808 int border = bits & 15;
1809 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1810 float dx = tex.s * .0625f; // 16 images/row
1811 float dy = tex.t * .5f ; // 2 images/column
1812
1813 // this time naively avoiding texture state changes
1814 // save gobs of state changes.
1815 if (last_name != tex.name)
1816 {
1817 if (!tex.name)
1818 continue; // smoothing not yet available
1819
1820 glEnd ();
1821 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1822 glBegin (GL_QUADS);
1823 }
1824
1825 if (border)
1826 {
1827 float ox = border * dx;
1828
1829 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1830 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1831 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1832 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1833 }
1834
1835 if (corner)
1836 {
1837 float ox = corner * dx;
1838
1839 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1840 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1841 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1842 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1843 }
1844 }
1845 }
1846 }
1847 }
1848 }
1849
1850 hv_clear (smooth);
1851 }
1852
1853 glEnd ();
1854
1855 glDisable (GL_TEXTURE_2D);
1856 glDisable (GL_BLEND);
1857
1858 // top layer: overlays such as the health bar
1859 for (y = 0; y < sh; y++)
1860 if (0 <= y + my && y + my < self->rows)
1861 {
1862 maprow *row = self->row + (y + my);
1863
1864 for (x = 0; x < sw; x++)
1865 if (row->c0 <= x + mx && x + mx < row->c1)
1866 {
1867 mapcell *cell = row->col + (x + mx - row->c0);
1868
1869 int px = x * T;
1870 int py = y * T;
1871
1872 if (cell->stat_hp)
1873 {
1874 int width = cell->stat_width * T;
1875 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1876
1877 glColor3ub (0, 0, 0);
1878 glRectf (px + 1, py - thick - 2,
1879 px + width - 1, py);
1880
1881 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1882 glRectf (px + 2,
1883 py - thick - 1,
1884 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1885 }
1886 }
1887 }
1888}
1889
1890void
1891draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1892 CODE:
1893{
1894 static float color[16][3] = {
1895 { 0.00F, 0.00F, 0.00F },
1896 { 1.00F, 1.00F, 1.00F },
1897 { 0.00F, 0.00F, 0.55F },
1898 { 1.00F, 0.00F, 0.00F },
1899
1900 { 1.00F, 0.54F, 0.00F },
1901 { 0.11F, 0.56F, 1.00F },
1902 { 0.93F, 0.46F, 0.00F },
1903 { 0.18F, 0.54F, 0.34F },
1904
1905 { 0.56F, 0.73F, 0.56F },
1906 { 0.80F, 0.80F, 0.80F },
1907 { 0.55F, 0.41F, 0.13F },
1908 { 0.99F, 0.77F, 0.26F },
1909
1910 { 0.74F, 0.65F, 0.41F },
1911
1912 { 0.00F, 1.00F, 1.00F },
1913 { 1.00F, 0.00F, 1.00F },
1914 { 1.00F, 1.00F, 0.00F },
1915 };
1916
1917 int x, y;
1918
1919 glEnable (GL_TEXTURE_2D);
1920 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1921 glEnable (GL_BLEND);
1922 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1923 glBegin (GL_QUADS);
1924
1925 for (y = 0; y < h; y++)
1926 for (x = 0; x < w; x++)
1927 {
1928 unsigned char m = data [x + y * w];
1929
1930 if (m)
1931 {
1932 float *c = color [m & 15];
1933
1934 float tx1 = m & 0x40 ? 0.5 : 0.;
1935 float tx2 = tx1 + 0.5;
1936
1937 glColor4f (c[0], c[1], c[2], 0.75);
1938 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1939 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1940 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1941 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1942 }
1943 }
1944
1945 glEnd ();
1946 glDisable (GL_BLEND);
1947 glDisable (GL_TEXTURE_2D);
1948}
1949
1950void
1951fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1952 PPCODE:
1953{
1954 int x, y;
1278 int sw4 = (sw + 3) & ~3; 1955 int sw4 = (sw + 3) & ~3;
1279 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1956 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1280 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1957 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1281 1958
1282 memset (darkness, 255, sw4 * sh); 1959 memset (darkness, 255, sw4 * sh);
1283 SvPOK_only (darkness_sv); 1960 SvPOK_only (darkness_sv);
1284 SvCUR_set (darkness_sv, sw4 * sh); 1961 SvCUR_set (darkness_sv, sw4 * sh);
1285 1962
1286 vx = self->x + (self->w - sw) / 2 - shift_x; 1963 mx += self->x;
1287 vy = self->y + (self->h - sh) / 2 - shift_y; 1964 my += self->y;
1288 1965
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++) 1966 for (y = 0; y < sh; y++)
1312 if (0 <= y + vy && y + vy < self->rows) 1967 if (0 <= y + my && y + my < self->rows)
1313 { 1968 {
1314 maprow *row = self->row + (y + vy); 1969 maprow *row = self->row + (y + my);
1315 1970
1316 for (x = 0; x < sw; x++) 1971 for (x = 0; x < sw; x++)
1317 if (row->c0 <= x + vx && x + vx < row->c1) 1972 if (row->c0 <= x + mx && x + mx < row->c1)
1318 { 1973 {
1319 mapcell *cell = row->col + (x + vx - row->c0); 1974 mapcell *cell = row->col + (x + mx - row->c0);
1320 1975
1321 darkness[y * sw4 + x] = cell->darkness < 0 1976 darkness[y * sw4 + x] = cell->darkness
1977 ? 255 - (cell->darkness - 1)
1322 ? 255 - FOW_DARKNESS 1978 : 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 } 1979 }
1348 } 1980 }
1349
1350 glEnd ();
1351
1352 glDisable (GL_TEXTURE_2D);
1353 glDisable (GL_BLEND);
1354 1981
1355 EXTEND (SP, 3); 1982 EXTEND (SP, 3);
1356 PUSHs (sv_2mortal (newSViv (sw4))); 1983 PUSHs (sv_2mortal (newSViv (sw4)));
1357 PUSHs (sv_2mortal (newSViv (sh))); 1984 PUSHs (sv_2mortal (newSViv (sh)));
1358 PUSHs (darkness_sv); 1985 PUSHs (darkness_sv);
1359} 1986}
1360 1987
1361SV * 1988SV *
1362get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1989get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1363 CODE: 1990 CODE:
1364{ 1991{
1365 int x, y, x1, y1; 1992 int x, y, x1, y1;
1366 SV *data_sv = newSV (w * h * 7 + 5); 1993 SV *data_sv = newSV (w * h * 7 + 5);
1367 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1994 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1392 if (row && row->c0 <= x && x < row->c1) 2019 if (row && row->c0 <= x && x < row->c1)
1393 { 2020 {
1394 mapcell *cell = row->col + (x - row->c0); 2021 mapcell *cell = row->col + (x - row->c0);
1395 uint8_t flags = 0; 2022 uint8_t flags = 0;
1396 2023
1397 if (cell->face [0]) flags |= 1; 2024 if (cell->tile [0]) flags |= 1;
1398 if (cell->face [1]) flags |= 2; 2025 if (cell->tile [1]) flags |= 2;
1399 if (cell->face [2]) flags |= 4; 2026 if (cell->tile [2]) flags |= 4;
1400 2027
1401 *data++ = flags; 2028 *data++ = flags;
1402 2029
1403 if (flags & 1) 2030 if (flags & 1)
1404 { 2031 {
2032 tileid tile = cell->tile [0];
1405 *data++ = cell->face [0] >> 8; 2033 *data++ = tile >> 8;
1406 *data++ = cell->face [0]; 2034 *data++ = tile;
1407 } 2035 }
1408 2036
1409 if (flags & 2) 2037 if (flags & 2)
1410 { 2038 {
2039 tileid tile = cell->tile [1];
1411 *data++ = cell->face [1] >> 8; 2040 *data++ = tile >> 8;
1412 *data++ = cell->face [1]; 2041 *data++ = tile;
1413 } 2042 }
1414 2043
1415 if (flags & 4) 2044 if (flags & 4)
1416 { 2045 {
2046 tileid tile = cell->tile [2];
1417 *data++ = cell->face [2] >> 8; 2047 *data++ = tile >> 8;
1418 *data++ = cell->face [2]; 2048 *data++ = tile;
1419 } 2049 }
1420 } 2050 }
1421 else 2051 else
1422 *data++ = 0; 2052 *data++ = 0;
1423 } 2053 }
1429} 2059}
1430 OUTPUT: 2060 OUTPUT:
1431 RETVAL 2061 RETVAL
1432 2062
1433void 2063void
1434set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2064set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1435 PPCODE: 2065 PPCODE:
1436{ 2066{
1437 int x, y, z; 2067 int x, y, z;
1438 int w, h; 2068 int w, h;
1439 int x1, y1; 2069 int x1, y1;
1463 { 2093 {
1464 uint8_t flags = *data++; 2094 uint8_t flags = *data++;
1465 2095
1466 if (flags) 2096 if (flags)
1467 { 2097 {
1468 mapface face[3] = { 0, 0, 0 };
1469
1470 mapcell *cell = row_get_cell (row, x); 2098 mapcell *cell = row_get_cell (row, x);
2099 tileid tile[3] = { 0, 0, 0 };
1471 2100
1472 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2101 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1473 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2102 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1474 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2103 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1475 2104
1476 if (cell->darkness <= 0) 2105 if (cell->darkness == 0)
1477 { 2106 {
1478 cell->darkness = -1; 2107 cell->darkness = 0;
1479 2108
1480 for (z = 0; z <= 2; z++) 2109 for (z = 0; z <= 2; z++)
1481 { 2110 {
1482 cell->face[z] = face[z]; 2111 tileid t = tile [z];
1483 2112
1484 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2113 if (t >= self->texs || (t && !self->tex [t].name))
2114 {
1485 XPUSHs (sv_2mortal (newSViv (face[z]))); 2115 XPUSHs (sv_2mortal (newSViv (t)));
2116 need_texid (self, t);
2117 }
2118
2119 cell->tile [z] = t;
1486 } 2120 }
1487 } 2121 }
1488 } 2122 }
1489 } 2123 }
1490 } 2124 }
1491} 2125}
1492 2126
1493MODULE = CFClient PACKAGE = CFClient::MixChunk 2127MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1494 2128
1495CFClient::MixChunk 2129CFPlus::MixChunk
1496new_from_file (SV *class, char *path) 2130new_from_file (SV *class, char *path)
1497 CODE: 2131 CODE:
1498 RETVAL = Mix_LoadWAV (path); 2132 RETVAL = Mix_LoadWAV (path);
1499 OUTPUT: 2133 OUTPUT:
1500 RETVAL 2134 RETVAL
1501 2135
1502void 2136void
1503DESTROY (CFClient::MixChunk self) 2137DESTROY (CFPlus::MixChunk self)
1504 CODE: 2138 CODE:
1505 Mix_FreeChunk (self); 2139 Mix_FreeChunk (self);
1506 2140
1507int 2141int
1508volume (CFClient::MixChunk self, int volume = -1) 2142volume (CFPlus::MixChunk self, int volume = -1)
1509 CODE: 2143 CODE:
1510 RETVAL = Mix_VolumeChunk (self, volume); 2144 RETVAL = Mix_VolumeChunk (self, volume);
1511 OUTPUT: 2145 OUTPUT:
1512 RETVAL 2146 RETVAL
1513 2147
1514int 2148int
1515play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2149play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1516 CODE: 2150 CODE:
1517 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2151 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1518 OUTPUT: 2152 OUTPUT:
1519 RETVAL 2153 RETVAL
1520 2154
1521MODULE = CFClient PACKAGE = CFClient::MixMusic 2155MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1522 2156
1523int 2157int
1524volume (int volume = -1) 2158volume (int volume = -1)
1525 CODE: 2159 CODE:
1526 RETVAL = Mix_VolumeMusic (volume); 2160 RETVAL = Mix_VolumeMusic (volume);
1527 OUTPUT: 2161 OUTPUT:
1528 RETVAL 2162 RETVAL
1529 2163
2164int
2165fade_out (int ms)
2166 CODE:
2167 RETVAL = Mix_FadeOutMusic (ms);
2168 OUTPUT:
2169 RETVAL
2170
1530CFClient::MixMusic 2171CFPlus::MixMusic
1531new_from_file (SV *class, char *path) 2172new_from_file (SV *class, char *path)
1532 CODE: 2173 CODE:
1533 RETVAL = Mix_LoadMUS (path); 2174 RETVAL = Mix_LoadMUS (path);
1534 OUTPUT: 2175 OUTPUT:
1535 RETVAL 2176 RETVAL
1536 2177
1537void 2178void
1538DESTROY (CFClient::MixMusic self) 2179DESTROY (CFPlus::MixMusic self)
1539 CODE: 2180 CODE:
1540 Mix_FreeMusic (self); 2181 Mix_FreeMusic (self);
1541 2182
1542int 2183int
1543play (CFClient::MixMusic self, int loops = -1) 2184play (CFPlus::MixMusic self, int loops = -1)
1544 CODE: 2185 CODE:
1545 RETVAL = Mix_PlayMusic (self, loops); 2186 RETVAL = Mix_PlayMusic (self, loops);
1546 OUTPUT: 2187 OUTPUT:
1547 RETVAL 2188 RETVAL
1548 2189
2190int
2191fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2192 CODE:
2193 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2194 OUTPUT:
2195 RETVAL
2196
1549MODULE = CFClient PACKAGE = CFClient::OpenGL 2197MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1550 2198
1551BOOT: 2199BOOT:
1552{ 2200{
1553 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2201 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1554 static const struct { 2202 static const struct {
1555 const char *name; 2203 const char *name;
1556 IV iv; 2204 IV iv;
1557 } *civ, const_iv[] = { 2205 } *civ, const_iv[] = {
1558# define const_iv(name) { # name, (IV)name } 2206# define const_iv(name) { # name, (IV)name }
1565 const_iv (GL_SCISSOR_TEST), 2213 const_iv (GL_SCISSOR_TEST),
1566 const_iv (GL_DEPTH_TEST), 2214 const_iv (GL_DEPTH_TEST),
1567 const_iv (GL_ALPHA_TEST), 2215 const_iv (GL_ALPHA_TEST),
1568 const_iv (GL_NORMALIZE), 2216 const_iv (GL_NORMALIZE),
1569 const_iv (GL_RESCALE_NORMAL), 2217 const_iv (GL_RESCALE_NORMAL),
2218 const_iv (GL_FRONT),
2219 const_iv (GL_BACK),
1570 const_iv (GL_AND), 2220 const_iv (GL_AND),
1571 const_iv (GL_ONE), 2221 const_iv (GL_ONE),
1572 const_iv (GL_ZERO), 2222 const_iv (GL_ZERO),
1573 const_iv (GL_SRC_ALPHA), 2223 const_iv (GL_SRC_ALPHA),
1574 const_iv (GL_DST_ALPHA), 2224 const_iv (GL_DST_ALPHA),
1575 const_iv (GL_ONE_MINUS_SRC_ALPHA), 2225 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1576 const_iv (GL_ONE_MINUS_DST_ALPHA), 2226 const_iv (GL_ONE_MINUS_DST_ALPHA),
1577 const_iv (GL_SRC_ALPHA_SATURATE), 2227 const_iv (GL_SRC_ALPHA_SATURATE),
1578 const_iv (GL_RGB), 2228 const_iv (GL_RGB),
1579 const_iv (GL_RGBA), 2229 const_iv (GL_RGBA),
2230 const_iv (GL_RGBA4),
2231 const_iv (GL_RGBA8),
2232 const_iv (GL_RGB5_A1),
1580 const_iv (GL_UNSIGNED_BYTE), 2233 const_iv (GL_UNSIGNED_BYTE),
1581 const_iv (GL_UNSIGNED_SHORT), 2234 const_iv (GL_UNSIGNED_SHORT),
1582 const_iv (GL_UNSIGNED_INT), 2235 const_iv (GL_UNSIGNED_INT),
1583 const_iv (GL_ALPHA), 2236 const_iv (GL_ALPHA),
1584 const_iv (GL_INTENSITY), 2237 const_iv (GL_INTENSITY),
1616 const_iv (GL_SEPARABLE_2D), 2269 const_iv (GL_SEPARABLE_2D),
1617 const_iv (GL_CONVOLUTION_2D), 2270 const_iv (GL_CONVOLUTION_2D),
1618 const_iv (GL_CONVOLUTION_BORDER_MODE), 2271 const_iv (GL_CONVOLUTION_BORDER_MODE),
1619 const_iv (GL_CONSTANT_BORDER), 2272 const_iv (GL_CONSTANT_BORDER),
1620 const_iv (GL_LINES), 2273 const_iv (GL_LINES),
2274 const_iv (GL_LINE_STRIP),
1621 const_iv (GL_LINE_LOOP), 2275 const_iv (GL_LINE_LOOP),
1622 const_iv (GL_QUADS), 2276 const_iv (GL_QUADS),
1623 const_iv (GL_QUAD_STRIP), 2277 const_iv (GL_QUAD_STRIP),
1624 const_iv (GL_TRIANGLES), 2278 const_iv (GL_TRIANGLES),
1625 const_iv (GL_TRIANGLE_STRIP), 2279 const_iv (GL_TRIANGLE_STRIP),
1633# undef const_iv 2287# undef const_iv
1634 }; 2288 };
1635 2289
1636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2290 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2291 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2292
2293 texture_av = newAV ();
2294 AvREAL_off (texture_av);
1638} 2295}
1639 2296
1640char * 2297char *
1641gl_vendor () 2298gl_vendor ()
1642 CODE: 2299 CODE:
1658 OUTPUT: 2315 OUTPUT:
1659 RETVAL 2316 RETVAL
1660 2317
1661int glGetError () 2318int glGetError ()
1662 2319
2320void glFinish ()
2321
1663void glClear (int mask) 2322void glClear (int mask)
1664 2323
1665void glClearColor (float r, float g, float b, float a = 1.0) 2324void glClearColor (float r, float g, float b, float a = 1.0)
1666 PROTOTYPE: @ 2325 PROTOTYPE: @
1667 2326
1690void glPushMatrix () 2349void glPushMatrix ()
1691 2350
1692void glPopMatrix () 2351void glPopMatrix ()
1693 2352
1694void glLoadIdentity () 2353void glLoadIdentity ()
2354
2355void glDrawBuffer (int buffer)
2356
2357void glReadBuffer (int buffer)
1695 2358
1696# near_ and far_ are due to microsofts buggy "c" compiler 2359# near_ and far_ are due to microsofts buggy "c" compiler
1697void glFrustum (double left, double right, double bottom, double top, double near_, double far_) 2360void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1698 2361
1699# near_ and far_ are due to microsofts buggy "c" compiler 2362# near_ and far_ are due to microsofts buggy "c" compiler
1729 r *= a; 2392 r *= a;
1730 g *= a; 2393 g *= a;
1731 b *= a; 2394 b *= a;
1732 } 2395 }
1733 // microsoft visual "c" rounds instead of truncating... 2396 // microsoft visual "c" rounds instead of truncating...
1734 glColor4ub (MIN ((int)(r * 256.f), 255), 2397 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 2398
1739void glInterleavedArrays (int format, int stride, char *data) 2399void glInterleavedArrays (int format, int stride, char *data)
1740 2400
1741void glDrawElements (int mode, int count, int type, char *indices) 2401void glDrawElements (int mode, int count, int type, char *indices)
1742 2402
1788 2448
1789void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2449void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1790 2450
1791int glGenTexture () 2451int glGenTexture ()
1792 CODE: 2452 CODE:
1793{ 2453 RETVAL = gen_texture ();
1794 GLuint name;
1795 glGenTextures (1, &name);
1796 RETVAL = name;
1797}
1798 OUTPUT: 2454 OUTPUT:
1799 RETVAL 2455 RETVAL
1800 2456
1801void glDeleteTexture (int name) 2457void glDeleteTexture (int name)
1802 CODE: 2458 CODE:
1803{
1804 GLuint name_ = name;
1805 glDeleteTextures (1, &name_); 2459 del_texture (name);
1806} 2460
1807
1808int glGenList () 2461int glGenList ()
1809 CODE: 2462 CODE:
1810 RETVAL = glGenLists (1); 2463 RETVAL = glGenLists (1);
1811 OUTPUT: 2464 OUTPUT:
1812 RETVAL 2465 RETVAL
1819 2472
1820void glEndList () 2473void glEndList ()
1821 2474
1822void glCallList (int list) 2475void glCallList (int list)
1823 2476
1824

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines