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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines