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.122 by root, Fri Jun 23 22:35:15 2006 UTC vs.
Revision 1.200 by root, Tue Jul 17 16:02:13 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>
15#include <stdlib.h> 28#include <stdlib.h>
16 29
18#include <SDL_endian.h> 31#include <SDL_endian.h>
19#include <SDL_image.h> 32#include <SDL_image.h>
20#include <SDL_mixer.h> 33#include <SDL_mixer.h>
21#include <SDL_opengl.h> 34#include <SDL_opengl.h>
22 35
36#define PANGO_ENABLE_BACKEND
37#define G_DISABLE_CAST_CHECKS
38
23#include <glib/gmacros.h> 39#include <glib/gmacros.h>
24 40
25#include <pango/pango.h> 41#include <pango/pango.h>
26#include <pango/pangofc-fontmap.h>
27#include <pango/pangoft2.h>
28#include <pango/pangocairo.h>
29 42
30#ifndef _WIN32 43#ifndef _WIN32
31# include <sys/types.h> 44# include <sys/types.h>
32# include <sys/socket.h> 45# include <sys/socket.h>
33# include <netinet/in.h> 46# include <netinet/in.h>
34# include <netinet/tcp.h> 47# include <netinet/tcp.h>
35# include <inttypes.h> 48# include <inttypes.h>
36#else
37 typedef unsigned char uint8_t;
38 typedef unsigned short uint16_t;
39 typedef unsigned int uint32_t;
40 typedef signed char int8_t;
41 typedef signed short int16_t;
42 typedef signed int int32_t;
43#endif 49#endif
44 50
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 51#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 52
49#define FOW_DARKNESS 32 53#define FOW_DARKNESS 32
50 54
51#define MAP_EXTEND_X 32 55#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 56#define MAP_EXTEND_Y 512
53 57
54#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;
55 67
56static struct 68static struct
57{ 69{
58#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
59#include "glfunc.h" 71#include "glfunc.h"
60#undef GL_FUNC 72#undef GL_FUNC
61} gl; 73} gl;
62 74
75static void
63static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
64{ 77{
65 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
66 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
67 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
68 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69 else 82 else
70 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
71} 84}
72 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
73typedef Mix_Chunk *CFClient__MixChunk; 116typedef Mix_Chunk *CFPlus__MixChunk;
74typedef Mix_Music *CFClient__MixMusic; 117typedef Mix_Music *CFPlus__MixMusic;
75 118
76typedef PangoFontDescription *CFClient__Font; 119typedef PangoFontDescription *CFPlus__Font;
77 120
78static int 121static int
79shape_attr_p (PangoLayoutRun *run) 122shape_attr_p (PangoLayoutRun *run)
80{ 123{
81 GSList *attrs = run->item->analysis.extra_attrs; 124 GSList *attrs = run->item->analysis.extra_attrs;
92 135
93 return 0; 136 return 0;
94} 137}
95 138
96typedef struct cf_layout { 139typedef struct cf_layout {
97 PangoLayout *pl; // either derived from a cairo or ft2 context 140 PangoLayout *pl;
98 int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99 float r, g, b, a; // default color for rgba mode 141 float r, g, b, a; // default color for rgba mode
100 int base_height; 142 int base_height;
101 CFClient__Font font; 143 CFPlus__Font font;
102} *CFClient__Layout; 144} *CFPlus__Layout;
103 145
104static CFClient__Font default_font; 146static CFPlus__Font default_font;
105static PangoContext *ft2_context, *cairo_context; 147static PangoContext *opengl_context;
106static PangoFontMap *ft2_fontmap, *cairo_fontmap; 148static PangoFontMap *opengl_fontmap;
107 149
108static void 150static void
109substitute_func (FcPattern *pattern, gpointer data) 151substitute_func (FcPattern *pattern, gpointer data)
110{ 152{
111 FcPatternAddBool (pattern, FC_HINTING, 1); 153 FcPatternAddBool (pattern, FC_HINTING, 1);
112#ifdef FC_HINT_STYLE 154#ifdef FC_HINT_STYLE
113 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 155 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114#endif 156#endif
115#ifdef _WIN32
116 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117#else
118 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 157 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119#endif
120} 158}
121 159
122static void 160static void
123layout_update_font (CFClient__Layout self) 161layout_update_font (CFPlus__Layout self)
124{ 162{
125 /* 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
126 * reasonably well with bitstream vera 164 * reasonably well with bitstream vera
127 */ 165 */
128 PangoFontDescription *font = self->font ? self->font : default_font; 166 PangoFontDescription *font = self->font ? self->font : default_font;
132 170
133 pango_layout_set_font_description (self->pl, font); 171 pango_layout_set_font_description (self->pl, font);
134} 172}
135 173
136static void 174static void
137layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 175layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
138{ 176{
177 PangoRectangle rect;
178
179 // get_pixel_* wrongly rounds down
139 pango_layout_get_pixel_size (self->pl, w, h); 180 pango_layout_get_extents (self->pl, 0, &rect);
140 181
141 if (!*w) *w = 1; 182 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142 if (!*h) *h = 1; 183 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143 184
144 *w = (*w + 3) & ~3; 185 if (!rect.width) rect.width = 1;
145} 186 if (!rect.height) rect.height = 1;
146 187
188 *w = rect.width;
189 *h = rect.height;
190}
191
192typedef uint16_t tileid;
147typedef uint16_t mapface; 193typedef uint16_t faceid;
148 194
149typedef struct { 195typedef struct {
150 GLint name; 196 int name;
151 int w, h; 197 int w, h;
152 float s, t; 198 float s, t;
153 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
154} maptex; 202} maptex;
155 203
156typedef struct { 204typedef struct {
205 uint32_t player;
206 tileid tile[3];
157 int16_t darkness; 207 uint16_t darkness;
158 mapface face[3]; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
159} mapcell; 209} mapcell;
160 210
161typedef struct { 211typedef struct {
162 int32_t c0, c1; 212 int32_t c0, c1;
163 mapcell *col; 213 mapcell *col;
164} maprow; 214} maprow;
165 215
166typedef struct map { 216typedef struct map {
167 int x, y, w, h; 217 int x, y, w, h;
168 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
169 int faces; 219 int faces; tileid *face2tile; // [faceid]
170 mapface *face; 220 int texs; maptex *tex; // [tileid]
171
172 int texs;
173 maptex *tex;
174 221
175 int32_t rows; 222 int32_t rows;
176 maprow *row; 223 maprow *row;
177} *CFClient__Map; 224} *CFPlus__Map;
178 225
179static char * 226static char *
180prepend (char *ptr, int sze, int inc) 227prepend (char *ptr, int sze, int inc)
181{ 228{
182 char *p; 229 char *p;
199} 246}
200 247
201#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))
202#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))
203 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
204static maprow * 271static maprow *
205map_get_row (CFClient__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
206{ 273{
207 if (0 > y) 274 if (0 > y)
208 { 275 {
209 int extend = - y + MAP_EXTEND_Y; 276 int extend = - y + MAP_EXTEND_Y;
210 Prepend (maprow, self->row, self->rows, extend); 277 Prepend (maprow, self->row, self->rows, extend);
248 315
249 return row->col + (x - row->c0); 316 return row->col + (x - row->c0);
250} 317}
251 318
252static mapcell * 319static mapcell *
253map_get_cell (CFClient__Map self, int x, int y) 320map_get_cell (CFPlus__Map self, int x, int y)
254{ 321{
255 return row_get_cell (map_get_row (self, y), x); 322 return row_get_cell (map_get_row (self, y), x);
256} 323}
257 324
258static void 325static void
259map_clear (CFClient__Map self) 326map_clear (CFPlus__Map self)
260{ 327{
261 int r; 328 int r;
262 329
263 for (r = 0; r < self->rows; r++) 330 for (r = 0; r < self->rows; r++)
264 Safefree (self->row[r].col); 331 Safefree (self->row[r].col);
272 self->row = 0; 339 self->row = 0;
273 self->rows = 0; 340 self->rows = 0;
274} 341}
275 342
276static void 343static void
277map_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)
278{ 345{
279 int x, y; 346 int x, y;
280 maprow *row; 347 maprow *row;
348 mapcell *cell;
281 349
282 for (y = y0; y < y0 + h; y++) 350 for (y = y0; y < y0 + h; y++)
283 if (y >= 0) 351 if (y >= 0)
284 { 352 {
285 if (y >= self->rows) 353 if (y >= self->rows)
291 if (x >= row->c0) 359 if (x >= row->c0)
292 { 360 {
293 if (x >= row->c1) 361 if (x >= row->c1)
294 break; 362 break;
295 363
296 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;
297 } 370 }
298 } 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);
299} 388}
300 389
301static void 390static void
302music_finished (void) 391music_finished (void)
303{ 392{
339 n |= n >> 16; 428 n |= n >> 16;
340 429
341 return n + 1; 430 return n + 1;
342} 431}
343 432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
436
344MODULE = CFClient PACKAGE = CFClient 437MODULE = CFPlus PACKAGE = CFPlus
345 438
346PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
347 440
348BOOT: 441BOOT:
349{ 442{
350 HV *stash = gv_stashpv ("CFClient", 1); 443 HV *stash = gv_stashpv ("CFPlus", 1);
351 static const struct { 444 static const struct {
352 const char *name; 445 const char *name;
353 IV iv; 446 IV iv;
354 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
355# 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
356 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
357 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
358 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
359 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
360 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
369 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
370 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
371 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
372 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
373 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
374 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
375 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
376 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
377 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
378 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
433 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
434 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
435 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
436 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
437 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
438 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
439 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
440 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
441 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
442 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
443 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
444 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
445 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
446 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
447 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
448 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
449 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
450 const_iv (KMOD_CTRL),
451 const_iv (KMOD_SHIFT),
452 const_iv (KMOD_ALT),
453 const_iv (KMOD_META)
454# undef const_iv 556# undef const_iv
455 }; 557 };
456 558
457 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; )
458 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);
459} 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
460 578
461NV floor (NV x) 579NV floor (NV x)
462 580
463NV ceil (NV x) 581NV ceil (NV x)
464 582
465void 583void
466pango_init () 584pango_init ()
467 CODE: 585 CODE:
468 // delayed, so it can pick up new fonts added by AddFontResourceEx
469{ 586{
470 {
471 ft2_fontmap = pango_ft2_font_map_new (); 587 opengl_fontmap = pango_opengl_font_map_new ();
472 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);
473 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 589 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474 }
475 {
476 cairo_font_options_t *fopt = cairo_font_options_create ();
477 cairo_fontmap = pango_cairo_font_map_get_default ();
478 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479#ifdef _WIN32
480 // cairo looks like shit eaten twice on windows
481 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482#else
483 cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484#endif
485 cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486 cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487 pango_cairo_context_set_font_options (cairo_context, fopt);
488 cairo_font_options_destroy (fopt);
489 }
490} 590}
591
592char *
593SDL_GetError ()
491 594
492int 595int
493SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 596SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
494 597
495void 598void
496SDL_Quit () 599SDL_Quit ()
497 600
498void 601void
499SDL_ListModes () 602SDL_ListModes (int rgb, int alpha)
500 PPCODE: 603 PPCODE:
501{ 604{
502 SDL_Rect **m; 605 SDL_Rect **m;
503 606
504 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 607 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
505 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
506 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
507 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 610 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
508 611
509 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 612 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
510 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 613 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
511 614
512 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 615 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
513 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
515 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516 619
517 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 620 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
518 621#if SDL_VERSION_ATLEAST(1,2,10)
519 SDL_EnableUNICODE (1); 622 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
520 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 623 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
624#endif
521 625
522 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 626 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
523 627
524 if (m && m != (SDL_Rect **)-1) 628 if (m && m != (SDL_Rect **)-1)
525 while (*m) 629 while (*m)
526 { 630 {
631 if ((*m)->w >= 640 && (*m)->h >= 480)
632 {
527 AV *av = newAV (); 633 AV *av = newAV ();
528 av_push (av, newSViv ((*m)->w)); 634 av_push (av, newSViv ((*m)->w));
529 av_push (av, newSViv ((*m)->h)); 635 av_push (av, newSViv ((*m)->h));
636 av_push (av, newSViv (rgb));
637 av_push (av, newSViv (alpha));
530 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 638 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
639 }
531 640
532 ++m; 641 ++m;
533 } 642 }
534} 643}
535 644
536char *
537SDL_GetError ()
538
539int 645int
540SDL_SetVideoMode (int w, int h, int fullscreen) 646SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
541 CODE: 647 CODE:
648{
649 SDL_EnableUNICODE (1);
650 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
651
652 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
653 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
654 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
655 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
656
542 RETVAL = !!SDL_SetVideoMode ( 657 RETVAL = !!SDL_SetVideoMode (
543 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 658 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
544 ); 659 );
660
545 if (RETVAL) 661 if (RETVAL)
546 { 662 {
663 av_clear (texture_av);
664
547 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 665 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
548# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 666#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
549# include "glfunc.h" 667#include "glfunc.h"
550# undef GL_FUNC 668#undef GL_FUNC
551 } 669 }
670}
552 OUTPUT: 671 OUTPUT:
553 RETVAL 672 RETVAL
554 673
555void 674void
556SDL_GL_SwapBuffers () 675SDL_GL_SwapBuffers ()
557 676
558char * 677char *
559SDL_GetKeyName (int sym) 678SDL_GetKeyName (int sym)
560 679
680int
681SDL_GetAppState ()
682
561void 683void
562SDL_PollEvent () 684poll_events ()
563 PPCODE: 685 PPCODE:
564{ 686{
565 SDL_Event ev; 687 SDL_Event ev;
566 688
567 while (SDL_PollEvent (&ev)) 689 SDL_PumpEvents ();
690 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
568 { 691 {
569 HV *hv = newHV (); 692 HV *hv = newHV ();
570 hv_store (hv, "type", 4, newSViv (ev.type), 0); 693 hv_store (hv, "type", 4, newSViv (ev.type), 0);
571 694
572 switch (ev.type) 695 switch (ev.type)
574 case SDL_KEYDOWN: 697 case SDL_KEYDOWN:
575 case SDL_KEYUP: 698 case SDL_KEYUP:
576 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 699 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
577 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 700 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
578 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 701 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
702 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
579 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 703 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
580 break; 704 break;
581 705
582 case SDL_ACTIVEEVENT: 706 case SDL_ACTIVEEVENT:
583 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 707 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
584 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 708 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
585 break; 709 break;
586 710
587 case SDL_MOUSEMOTION: 711 case SDL_MOUSEMOTION:
712 {
713 int state = ev.motion.state;
714 int x = ev.motion.x;
715 int y = ev.motion.y;
716 int xrel = ev.motion.xrel;
717 int yrel = ev.motion.yrel;
718
719 /* do simplistic event compression */
720 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
721 && state == ev.motion.state)
722 {
723 xrel += ev.motion.xrel;
724 yrel += ev.motion.yrel;
725 x = ev.motion.x;
726 y = ev.motion.y;
727 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
728 }
729
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 730 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
589
590 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 731 hv_store (hv, "state", 5, newSViv (state), 0);
591 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 732 hv_store (hv, "x", 1, newSViv (x), 0);
592 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 733 hv_store (hv, "y", 1, newSViv (y), 0);
593 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 734 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
594 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 735 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
736 }
595 break; 737 break;
596 738
597 case SDL_MOUSEBUTTONDOWN: 739 case SDL_MOUSEBUTTONDOWN:
598 case SDL_MOUSEBUTTONUP: 740 case SDL_MOUSEBUTTONUP:
599 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 741 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
609 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 751 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 752 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611 break; 753 break;
612 } 754 }
613 755
614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 756 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615 } 757 }
616} 758}
617 759
618int 760int
619Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 761Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
628Mix_AllocateChannels (int numchans = -1) 770Mix_AllocateChannels (int numchans = -1)
629 771
630void 772void
631lowdelay (int fd, int val = 1) 773lowdelay (int fd, int val = 1)
632 CODE: 774 CODE:
775 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
776
777void
778win32_proxy_info ()
779 PPCODE:
780{
633#ifndef _WIN32 781#ifdef _WIN32
634 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 782 char buffer[2048];
783 DWORD buflen;
784
785 EXTEND (SP, 3);
786
787 buflen = sizeof (buffer);
788 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
789 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
790 {
791 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
792
793 buflen = sizeof (buffer);
794 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
795 {
796 PUSHs (newSVpv (buffer, 0));
797
798 buflen = sizeof (buffer);
799 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
800 PUSHs (newSVpv (buffer, 0));
801 }
802 }
635#endif 803#endif
804}
636 805
637void 806void
638add_font (char *file) 807add_font (char *file)
639 CODE: 808 CODE:
640 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 809 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641#ifdef _WIN32
642 // cairo... sigh... requires win2000
643 AddFontResourceEx (file, FR_PRIVATE, 0);
644#endif
645 810
646void 811void
647load_image_inline (SV *image_) 812load_image_inline (SV *image_)
648 ALIAS: 813 ALIAS:
649 load_image_file = 1 814 load_image_file = 1
691 856
692 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 857 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693 858
694 assert (surface2->pitch == surface2->w * 4); 859 assert (surface2->pitch == surface2->w * 4);
695 860
861 SDL_LockSurface (surface2);
696 EXTEND (SP, 5); 862 EXTEND (SP, 6);
697 PUSHs (sv_2mortal (newSViv (surface2->w))); 863 PUSHs (sv_2mortal (newSViv (surface2->w)));
698 PUSHs (sv_2mortal (newSViv (surface2->h))); 864 PUSHs (sv_2mortal (newSViv (surface2->h)));
699 SDL_LockSurface (surface2);
700 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 865 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701 SDL_UnlockSurface (surface2);
702 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 866 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 867 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 868 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
869 SDL_UnlockSurface (surface2);
705 870
706 SDL_FreeSurface (surface); 871 SDL_FreeSurface (surface);
707 SDL_FreeSurface (surface2); 872 SDL_FreeSurface (surface2);
708} 873}
709 874
748 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 913 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
749#endif 914#endif
750 _exit (1); 915 _exit (1);
751 916
752void 917void
753_exit (int retval) 918_exit (int retval = 0)
754 CODE: 919 CODE:
920#ifdef WIN32
921 ExitThread (retval); // unclean, please beam me up
922#else
755 _exit (retval); 923 _exit (retval);
924#endif
756 925
926void
927debug ()
928 CODE:
929{
930#if DEBUG
931 VALGRIND_DO_LEAK_CHECK;
932#endif
933}
934
757MODULE = CFClient PACKAGE = CFClient::Font 935MODULE = CFPlus PACKAGE = CFPlus::Font
758 936
759CFClient::Font 937CFPlus::Font
760new_from_file (SV *class, char *path, int id = 0) 938new_from_file (SV *class, char *path, int id = 0)
761 CODE: 939 CODE:
762{ 940{
763 int count; 941 int count;
764 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 942 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
767} 945}
768 OUTPUT: 946 OUTPUT:
769 RETVAL 947 RETVAL
770 948
771void 949void
772DESTROY (CFClient::Font self) 950DESTROY (CFPlus::Font self)
773 CODE: 951 CODE:
774 pango_font_description_free (self); 952 pango_font_description_free (self);
775 953
776void 954void
777make_default (CFClient::Font self) 955make_default (CFPlus::Font self)
778 CODE: 956 CODE:
779 default_font = self; 957 default_font = self;
780 958
781MODULE = CFClient PACKAGE = CFClient::Layout 959MODULE = CFPlus PACKAGE = CFPlus::Layout
782 960
783CFClient::Layout 961void
784new (SV *class, int rgba = 0) 962reset_glyph_cache ()
963 CODE:
964 tc_clear ();
965
966CFPlus::Layout
967new (SV *class)
785 CODE: 968 CODE:
786 New (0, RETVAL, 1, struct cf_layout); 969 New (0, RETVAL, 1, struct cf_layout);
787 970
788 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 971 RETVAL->pl = pango_layout_new (opengl_context);
789 RETVAL->rgba = rgba;
790 RETVAL->r = 1.; 972 RETVAL->r = 1.;
791 RETVAL->g = 1.; 973 RETVAL->g = 1.;
792 RETVAL->b = 1.; 974 RETVAL->b = 1.;
793 RETVAL->a = 1.; 975 RETVAL->a = 1.;
794 RETVAL->base_height = MIN_FONT_HEIGHT; 976 RETVAL->base_height = MIN_FONT_HEIGHT;
798 layout_update_font (RETVAL); 980 layout_update_font (RETVAL);
799 OUTPUT: 981 OUTPUT:
800 RETVAL 982 RETVAL
801 983
802void 984void
803DESTROY (CFClient::Layout self) 985DESTROY (CFPlus::Layout self)
804 CODE: 986 CODE:
805 g_object_unref (self->pl); 987 g_object_unref (self->pl);
806 Safefree (self); 988 Safefree (self);
807 989
808int
809is_rgba (CFClient::Layout self)
810 CODE:
811 RETVAL = self->rgba;
812 OUTPUT:
813 RETVAL
814
815void 990void
816set_text (CFClient::Layout self, SV *text_) 991set_text (CFPlus::Layout self, SV *text_)
817 CODE: 992 CODE:
818{ 993{
819 STRLEN textlen; 994 STRLEN textlen;
820 char *text = SvPVutf8 (text_, textlen); 995 char *text = SvPVutf8 (text_, textlen);
821 996
822 pango_layout_set_text (self->pl, text, textlen); 997 pango_layout_set_text (self->pl, text, textlen);
823} 998}
824 999
825void 1000void
826set_markup (CFClient::Layout self, SV *text_) 1001set_markup (CFPlus::Layout self, SV *text_)
827 CODE: 1002 CODE:
828{ 1003{
829 STRLEN textlen; 1004 STRLEN textlen;
830 char *text = SvPVutf8 (text_, textlen); 1005 char *text = SvPVutf8 (text_, textlen);
831 1006
832 pango_layout_set_markup (self->pl, text, textlen); 1007 pango_layout_set_markup (self->pl, text, textlen);
833} 1008}
834 1009
835void 1010void
836set_shapes (CFClient::Layout self, ...) 1011set_shapes (CFPlus::Layout self, ...)
837 CODE: 1012 CODE:
838{ 1013{
839 PangoAttrList *attrs = 0; 1014 PangoAttrList *attrs = 0;
840 const char *text = pango_layout_get_text (self->pl); 1015 const char *text = pango_layout_get_text (self->pl);
841 const char *pos = text; 1016 const char *pos = text;
876 if (attrs) 1051 if (attrs)
877 pango_layout_set_attributes (self->pl, attrs); 1052 pango_layout_set_attributes (self->pl, attrs);
878} 1053}
879 1054
880void 1055void
881get_shapes (CFClient::Layout self) 1056get_shapes (CFPlus::Layout self)
882 PPCODE: 1057 PPCODE:
883{ 1058{
884 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1059 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885 1060
886 do 1061 do
890 if (run && shape_attr_p (run)) 1065 if (run && shape_attr_p (run))
891 { 1066 {
892 PangoRectangle extents; 1067 PangoRectangle extents;
893 pango_layout_iter_get_run_extents (iter, 0, &extents); 1068 pango_layout_iter_get_run_extents (iter, 0, &extents);
894 1069
1070 EXTEND (SP, 2);
895 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1071 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1072 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897 } 1073 }
898 } 1074 }
899 while (pango_layout_iter_next_run (iter)); 1075 while (pango_layout_iter_next_run (iter));
900 1076
901 pango_layout_iter_free (iter); 1077 pango_layout_iter_free (iter);
902} 1078}
903 1079
904int 1080int
905has_wrapped (CFClient::Layout self) 1081has_wrapped (CFPlus::Layout self)
906 CODE: 1082 CODE:
907{ 1083{
908 int lines = 1; 1084 int lines = 1;
909 const char *text = pango_layout_get_text (self->pl); 1085 const char *text = pango_layout_get_text (self->pl);
910 1086
915} 1091}
916 OUTPUT: 1092 OUTPUT:
917 RETVAL 1093 RETVAL
918 1094
919SV * 1095SV *
920get_text (CFClient::Layout self) 1096get_text (CFPlus::Layout self)
921 CODE: 1097 CODE:
922 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1098 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923 sv_utf8_decode (RETVAL); 1099 sv_utf8_decode (RETVAL);
924 OUTPUT: 1100 OUTPUT:
925 RETVAL 1101 RETVAL
926 1102
927void 1103void
928set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1104set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929 CODE: 1105 CODE:
930 self->r = r; 1106 self->r = r;
931 self->g = g; 1107 self->g = g;
932 self->b = b; 1108 self->b = b;
933 self->a = a; 1109 self->a = a;
934 1110
935void 1111void
936set_font (CFClient::Layout self, CFClient::Font font = 0) 1112set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937 CODE: 1113 CODE:
938 if (self->font != font) 1114 if (self->font != font)
939 { 1115 {
940 self->font = font; 1116 self->font = font;
941 layout_update_font (self); 1117 layout_update_font (self);
942 } 1118 }
943 1119
944void 1120void
945set_height (CFClient::Layout self, int base_height) 1121set_height (CFPlus::Layout self, int base_height)
946 CODE: 1122 CODE:
947 if (self->base_height != base_height) 1123 if (self->base_height != base_height)
948 { 1124 {
949 self->base_height = base_height; 1125 self->base_height = base_height;
950 layout_update_font (self); 1126 layout_update_font (self);
951 } 1127 }
952 1128
953void 1129void
954set_width (CFClient::Layout self, int max_width = -1) 1130set_width (CFPlus::Layout self, int max_width = -1)
955 CODE: 1131 CODE:
956 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1132 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957 1133
958void 1134void
959set_indent (CFClient::Layout self, int indent) 1135set_indent (CFPlus::Layout self, int indent)
960 CODE: 1136 CODE:
961 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1137 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962 1138
963void 1139void
964set_spacing (CFClient::Layout self, int spacing) 1140set_spacing (CFPlus::Layout self, int spacing)
965 CODE: 1141 CODE:
966 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1142 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967 1143
968void 1144void
969set_ellipsise (CFClient::Layout self, int ellipsise) 1145set_ellipsise (CFPlus::Layout self, int ellipsise)
970 CODE: 1146 CODE:
971 pango_layout_set_ellipsize (self->pl, 1147 pango_layout_set_ellipsize (self->pl,
972 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1148 ellipsise == 1 ? PANGO_ELLIPSIZE_START
973 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1149 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1150 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
975 : PANGO_ELLIPSIZE_NONE 1151 : PANGO_ELLIPSIZE_NONE
976 ); 1152 );
977 1153
978void 1154void
979set_single_paragraph_mode (CFClient::Layout self, int spm) 1155set_single_paragraph_mode (CFPlus::Layout self, int spm)
980 CODE: 1156 CODE:
981 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1157 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982 1158
983void 1159void
984size (CFClient::Layout self) 1160size (CFPlus::Layout self)
985 PPCODE: 1161 PPCODE:
986{ 1162{
987 int w, h; 1163 int w, h;
988 1164
989 layout_get_pixel_size (self, &w, &h); 1165 layout_get_pixel_size (self, &w, &h);
992 PUSHs (sv_2mortal (newSViv (w))); 1168 PUSHs (sv_2mortal (newSViv (w)));
993 PUSHs (sv_2mortal (newSViv (h))); 1169 PUSHs (sv_2mortal (newSViv (h)));
994} 1170}
995 1171
996int 1172int
997descent (CFClient::Layout self) 1173descent (CFPlus::Layout self)
998 CODE: 1174 CODE:
999{ 1175{
1000 PangoRectangle rect; 1176 PangoRectangle rect;
1001 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1177 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002 pango_layout_line_get_pixel_extents (line, 0, &rect); 1178 pango_layout_line_get_pixel_extents (line, 0, &rect);
1004} 1180}
1005 OUTPUT: 1181 OUTPUT:
1006 RETVAL 1182 RETVAL
1007 1183
1008int 1184int
1009xy_to_index (CFClient::Layout self, int x, int y) 1185xy_to_index (CFPlus::Layout self, int x, int y)
1010 CODE: 1186 CODE:
1011{ 1187{
1012 int index, trailing; 1188 int index, trailing;
1013 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1189 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014 RETVAL = index; 1190 RETVAL = index + trailing;
1015} 1191}
1016 OUTPUT: 1192 OUTPUT:
1017 RETVAL 1193 RETVAL
1018 1194
1019void 1195void
1020cursor_pos (CFClient::Layout self, int index) 1196cursor_pos (CFPlus::Layout self, int index)
1021 PPCODE: 1197 PPCODE:
1022{ 1198{
1023 PangoRectangle strong_pos; 1199 PangoRectangle strong_pos;
1024 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1200 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025 1201
1028 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1204 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030} 1206}
1031 1207
1032void 1208void
1033render (CFClient::Layout self) 1209index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1034 PPCODE: 1210 PPCODE:
1035{ 1211{
1036 SV *retval; 1212 int line, x;
1037 int w, h;
1038 1213
1039 layout_get_pixel_size (self, &w, &h); 1214 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1215 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1040 1216
1041 if (self->rgba)
1042 {
1043 cairo_surface_t *surface;
1044 cairo_t *cairo;
1045
1046 retval = newSV (w * h * 4);
1047 SvPOK_only (retval);
1048 SvCUR_set (retval, w * h * 4);
1049
1050 memset (SvPVX (retval), 0, w * h * 4);
1051
1052 surface = cairo_image_surface_create_for_data (
1053 (void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
1054 cairo = cairo_create (surface);
1055 cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1056
1057 pango_cairo_show_layout (cairo, self->pl);
1058
1059 cairo_destroy (cairo);
1060 cairo_surface_destroy (surface);
1061
1062 // what a mess, and its premultiplied, too :(
1063 {
1064 uint32_t *p = (uint32_t *)SvPVX (retval);
1065 uint32_t *e = p + w * h;
1066
1067 while (p < e)
1068 {
1069 uint32_t rgba = *p;
1070 rgba = (rgba >> 24) | (rgba << 8);
1071#if 0
1072#ifdef _WIN32
1073 {//D
1074 uint8_t r = rgba >> 24;
1075 uint8_t g = rgba >> 16;
1076 uint8_t b = rgba >> 8;
1077 uint8_t a = rgba >> 0;
1078
1079 rgba = (rgba & 0xffffff00) | a;
1080 }
1081#endif
1082#endif
1083 rgba = SDL_SwapBE32 (rgba);
1084 *p++ = rgba;
1085 }
1086 }
1087
1088 EXTEND (SP, 5); 1217 EXTEND (SP, 2);
1089 PUSHs (sv_2mortal (newSViv (w))); 1218 PUSHs (sv_2mortal (newSViv (line - 1)));
1219 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1220}
1221
1222void
1223line_x_to_index (CFPlus::Layout self, int line, int x)
1224 PPCODE:
1225{
1226 PangoLayoutLine *lp;
1227 int index, trailing;
1228
1229 if (line < 0)
1230 XSRETURN_EMPTY;
1231
1232 if (!(lp = pango_layout_get_line (self->pl, line)))
1233 XSRETURN_EMPTY; /* do better */
1234
1235 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1236
1237 EXTEND (SP, 2);
1238 if (GIMME_V == G_SCALAR)
1090 PUSHs (sv_2mortal (newSViv (h))); 1239 PUSHs (sv_2mortal (newSViv (index + trailing)));
1091 PUSHs (sv_2mortal (retval));
1092 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1093 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1094 }
1095 else 1240 else
1096 { 1241 {
1097 FT_Bitmap bitmap;
1098
1099 retval = newSV (w * h);
1100 SvPOK_only (retval);
1101 SvCUR_set (retval, w * h);
1102
1103 bitmap.rows = h;
1104 bitmap.width = w;
1105 bitmap.pitch = w;
1106 bitmap.buffer = (unsigned char*)SvPVX (retval);
1107 bitmap.num_grays = 256;
1108 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1109
1110 memset (bitmap.buffer, 0, w * h);
1111
1112 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1113
1114 EXTEND (SP, 5);
1115 PUSHs (sv_2mortal (newSViv (w))); 1242 PUSHs (sv_2mortal (newSViv (index)));
1116 PUSHs (sv_2mortal (newSViv (h))); 1243 PUSHs (sv_2mortal (newSViv (trailing)));
1117 PUSHs (sv_2mortal (retval));
1118 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1119 PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1120 } 1244 }
1121} 1245}
1122 1246
1247void
1248render (CFPlus::Layout self, float x, float y, int flags = 0)
1249 PPCODE:
1250 pango_opengl_render_layout_subpixel (
1251 self->pl,
1252 x * PANGO_SCALE, y * PANGO_SCALE,
1253 self->r, self->g, self->b, self->a,
1254 flags
1255 );
1256
1123MODULE = CFClient PACKAGE = CFClient::Texture 1257MODULE = CFPlus PACKAGE = CFPlus::Texture
1258
1259int minpot (int n)
1124 1260
1125void 1261void
1126pad2pot (SV *data_, SV *w_, SV *h_) 1262pad2pot (SV *data_, SV *w_, SV *h_)
1127 CODE: 1263 CODE:
1128{ 1264{
1206 glDisable (GL_ALPHA_TEST); 1342 glDisable (GL_ALPHA_TEST);
1207 glDisable (GL_BLEND); 1343 glDisable (GL_BLEND);
1208 } 1344 }
1209} 1345}
1210 1346
1347IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1348 CODE:
1349{
1350 GLint width;
1351 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1352 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1353 RETVAL = width > 0;
1354}
1355 OUTPUT:
1356 RETVAL
1357
1211MODULE = CFClient PACKAGE = CFClient::Map 1358MODULE = CFPlus PACKAGE = CFPlus::Map
1212 1359
1213CFClient::Map 1360CFPlus::Map
1214new (SV *class, int map_width, int map_height) 1361new (SV *class)
1215 CODE: 1362 CODE:
1216 New (0, RETVAL, 1, struct map); 1363 New (0, RETVAL, 1, struct map);
1217 RETVAL->x = 0; 1364 RETVAL->x = 0;
1218 RETVAL->y = 0; 1365 RETVAL->y = 0;
1219 RETVAL->w = map_width; 1366 RETVAL->w = 0;
1220 RETVAL->h = map_height; 1367 RETVAL->h = 0;
1221 RETVAL->ox = 0; 1368 RETVAL->ox = 0;
1222 RETVAL->oy = 0; 1369 RETVAL->oy = 0;
1223 RETVAL->faces = 8192; 1370 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1224 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1371 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1225 RETVAL->texs = 8192;
1226 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1227 RETVAL->rows = 0; 1372 RETVAL->rows = 0;
1228 RETVAL->row = 0; 1373 RETVAL->row = 0;
1229 OUTPUT: 1374 OUTPUT:
1230 RETVAL 1375 RETVAL
1231 1376
1232void 1377void
1233DESTROY (CFClient::Map self) 1378DESTROY (CFPlus::Map self)
1234 CODE: 1379 CODE:
1235{ 1380{
1236 map_clear (self); 1381 map_clear (self);
1237 Safefree (self->face); 1382 Safefree (self->face2tile);
1238 Safefree (self->tex); 1383 Safefree (self->tex);
1239 Safefree (self); 1384 Safefree (self);
1240} 1385}
1241 1386
1242void 1387void
1388resize (CFPlus::Map self, int map_width, int map_height)
1389 CODE:
1390 self->w = map_width;
1391 self->h = map_height;
1392
1393void
1243clear (CFClient::Map self) 1394clear (CFPlus::Map self)
1244 CODE: 1395 CODE:
1245 map_clear (self); 1396 map_clear (self);
1246 1397
1247void 1398void
1248set_face (CFClient::Map self, int face, int texid) 1399set_tileid (CFPlus::Map self, int face, int tile)
1249 CODE: 1400 CODE:
1250{ 1401{
1251 while (self->faces <= face) 1402 need_facenum (self, face); self->face2tile [face] = tile;
1252 { 1403 need_texid (self, tile);
1253 Append (mapface, self->face, self->faces, self->faces);
1254 self->faces *= 2;
1255 }
1256
1257 self->face [face] = texid;
1258} 1404}
1259 1405
1260void 1406void
1407set_smooth (CFPlus::Map self, int face, int smooth, int level)
1408 CODE:
1409{
1410 tileid texid;
1411 maptex *tex;
1412
1413 if (face < 0 || face >= self->faces)
1414 return;
1415
1416 if (smooth < 0 || smooth >= self->faces)
1417 return;
1418
1419 texid = self->face2tile [face];
1420
1421 if (!texid)
1422 return;
1423
1424 tex = self->tex + texid;
1425 tex->smoothtile = self->face2tile [smooth];
1426 tex->smoothlevel = level;
1427}
1428
1429void
1261set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1430set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1262 CODE: 1431 CODE:
1263{ 1432{
1264 while (self->texs <= texid) 1433 need_texid (self, texid);
1265 {
1266 Append (maptex, self->tex, self->texs, self->texs);
1267 self->texs *= 2;
1268 }
1269 1434
1270 { 1435 {
1271 maptex *tex = self->tex + texid; 1436 maptex *tex = self->tex + texid;
1272 1437
1273 tex->name = name; 1438 tex->name = name;
1290 // from transparent color bleeding and ugly wrapping effects. 1455 // from transparent color bleeding and ugly wrapping effects.
1291 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1456 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292} 1457}
1293 1458
1294int 1459int
1295ox (CFClient::Map self) 1460ox (CFPlus::Map self)
1296 ALIAS: 1461 ALIAS:
1297 oy = 1 1462 oy = 1
1298 x = 2 1463 x = 2
1299 y = 3 1464 y = 3
1300 w = 4 1465 w = 4
1311 } 1476 }
1312 OUTPUT: 1477 OUTPUT:
1313 RETVAL 1478 RETVAL
1314 1479
1315void 1480void
1316scroll (CFClient::Map self, int dx, int dy) 1481scroll (CFPlus::Map self, int dx, int dy)
1317 CODE: 1482 CODE:
1318{ 1483{
1319 if (dx > 0) 1484 if (dx > 0)
1320 map_blank (self, self->x, self->y, dx - 1, self->h); 1485 map_blank (self, self->x, self->y, dx, self->h);
1321 else if (dx < 0) 1486 else if (dx < 0)
1322 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1487 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1323 1488
1324 if (dy > 0) 1489 if (dy > 0)
1325 map_blank (self, self->x, self->y, self->w, dy - 1); 1490 map_blank (self, self->x, self->y, self->w, dy);
1326 else if (dy < 0) 1491 else if (dy < 0)
1327 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1492 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1328 1493
1329 self->ox += dx; self->x += dx; 1494 self->ox += dx; self->x += dx;
1330 self->oy += dy; self->y += dy; 1495 self->oy += dy; self->y += dy;
1331 1496
1332 while (self->y < 0) 1497 while (self->y < 0)
1337 self->y += MAP_EXTEND_Y; 1502 self->y += MAP_EXTEND_Y;
1338 } 1503 }
1339} 1504}
1340 1505
1341void 1506void
1342map1a_update (CFClient::Map self, SV *data_) 1507map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343 CODE: 1508 CODE:
1344{ 1509{
1345 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1510 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1346 uint8_t *data_end = (uint8_t *)SvEND (data_); 1511 uint8_t *data_end = (uint8_t *)SvEND (data_);
1347 mapcell *cell; 1512 mapcell *cell;
1348 int x, y, flags; 1513 int x, y, flags;
1349 1514
1350 while (data < data_end) 1515 while (data < data_end - 1)
1351 { 1516 {
1352 flags = (data [0] << 8) + data [1]; data += 2; 1517 flags = (data [0] << 8) + data [1]; data += 2;
1353 1518
1354 x = self->x + ((flags >> 10) & 63); 1519 x = self->x + ((flags >> 10) & 63);
1355 y = self->y + ((flags >> 4) & 63); 1520 y = self->y + ((flags >> 4) & 63);
1356 1521
1357 cell = map_get_cell (self, x, y); 1522 cell = map_get_cell (self, x, y);
1358 1523
1359 if (flags & 15) 1524 if (flags & 15)
1360 { 1525 {
1361 if (cell->darkness < 0) 1526 if (!cell->darkness)
1362 { 1527 {
1528 memset (cell, 0, sizeof (*cell));
1363 cell->darkness = 0; 1529 cell->darkness = 256;
1364 cell->face [0] = 0;
1365 cell->face [1] = 0;
1366 cell->face [2] = 0;
1367 } 1530 }
1368 1531
1369 cell->darkness = flags & 8 ? *data++ : 255;
1370
1371 //TODO: don't trust server data to be in-range(!) 1532 //TODO: don't trust server data to be in-range(!)
1533
1534 if (flags & 8)
1535 {
1536 if (extmap)
1537 {
1538 uint8_t ext, cmd;
1539
1540 do
1541 {
1542 ext = *data++;
1543 cmd = ext & 0x3f;
1544
1545 if (cmd < 4)
1546 cell->darkness = 255 - ext * 64 + 1;
1547 else if (cmd == 5) // health
1548 {
1549 cell->stat_width = 1;
1550 cell->stat_hp = *data++;
1551 }
1552 else if (cmd == 6) // monster width
1553 cell->stat_width = *data++ + 1;
1554 else if (cmd == 0x47)
1555 {
1556 if (*data == 4)
1557 ; // decode player count
1558
1559 data += *data + 1;
1560 }
1561 else if (cmd == 8) // cell flags
1562 cell->flags = *data++;
1563 else if (ext & 0x40) // unknown, multibyte => skip
1564 data += *data + 1;
1565 else
1566 data++;
1567 }
1568 while (ext & 0x80);
1569 }
1570 else
1571 cell->darkness = *data++ + 1;
1572 }
1372 1573
1373 if (flags & 4) 1574 if (flags & 4)
1374 { 1575 {
1375 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1576 faceid face = (data [0] << 8) + data [1]; data += 2;
1577 need_facenum (self, face);
1578 cell->tile [0] = self->face2tile [face];
1376 } 1579 }
1377 1580
1378 if (flags & 2) 1581 if (flags & 2)
1379 { 1582 {
1380 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1583 faceid face = (data [0] << 8) + data [1]; data += 2;
1584 need_facenum (self, face);
1585 cell->tile [1] = self->face2tile [face];
1381 } 1586 }
1382 1587
1383 if (flags & 1) 1588 if (flags & 1)
1384 { 1589 {
1385 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1590 faceid face = (data [0] << 8) + data [1]; data += 2;
1591 need_facenum (self, face);
1592 cell->tile [2] = self->face2tile [face];
1386 } 1593 }
1387 } 1594 }
1388 else 1595 else
1389 cell->darkness = -1; 1596 cell->darkness = 0;
1390 } 1597 }
1391} 1598}
1392 1599
1393SV * 1600SV *
1394mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1601mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395 CODE: 1602 CODE:
1396{ 1603{
1397 int x1, x; 1604 int x1, x;
1398 int y1, y; 1605 int y1, y;
1399 int z; 1606 int z;
1420 { 1627 {
1421 mapcell *cell = row->col + (x - row->c0); 1628 mapcell *cell = row->col + (x - row->c0);
1422 1629
1423 for (z = 0; z <= 0; z++) 1630 for (z = 0; z <= 0; z++)
1424 { 1631 {
1425 mapface face = cell->face [z];
1426
1427 if (face)
1428 {
1429 maptex tex = self->tex [face]; 1632 maptex tex = self->tex [cell->tile [z]];
1430 int a0 = 255 - tex.a; 1633 int a0 = 255 - tex.a;
1431 int a1 = tex.a; 1634 int a1 = tex.a;
1432 1635
1433 r = (r * a0 + tex.r * a1) / 255; 1636 r = (r * a0 + tex.r * a1) / 255;
1434 g = (g * a0 + tex.g * a1) / 255; 1637 g = (g * a0 + tex.g * a1) / 255;
1435 b = (b * a0 + tex.b * a1) / 255; 1638 b = (b * a0 + tex.b * a1) / 255;
1436 a = (a * a0 + tex.a * a1) / 255; 1639 a = (a * a0 + tex.a * a1) / 255;
1437 }
1438 } 1640 }
1439 } 1641 }
1440 1642
1441 *map++ = (r ) 1643 *map++ = (r )
1442 | (g << 8) 1644 | (g << 8)
1449} 1651}
1450 OUTPUT: 1652 OUTPUT:
1451 RETVAL 1653 RETVAL
1452 1654
1453void 1655void
1454draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1656draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1455 CODE: 1657 CODE:
1456{ 1658{
1457 int vx, vy; 1659 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1660 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1661 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1662 smooth_key skey;
1458 int x, y, z; 1663 int x, y, z;
1459 int last_name; 1664 int last_name;
1460 mapface face;
1461 1665
1462 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1666 // thats current max. sorry.
1463 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1667 if (sw > 255) sw = 255;
1668 if (sh > 255) sh = 255;
1464 1669
1465 /* 1670 // clear key, in case of extra padding
1466 int vx = self->vx = self->w >= sw 1671 memset (&skey, 0, sizeof (skey));
1467 ? self->x + (self->w - sw) / 2
1468 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1469
1470 int vy = self->vy = self->h >= sh
1471 ? self->y + (self->h - sh) / 2
1472 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1473 */
1474 1672
1475 glColor4ub (255, 255, 255, 255); 1673 glColor4ub (255, 255, 255, 255);
1476 1674
1477 glEnable (GL_BLEND); 1675 glEnable (GL_BLEND);
1478 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1676 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1481 1679
1482 glBegin (GL_QUADS); 1680 glBegin (GL_QUADS);
1483 1681
1484 last_name = 0; 1682 last_name = 0;
1485 1683
1684 mx += self->x;
1685 my += self->y;
1686
1687 // first pass: determine smooth_max
1688 // rather ugly, if you ask me
1689 // could also be stored inside mapcell and updated on change
1690 memset (smooth_max, 0, sizeof (smooth_max));
1691
1692 for (y = 0; y < sh; y++)
1693 if (0 <= y + my && y + my < self->rows)
1694 {
1695 maprow *row = self->row + (y + my);
1696
1697 for (x = 0; x < sw; x++)
1698 if (row->c0 <= x + mx && x + mx < row->c1)
1699 {
1700 mapcell *cell = row->col + (x + mx - row->c0);
1701
1702 smooth_max[x + 1][y + 1] =
1703 MAX (self->tex [cell->tile [0]].smoothlevel,
1704 MAX (self->tex [cell->tile [1]].smoothlevel,
1705 self->tex [cell->tile [2]].smoothlevel));
1706 }
1707 }
1708
1486 for (z = 0; z < 3; z++) 1709 for (z = 0; z <= 2; z++)
1710 {
1711 memset (smooth_level, 0, sizeof (smooth_level));
1712
1487 for (y = 0; y < sh; y++) 1713 for (y = 0; y < sh; y++)
1488 if (0 <= y + vy && y + vy < self->rows) 1714 if (0 <= y + my && y + my < self->rows)
1489 { 1715 {
1490 maprow *row = self->row + (y + vy); 1716 maprow *row = self->row + (y + my);
1491 1717
1492 for (x = 0; x < sw; x++) 1718 for (x = 0; x < sw; x++)
1493 if (row->c0 <= x + vx && x + vx < row->c1) 1719 if (row->c0 <= x + mx && x + mx < row->c1)
1494 { 1720 {
1495 mapcell *cell = row->col + (x + vx - row->c0); 1721 mapcell *cell = row->col + (x + mx - row->c0);
1496
1497 face = cell->face [z]; 1722 tileid tile = cell->tile [z];
1498 1723
1499 if (face) 1724 if (tile)
1725 {
1726 maptex tex = self->tex [tile];
1727 int px = (x + 1) * T - tex.w;
1728 int py = (y + 1) * T - tex.h;
1729
1730 // suppressing texture state switches here
1731 // is only moderately effective, but worth the extra effort
1732 if (last_name != tex.name)
1733 {
1734 if (!tex.name)
1735 tex = self->tex [2]; /* missing, replace by noface */
1736
1737 glEnd ();
1738 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1739 glBegin (GL_QUADS);
1740 }
1741
1742 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1743 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1744 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1745 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1746
1747 if (cell->flags && z == 2)
1748 {
1749 if (cell->flags & 1)
1750 {
1751 maptex tex = self->tex [1];
1752 int px = x * T + T * 2 / 32;
1753 int py = y * T - T * 6 / 32;
1754
1755 glEnd ();
1756 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1757 glBegin (GL_QUADS);
1758
1759 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1760 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1761 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1762 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1763 }
1764 }
1765
1766 // update smooth hash
1767 if (tex.smoothtile)
1768 {
1769 skey.tile = tex.smoothtile;
1770 skey.level = tex.smoothlevel;
1771
1772 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1773
1774 // add bits to current tile and all neighbours. skey.x|y is
1775 // shifted +1|+1 so we always stay positive.
1776
1777 // bits is ___n cccc CCCC bbbb
1778 // n do not draw borders&corners
1779 // c draw these corners, but...
1780 // C ... not these
1781 // b draw these borders
1782
1783 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1784 // ┃· ·· ·┃ ━━
1785
1786 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1787 // ·· ·· ·┏ ┓·
1788
1789 // full tile
1790 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1791
1792 // borders
1793 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1794 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1795 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1796 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1797
1798 // corners
1799 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1800 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1801 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1802 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1803 }
1804 }
1805 }
1806 }
1807
1808 // go through all smoothlevels, lowest to highest, then draw.
1809 // this is basically counting sort
1810 {
1811 int w, b;
1812
1813 for (w = 0; w < 256 / 32; ++w)
1814 {
1815 uint32_t smask = smooth_level [w];
1816 if (smask)
1817 for (b = 0; b < 32; ++b)
1818 if (smask & (((uint32_t)1) << b))
1500 { 1819 {
1501 maptex tex = self->tex [face]; 1820 int level = (w << 5) | b;
1821 HE *he;
1502 1822
1503 int px = (x + 1) * 32 - tex.w; 1823 hv_iterinit (smooth);
1504 int py = (y + 1) * 32 - tex.h; 1824 while ((he = hv_iternext (smooth)))
1505
1506 if (last_name != tex.name)
1507 { 1825 {
1826 smooth_key *skey = (smooth_key *)HeKEY (he);
1827 IV bits = SvIVX (HeVAL (he));
1828
1829 if (!(bits & 0x1000)
1830 && skey->level == level
1831 && level > smooth_max [skey->x][skey->y])
1832 {
1833 maptex tex = self->tex [skey->tile];
1834 int px = (((int)skey->x) - 1) * T;
1835 int py = (((int)skey->y) - 1) * T;
1836 int border = bits & 15;
1837 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1838 float dx = tex.s * .0625f; // 16 images/row
1839 float dy = tex.t * .5f ; // 2 images/column
1840
1841 // this time naively avoiding texture state changes
1842 // save gobs of state changes.
1843 if (last_name != tex.name)
1844 {
1845 if (!tex.name)
1846 continue; // smoothing not yet available
1847
1508 glEnd (); 1848 glEnd ();
1509 last_name = tex.name;
1510 glBindTexture (GL_TEXTURE_2D, last_name); 1849 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1511 glBegin (GL_QUADS); 1850 glBegin (GL_QUADS);
1851 }
1852
1853 if (border)
1854 {
1855 float ox = border * dx;
1856
1857 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1858 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1859 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1860 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1861 }
1862
1863 if (corner)
1864 {
1865 float ox = corner * dx;
1866
1867 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1868 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1869 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1870 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1871 }
1872 }
1512 } 1873 }
1513
1514 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1515 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1516 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1517 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1518 } 1874 }
1519 }
1520 } 1875 }
1876 }
1877
1878 hv_clear (smooth);
1879 }
1521 1880
1522 glEnd (); 1881 glEnd ();
1523 1882
1524 glDisable (GL_TEXTURE_2D); 1883 glDisable (GL_TEXTURE_2D);
1525 glDisable (GL_BLEND); 1884 glDisable (GL_BLEND);
1526}
1527 1885
1886 // top layer: overlays such as the health bar
1887 for (y = 0; y < sh; y++)
1888 if (0 <= y + my && y + my < self->rows)
1889 {
1890 maprow *row = self->row + (y + my);
1891
1892 for (x = 0; x < sw; x++)
1893 if (row->c0 <= x + mx && x + mx < row->c1)
1894 {
1895 mapcell *cell = row->col + (x + mx - row->c0);
1896
1897 int px = x * T;
1898 int py = y * T;
1899
1900 if (cell->stat_hp)
1901 {
1902 int width = cell->stat_width * T;
1903 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1904
1905 glColor3ub (0, 0, 0);
1906 glRectf (px + 1, py - thick - 2,
1907 px + width - 1, py);
1908
1909 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1910 glRectf (px + 2,
1911 py - thick - 1,
1912 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1913 }
1914 }
1915 }
1916}
1917
1528void 1918void
1529draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1919draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530 CODE: 1920 CODE:
1531{ 1921{
1532 static float color[16][3] = { 1922 static float color[16][3] = {
1533 { 0.00, 0.00, 0.00 }, 1923 { 0.00F, 0.00F, 0.00F },
1534 { 1.00, 1.00, 1.00 }, 1924 { 1.00F, 1.00F, 1.00F },
1535 { 0.00, 0.00, 0.55 }, 1925 { 0.00F, 0.00F, 0.55F },
1536 { 1.00, 0.00, 0.00 }, 1926 { 1.00F, 0.00F, 0.00F },
1537 1927
1538 { 1.00, 0.54, 0.00 }, 1928 { 1.00F, 0.54F, 0.00F },
1539 { 0.11, 0.56, 1.00 }, 1929 { 0.11F, 0.56F, 1.00F },
1540 { 0.93, 0.46, 0.00 }, 1930 { 0.93F, 0.46F, 0.00F },
1541 { 0.18, 0.54, 0.34 }, 1931 { 0.18F, 0.54F, 0.34F },
1542 1932
1543 { 0.56, 0.73, 0.56 }, 1933 { 0.56F, 0.73F, 0.56F },
1544 { 0.80, 0.80, 0.80 }, 1934 { 0.80F, 0.80F, 0.80F },
1545 { 0.55, 0.41, 0.13 }, 1935 { 0.55F, 0.41F, 0.13F },
1546 { 0.99, 0.77, 0.26 }, 1936 { 0.99F, 0.77F, 0.26F },
1547 1937
1548 { 0.74, 0.65, 0.41 }, 1938 { 0.74F, 0.65F, 0.41F },
1549 1939
1550 { 0.00, 1.00, 1.00 }, 1940 { 0.00F, 1.00F, 1.00F },
1551 { 1.00, 0.00, 1.00 }, 1941 { 1.00F, 0.00F, 1.00F },
1552 { 1.00, 1.00, 0.00 }, 1942 { 1.00F, 1.00F, 0.00F },
1553 }; 1943 };
1554 1944
1555 int x, y; 1945 int x, y;
1556 1946
1557 glEnable (GL_TEXTURE_2D); 1947 glEnable (GL_TEXTURE_2D);
1584 glDisable (GL_BLEND); 1974 glDisable (GL_BLEND);
1585 glDisable (GL_TEXTURE_2D); 1975 glDisable (GL_TEXTURE_2D);
1586} 1976}
1587 1977
1588void 1978void
1589fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1979fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1590 PPCODE: 1980 PPCODE:
1591{ 1981{
1592 int vx, vy;
1593 int x, y; 1982 int x, y;
1594 int sw4 = (sw + 3) & ~3; 1983 int sw4 = (sw + 3) & ~3;
1595 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1984 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1596 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1985 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1597 1986
1598 memset (darkness, 255, sw4 * sh); 1987 memset (darkness, 255, sw4 * sh);
1599 SvPOK_only (darkness_sv); 1988 SvPOK_only (darkness_sv);
1600 SvCUR_set (darkness_sv, sw4 * sh); 1989 SvCUR_set (darkness_sv, sw4 * sh);
1601 1990
1602 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1991 mx += self->x;
1603 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1992 my += self->y;
1604 1993
1605 for (y = 0; y < sh; y++) 1994 for (y = 0; y < sh; y++)
1606 if (0 <= y + vy && y + vy < self->rows) 1995 if (0 <= y + my && y + my < self->rows)
1607 { 1996 {
1608 maprow *row = self->row + (y + vy); 1997 maprow *row = self->row + (y + my);
1609 1998
1610 for (x = 0; x < sw; x++) 1999 for (x = 0; x < sw; x++)
1611 if (row->c0 <= x + vx && x + vx < row->c1) 2000 if (row->c0 <= x + mx && x + mx < row->c1)
1612 { 2001 {
1613 mapcell *cell = row->col + (x + vx - row->c0); 2002 mapcell *cell = row->col + (x + mx - row->c0);
1614 2003
1615 darkness[y * sw4 + x] = cell->darkness < 0 2004 darkness[y * sw4 + x] = cell->darkness
2005 ? 255 - (cell->darkness - 1)
1616 ? 255 - FOW_DARKNESS 2006 : 255 - FOW_DARKNESS;
1617 : 255 - cell->darkness;
1618 } 2007 }
1619 } 2008 }
1620 2009
1621 EXTEND (SP, 3); 2010 EXTEND (SP, 3);
1622 PUSHs (sv_2mortal (newSViv (sw4))); 2011 PUSHs (sv_2mortal (newSViv (sw4)));
1623 PUSHs (sv_2mortal (newSViv (sh))); 2012 PUSHs (sv_2mortal (newSViv (sh)));
1624 PUSHs (darkness_sv); 2013 PUSHs (darkness_sv);
1625} 2014}
1626 2015
1627SV * 2016SV *
1628get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2017get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629 CODE: 2018 CODE:
1630{ 2019{
1631 int x, y, x1, y1; 2020 int x, y, x1, y1;
1632 SV *data_sv = newSV (w * h * 7 + 5); 2021 SV *data_sv = newSV (w * h * 7 + 5);
1633 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2022 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1658 if (row && row->c0 <= x && x < row->c1) 2047 if (row && row->c0 <= x && x < row->c1)
1659 { 2048 {
1660 mapcell *cell = row->col + (x - row->c0); 2049 mapcell *cell = row->col + (x - row->c0);
1661 uint8_t flags = 0; 2050 uint8_t flags = 0;
1662 2051
1663 if (cell->face [0]) flags |= 1; 2052 if (cell->tile [0]) flags |= 1;
1664 if (cell->face [1]) flags |= 2; 2053 if (cell->tile [1]) flags |= 2;
1665 if (cell->face [2]) flags |= 4; 2054 if (cell->tile [2]) flags |= 4;
1666 2055
1667 *data++ = flags; 2056 *data++ = flags;
1668 2057
1669 if (flags & 1) 2058 if (flags & 1)
1670 { 2059 {
2060 tileid tile = cell->tile [0];
1671 *data++ = cell->face [0] >> 8; 2061 *data++ = tile >> 8;
1672 *data++ = cell->face [0]; 2062 *data++ = tile;
1673 } 2063 }
1674 2064
1675 if (flags & 2) 2065 if (flags & 2)
1676 { 2066 {
2067 tileid tile = cell->tile [1];
1677 *data++ = cell->face [1] >> 8; 2068 *data++ = tile >> 8;
1678 *data++ = cell->face [1]; 2069 *data++ = tile;
1679 } 2070 }
1680 2071
1681 if (flags & 4) 2072 if (flags & 4)
1682 { 2073 {
2074 tileid tile = cell->tile [2];
1683 *data++ = cell->face [2] >> 8; 2075 *data++ = tile >> 8;
1684 *data++ = cell->face [2]; 2076 *data++ = tile;
1685 } 2077 }
1686 } 2078 }
1687 else 2079 else
1688 *data++ = 0; 2080 *data++ = 0;
1689 } 2081 }
1695} 2087}
1696 OUTPUT: 2088 OUTPUT:
1697 RETVAL 2089 RETVAL
1698 2090
1699void 2091void
1700set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2092set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701 PPCODE: 2093 PPCODE:
1702{ 2094{
1703 int x, y, z; 2095 int x, y, z;
1704 int w, h; 2096 int w, h;
1705 int x1, y1; 2097 int x1, y1;
1729 { 2121 {
1730 uint8_t flags = *data++; 2122 uint8_t flags = *data++;
1731 2123
1732 if (flags) 2124 if (flags)
1733 { 2125 {
1734 mapface face[3] = { 0, 0, 0 };
1735
1736 mapcell *cell = row_get_cell (row, x); 2126 mapcell *cell = row_get_cell (row, x);
2127 tileid tile[3] = { 0, 0, 0 };
1737 2128
1738 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2129 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1739 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2130 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1740 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2131 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1741 2132
1742 if (cell->darkness <= 0) 2133 if (cell->darkness == 0)
1743 { 2134 {
1744 cell->darkness = -1; 2135 cell->darkness = 0;
1745 2136
1746 for (z = 0; z <= 2; z++) 2137 for (z = 0; z <= 2; z++)
1747 { 2138 {
1748 cell->face[z] = face[z]; 2139 tileid t = tile [z];
1749 2140
1750 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2141 if (t >= self->texs || (t && !self->tex [t].name))
2142 {
1751 XPUSHs (sv_2mortal (newSViv (face[z]))); 2143 XPUSHs (sv_2mortal (newSViv (t)));
2144 need_texid (self, t);
2145 }
2146
2147 cell->tile [z] = t;
1752 } 2148 }
1753 } 2149 }
1754 } 2150 }
1755 } 2151 }
1756 } 2152 }
1757} 2153}
1758 2154
1759MODULE = CFClient PACKAGE = CFClient::MixChunk 2155MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760 2156
1761CFClient::MixChunk 2157CFPlus::MixChunk
1762new_from_file (SV *class, char *path) 2158new_from_file (SV *class, char *path)
1763 CODE: 2159 CODE:
1764 RETVAL = Mix_LoadWAV (path); 2160 RETVAL = Mix_LoadWAV (path);
1765 OUTPUT: 2161 OUTPUT:
1766 RETVAL 2162 RETVAL
1767 2163
1768void 2164void
1769DESTROY (CFClient::MixChunk self) 2165DESTROY (CFPlus::MixChunk self)
1770 CODE: 2166 CODE:
1771 Mix_FreeChunk (self); 2167 Mix_FreeChunk (self);
1772 2168
1773int 2169int
1774volume (CFClient::MixChunk self, int volume = -1) 2170volume (CFPlus::MixChunk self, int volume = -1)
1775 CODE: 2171 CODE:
1776 RETVAL = Mix_VolumeChunk (self, volume); 2172 RETVAL = Mix_VolumeChunk (self, volume);
1777 OUTPUT: 2173 OUTPUT:
1778 RETVAL 2174 RETVAL
1779 2175
1780int 2176int
1781play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2177play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782 CODE: 2178 CODE:
1783 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2179 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784 OUTPUT: 2180 OUTPUT:
1785 RETVAL 2181 RETVAL
1786 2182
1787MODULE = CFClient PACKAGE = CFClient::MixMusic 2183MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788 2184
1789int 2185int
1790volume (int volume = -1) 2186volume (int volume = -1)
1791 CODE: 2187 CODE:
1792 RETVAL = Mix_VolumeMusic (volume); 2188 RETVAL = Mix_VolumeMusic (volume);
1793 OUTPUT: 2189 OUTPUT:
1794 RETVAL 2190 RETVAL
1795 2191
2192int
2193fade_out (int ms)
2194 CODE:
2195 RETVAL = Mix_FadeOutMusic (ms);
2196 OUTPUT:
2197 RETVAL
2198
1796CFClient::MixMusic 2199CFPlus::MixMusic
1797new_from_file (SV *class, char *path) 2200new_from_file (SV *class, char *path)
1798 CODE: 2201 CODE:
1799 RETVAL = Mix_LoadMUS (path); 2202 RETVAL = Mix_LoadMUS (path);
1800 OUTPUT: 2203 OUTPUT:
1801 RETVAL 2204 RETVAL
1802 2205
1803void 2206void
1804DESTROY (CFClient::MixMusic self) 2207DESTROY (CFPlus::MixMusic self)
1805 CODE: 2208 CODE:
1806 Mix_FreeMusic (self); 2209 Mix_FreeMusic (self);
1807 2210
1808int 2211int
1809play (CFClient::MixMusic self, int loops = -1) 2212play (CFPlus::MixMusic self, int loops = -1)
1810 CODE: 2213 CODE:
1811 RETVAL = Mix_PlayMusic (self, loops); 2214 RETVAL = Mix_PlayMusic (self, loops);
1812 OUTPUT: 2215 OUTPUT:
1813 RETVAL 2216 RETVAL
1814 2217
2218int
2219fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2220 CODE:
2221 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2222 OUTPUT:
2223 RETVAL
2224
1815MODULE = CFClient PACKAGE = CFClient::OpenGL 2225MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816 2226
1817BOOT: 2227BOOT:
1818{ 2228{
1819 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2229 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820 static const struct { 2230 static const struct {
1821 const char *name; 2231 const char *name;
1822 IV iv; 2232 IV iv;
1823 } *civ, const_iv[] = { 2233 } *civ, const_iv[] = {
1824# define const_iv(name) { # name, (IV)name } 2234# define const_iv(name) { # name, (IV)name }
2235 const_iv (GL_VENDOR),
2236 const_iv (GL_VERSION),
2237 const_iv (GL_EXTENSIONS),
1825 const_iv (GL_COLOR_MATERIAL), 2238 const_iv (GL_COLOR_MATERIAL),
1826 const_iv (GL_SMOOTH), 2239 const_iv (GL_SMOOTH),
1827 const_iv (GL_FLAT), 2240 const_iv (GL_FLAT),
1828 const_iv (GL_DITHER), 2241 const_iv (GL_DITHER),
1829 const_iv (GL_BLEND), 2242 const_iv (GL_BLEND),
1856 const_iv (GL_LUMINANCE), 2269 const_iv (GL_LUMINANCE),
1857 const_iv (GL_LUMINANCE_ALPHA), 2270 const_iv (GL_LUMINANCE_ALPHA),
1858 const_iv (GL_FLOAT), 2271 const_iv (GL_FLOAT),
1859 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2272 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1860 const_iv (GL_COMPILE), 2273 const_iv (GL_COMPILE),
2274 const_iv (GL_PROXY_TEXTURE_1D),
2275 const_iv (GL_PROXY_TEXTURE_2D),
1861 const_iv (GL_TEXTURE_1D), 2276 const_iv (GL_TEXTURE_1D),
1862 const_iv (GL_TEXTURE_2D), 2277 const_iv (GL_TEXTURE_2D),
1863 const_iv (GL_TEXTURE_ENV), 2278 const_iv (GL_TEXTURE_ENV),
1864 const_iv (GL_TEXTURE_MAG_FILTER), 2279 const_iv (GL_TEXTURE_MAG_FILTER),
1865 const_iv (GL_TEXTURE_MIN_FILTER), 2280 const_iv (GL_TEXTURE_MIN_FILTER),
1887 const_iv (GL_SEPARABLE_2D), 2302 const_iv (GL_SEPARABLE_2D),
1888 const_iv (GL_CONVOLUTION_2D), 2303 const_iv (GL_CONVOLUTION_2D),
1889 const_iv (GL_CONVOLUTION_BORDER_MODE), 2304 const_iv (GL_CONVOLUTION_BORDER_MODE),
1890 const_iv (GL_CONSTANT_BORDER), 2305 const_iv (GL_CONSTANT_BORDER),
1891 const_iv (GL_LINES), 2306 const_iv (GL_LINES),
2307 const_iv (GL_LINE_STRIP),
1892 const_iv (GL_LINE_LOOP), 2308 const_iv (GL_LINE_LOOP),
1893 const_iv (GL_QUADS), 2309 const_iv (GL_QUADS),
1894 const_iv (GL_QUAD_STRIP), 2310 const_iv (GL_QUAD_STRIP),
1895 const_iv (GL_TRIANGLES), 2311 const_iv (GL_TRIANGLES),
1896 const_iv (GL_TRIANGLE_STRIP), 2312 const_iv (GL_TRIANGLE_STRIP),
1904# undef const_iv 2320# undef const_iv
1905 }; 2321 };
1906 2322
1907 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2323 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1908 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2324 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2325
2326 texture_av = newAV ();
2327 AvREAL_off (texture_av);
1909} 2328}
1910 2329
1911char * 2330char *
1912gl_vendor () 2331gl_vendor ()
1913 CODE: 2332 CODE:
1924 2343
1925char * 2344char *
1926gl_extensions () 2345gl_extensions ()
1927 CODE: 2346 CODE:
1928 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2347 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2348 OUTPUT:
2349 RETVAL
2350
2351char *glGetString (GLenum pname)
2352
2353GLint glGetInteger (GLenum pname)
2354 CODE:
2355 glGetIntegerv (pname, &RETVAL);
2356 OUTPUT:
2357 RETVAL
2358
2359GLdouble glGetDouble (GLenum pname)
2360 CODE:
2361 glGetDoublev (pname, &RETVAL);
1929 OUTPUT: 2362 OUTPUT:
1930 RETVAL 2363 RETVAL
1931 2364
1932int glGetError () 2365int glGetError ()
1933 2366
2006 r *= a; 2439 r *= a;
2007 g *= a; 2440 g *= a;
2008 b *= a; 2441 b *= a;
2009 } 2442 }
2010 // microsoft visual "c" rounds instead of truncating... 2443 // microsoft visual "c" rounds instead of truncating...
2011 glColor4ub (MIN ((int)(r * 256.f), 255), 2444 glColor4f (r, g, b, a);
2012 MIN ((int)(g * 256.f), 255),
2013 MIN ((int)(b * 256.f), 255),
2014 MIN ((int)(a * 256.f), 255));
2015 2445
2016void glInterleavedArrays (int format, int stride, char *data) 2446void glInterleavedArrays (int format, int stride, char *data)
2017 2447
2018void glDrawElements (int mode, int count, int type, char *indices) 2448void glDrawElements (int mode, int count, int type, char *indices)
2019 2449
2061 2491
2062void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2492void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2063 2493
2064void glDrawPixels (int width, int height, int format, int type, char *pixels) 2494void glDrawPixels (int width, int height, int format, int type, char *pixels)
2065 2495
2496void glPixelZoom (float x, float y)
2497
2066void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2498void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2067 2499
2068int glGenTexture () 2500int glGenTexture ()
2069 CODE: 2501 CODE:
2070{ 2502 RETVAL = gen_texture ();
2071 GLuint name;
2072 glGenTextures (1, &name);
2073 RETVAL = name;
2074}
2075 OUTPUT: 2503 OUTPUT:
2076 RETVAL 2504 RETVAL
2077 2505
2078void glDeleteTexture (int name) 2506void glDeleteTexture (int name)
2079 CODE: 2507 CODE:
2080{
2081 GLuint name_ = name;
2082 glDeleteTextures (1, &name_); 2508 del_texture (name);
2083} 2509
2084
2085int glGenList () 2510int glGenList ()
2086 CODE: 2511 CODE:
2087 RETVAL = glGenLists (1); 2512 RETVAL = glGenLists (1);
2088 OUTPUT: 2513 OUTPUT:
2089 RETVAL 2514 RETVAL
2096 2521
2097void glEndList () 2522void glEndList ()
2098 2523
2099void glCallList (int list) 2524void glCallList (int list)
2100 2525
2101

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines