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.117 by root, Thu Jun 15 15:33:57 2006 UTC vs.
Revision 1.197 by root, Sun Jul 15 21:08:40 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines