ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines