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.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.196 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines