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.128 by root, Wed Jul 5 03:01:01 2006 UTC vs.
Revision 1.204 by root, Thu Jul 19 14:54:50 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
17#include <SDL.h> 30#include <SDL.h>
31#include <SDL_thread.h>
18#include <SDL_endian.h> 32#include <SDL_endian.h>
19#include <SDL_image.h> 33#include <SDL_image.h>
20#include <SDL_mixer.h> 34#include <SDL_mixer.h>
21#include <SDL_opengl.h> 35#include <SDL_opengl.h>
22 36
31# include <sys/types.h> 45# include <sys/types.h>
32# include <sys/socket.h> 46# include <sys/socket.h>
33# include <netinet/in.h> 47# include <netinet/in.h>
34# include <netinet/tcp.h> 48# include <netinet/tcp.h>
35# include <inttypes.h> 49# 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 50#endif
44 51
45#include "glext.h"
46
47#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 52#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
48 53
49#define FOW_DARKNESS 32 54#define FOW_DARKNESS 32
50 55
51#define MAP_EXTEND_X 32 56#define MAP_EXTEND_X 32
52#define MAP_EXTEND_Y 512 57#define MAP_EXTEND_Y 512
57# define PARACHUTE SDL_INIT_NOPARACHUTE 62# define PARACHUTE SDL_INIT_NOPARACHUTE
58#else 63#else
59# define PARACHUTE 0 64# define PARACHUTE 0
60#endif 65#endif
61 66
67static AV *texture_av;
68
62static struct 69static struct
63{ 70{
64#define GL_FUNC(ptr,name) ptr name; 71#define GL_FUNC(ptr,name) ptr name;
65#include "glfunc.h" 72#include "glfunc.h"
66#undef GL_FUNC 73#undef GL_FUNC
67} gl; 74} gl;
68 75
76static void
69static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 77gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
70{ 78{
71 if (gl.BlendFuncSeparate) 79 if (gl.BlendFuncSeparate)
72 gl.BlendFuncSeparate (sa, da, saa, daa); 80 gl.BlendFuncSeparate (sa, da, saa, daa);
73 else if (gl.BlendFuncSeparateEXT) 81 else if (gl.BlendFuncSeparateEXT)
74 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 82 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
75 else 83 else
76 glBlendFunc (sa, da); 84 glBlendFunc (sa, da);
77} 85}
78 86
87static GLuint
88gen_texture ()
89{
90 GLuint name;
91
92 if (AvFILL (texture_av) >= 0)
93 name = (GLuint)(size_t)av_pop (texture_av);
94 else
95 glGenTextures (1, &name);
96
97 return name;
98}
99
100static void
101del_texture (GLuint name)
102{
103 /* make a half-assed attempt at returning the memory used by the texture */
104 /* textures are frequently being reused by cfplus anyway */
105 /*glBindTexture (GL_TEXTURE_2D, name);*/
106 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
107 av_push (texture_av, (SV *)(size_t)name);
108 glDeleteTextures (1, &name);
109}
110
79#include "texcache.c" 111#include "texcache.c"
80 112
81#include "pango-font.c" 113#include "pango-font.c"
82#include "pango-fontmap.c" 114#include "pango-fontmap.c"
83#include "pango-render.c" 115#include "pango-render.c"
84 116
85typedef Mix_Chunk *CFClient__MixChunk; 117typedef Mix_Chunk *CFPlus__MixChunk;
86typedef Mix_Music *CFClient__MixMusic; 118typedef Mix_Music *CFPlus__MixMusic;
87 119
88typedef PangoFontDescription *CFClient__Font; 120typedef PangoFontDescription *CFPlus__Font;
89 121
90static int 122static int
91shape_attr_p (PangoLayoutRun *run) 123shape_attr_p (PangoLayoutRun *run)
92{ 124{
93 GSList *attrs = run->item->analysis.extra_attrs; 125 GSList *attrs = run->item->analysis.extra_attrs;
107 139
108typedef struct cf_layout { 140typedef struct cf_layout {
109 PangoLayout *pl; 141 PangoLayout *pl;
110 float r, g, b, a; // default color for rgba mode 142 float r, g, b, a; // default color for rgba mode
111 int base_height; 143 int base_height;
112 CFClient__Font font; 144 CFPlus__Font font;
113} *CFClient__Layout; 145} *CFPlus__Layout;
114 146
115static CFClient__Font default_font; 147static CFPlus__Font default_font;
116static PangoContext *opengl_context; 148static PangoContext *opengl_context;
117static PangoFontMap *opengl_fontmap; 149static PangoFontMap *opengl_fontmap;
118 150
119static void 151static void
120substitute_func (FcPattern *pattern, gpointer data) 152substitute_func (FcPattern *pattern, gpointer data)
125#endif 157#endif
126 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 158 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
127} 159}
128 160
129static void 161static void
130layout_update_font (CFClient__Layout self) 162layout_update_font (CFPlus__Layout self)
131{ 163{
132 /* use a random scale factor to account for unknown descenders, 0.8 works 164 /* use a random scale factor to account for unknown descenders, 0.8 works
133 * reasonably well with bitstream vera 165 * reasonably well with bitstream vera
134 */ 166 */
135 PangoFontDescription *font = self->font ? self->font : default_font; 167 PangoFontDescription *font = self->font ? self->font : default_font;
139 171
140 pango_layout_set_font_description (self->pl, font); 172 pango_layout_set_font_description (self->pl, font);
141} 173}
142 174
143static void 175static void
144layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 176layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
145{ 177{
178 PangoRectangle rect;
179
180 // get_pixel_* wrongly rounds down
146 pango_layout_get_pixel_size (self->pl, w, h); 181 pango_layout_get_extents (self->pl, 0, &rect);
147 182
148 if (!*w) *w = 1; 183 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
149 if (!*h) *h = 1; 184 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
150 185
151 *w = (*w + 3) & ~3; 186 if (!rect.width) rect.width = 1;
152} 187 if (!rect.height) rect.height = 1;
153 188
189 *w = rect.width;
190 *h = rect.height;
191}
192
193typedef uint16_t tileid;
154typedef uint16_t mapface; 194typedef uint16_t faceid;
155 195
156typedef struct { 196typedef struct {
157 GLint name; 197 int name;
158 int w, h; 198 int w, h;
159 float s, t; 199 float s, t;
160 uint8_t r, g, b, a; 200 uint8_t r, g, b, a;
201 tileid smoothtile;
202 uint8_t smoothlevel;
161} maptex; 203} maptex;
162 204
163typedef struct { 205typedef struct {
206 uint32_t player;
207 tileid tile[3];
164 int16_t darkness; 208 uint16_t darkness;
165 mapface face[3]; 209 uint8_t stat_width, stat_hp, flags, smoothmax;
166} mapcell; 210} mapcell;
167 211
168typedef struct { 212typedef struct {
169 int32_t c0, c1; 213 int32_t c0, c1;
170 mapcell *col; 214 mapcell *col;
171} maprow; 215} maprow;
172 216
173typedef struct map { 217typedef struct map {
174 int x, y, w, h; 218 int x, y, w, h;
175 int ox, oy; /* offset to virtual global coordinate system */ 219 int ox, oy; /* offset to virtual global coordinate system */
176 int faces; 220 int faces; tileid *face2tile; // [faceid]
177 mapface *face; 221 int texs; maptex *tex; // [tileid]
178
179 int texs;
180 maptex *tex;
181 222
182 int32_t rows; 223 int32_t rows;
183 maprow *row; 224 maprow *row;
184} *CFClient__Map; 225} *CFPlus__Map;
185 226
186static char * 227static char *
187prepend (char *ptr, int sze, int inc) 228prepend (char *ptr, int sze, int inc)
188{ 229{
189 char *p; 230 char *p;
206} 247}
207 248
208#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
209#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 250#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
210 251
252static void
253need_facenum (struct map *self, faceid face)
254{
255 while (self->faces <= face)
256 {
257 Append (tileid, self->face2tile, self->faces, self->faces);
258 self->faces *= 2;
259 }
260}
261
262static void
263need_texid (struct map *self, int texid)
264{
265 while (self->texs <= texid)
266 {
267 Append (maptex, self->tex, self->texs, self->texs);
268 self->texs *= 2;
269 }
270}
271
211static maprow * 272static maprow *
212map_get_row (CFClient__Map self, int y) 273map_get_row (CFPlus__Map self, int y)
213{ 274{
214 if (0 > y) 275 if (0 > y)
215 { 276 {
216 int extend = - y + MAP_EXTEND_Y; 277 int extend = - y + MAP_EXTEND_Y;
217 Prepend (maprow, self->row, self->rows, extend); 278 Prepend (maprow, self->row, self->rows, extend);
255 316
256 return row->col + (x - row->c0); 317 return row->col + (x - row->c0);
257} 318}
258 319
259static mapcell * 320static mapcell *
260map_get_cell (CFClient__Map self, int x, int y) 321map_get_cell (CFPlus__Map self, int x, int y)
261{ 322{
262 return row_get_cell (map_get_row (self, y), x); 323 return row_get_cell (map_get_row (self, y), x);
263} 324}
264 325
265static void 326static void
266map_clear (CFClient__Map self) 327map_clear (CFPlus__Map self)
267{ 328{
268 int r; 329 int r;
269 330
270 for (r = 0; r < self->rows; r++) 331 for (r = 0; r < self->rows; r++)
271 Safefree (self->row[r].col); 332 Safefree (self->row[r].col);
279 self->row = 0; 340 self->row = 0;
280 self->rows = 0; 341 self->rows = 0;
281} 342}
282 343
283static void 344static void
284map_blank (CFClient__Map self, int x0, int y0, int w, int h) 345map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
285{ 346{
286 int x, y; 347 int x, y;
287 maprow *row; 348 maprow *row;
349 mapcell *cell;
288 350
289 for (y = y0; y < y0 + h; y++) 351 for (y = y0; y < y0 + h; y++)
290 if (y >= 0) 352 if (y >= 0)
291 { 353 {
292 if (y >= self->rows) 354 if (y >= self->rows)
298 if (x >= row->c0) 360 if (x >= row->c0)
299 { 361 {
300 if (x >= row->c1) 362 if (x >= row->c1)
301 break; 363 break;
302 364
303 row->col[x - row->c0].darkness = -1; 365 cell = row->col + x - row->c0;
366
367 cell->darkness = 0;
368 cell->stat_hp = 0;
369 cell->flags = 0;
370 cell->player = 0;
304 } 371 }
305 } 372 }
373}
374
375typedef struct {
376 tileid tile;
377 uint8_t x, y, level;
378} smooth_key;
379
380static void
381smooth_or_bits (HV *hv, smooth_key *key, IV bits)
382{
383 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
384
385 if (SvIOK (*sv))
386 SvIV_set (*sv, SvIVX (*sv) | bits);
387 else
388 sv_setiv (*sv, bits);
306} 389}
307 390
308static void 391static void
309music_finished (void) 392music_finished (void)
310{ 393{
346 n |= n >> 16; 429 n |= n >> 16;
347 430
348 return n + 1; 431 return n + 1;
349} 432}
350 433
434/* SDL should provide this, really. */
435#define SDLK_MODIFIER_MIN 300
436#define SDLK_MODIFIER_MAX 314
437
351MODULE = CFClient PACKAGE = CFClient 438MODULE = CFPlus PACKAGE = CFPlus
352 439
353PROTOTYPES: ENABLE 440PROTOTYPES: ENABLE
354 441
355BOOT: 442BOOT:
356{ 443{
357 HV *stash = gv_stashpv ("CFClient", 1); 444 HV *stash = gv_stashpv ("CFPlus", 1);
358 static const struct { 445 static const struct {
359 const char *name; 446 const char *name;
360 IV iv; 447 IV iv;
361 } *civ, const_iv[] = { 448 } *civ, const_iv[] = {
362# define const_iv(name) { # name, (IV)name } 449# define const_iv(name) { # name, (IV)name }
450 const_iv (SDLK_MODIFIER_MIN),
451 const_iv (SDLK_MODIFIER_MAX),
452
363 const_iv (SDL_ACTIVEEVENT), 453 const_iv (SDL_ACTIVEEVENT),
364 const_iv (SDL_KEYDOWN), 454 const_iv (SDL_KEYDOWN),
365 const_iv (SDL_KEYUP), 455 const_iv (SDL_KEYUP),
366 const_iv (SDL_MOUSEMOTION), 456 const_iv (SDL_MOUSEMOTION),
367 const_iv (SDL_MOUSEBUTTONDOWN), 457 const_iv (SDL_MOUSEBUTTONDOWN),
376 const_iv (SDL_EVENT_RESERVEDA), 466 const_iv (SDL_EVENT_RESERVEDA),
377 const_iv (SDL_EVENT_RESERVEDB), 467 const_iv (SDL_EVENT_RESERVEDB),
378 const_iv (SDL_VIDEORESIZE), 468 const_iv (SDL_VIDEORESIZE),
379 const_iv (SDL_VIDEOEXPOSE), 469 const_iv (SDL_VIDEOEXPOSE),
380 const_iv (SDL_USEREVENT), 470 const_iv (SDL_USEREVENT),
471
472 const_iv (SDL_APPINPUTFOCUS),
473 const_iv (SDL_APPMOUSEFOCUS),
474 const_iv (SDL_APPACTIVE),
475
381 const_iv (SDLK_KP0), 476 const_iv (SDLK_KP0),
382 const_iv (SDLK_KP1), 477 const_iv (SDLK_KP1),
383 const_iv (SDLK_KP2), 478 const_iv (SDLK_KP2),
384 const_iv (SDLK_KP3), 479 const_iv (SDLK_KP3),
385 const_iv (SDLK_KP4), 480 const_iv (SDLK_KP4),
440 const_iv (SDLK_BREAK), 535 const_iv (SDLK_BREAK),
441 const_iv (SDLK_MENU), 536 const_iv (SDLK_MENU),
442 const_iv (SDLK_POWER), 537 const_iv (SDLK_POWER),
443 const_iv (SDLK_EURO), 538 const_iv (SDLK_EURO),
444 const_iv (SDLK_UNDO), 539 const_iv (SDLK_UNDO),
540
445 const_iv (KMOD_NONE), 541 const_iv (KMOD_NONE),
542 const_iv (KMOD_SHIFT),
446 const_iv (KMOD_LSHIFT), 543 const_iv (KMOD_LSHIFT),
447 const_iv (KMOD_RSHIFT), 544 const_iv (KMOD_RSHIFT),
545 const_iv (KMOD_CTRL),
448 const_iv (KMOD_LCTRL), 546 const_iv (KMOD_LCTRL),
449 const_iv (KMOD_RCTRL), 547 const_iv (KMOD_RCTRL),
548 const_iv (KMOD_ALT),
450 const_iv (KMOD_LALT), 549 const_iv (KMOD_LALT),
451 const_iv (KMOD_RALT), 550 const_iv (KMOD_RALT),
551 const_iv (KMOD_META),
452 const_iv (KMOD_LMETA), 552 const_iv (KMOD_LMETA),
453 const_iv (KMOD_RMETA), 553 const_iv (KMOD_RMETA),
454 const_iv (KMOD_NUM), 554 const_iv (KMOD_NUM),
455 const_iv (KMOD_CAPS), 555 const_iv (KMOD_CAPS),
456 const_iv (KMOD_MODE), 556 const_iv (KMOD_MODE),
457 const_iv (KMOD_CTRL),
458 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_ALT),
460 const_iv (KMOD_META)
461# undef const_iv 557# undef const_iv
462 }; 558 };
463 559
464 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 560 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
465 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 561 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
562
563 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
564 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
466} 565}
566
567void
568weaken (SV *rv)
569 PROTOTYPE: $
570 CODE:
571 sv_rvweaken (rv);
572
573int
574in_destruct ()
575 CODE:
576 RETVAL = PL_main_cv == Nullcv;
577 OUTPUT:
578 RETVAL
467 579
468NV floor (NV x) 580NV floor (NV x)
469 581
470NV ceil (NV x) 582NV ceil (NV x)
471 583
476 opengl_fontmap = pango_opengl_font_map_new (); 588 opengl_fontmap = pango_opengl_font_map_new ();
477 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 589 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
478 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 590 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
479} 591}
480 592
593char *
594SDL_GetError ()
595
481int 596int
482SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE) 597SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
483 598
484void 599void
485SDL_Quit () 600SDL_Quit ()
486 601
487void 602void
488SDL_ListModes () 603SDL_ListModes (int rgb, int alpha)
489 PPCODE: 604 PPCODE:
490{ 605{
491 SDL_Rect **m; 606 SDL_Rect **m;
492 607
493 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 608 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
494 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 609 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
495 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 610 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
496 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 611 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
497 612
498 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 613 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
499 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 614 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
500 615
501 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 616 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
502 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 617 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
503 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 618 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
504 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 619 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
505 620
506 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 621 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
507 622#if SDL_VERSION_ATLEAST(1,2,10)
508 SDL_EnableUNICODE (1); 623 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
509 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 624 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
625#endif
510 626
511 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 627 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
512 628
513 if (m && m != (SDL_Rect **)-1) 629 if (m && m != (SDL_Rect **)-1)
514 while (*m) 630 while (*m)
515 { 631 {
632 if ((*m)->w >= 640 && (*m)->h >= 480)
633 {
516 AV *av = newAV (); 634 AV *av = newAV ();
517 av_push (av, newSViv ((*m)->w)); 635 av_push (av, newSViv ((*m)->w));
518 av_push (av, newSViv ((*m)->h)); 636 av_push (av, newSViv ((*m)->h));
637 av_push (av, newSViv (rgb));
638 av_push (av, newSViv (alpha));
519 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 639 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
640 }
520 641
521 ++m; 642 ++m;
522 } 643 }
523} 644}
524 645
525char *
526SDL_GetError ()
527
528int 646int
529SDL_SetVideoMode (int w, int h, int fullscreen) 647SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
530 CODE: 648 CODE:
649{
650 SDL_EnableUNICODE (1);
651 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
652
653 SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
654 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
655 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
656 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
657
531 RETVAL = !!SDL_SetVideoMode ( 658 RETVAL = !!SDL_SetVideoMode (
532 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 659 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
533 ); 660 );
661
534 if (RETVAL) 662 if (RETVAL)
535 { 663 {
664 av_clear (texture_av);
665
536 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 666 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
537# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 667#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
538# include "glfunc.h" 668#include "glfunc.h"
539# undef GL_FUNC 669#undef GL_FUNC
540 } 670 }
671}
541 OUTPUT: 672 OUTPUT:
542 RETVAL 673 RETVAL
543 674
544void 675void
545SDL_GL_SwapBuffers () 676SDL_GL_SwapBuffers ()
546 677
547char * 678char *
548SDL_GetKeyName (int sym) 679SDL_GetKeyName (int sym)
549 680
681int
682SDL_GetAppState ()
683
550void 684void
551SDL_PollEvent () 685poll_events ()
552 PPCODE: 686 PPCODE:
553{ 687{
554 SDL_Event ev; 688 SDL_Event ev;
555 689
556 while (SDL_PollEvent (&ev)) 690 SDL_PumpEvents ();
691 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
557 { 692 {
558 HV *hv = newHV (); 693 HV *hv = newHV ();
559 hv_store (hv, "type", 4, newSViv (ev.type), 0); 694 hv_store (hv, "type", 4, newSViv (ev.type), 0);
560 695
561 switch (ev.type) 696 switch (ev.type)
563 case SDL_KEYDOWN: 698 case SDL_KEYDOWN:
564 case SDL_KEYUP: 699 case SDL_KEYUP:
565 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 700 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
566 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 701 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
567 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 702 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
703 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
568 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 704 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
569 break; 705 break;
570 706
571 case SDL_ACTIVEEVENT: 707 case SDL_ACTIVEEVENT:
572 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 708 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
573 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 709 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
574 break; 710 break;
575 711
576 case SDL_MOUSEMOTION: 712 case SDL_MOUSEMOTION:
713 {
714 int state = ev.motion.state;
715 int x = ev.motion.x;
716 int y = ev.motion.y;
717 int xrel = ev.motion.xrel;
718 int yrel = ev.motion.yrel;
719
720 /* do simplistic event compression */
721 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
722 && state == ev.motion.state)
723 {
724 xrel += ev.motion.xrel;
725 yrel += ev.motion.yrel;
726 x = ev.motion.x;
727 y = ev.motion.y;
728 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
729 }
730
577 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 731 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
578
579 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 732 hv_store (hv, "state", 5, newSViv (state), 0);
580 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 733 hv_store (hv, "x", 1, newSViv (x), 0);
581 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 734 hv_store (hv, "y", 1, newSViv (y), 0);
582 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 735 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
583 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 736 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
737 }
584 break; 738 break;
585 739
586 case SDL_MOUSEBUTTONDOWN: 740 case SDL_MOUSEBUTTONDOWN:
587 case SDL_MOUSEBUTTONUP: 741 case SDL_MOUSEBUTTONUP:
588 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 742 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
598 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 752 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
599 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 753 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
600 break; 754 break;
601 } 755 }
602 756
603 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 757 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
604 } 758 }
605} 759}
606 760
607int 761int
608Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 762Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
617Mix_AllocateChannels (int numchans = -1) 771Mix_AllocateChannels (int numchans = -1)
618 772
619void 773void
620lowdelay (int fd, int val = 1) 774lowdelay (int fd, int val = 1)
621 CODE: 775 CODE:
776 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
777
778void
779win32_proxy_info ()
780 PPCODE:
781{
622#ifndef _WIN32 782#ifdef _WIN32
623 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 783 char buffer[2048];
784 DWORD buflen;
785
786 EXTEND (SP, 3);
787
788 buflen = sizeof (buffer);
789 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
790 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
791 {
792 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
793
794 buflen = sizeof (buffer);
795 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
796 {
797 PUSHs (newSVpv (buffer, 0));
798
799 buflen = sizeof (buffer);
800 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
801 PUSHs (newSVpv (buffer, 0));
802 }
803 }
624#endif 804#endif
805}
625 806
626void 807void
627add_font (char *file) 808add_font (char *file)
628 CODE: 809 CODE:
629 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 810 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
630 811
631void 812void
632load_image_inline (SV *image_) 813load_image_inline (SV *image_)
633 ALIAS: 814 ALIAS:
634 load_image_file = 1 815 load_image_file = 1
676 857
677 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 858 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
678 859
679 assert (surface2->pitch == surface2->w * 4); 860 assert (surface2->pitch == surface2->w * 4);
680 861
862 SDL_LockSurface (surface2);
681 EXTEND (SP, 5); 863 EXTEND (SP, 6);
682 PUSHs (sv_2mortal (newSViv (surface2->w))); 864 PUSHs (sv_2mortal (newSViv (surface2->w)));
683 PUSHs (sv_2mortal (newSViv (surface2->h))); 865 PUSHs (sv_2mortal (newSViv (surface2->h)));
684 SDL_LockSurface (surface2);
685 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 866 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
686 SDL_UnlockSurface (surface2);
687 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 867 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
688 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 868 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
689 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 869 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
870 SDL_UnlockSurface (surface2);
690 871
691 SDL_FreeSurface (surface); 872 SDL_FreeSurface (surface);
692 SDL_FreeSurface (surface2); 873 SDL_FreeSurface (surface2);
693} 874}
694 875
733 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 914 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
734#endif 915#endif
735 _exit (1); 916 _exit (1);
736 917
737void 918void
738_exit (int retval) 919_exit (int retval = 0)
739 CODE: 920 CODE:
921#ifdef WIN32
922 ExitThread (retval); // unclean, please beam me up
923#else
740 _exit (retval); 924 _exit (retval);
925#endif
741 926
927void
928debug ()
929 CODE:
930{
931#if DEBUG
932 VALGRIND_DO_LEAK_CHECK;
933#endif
934}
935
742MODULE = CFClient PACKAGE = CFClient::Font 936MODULE = CFPlus PACKAGE = CFPlus::Font
743 937
744CFClient::Font 938CFPlus::Font
745new_from_file (SV *class, char *path, int id = 0) 939new_from_file (SV *class, char *path, int id = 0)
746 CODE: 940 CODE:
747{ 941{
748 int count; 942 int count;
749 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 943 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
752} 946}
753 OUTPUT: 947 OUTPUT:
754 RETVAL 948 RETVAL
755 949
756void 950void
757DESTROY (CFClient::Font self) 951DESTROY (CFPlus::Font self)
758 CODE: 952 CODE:
759 pango_font_description_free (self); 953 pango_font_description_free (self);
760 954
761void 955void
762make_default (CFClient::Font self) 956make_default (CFPlus::Font self)
763 CODE: 957 CODE:
764 default_font = self; 958 default_font = self;
765 959
766MODULE = CFClient PACKAGE = CFClient::Layout 960MODULE = CFPlus PACKAGE = CFPlus::Layout
767 961
768void 962void
769clear_font_cache () 963reset_glyph_cache ()
770 CODE: 964 CODE:
771 tc_clear (); 965 tc_clear ();
772 966
773CFClient::Layout 967CFPlus::Layout
774new (SV *class) 968new (SV *class)
775 CODE: 969 CODE:
776 New (0, RETVAL, 1, struct cf_layout); 970 New (0, RETVAL, 1, struct cf_layout);
777 971
778 RETVAL->pl = pango_layout_new (opengl_context); 972 RETVAL->pl = pango_layout_new (opengl_context);
787 layout_update_font (RETVAL); 981 layout_update_font (RETVAL);
788 OUTPUT: 982 OUTPUT:
789 RETVAL 983 RETVAL
790 984
791void 985void
792DESTROY (CFClient::Layout self) 986DESTROY (CFPlus::Layout self)
793 CODE: 987 CODE:
794 g_object_unref (self->pl); 988 g_object_unref (self->pl);
795 Safefree (self); 989 Safefree (self);
796 990
797void 991void
798set_text (CFClient::Layout self, SV *text_) 992set_text (CFPlus::Layout self, SV *text_)
799 CODE: 993 CODE:
800{ 994{
801 STRLEN textlen; 995 STRLEN textlen;
802 char *text = SvPVutf8 (text_, textlen); 996 char *text = SvPVutf8 (text_, textlen);
803 997
804 pango_layout_set_text (self->pl, text, textlen); 998 pango_layout_set_text (self->pl, text, textlen);
805} 999}
806 1000
807void 1001void
808set_markup (CFClient::Layout self, SV *text_) 1002set_markup (CFPlus::Layout self, SV *text_)
809 CODE: 1003 CODE:
810{ 1004{
811 STRLEN textlen; 1005 STRLEN textlen;
812 char *text = SvPVutf8 (text_, textlen); 1006 char *text = SvPVutf8 (text_, textlen);
813 1007
814 pango_layout_set_markup (self->pl, text, textlen); 1008 pango_layout_set_markup (self->pl, text, textlen);
815} 1009}
816 1010
817void 1011void
818set_shapes (CFClient::Layout self, ...) 1012set_shapes (CFPlus::Layout self, ...)
819 CODE: 1013 CODE:
820{ 1014{
821 PangoAttrList *attrs = 0; 1015 PangoAttrList *attrs = 0;
822 const char *text = pango_layout_get_text (self->pl); 1016 const char *text = pango_layout_get_text (self->pl);
823 const char *pos = text; 1017 const char *pos = text;
858 if (attrs) 1052 if (attrs)
859 pango_layout_set_attributes (self->pl, attrs); 1053 pango_layout_set_attributes (self->pl, attrs);
860} 1054}
861 1055
862void 1056void
863get_shapes (CFClient::Layout self) 1057get_shapes (CFPlus::Layout self)
864 PPCODE: 1058 PPCODE:
865{ 1059{
866 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1060 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
867 1061
868 do 1062 do
872 if (run && shape_attr_p (run)) 1066 if (run && shape_attr_p (run))
873 { 1067 {
874 PangoRectangle extents; 1068 PangoRectangle extents;
875 pango_layout_iter_get_run_extents (iter, 0, &extents); 1069 pango_layout_iter_get_run_extents (iter, 0, &extents);
876 1070
1071 EXTEND (SP, 2);
877 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x)))); 1072 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
878 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y)))); 1073 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
879 } 1074 }
880 } 1075 }
881 while (pango_layout_iter_next_run (iter)); 1076 while (pango_layout_iter_next_run (iter));
882 1077
883 pango_layout_iter_free (iter); 1078 pango_layout_iter_free (iter);
884} 1079}
885 1080
886int 1081int
887has_wrapped (CFClient::Layout self) 1082has_wrapped (CFPlus::Layout self)
888 CODE: 1083 CODE:
889{ 1084{
890 int lines = 1; 1085 int lines = 1;
891 const char *text = pango_layout_get_text (self->pl); 1086 const char *text = pango_layout_get_text (self->pl);
892 1087
897} 1092}
898 OUTPUT: 1093 OUTPUT:
899 RETVAL 1094 RETVAL
900 1095
901SV * 1096SV *
902get_text (CFClient::Layout self) 1097get_text (CFPlus::Layout self)
903 CODE: 1098 CODE:
904 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 1099 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
905 sv_utf8_decode (RETVAL); 1100 sv_utf8_decode (RETVAL);
906 OUTPUT: 1101 OUTPUT:
907 RETVAL 1102 RETVAL
908 1103
909void 1104void
910set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.) 1105set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
911 CODE: 1106 CODE:
912 self->r = r; 1107 self->r = r;
913 self->g = g; 1108 self->g = g;
914 self->b = b; 1109 self->b = b;
915 self->a = a; 1110 self->a = a;
916 1111
917void 1112void
918set_font (CFClient::Layout self, CFClient::Font font = 0) 1113set_font (CFPlus::Layout self, CFPlus::Font font = 0)
919 CODE: 1114 CODE:
920 if (self->font != font) 1115 if (self->font != font)
921 { 1116 {
922 self->font = font; 1117 self->font = font;
923 layout_update_font (self); 1118 layout_update_font (self);
924 } 1119 }
925 1120
926void 1121void
927set_height (CFClient::Layout self, int base_height) 1122set_height (CFPlus::Layout self, int base_height)
928 CODE: 1123 CODE:
929 if (self->base_height != base_height) 1124 if (self->base_height != base_height)
930 { 1125 {
931 self->base_height = base_height; 1126 self->base_height = base_height;
932 layout_update_font (self); 1127 layout_update_font (self);
933 } 1128 }
934 1129
935void 1130void
936set_width (CFClient::Layout self, int max_width = -1) 1131set_width (CFPlus::Layout self, int max_width = -1)
937 CODE: 1132 CODE:
938 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1133 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
939 1134
940void 1135void
941set_indent (CFClient::Layout self, int indent) 1136set_indent (CFPlus::Layout self, int indent)
942 CODE: 1137 CODE:
943 pango_layout_set_indent (self->pl, indent * PANGO_SCALE); 1138 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
944 1139
945void 1140void
946set_spacing (CFClient::Layout self, int spacing) 1141set_spacing (CFPlus::Layout self, int spacing)
947 CODE: 1142 CODE:
948 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE); 1143 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
949 1144
950void 1145void
951set_ellipsise (CFClient::Layout self, int ellipsise) 1146set_ellipsise (CFPlus::Layout self, int ellipsise)
952 CODE: 1147 CODE:
953 pango_layout_set_ellipsize (self->pl, 1148 pango_layout_set_ellipsize (self->pl,
954 ellipsise == 1 ? PANGO_ELLIPSIZE_START 1149 ellipsise == 1 ? PANGO_ELLIPSIZE_START
955 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE 1150 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
956 : ellipsise == 3 ? PANGO_ELLIPSIZE_END 1151 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
957 : PANGO_ELLIPSIZE_NONE 1152 : PANGO_ELLIPSIZE_NONE
958 ); 1153 );
959 1154
960void 1155void
961set_single_paragraph_mode (CFClient::Layout self, int spm) 1156set_single_paragraph_mode (CFPlus::Layout self, int spm)
962 CODE: 1157 CODE:
963 pango_layout_set_single_paragraph_mode (self->pl, !!spm); 1158 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
964 1159
965void 1160void
966size (CFClient::Layout self) 1161size (CFPlus::Layout self)
967 PPCODE: 1162 PPCODE:
968{ 1163{
969 int w, h; 1164 int w, h;
970 1165
971 layout_get_pixel_size (self, &w, &h); 1166 layout_get_pixel_size (self, &w, &h);
974 PUSHs (sv_2mortal (newSViv (w))); 1169 PUSHs (sv_2mortal (newSViv (w)));
975 PUSHs (sv_2mortal (newSViv (h))); 1170 PUSHs (sv_2mortal (newSViv (h)));
976} 1171}
977 1172
978int 1173int
979descent (CFClient::Layout self) 1174descent (CFPlus::Layout self)
980 CODE: 1175 CODE:
981{ 1176{
982 PangoRectangle rect; 1177 PangoRectangle rect;
983 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1178 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
984 pango_layout_line_get_pixel_extents (line, 0, &rect); 1179 pango_layout_line_get_pixel_extents (line, 0, &rect);
986} 1181}
987 OUTPUT: 1182 OUTPUT:
988 RETVAL 1183 RETVAL
989 1184
990int 1185int
991xy_to_index (CFClient::Layout self, int x, int y) 1186xy_to_index (CFPlus::Layout self, int x, int y)
992 CODE: 1187 CODE:
993{ 1188{
994 int index, trailing; 1189 int index, trailing;
995 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1190 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996 RETVAL = index; 1191 RETVAL = index + trailing;
997} 1192}
998 OUTPUT: 1193 OUTPUT:
999 RETVAL 1194 RETVAL
1000 1195
1001void 1196void
1002cursor_pos (CFClient::Layout self, int index) 1197cursor_pos (CFPlus::Layout self, int index)
1003 PPCODE: 1198 PPCODE:
1004{ 1199{
1005 PangoRectangle strong_pos; 1200 PangoRectangle strong_pos;
1006 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1201 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007 1202
1010 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1205 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1206 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012} 1207}
1013 1208
1014void 1209void
1210index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1211 PPCODE:
1212{
1213 int line, x;
1214
1215 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1216 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1217
1218 EXTEND (SP, 2);
1219 PUSHs (sv_2mortal (newSViv (line - 1)));
1220 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1221}
1222
1223void
1224line_x_to_index (CFPlus::Layout self, int line, int x)
1225 PPCODE:
1226{
1227 PangoLayoutLine *lp;
1228 int index, trailing;
1229
1230 if (line < 0)
1231 XSRETURN_EMPTY;
1232
1233 if (!(lp = pango_layout_get_line (self->pl, line)))
1234 XSRETURN_EMPTY; /* do better */
1235
1236 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1237
1238 EXTEND (SP, 2);
1239 if (GIMME_V == G_SCALAR)
1240 PUSHs (sv_2mortal (newSViv (index + trailing)));
1241 else
1242 {
1243 PUSHs (sv_2mortal (newSViv (index)));
1244 PUSHs (sv_2mortal (newSViv (trailing)));
1245 }
1246}
1247
1248void
1015render (CFClient::Layout self, float x, float y) 1249render (CFPlus::Layout self, float x, float y, int flags = 0)
1016 PPCODE: 1250 PPCODE:
1017 pango_opengl_render_layout_subpixel ( 1251 pango_opengl_render_layout_subpixel (
1018 self->pl, 1252 self->pl,
1019 x * PANGO_SCALE, y * PANGO_SCALE, 1253 x * PANGO_SCALE, y * PANGO_SCALE,
1020 self->r, self->g, self->b, self->a 1254 self->r, self->g, self->b, self->a,
1255 flags
1021 ); 1256 );
1022 1257
1023MODULE = CFClient PACKAGE = CFClient::Texture 1258MODULE = CFPlus PACKAGE = CFPlus::Texture
1024 1259
1025void 1260int minpot (int n)
1026pad2pot (SV *data_, SV *w_, SV *h_)
1027 CODE:
1028{
1029 int ow = SvIV (w_);
1030 int oh = SvIV (h_);
1031 1261
1032 if (ow && oh) 1262void
1263pad (SV *data_, int ow, int oh, int nw, int nh)
1264 CODE:
1265{
1266 if ((nw != ow || nh != oh) && SvOK (data_))
1033 { 1267 {
1034 int nw = minpot (ow);
1035 int nh = minpot (oh);
1036
1037 if (nw != ow || nh != oh)
1038 {
1039 if (SvOK (data_))
1040 {
1041 STRLEN datalen; 1268 STRLEN datalen;
1042 char *data = SvPVbyte (data_, datalen); 1269 char *data = SvPVbyte (data_, datalen);
1043 int bpp = datalen / (ow * oh); 1270 int bpp = datalen / (ow * oh);
1044 SV *result_ = sv_2mortal (newSV (nw * nh * bpp)); 1271 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1045 1272
1046 SvPOK_only (result_); 1273 SvPOK_only (result_);
1047 SvCUR_set (result_, nw * nh * bpp); 1274 SvCUR_set (result_, nw * nh * bpp);
1048 1275
1049 memset (SvPVX (result_), 0, nw * nh * bpp); 1276 memset (SvPVX (result_), 0, nw * nh * bpp);
1050 while (oh--) 1277 while (oh--)
1051 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp); 1278 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1052 1279
1053 sv_setsv (data_, result_); 1280 sv_setsv (data_, result_);
1054 }
1055
1056 sv_setiv (w_, nw);
1057 sv_setiv (h_, nh);
1058 }
1059 } 1281 }
1060} 1282}
1061 1283
1062void 1284void
1063draw_quad (SV *self, float x, float y, float w = 0., float h = 0.) 1285draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1106 glDisable (GL_ALPHA_TEST); 1328 glDisable (GL_ALPHA_TEST);
1107 glDisable (GL_BLEND); 1329 glDisable (GL_BLEND);
1108 } 1330 }
1109} 1331}
1110 1332
1333IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1334 CODE:
1335{
1336 GLint width;
1337 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1338 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1339 RETVAL = width > 0;
1340}
1341 OUTPUT:
1342 RETVAL
1343
1111MODULE = CFClient PACKAGE = CFClient::Map 1344MODULE = CFPlus PACKAGE = CFPlus::Map
1112 1345
1113CFClient::Map 1346CFPlus::Map
1114new (SV *class, int map_width, int map_height) 1347new (SV *class)
1115 CODE: 1348 CODE:
1116 New (0, RETVAL, 1, struct map); 1349 New (0, RETVAL, 1, struct map);
1117 RETVAL->x = 0; 1350 RETVAL->x = 0;
1118 RETVAL->y = 0; 1351 RETVAL->y = 0;
1119 RETVAL->w = map_width; 1352 RETVAL->w = 0;
1120 RETVAL->h = map_height; 1353 RETVAL->h = 0;
1121 RETVAL->ox = 0; 1354 RETVAL->ox = 0;
1122 RETVAL->oy = 0; 1355 RETVAL->oy = 0;
1123 RETVAL->faces = 8192; 1356 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1124 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1357 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1125 RETVAL->texs = 8192;
1126 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1127 RETVAL->rows = 0; 1358 RETVAL->rows = 0;
1128 RETVAL->row = 0; 1359 RETVAL->row = 0;
1129 OUTPUT: 1360 OUTPUT:
1130 RETVAL 1361 RETVAL
1131 1362
1132void 1363void
1133DESTROY (CFClient::Map self) 1364DESTROY (CFPlus::Map self)
1134 CODE: 1365 CODE:
1135{ 1366{
1136 map_clear (self); 1367 map_clear (self);
1137 Safefree (self->face); 1368 Safefree (self->face2tile);
1138 Safefree (self->tex); 1369 Safefree (self->tex);
1139 Safefree (self); 1370 Safefree (self);
1140} 1371}
1141 1372
1142void 1373void
1374resize (CFPlus::Map self, int map_width, int map_height)
1375 CODE:
1376 self->w = map_width;
1377 self->h = map_height;
1378
1379void
1143clear (CFClient::Map self) 1380clear (CFPlus::Map self)
1144 CODE: 1381 CODE:
1145 map_clear (self); 1382 map_clear (self);
1146 1383
1147void 1384void
1148set_face (CFClient::Map self, int face, int texid) 1385set_tileid (CFPlus::Map self, int face, int tile)
1149 CODE: 1386 CODE:
1150{ 1387{
1151 while (self->faces <= face) 1388 need_facenum (self, face); self->face2tile [face] = tile;
1152 { 1389 need_texid (self, tile);
1153 Append (mapface, self->face, self->faces, self->faces);
1154 self->faces *= 2;
1155 }
1156
1157 self->face [face] = texid;
1158} 1390}
1159 1391
1160void 1392void
1393set_smooth (CFPlus::Map self, int face, int smooth, int level)
1394 CODE:
1395{
1396 tileid texid;
1397 maptex *tex;
1398
1399 if (face < 0 || face >= self->faces)
1400 return;
1401
1402 if (smooth < 0 || smooth >= self->faces)
1403 return;
1404
1405 texid = self->face2tile [face];
1406
1407 if (!texid)
1408 return;
1409
1410 tex = self->tex + texid;
1411 tex->smoothtile = self->face2tile [smooth];
1412 tex->smoothlevel = level;
1413}
1414
1415void
1161set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1416set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1162 CODE: 1417 CODE:
1163{ 1418{
1164 while (self->texs <= texid) 1419 need_texid (self, texid);
1165 {
1166 Append (maptex, self->tex, self->texs, self->texs);
1167 self->texs *= 2;
1168 }
1169 1420
1170 { 1421 {
1171 maptex *tex = self->tex + texid; 1422 maptex *tex = self->tex + texid;
1172 1423
1173 tex->name = name; 1424 tex->name = name;
1190 // from transparent color bleeding and ugly wrapping effects. 1441 // from transparent color bleeding and ugly wrapping effects.
1191 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1442 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1192} 1443}
1193 1444
1194int 1445int
1195ox (CFClient::Map self) 1446ox (CFPlus::Map self)
1196 ALIAS: 1447 ALIAS:
1197 oy = 1 1448 oy = 1
1198 x = 2 1449 x = 2
1199 y = 3 1450 y = 3
1200 w = 4 1451 w = 4
1211 } 1462 }
1212 OUTPUT: 1463 OUTPUT:
1213 RETVAL 1464 RETVAL
1214 1465
1215void 1466void
1216scroll (CFClient::Map self, int dx, int dy) 1467scroll (CFPlus::Map self, int dx, int dy)
1217 CODE: 1468 CODE:
1218{ 1469{
1219 if (dx > 0) 1470 if (dx > 0)
1220 map_blank (self, self->x, self->y, dx - 1, self->h); 1471 map_blank (self, self->x, self->y, dx, self->h);
1221 else if (dx < 0) 1472 else if (dx < 0)
1222 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1473 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1223 1474
1224 if (dy > 0) 1475 if (dy > 0)
1225 map_blank (self, self->x, self->y, self->w, dy - 1); 1476 map_blank (self, self->x, self->y, self->w, dy);
1226 else if (dy < 0) 1477 else if (dy < 0)
1227 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1478 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1228 1479
1229 self->ox += dx; self->x += dx; 1480 self->ox += dx; self->x += dx;
1230 self->oy += dy; self->y += dy; 1481 self->oy += dy; self->y += dy;
1231 1482
1232 while (self->y < 0) 1483 while (self->y < 0)
1237 self->y += MAP_EXTEND_Y; 1488 self->y += MAP_EXTEND_Y;
1238 } 1489 }
1239} 1490}
1240 1491
1241void 1492void
1242map1a_update (CFClient::Map self, SV *data_) 1493map1a_update (CFPlus::Map self, SV *data_, int extmap)
1243 CODE: 1494 CODE:
1244{ 1495{
1245 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1496 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1246 uint8_t *data_end = (uint8_t *)SvEND (data_); 1497 uint8_t *data_end = (uint8_t *)SvEND (data_);
1247 mapcell *cell; 1498 mapcell *cell;
1248 int x, y, flags; 1499 int x, y, flags;
1249 1500
1250 while (data < data_end) 1501 while (data < data_end - 1)
1251 { 1502 {
1252 flags = (data [0] << 8) + data [1]; data += 2; 1503 flags = (data [0] << 8) + data [1]; data += 2;
1253 1504
1254 x = self->x + ((flags >> 10) & 63); 1505 x = self->x + ((flags >> 10) & 63);
1255 y = self->y + ((flags >> 4) & 63); 1506 y = self->y + ((flags >> 4) & 63);
1256 1507
1257 cell = map_get_cell (self, x, y); 1508 cell = map_get_cell (self, x, y);
1258 1509
1259 if (flags & 15) 1510 if (flags & 15)
1260 { 1511 {
1261 if (cell->darkness < 0) 1512 if (!cell->darkness)
1262 { 1513 {
1514 memset (cell, 0, sizeof (*cell));
1263 cell->darkness = 0; 1515 cell->darkness = 256;
1264 cell->face [0] = 0;
1265 cell->face [1] = 0;
1266 cell->face [2] = 0;
1267 } 1516 }
1268 1517
1269 cell->darkness = flags & 8 ? *data++ : 255;
1270
1271 //TODO: don't trust server data to be in-range(!) 1518 //TODO: don't trust server data to be in-range(!)
1519
1520 if (flags & 8)
1521 {
1522 if (extmap)
1523 {
1524 uint8_t ext, cmd;
1525
1526 do
1527 {
1528 ext = *data++;
1529 cmd = ext & 0x3f;
1530
1531 if (cmd < 4)
1532 cell->darkness = 255 - ext * 64 + 1;
1533 else if (cmd == 5) // health
1534 {
1535 cell->stat_width = 1;
1536 cell->stat_hp = *data++;
1537 }
1538 else if (cmd == 6) // monster width
1539 cell->stat_width = *data++ + 1;
1540 else if (cmd == 0x47)
1541 {
1542 if (*data == 4)
1543 ; // decode player count
1544
1545 data += *data + 1;
1546 }
1547 else if (cmd == 8) // cell flags
1548 cell->flags = *data++;
1549 else if (ext & 0x40) // unknown, multibyte => skip
1550 data += *data + 1;
1551 else
1552 data++;
1553 }
1554 while (ext & 0x80);
1555 }
1556 else
1557 cell->darkness = *data++ + 1;
1558 }
1272 1559
1273 if (flags & 4) 1560 if (flags & 4)
1274 { 1561 {
1275 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1562 faceid face = (data [0] << 8) + data [1]; data += 2;
1563 need_facenum (self, face);
1564 cell->tile [0] = self->face2tile [face];
1276 } 1565 }
1277 1566
1278 if (flags & 2) 1567 if (flags & 2)
1279 { 1568 {
1280 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1569 faceid face = (data [0] << 8) + data [1]; data += 2;
1570 need_facenum (self, face);
1571 cell->tile [1] = self->face2tile [face];
1281 } 1572 }
1282 1573
1283 if (flags & 1) 1574 if (flags & 1)
1284 { 1575 {
1285 cell->face [2] = 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 [2] = self->face2tile [face];
1286 } 1579 }
1287 } 1580 }
1288 else 1581 else
1289 cell->darkness = -1; 1582 cell->darkness = 0;
1290 } 1583 }
1291} 1584}
1292 1585
1293SV * 1586SV *
1294mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1587mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1295 CODE: 1588 CODE:
1296{ 1589{
1297 int x1, x; 1590 int x1, x;
1298 int y1, y; 1591 int y1, y;
1299 int z; 1592 int z;
1320 { 1613 {
1321 mapcell *cell = row->col + (x - row->c0); 1614 mapcell *cell = row->col + (x - row->c0);
1322 1615
1323 for (z = 0; z <= 0; z++) 1616 for (z = 0; z <= 0; z++)
1324 { 1617 {
1325 mapface face = cell->face [z];
1326
1327 if (face)
1328 {
1329 maptex tex = self->tex [face]; 1618 maptex tex = self->tex [cell->tile [z]];
1330 int a0 = 255 - tex.a; 1619 int a0 = 255 - tex.a;
1331 int a1 = tex.a; 1620 int a1 = tex.a;
1332 1621
1333 r = (r * a0 + tex.r * a1) / 255; 1622 r = (r * a0 + tex.r * a1) / 255;
1334 g = (g * a0 + tex.g * a1) / 255; 1623 g = (g * a0 + tex.g * a1) / 255;
1335 b = (b * a0 + tex.b * a1) / 255; 1624 b = (b * a0 + tex.b * a1) / 255;
1336 a = (a * a0 + tex.a * a1) / 255; 1625 a = (a * a0 + tex.a * a1) / 255;
1337 }
1338 } 1626 }
1339 } 1627 }
1340 1628
1341 *map++ = (r ) 1629 *map++ = (r )
1342 | (g << 8) 1630 | (g << 8)
1349} 1637}
1350 OUTPUT: 1638 OUTPUT:
1351 RETVAL 1639 RETVAL
1352 1640
1353void 1641void
1354draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1642draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1355 CODE: 1643 CODE:
1356{ 1644{
1357 int vx, vy; 1645 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1646 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1647 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1648 smooth_key skey;
1358 int x, y, z; 1649 int x, y, z;
1359 int last_name; 1650 int last_name;
1360 mapface face;
1361 1651
1362 vx = self->x + self->w / 2 - sw / 2 - shift_x; 1652 // thats current max. sorry.
1363 vy = self->y + self->h / 2 - sh / 2 - shift_y; 1653 if (sw > 255) sw = 255;
1654 if (sh > 255) sh = 255;
1364 1655
1365 /* 1656 // clear key, in case of extra padding
1366 int vx = self->vx = self->w >= sw 1657 memset (&skey, 0, sizeof (skey));
1367 ? self->x + (self->w - sw) / 2
1368 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1369
1370 int vy = self->vy = self->h >= sh
1371 ? self->y + (self->h - sh) / 2
1372 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1373 */
1374 1658
1375 glColor4ub (255, 255, 255, 255); 1659 glColor4ub (255, 255, 255, 255);
1376 1660
1377 glEnable (GL_BLEND); 1661 glEnable (GL_BLEND);
1378 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1662 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1381 1665
1382 glBegin (GL_QUADS); 1666 glBegin (GL_QUADS);
1383 1667
1384 last_name = 0; 1668 last_name = 0;
1385 1669
1670 mx += self->x;
1671 my += self->y;
1672
1673 // first pass: determine smooth_max
1674 // rather ugly, if you ask me
1675 // could also be stored inside mapcell and updated on change
1676 memset (smooth_max, 0, sizeof (smooth_max));
1677
1678 for (y = 0; y < sh; y++)
1679 if (0 <= y + my && y + my < self->rows)
1680 {
1681 maprow *row = self->row + (y + my);
1682
1683 for (x = 0; x < sw; x++)
1684 if (row->c0 <= x + mx && x + mx < row->c1)
1685 {
1686 mapcell *cell = row->col + (x + mx - row->c0);
1687
1688 smooth_max[x + 1][y + 1] =
1689 MAX (self->tex [cell->tile [0]].smoothlevel,
1690 MAX (self->tex [cell->tile [1]].smoothlevel,
1691 self->tex [cell->tile [2]].smoothlevel));
1692 }
1693 }
1694
1386 for (z = 0; z < 3; z++) 1695 for (z = 0; z <= 2; z++)
1696 {
1697 memset (smooth_level, 0, sizeof (smooth_level));
1698
1387 for (y = 0; y < sh; y++) 1699 for (y = 0; y < sh; y++)
1388 if (0 <= y + vy && y + vy < self->rows) 1700 if (0 <= y + my && y + my < self->rows)
1389 { 1701 {
1390 maprow *row = self->row + (y + vy); 1702 maprow *row = self->row + (y + my);
1391 1703
1392 for (x = 0; x < sw; x++) 1704 for (x = 0; x < sw; x++)
1393 if (row->c0 <= x + vx && x + vx < row->c1) 1705 if (row->c0 <= x + mx && x + mx < row->c1)
1394 { 1706 {
1395 mapcell *cell = row->col + (x + vx - row->c0); 1707 mapcell *cell = row->col + (x + mx - row->c0);
1396
1397 face = cell->face [z]; 1708 tileid tile = cell->tile [z];
1398 1709
1399 if (face) 1710 if (tile)
1711 {
1712 maptex tex = self->tex [tile];
1713 int px = (x + 1) * T - tex.w;
1714 int py = (y + 1) * T - tex.h;
1715
1716 // suppressing texture state switches here
1717 // is only moderately effective, but worth the extra effort
1718 if (last_name != tex.name)
1719 {
1720 if (!tex.name)
1721 tex = self->tex [2]; /* missing, replace by noface */
1722
1723 glEnd ();
1724 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1725 glBegin (GL_QUADS);
1726 }
1727
1728 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1729 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1730 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1731 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1732
1733 if (cell->flags && z == 2)
1734 {
1735 if (cell->flags & 1)
1736 {
1737 maptex tex = self->tex [1];
1738 int px = x * T + T * 2 / 32;
1739 int py = y * T - T * 6 / 32;
1740
1741 glEnd ();
1742 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1743 glBegin (GL_QUADS);
1744
1745 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1746 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1747 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1748 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1749 }
1750 }
1751
1752 // update smooth hash
1753 if (tex.smoothtile)
1754 {
1755 skey.tile = tex.smoothtile;
1756 skey.level = tex.smoothlevel;
1757
1758 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1759
1760 // add bits to current tile and all neighbours. skey.x|y is
1761 // shifted +1|+1 so we always stay positive.
1762
1763 // bits is ___n cccc CCCC bbbb
1764 // n do not draw borders&corners
1765 // c draw these corners, but...
1766 // C ... not these
1767 // b draw these borders
1768
1769 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1770 // ┃· ·· ·┃ ━━
1771
1772 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1773 // ·· ·· ·┏ ┓·
1774
1775 // full tile
1776 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1777
1778 // borders
1779 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1780 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1781 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1782 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1783
1784 // corners
1785 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1786 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1787 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1788 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1789 }
1790 }
1791 }
1792 }
1793
1794 // go through all smoothlevels, lowest to highest, then draw.
1795 // this is basically counting sort
1796 {
1797 int w, b;
1798
1799 for (w = 0; w < 256 / 32; ++w)
1800 {
1801 uint32_t smask = smooth_level [w];
1802 if (smask)
1803 for (b = 0; b < 32; ++b)
1804 if (smask & (((uint32_t)1) << b))
1400 { 1805 {
1401 maptex tex = self->tex [face]; 1806 int level = (w << 5) | b;
1807 HE *he;
1402 1808
1403 int px = (x + 1) * 32 - tex.w; 1809 hv_iterinit (smooth);
1404 int py = (y + 1) * 32 - tex.h; 1810 while ((he = hv_iternext (smooth)))
1405
1406 if (last_name != tex.name)
1407 { 1811 {
1812 smooth_key *skey = (smooth_key *)HeKEY (he);
1813 IV bits = SvIVX (HeVAL (he));
1814
1815 if (!(bits & 0x1000)
1816 && skey->level == level
1817 && level > smooth_max [skey->x][skey->y])
1818 {
1819 maptex tex = self->tex [skey->tile];
1820 int px = (((int)skey->x) - 1) * T;
1821 int py = (((int)skey->y) - 1) * T;
1822 int border = bits & 15;
1823 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1824 float dx = tex.s * .0625f; // 16 images/row
1825 float dy = tex.t * .5f ; // 2 images/column
1826
1827 // this time naively avoiding texture state changes
1828 // save gobs of state changes.
1829 if (last_name != tex.name)
1830 {
1831 if (!tex.name)
1832 continue; // smoothing not yet available
1833
1408 glEnd (); 1834 glEnd ();
1409 last_name = tex.name;
1410 glBindTexture (GL_TEXTURE_2D, last_name); 1835 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1411 glBegin (GL_QUADS); 1836 glBegin (GL_QUADS);
1837 }
1838
1839 if (border)
1840 {
1841 float ox = border * dx;
1842
1843 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1844 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1845 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1846 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1847 }
1848
1849 if (corner)
1850 {
1851 float ox = corner * dx;
1852
1853 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1854 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1855 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1856 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1857 }
1858 }
1412 } 1859 }
1413
1414 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1415 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1416 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1417 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1418 } 1860 }
1419 }
1420 } 1861 }
1862 }
1863
1864 hv_clear (smooth);
1865 }
1421 1866
1422 glEnd (); 1867 glEnd ();
1423 1868
1424 glDisable (GL_TEXTURE_2D); 1869 glDisable (GL_TEXTURE_2D);
1425 glDisable (GL_BLEND); 1870 glDisable (GL_BLEND);
1426}
1427 1871
1872 // top layer: overlays such as the health bar
1873 for (y = 0; y < sh; y++)
1874 if (0 <= y + my && y + my < self->rows)
1875 {
1876 maprow *row = self->row + (y + my);
1877
1878 for (x = 0; x < sw; x++)
1879 if (row->c0 <= x + mx && x + mx < row->c1)
1880 {
1881 mapcell *cell = row->col + (x + mx - row->c0);
1882
1883 int px = x * T;
1884 int py = y * T;
1885
1886 if (cell->stat_hp)
1887 {
1888 int width = cell->stat_width * T;
1889 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1890
1891 glColor3ub (0, 0, 0);
1892 glRectf (px + 1, py - thick - 2,
1893 px + width - 1, py);
1894
1895 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1896 glRectf (px + 2,
1897 py - thick - 1,
1898 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1899 }
1900 }
1901 }
1902}
1903
1428void 1904void
1429draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data) 1905draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1430 CODE: 1906 CODE:
1431{ 1907{
1432 static float color[16][3] = { 1908 static float color[16][3] = {
1433 { 0.00F, 0.00F, 0.00F }, 1909 { 0.00F, 0.00F, 0.00F },
1434 { 1.00F, 1.00F, 1.00F }, 1910 { 1.00F, 1.00F, 1.00F },
1484 glDisable (GL_BLEND); 1960 glDisable (GL_BLEND);
1485 glDisable (GL_TEXTURE_2D); 1961 glDisable (GL_TEXTURE_2D);
1486} 1962}
1487 1963
1488void 1964void
1489fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1965fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1490 PPCODE: 1966 PPCODE:
1491{ 1967{
1492 int vx, vy;
1493 int x, y; 1968 int x, y;
1969 int sw1 = sw + 2;
1970 int sh1 = sh + 2;
1971 int sh3 = sh * 3;
1494 int sw4 = (sw + 3) & ~3; 1972 int sw34 = (sw * 3 + 3) & ~3;
1973 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1495 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1974 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1496 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1975 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1497 1976
1498 memset (darkness, 255, sw4 * sh);
1499 SvPOK_only (darkness_sv); 1977 SvPOK_only (darkness3_sv);
1500 SvCUR_set (darkness_sv, sw4 * sh); 1978 SvCUR_set (darkness3_sv, sw34 * sh3);
1501 1979
1502 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1980 mx += self->x - 1;
1503 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1981 my += self->y - 1;
1504 1982
1983 memset (darkness1, 255, sw1 * sh1);
1984
1505 for (y = 0; y < sh; y++) 1985 for (y = 0; y < sh1; y++)
1506 if (0 <= y + vy && y + vy < self->rows) 1986 if (0 <= y + my && y + my < self->rows)
1507 { 1987 {
1508 maprow *row = self->row + (y + vy); 1988 maprow *row = self->row + (y + my);
1509 1989
1510 for (x = 0; x < sw; x++) 1990 for (x = 0; x < sw1; x++)
1511 if (row->c0 <= x + vx && x + vx < row->c1) 1991 if (row->c0 <= x + mx && x + mx < row->c1)
1512 { 1992 {
1513 mapcell *cell = row->col + (x + vx - row->c0); 1993 mapcell *cell = row->col + (x + mx - row->c0);
1514 1994
1515 darkness[y * sw4 + x] = cell->darkness < 0 1995 darkness1 [y * sw1 + x] = cell->darkness
1996 ? 255 - (cell->darkness - 1)
1516 ? 255 - FOW_DARKNESS 1997 : 255 - FOW_DARKNESS;
1517 : 255 - cell->darkness;
1518 } 1998 }
1519 } 1999 }
1520 2000
2001 for (y = 0; y < sh; ++y)
2002 for (x = 0; x < sw; ++x)
2003 {
2004 uint8_t d11 = darkness1 [(y ) * sw1 + x ];
2005 uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
2006 uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
2007 uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
2008 uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
2009 uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
2010 uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
2011 uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
2012 uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
2013
2014 uint8_t r11 = (d11 + d21 + d12) / 3;
2015 uint8_t r21 = d21;
2016 uint8_t r31 = (d21 + d31 + d32) / 3;
2017
2018 uint8_t r12 = d12;
2019 uint8_t r22 = d22;
2020 uint8_t r32 = d32;
2021
2022 uint8_t r13 = (d13 + d23 + d12) / 3;
2023 uint8_t r23 = d23;
2024 uint8_t r33 = (d23 + d33 + d32) / 3;
2025
2026 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
2027 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
2028 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
2029 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
2030 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
2031 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
2032 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
2033 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
2034 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
2035 }
2036
2037 free (darkness1);
2038
1521 EXTEND (SP, 3); 2039 EXTEND (SP, 3);
1522 PUSHs (sv_2mortal (newSViv (sw4))); 2040 PUSHs (sv_2mortal (newSViv (sw34)));
1523 PUSHs (sv_2mortal (newSViv (sh))); 2041 PUSHs (sv_2mortal (newSViv (sh3)));
1524 PUSHs (darkness_sv); 2042 PUSHs (darkness3_sv);
1525} 2043}
1526 2044
1527SV * 2045SV *
1528get_rect (CFClient::Map self, int x0, int y0, int w, int h) 2046get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1529 CODE: 2047 CODE:
1530{ 2048{
1531 int x, y, x1, y1; 2049 int x, y, x1, y1;
1532 SV *data_sv = newSV (w * h * 7 + 5); 2050 SV *data_sv = newSV (w * h * 7 + 5);
1533 uint8_t *data = (uint8_t *)SvPVX (data_sv); 2051 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1558 if (row && row->c0 <= x && x < row->c1) 2076 if (row && row->c0 <= x && x < row->c1)
1559 { 2077 {
1560 mapcell *cell = row->col + (x - row->c0); 2078 mapcell *cell = row->col + (x - row->c0);
1561 uint8_t flags = 0; 2079 uint8_t flags = 0;
1562 2080
1563 if (cell->face [0]) flags |= 1; 2081 if (cell->tile [0]) flags |= 1;
1564 if (cell->face [1]) flags |= 2; 2082 if (cell->tile [1]) flags |= 2;
1565 if (cell->face [2]) flags |= 4; 2083 if (cell->tile [2]) flags |= 4;
1566 2084
1567 *data++ = flags; 2085 *data++ = flags;
1568 2086
1569 if (flags & 1) 2087 if (flags & 1)
1570 { 2088 {
2089 tileid tile = cell->tile [0];
1571 *data++ = cell->face [0] >> 8; 2090 *data++ = tile >> 8;
1572 *data++ = cell->face [0]; 2091 *data++ = tile;
1573 } 2092 }
1574 2093
1575 if (flags & 2) 2094 if (flags & 2)
1576 { 2095 {
2096 tileid tile = cell->tile [1];
1577 *data++ = cell->face [1] >> 8; 2097 *data++ = tile >> 8;
1578 *data++ = cell->face [1]; 2098 *data++ = tile;
1579 } 2099 }
1580 2100
1581 if (flags & 4) 2101 if (flags & 4)
1582 { 2102 {
2103 tileid tile = cell->tile [2];
1583 *data++ = cell->face [2] >> 8; 2104 *data++ = tile >> 8;
1584 *data++ = cell->face [2]; 2105 *data++ = tile;
1585 } 2106 }
1586 } 2107 }
1587 else 2108 else
1588 *data++ = 0; 2109 *data++ = 0;
1589 } 2110 }
1595} 2116}
1596 OUTPUT: 2117 OUTPUT:
1597 RETVAL 2118 RETVAL
1598 2119
1599void 2120void
1600set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 2121set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1601 PPCODE: 2122 PPCODE:
1602{ 2123{
1603 int x, y, z; 2124 int x, y, z;
1604 int w, h; 2125 int w, h;
1605 int x1, y1; 2126 int x1, y1;
1629 { 2150 {
1630 uint8_t flags = *data++; 2151 uint8_t flags = *data++;
1631 2152
1632 if (flags) 2153 if (flags)
1633 { 2154 {
1634 mapface face[3] = { 0, 0, 0 };
1635
1636 mapcell *cell = row_get_cell (row, x); 2155 mapcell *cell = row_get_cell (row, x);
2156 tileid tile[3] = { 0, 0, 0 };
1637 2157
1638 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2158 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1639 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2159 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1640 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2160 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1641 2161
1642 if (cell->darkness <= 0) 2162 if (cell->darkness == 0)
1643 { 2163 {
1644 cell->darkness = -1; 2164 cell->darkness = 0;
1645 2165
1646 for (z = 0; z <= 2; z++) 2166 for (z = 0; z <= 2; z++)
1647 { 2167 {
1648 cell->face[z] = face[z]; 2168 tileid t = tile [z];
1649 2169
1650 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2170 if (t >= self->texs || (t && !self->tex [t].name))
2171 {
1651 XPUSHs (sv_2mortal (newSViv (face[z]))); 2172 XPUSHs (sv_2mortal (newSViv (t)));
2173 need_texid (self, t);
2174 }
2175
2176 cell->tile [z] = t;
1652 } 2177 }
1653 } 2178 }
1654 } 2179 }
1655 } 2180 }
1656 } 2181 }
1657} 2182}
1658 2183
1659MODULE = CFClient PACKAGE = CFClient::MixChunk 2184MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1660 2185
1661CFClient::MixChunk 2186CFPlus::MixChunk
1662new_from_file (SV *class, char *path) 2187new_from_file (SV *class, char *path)
1663 CODE: 2188 CODE:
1664 RETVAL = Mix_LoadWAV (path); 2189 RETVAL = Mix_LoadWAV (path);
1665 OUTPUT: 2190 OUTPUT:
1666 RETVAL 2191 RETVAL
1667 2192
1668void 2193void
1669DESTROY (CFClient::MixChunk self) 2194DESTROY (CFPlus::MixChunk self)
1670 CODE: 2195 CODE:
1671 Mix_FreeChunk (self); 2196 Mix_FreeChunk (self);
1672 2197
1673int 2198int
1674volume (CFClient::MixChunk self, int volume = -1) 2199volume (CFPlus::MixChunk self, int volume = -1)
1675 CODE: 2200 CODE:
1676 RETVAL = Mix_VolumeChunk (self, volume); 2201 RETVAL = Mix_VolumeChunk (self, volume);
1677 OUTPUT: 2202 OUTPUT:
1678 RETVAL 2203 RETVAL
1679 2204
1680int 2205int
1681play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 2206play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1682 CODE: 2207 CODE:
1683 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 2208 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1684 OUTPUT: 2209 OUTPUT:
1685 RETVAL 2210 RETVAL
1686 2211
1687MODULE = CFClient PACKAGE = CFClient::MixMusic 2212MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1688 2213
1689int 2214int
1690volume (int volume = -1) 2215volume (int volume = -1)
1691 CODE: 2216 CODE:
1692 RETVAL = Mix_VolumeMusic (volume); 2217 RETVAL = Mix_VolumeMusic (volume);
1693 OUTPUT: 2218 OUTPUT:
1694 RETVAL 2219 RETVAL
1695 2220
2221int
2222fade_out (int ms)
2223 CODE:
2224 RETVAL = Mix_FadeOutMusic (ms);
2225 OUTPUT:
2226 RETVAL
2227
1696CFClient::MixMusic 2228CFPlus::MixMusic
1697new_from_file (SV *class, char *path) 2229new_from_file (SV *class, char *path)
1698 CODE: 2230 CODE:
1699 RETVAL = Mix_LoadMUS (path); 2231 RETVAL = Mix_LoadMUS (path);
1700 OUTPUT: 2232 OUTPUT:
1701 RETVAL 2233 RETVAL
1702 2234
1703void 2235void
1704DESTROY (CFClient::MixMusic self) 2236DESTROY (CFPlus::MixMusic self)
1705 CODE: 2237 CODE:
1706 Mix_FreeMusic (self); 2238 Mix_FreeMusic (self);
1707 2239
1708int 2240int
1709play (CFClient::MixMusic self, int loops = -1) 2241play (CFPlus::MixMusic self, int loops = -1)
1710 CODE: 2242 CODE:
1711 RETVAL = Mix_PlayMusic (self, loops); 2243 RETVAL = Mix_PlayMusic (self, loops);
1712 OUTPUT: 2244 OUTPUT:
1713 RETVAL 2245 RETVAL
1714 2246
2247int
2248fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2249 CODE:
2250 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2251 OUTPUT:
2252 RETVAL
2253
1715MODULE = CFClient PACKAGE = CFClient::OpenGL 2254MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1716 2255
1717BOOT: 2256BOOT:
1718{ 2257{
1719 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 2258 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1720 static const struct { 2259 static const struct {
1721 const char *name; 2260 const char *name;
1722 IV iv; 2261 IV iv;
1723 } *civ, const_iv[] = { 2262 } *civ, const_iv[] = {
1724# define const_iv(name) { # name, (IV)name } 2263# define const_iv(name) { # name, (IV)name }
2264 const_iv (GL_VENDOR),
2265 const_iv (GL_VERSION),
2266 const_iv (GL_EXTENSIONS),
1725 const_iv (GL_COLOR_MATERIAL), 2267 const_iv (GL_COLOR_MATERIAL),
1726 const_iv (GL_SMOOTH), 2268 const_iv (GL_SMOOTH),
1727 const_iv (GL_FLAT), 2269 const_iv (GL_FLAT),
1728 const_iv (GL_DITHER), 2270 const_iv (GL_DITHER),
1729 const_iv (GL_BLEND), 2271 const_iv (GL_BLEND),
1756 const_iv (GL_LUMINANCE), 2298 const_iv (GL_LUMINANCE),
1757 const_iv (GL_LUMINANCE_ALPHA), 2299 const_iv (GL_LUMINANCE_ALPHA),
1758 const_iv (GL_FLOAT), 2300 const_iv (GL_FLOAT),
1759 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2301 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1760 const_iv (GL_COMPILE), 2302 const_iv (GL_COMPILE),
2303 const_iv (GL_PROXY_TEXTURE_1D),
2304 const_iv (GL_PROXY_TEXTURE_2D),
1761 const_iv (GL_TEXTURE_1D), 2305 const_iv (GL_TEXTURE_1D),
1762 const_iv (GL_TEXTURE_2D), 2306 const_iv (GL_TEXTURE_2D),
1763 const_iv (GL_TEXTURE_ENV), 2307 const_iv (GL_TEXTURE_ENV),
1764 const_iv (GL_TEXTURE_MAG_FILTER), 2308 const_iv (GL_TEXTURE_MAG_FILTER),
1765 const_iv (GL_TEXTURE_MIN_FILTER), 2309 const_iv (GL_TEXTURE_MIN_FILTER),
1787 const_iv (GL_SEPARABLE_2D), 2331 const_iv (GL_SEPARABLE_2D),
1788 const_iv (GL_CONVOLUTION_2D), 2332 const_iv (GL_CONVOLUTION_2D),
1789 const_iv (GL_CONVOLUTION_BORDER_MODE), 2333 const_iv (GL_CONVOLUTION_BORDER_MODE),
1790 const_iv (GL_CONSTANT_BORDER), 2334 const_iv (GL_CONSTANT_BORDER),
1791 const_iv (GL_LINES), 2335 const_iv (GL_LINES),
2336 const_iv (GL_LINE_STRIP),
1792 const_iv (GL_LINE_LOOP), 2337 const_iv (GL_LINE_LOOP),
1793 const_iv (GL_QUADS), 2338 const_iv (GL_QUADS),
1794 const_iv (GL_QUAD_STRIP), 2339 const_iv (GL_QUAD_STRIP),
1795 const_iv (GL_TRIANGLES), 2340 const_iv (GL_TRIANGLES),
1796 const_iv (GL_TRIANGLE_STRIP), 2341 const_iv (GL_TRIANGLE_STRIP),
1804# undef const_iv 2349# undef const_iv
1805 }; 2350 };
1806 2351
1807 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2352 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1808 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2353 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2354
2355 texture_av = newAV ();
2356 AvREAL_off (texture_av);
1809} 2357}
1810 2358
1811char * 2359char *
1812gl_vendor () 2360gl_vendor ()
1813 CODE: 2361 CODE:
1824 2372
1825char * 2373char *
1826gl_extensions () 2374gl_extensions ()
1827 CODE: 2375 CODE:
1828 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2376 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2377 OUTPUT:
2378 RETVAL
2379
2380const char *glGetString (GLenum pname)
2381
2382GLint glGetInteger (GLenum pname)
2383 CODE:
2384 glGetIntegerv (pname, &RETVAL);
2385 OUTPUT:
2386 RETVAL
2387
2388GLdouble glGetDouble (GLenum pname)
2389 CODE:
2390 glGetDoublev (pname, &RETVAL);
1829 OUTPUT: 2391 OUTPUT:
1830 RETVAL 2392 RETVAL
1831 2393
1832int glGetError () 2394int glGetError ()
1833 2395
1906 r *= a; 2468 r *= a;
1907 g *= a; 2469 g *= a;
1908 b *= a; 2470 b *= a;
1909 } 2471 }
1910 // microsoft visual "c" rounds instead of truncating... 2472 // microsoft visual "c" rounds instead of truncating...
1911 glColor4ub (MIN ((int)(r * 256.f), 255), 2473 glColor4f (r, g, b, a);
1912 MIN ((int)(g * 256.f), 255),
1913 MIN ((int)(b * 256.f), 255),
1914 MIN ((int)(a * 256.f), 255));
1915 2474
1916void glInterleavedArrays (int format, int stride, char *data) 2475void glInterleavedArrays (int format, int stride, char *data)
1917 2476
1918void glDrawElements (int mode, int count, int type, char *indices) 2477void glDrawElements (int mode, int count, int type, char *indices)
1919 2478
1961 2520
1962void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2521void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1963 2522
1964void glDrawPixels (int width, int height, int format, int type, char *pixels) 2523void glDrawPixels (int width, int height, int format, int type, char *pixels)
1965 2524
2525void glPixelZoom (float x, float y)
2526
1966void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2527void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1967 2528
1968int glGenTexture () 2529int glGenTexture ()
1969 CODE: 2530 CODE:
1970{ 2531 RETVAL = gen_texture ();
1971 GLuint name;
1972 glGenTextures (1, &name);
1973 RETVAL = name;
1974}
1975 OUTPUT: 2532 OUTPUT:
1976 RETVAL 2533 RETVAL
1977 2534
1978void glDeleteTexture (int name) 2535void glDeleteTexture (int name)
1979 CODE: 2536 CODE:
1980{
1981 GLuint name_ = name;
1982 glDeleteTextures (1, &name_); 2537 del_texture (name);
1983} 2538
1984
1985int glGenList () 2539int glGenList ()
1986 CODE: 2540 CODE:
1987 RETVAL = glGenLists (1); 2541 RETVAL = glGenLists (1);
1988 OUTPUT: 2542 OUTPUT:
1989 RETVAL 2543 RETVAL
1996 2550
1997void glEndList () 2551void glEndList ()
1998 2552
1999void glCallList (int list) 2553void glCallList (int list)
2000 2554
2001

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines