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.61 by root, Sun Apr 23 21:47:30 2006 UTC vs.
Revision 1.175 by root, Fri Apr 6 08:09:42 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN
3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
2# include <malloc.h> 4# include <malloc.h>
5# include <windows.h>
6# include <wininet.h>
7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
3#endif 9#endif
4 10
5#include "EXTERN.h" 11#include "EXTERN.h"
6#include "perl.h" 12#include "perl.h"
7#include "XSUB.h" 13#include "XSUB.h"
8 14
15#ifdef _WIN32
16# undef pipe
17#endif
18
19#include <assert.h>
20#include <math.h>
9#include <string.h> 21#include <string.h>
10#include <stdio.h> 22#include <stdio.h>
23#include <stdlib.h>
11 24
12#include <SDL.h> 25#include <SDL.h>
26#include <SDL_endian.h>
13#include <SDL_image.h> 27#include <SDL_image.h>
14#include <SDL_mixer.h> 28#include <SDL_mixer.h>
15#include <SDL_opengl.h> 29#include <SDL_opengl.h>
16 30
31#define PANGO_ENABLE_BACKEND
32#define G_DISABLE_CAST_CHECKS
33
17#include <glib/gmacros.h> 34#include <glib/gmacros.h>
18 35
19#include <pango/pango.h> 36#include <pango/pango.h>
20#include <pango/pangofc-fontmap.h>
21#include <pango/pangoft2.h>
22 37
23#ifndef _WIN32 38#ifndef _WIN32
24# include <sys/types.h> 39# include <sys/types.h>
25# include <sys/socket.h> 40# include <sys/socket.h>
26# include <netinet/in.h> 41# include <netinet/in.h>
27# include <netinet/tcp.h> 42# include <netinet/tcp.h>
28# include <inttypes.h> 43# include <inttypes.h>
29#else
30 typedef unsigned char uint8_t;
31 typedef unsigned short uint16_t;
32 typedef unsigned int uint32_t;
33 typedef signed char int8_t;
34 typedef signed short int16_t;
35 typedef signed int int32_t;
36#endif 44#endif
37 45
38#include "glext.h" 46#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
39 47
40#define FOW_DARKNESS 32 48#define FOW_DARKNESS 32
41 49
42#define MAP_EXTEND_X 32 50#define MAP_EXTEND_X 32
43#define MAP_EXTEND_Y 512 51#define MAP_EXTEND_Y 512
44 52
45#define MIN_FONT_HEIGHT 8 53#define MIN_FONT_HEIGHT 10
46 54
55#if 0
56# define PARACHUTE SDL_INIT_NOPARACHUTE
57#else
58# define PARACHUTE 0
59#endif
60
61static struct
62{
63#define GL_FUNC(ptr,name) ptr name;
64#include "glfunc.h"
65#undef GL_FUNC
66} gl;
67
68static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69{
70 if (gl.BlendFuncSeparate)
71 gl.BlendFuncSeparate (sa, da, saa, daa);
72 else if (gl.BlendFuncSeparateEXT)
73 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74 else
75 glBlendFunc (sa, da);
76}
77
78#include "texcache.c"
79
80#include "pango-font.c"
81#include "pango-fontmap.c"
82#include "pango-render.c"
83
47typedef Mix_Chunk *CFClient__MixChunk; 84typedef Mix_Chunk *CFPlus__MixChunk;
48typedef Mix_Music *CFClient__MixMusic; 85typedef Mix_Music *CFPlus__MixMusic;
49 86
50typedef PangoFontDescription *CFClient__Font; 87typedef PangoFontDescription *CFPlus__Font;
88
89static int
90shape_attr_p (PangoLayoutRun *run)
91{
92 GSList *attrs = run->item->analysis.extra_attrs;
93
94 while (attrs)
95 {
96 PangoAttribute *attr = attrs->data;
97
98 if (attr->klass->type == PANGO_ATTR_SHAPE)
99 return 1;
100
101 attrs = attrs->next;
102 }
103
104 return 0;
105}
51 106
52typedef struct cf_layout { 107typedef struct cf_layout {
53 PangoLayout *pl; 108 PangoLayout *pl;
109 float r, g, b, a; // default color for rgba mode
54 int base_height; 110 int base_height;
55 CFClient__Font font; 111 CFPlus__Font font;
56} *CFClient__Layout; 112} *CFPlus__Layout;
57 113
58static CFClient__Font default_font; 114static CFPlus__Font default_font;
59static PangoContext *context; 115static PangoContext *opengl_context;
60static PangoFontMap *fontmap; 116static PangoFontMap *opengl_fontmap;
61 117
62static void 118static void
63substitute_func (FcPattern *pattern, gpointer data) 119substitute_func (FcPattern *pattern, gpointer data)
64{ 120{
65 FcPatternAddBool (pattern, FC_HINTING , 1); 121 FcPatternAddBool (pattern, FC_HINTING, 1);
122#ifdef FC_HINT_STYLE
123 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
124#endif
66 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 125 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
67} 126}
68 127
69static void 128static void
70layout_update_font (CFClient__Layout self) 129layout_update_font (CFPlus__Layout self)
71{ 130{
72 /* use a random scale factor to account for unknown descenders, 0.8 works 131 /* use a random scale factor to account for unknown descenders, 0.8 works
73 * reasonably well with bitstream vera 132 * reasonably well with bitstream vera
74 */ 133 */
75 PangoFontDescription *font = self->font ? self->font : default_font; 134 PangoFontDescription *font = self->font ? self->font : default_font;
79 138
80 pango_layout_set_font_description (self->pl, font); 139 pango_layout_set_font_description (self->pl, font);
81} 140}
82 141
83static void 142static void
84layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 143layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
85{ 144{
145 PangoRectangle rect;
146
147 // get_pixel_* wrongly rounds down
86 pango_layout_get_pixel_size (self->pl, w, h); 148 pango_layout_get_extents (self->pl, 0, &rect);
87 149
88 *w = (*w + 3) & ~3; 150 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
89 if (!*w) *w = 1; 151 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
90 if (!*h) *h = 1;
91}
92 152
153 if (!rect.width) rect.width = 1;
154 if (!rect.height) rect.height = 1;
155
156 *w = rect.width;
157 *h = rect.height;
158}
159
160typedef uint16_t tileid;
93typedef uint16_t mapface; 161typedef uint16_t faceid;
94 162
95typedef struct { 163typedef struct {
96 GLint name; 164 int name;
97 int w, h; 165 int w, h;
98 float s, t; 166 float s, t;
99 uint8_t r, g, b, a; 167 uint8_t r, g, b, a;
100} maptex; 168} maptex;
101 169
102typedef struct { 170typedef struct {
171 uint32_t player;
172 tileid tile[3];
103 int16_t darkness; 173 uint16_t darkness;
104 mapface face[3]; 174 uint8_t stat_width, stat_hp, flags;
105} mapcell; 175} mapcell;
106 176
107typedef struct { 177typedef struct {
108 int32_t c0, c1; 178 int32_t c0, c1;
109 mapcell *col; 179 mapcell *col;
110} maprow; 180} maprow;
111 181
112typedef struct map { 182typedef struct map {
113 int x, y, w, h; 183 int x, y, w, h;
114 int ox, oy; /* offset to virtual global coordinate system */ 184 int ox, oy; /* offset to virtual global coordinate system */
115 int faces; 185 int faces; tileid *face2tile; // [faceid]
116 mapface *face; 186 int texs; maptex *tex; // [tileid]
117
118 int texs;
119 maptex *tex;
120 187
121 int32_t rows; 188 int32_t rows;
122 maprow *row; 189 maprow *row;
123} *CFClient__Map; 190} *CFPlus__Map;
124 191
125static char * 192static char *
126prepend (char *ptr, int sze, int inc) 193prepend (char *ptr, int sze, int inc)
127{ 194{
128 char *p; 195 char *p;
145} 212}
146 213
147#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 214#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
148#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 215#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
149 216
217static void
218need_facenum (struct map *self, faceid face)
219{
220 while (self->faces <= face)
221 {
222 Append (tileid, self->face2tile, self->faces, self->faces);
223 self->faces *= 2;
224 }
225}
226
227static void
228need_texid (struct map *self, int texid)
229{
230 while (self->texs <= texid)
231 {
232 Append (maptex, self->tex, self->texs, self->texs);
233 self->texs *= 2;
234 }
235}
236
150static maprow * 237static maprow *
151map_get_row (CFClient__Map self, int y) 238map_get_row (CFPlus__Map self, int y)
152{ 239{
153 if (0 > y) 240 if (0 > y)
154 { 241 {
155 int extend = - y + MAP_EXTEND_Y; 242 int extend = - y + MAP_EXTEND_Y;
156 Prepend (maprow, self->row, self->rows, extend); 243 Prepend (maprow, self->row, self->rows, extend);
194 281
195 return row->col + (x - row->c0); 282 return row->col + (x - row->c0);
196} 283}
197 284
198static mapcell * 285static mapcell *
199map_get_cell (CFClient__Map self, int x, int y) 286map_get_cell (CFPlus__Map self, int x, int y)
200{ 287{
201 return row_get_cell (map_get_row (self, y), x); 288 return row_get_cell (map_get_row (self, y), x);
202} 289}
203 290
204static void 291static void
205map_clear (CFClient__Map self) 292map_clear (CFPlus__Map self)
206{ 293{
207 int r; 294 int r;
208 295
209 for (r = 0; r < self->rows; r++) 296 for (r = 0; r < self->rows; r++)
210 Safefree (self->row[r].col); 297 Safefree (self->row[r].col);
218 self->row = 0; 305 self->row = 0;
219 self->rows = 0; 306 self->rows = 0;
220} 307}
221 308
222static void 309static void
223map_blank (CFClient__Map self, int x0, int y0, int w, int h) 310map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
224{ 311{
225 int x, y; 312 int x, y;
226 maprow *row; 313 maprow *row;
314 mapcell *cell;
227 315
228 for (y = y0; y < y0 + h; y++) 316 for (y = y0; y < y0 + h; y++)
229 if (y >= 0) 317 if (y >= 0)
230 { 318 {
231 if (y >= self->rows) 319 if (y >= self->rows)
237 if (x >= row->c0) 325 if (x >= row->c0)
238 { 326 {
239 if (x >= row->c1) 327 if (x >= row->c1)
240 break; 328 break;
241 329
242 row->col[x - row->c0].darkness = -1; 330 cell = row->col + x - row->c0;
331
332 cell->darkness = 0;
333 cell->stat_hp = 0;
334 cell->flags = 0;
335 cell->player = 0;
243 } 336 }
244 } 337 }
245} 338}
246 339
247static void 340static void
248music_finished () 341music_finished (void)
249{ 342{
250 SDL_UserEvent ev; 343 SDL_UserEvent ev;
251 344
252 ev.type = SDL_USEREVENT; 345 ev.type = SDL_USEREVENT;
253 ev.code = 0; 346 ev.code = 0;
255 ev.data2 = 0; 348 ev.data2 = 0;
256 349
257 SDL_PushEvent ((SDL_Event *)&ev); 350 SDL_PushEvent ((SDL_Event *)&ev);
258} 351}
259 352
353static void
354channel_finished (int channel)
355{
356 SDL_UserEvent ev;
357
358 ev.type = SDL_USEREVENT;
359 ev.code = 1;
360 ev.data1 = (void *)(long)channel;
361 ev.data2 = 0;
362
363 SDL_PushEvent ((SDL_Event *)&ev);
364}
365
366static unsigned int
367minpot (unsigned int n)
368{
369 if (!n)
370 return 0;
371
372 --n;
373
374 n |= n >> 1;
375 n |= n >> 2;
376 n |= n >> 4;
377 n |= n >> 8;
378 n |= n >> 16;
379
380 return n + 1;
381}
382
383/* SDL should provide this, really. */
384#define SDLK_MODIFIER_MIN 300
385#define SDLK_MODIFIER_MAX 314
386
260MODULE = CFClient PACKAGE = CFClient 387MODULE = CFPlus PACKAGE = CFPlus
261 388
262PROTOTYPES: ENABLE 389PROTOTYPES: ENABLE
263 390
264BOOT: 391BOOT:
265{ 392{
266 HV *stash = gv_stashpv ("CFClient", 1); 393 HV *stash = gv_stashpv ("CFPlus", 1);
267 static const struct { 394 static const struct {
268 const char *name; 395 const char *name;
269 IV iv; 396 IV iv;
270 } *civ, const_iv[] = { 397 } *civ, const_iv[] = {
271# define const_iv(name) { # name, (IV)name } 398# define const_iv(name) { # name, (IV)name }
399 const_iv (SDLK_MODIFIER_MIN),
400 const_iv (SDLK_MODIFIER_MAX),
401
272 const_iv (SDL_ACTIVEEVENT), 402 const_iv (SDL_ACTIVEEVENT),
273 const_iv (SDL_KEYDOWN), 403 const_iv (SDL_KEYDOWN),
274 const_iv (SDL_KEYUP), 404 const_iv (SDL_KEYUP),
275 const_iv (SDL_MOUSEMOTION), 405 const_iv (SDL_MOUSEMOTION),
276 const_iv (SDL_MOUSEBUTTONDOWN), 406 const_iv (SDL_MOUSEBUTTONDOWN),
285 const_iv (SDL_EVENT_RESERVEDA), 415 const_iv (SDL_EVENT_RESERVEDA),
286 const_iv (SDL_EVENT_RESERVEDB), 416 const_iv (SDL_EVENT_RESERVEDB),
287 const_iv (SDL_VIDEORESIZE), 417 const_iv (SDL_VIDEORESIZE),
288 const_iv (SDL_VIDEOEXPOSE), 418 const_iv (SDL_VIDEOEXPOSE),
289 const_iv (SDL_USEREVENT), 419 const_iv (SDL_USEREVENT),
420
421 const_iv (SDL_APPINPUTFOCUS),
422 const_iv (SDL_APPMOUSEFOCUS),
423 const_iv (SDL_APPACTIVE),
424
290 const_iv (SDLK_KP0), 425 const_iv (SDLK_KP0),
291 const_iv (SDLK_KP1), 426 const_iv (SDLK_KP1),
292 const_iv (SDLK_KP2), 427 const_iv (SDLK_KP2),
293 const_iv (SDLK_KP3), 428 const_iv (SDLK_KP3),
294 const_iv (SDLK_KP4), 429 const_iv (SDLK_KP4),
349 const_iv (SDLK_BREAK), 484 const_iv (SDLK_BREAK),
350 const_iv (SDLK_MENU), 485 const_iv (SDLK_MENU),
351 const_iv (SDLK_POWER), 486 const_iv (SDLK_POWER),
352 const_iv (SDLK_EURO), 487 const_iv (SDLK_EURO),
353 const_iv (SDLK_UNDO), 488 const_iv (SDLK_UNDO),
489
354 const_iv (KMOD_NONE), 490 const_iv (KMOD_NONE),
491 const_iv (KMOD_SHIFT),
355 const_iv (KMOD_LSHIFT), 492 const_iv (KMOD_LSHIFT),
356 const_iv (KMOD_RSHIFT), 493 const_iv (KMOD_RSHIFT),
494 const_iv (KMOD_CTRL),
357 const_iv (KMOD_LCTRL), 495 const_iv (KMOD_LCTRL),
358 const_iv (KMOD_RCTRL), 496 const_iv (KMOD_RCTRL),
497 const_iv (KMOD_ALT),
359 const_iv (KMOD_LALT), 498 const_iv (KMOD_LALT),
360 const_iv (KMOD_RALT), 499 const_iv (KMOD_RALT),
500 const_iv (KMOD_META),
361 const_iv (KMOD_LMETA), 501 const_iv (KMOD_LMETA),
362 const_iv (KMOD_RMETA), 502 const_iv (KMOD_RMETA),
363 const_iv (KMOD_NUM), 503 const_iv (KMOD_NUM),
364 const_iv (KMOD_CAPS), 504 const_iv (KMOD_CAPS),
365 const_iv (KMOD_MODE), 505 const_iv (KMOD_MODE),
366 const_iv (KMOD_CTRL),
367 const_iv (KMOD_SHIFT),
368 const_iv (KMOD_ALT),
369 const_iv (KMOD_META)
370# undef const_iv 506# undef const_iv
371 }; 507 };
372 508
373 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 509 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
374 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 510 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
375 511
376 fontmap = pango_ft2_font_map_new (); 512 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
377 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0); 513 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
378 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
379} 514}
515
516void
517weaken (SV *rv)
518 PROTOTYPE: $
519 CODE:
520 sv_rvweaken (rv);
380 521
381int 522int
523in_destruct ()
524 CODE:
525 RETVAL = PL_main_cv == Nullcv;
526 OUTPUT:
527 RETVAL
528
529NV floor (NV x)
530
531NV ceil (NV x)
532
533void
534pango_init ()
535 CODE:
536{
537 opengl_fontmap = pango_opengl_font_map_new ();
538 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
539 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
540}
541
542int
382SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 543SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
383 544
384void 545void
385SDL_Quit () 546SDL_Quit ()
386 547
387void 548void
393 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 554 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
394 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 555 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
395 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 556 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
396 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 557 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
397 558
559 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
560 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
561
398 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 562 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
399 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 563 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
400 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 564 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
401 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 565 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
402 566
403 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 567 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568#if SDL_VERSION_ATLEAST(1,2,10)
404 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 569 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
405 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 570 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571#endif
406 572
407 SDL_EnableUNICODE (1); 573 SDL_EnableUNICODE (1);
408 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 574 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
409 575
410 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 576 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
419 585
420 ++m; 586 ++m;
421 } 587 }
422} 588}
423 589
590char *
591SDL_GetError ()
592
424int 593int
425SDL_SetVideoMode (int w, int h, int fullscreen) 594SDL_SetVideoMode (int w, int h, int fullscreen)
426 CODE: 595 CODE:
427 RETVAL = !!SDL_SetVideoMode ( 596 RETVAL = !!SDL_SetVideoMode (
428 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 597 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
429 ); 598 );
599 if (RETVAL)
600 {
430 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 601 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
602# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
603# include "glfunc.h"
604# undef GL_FUNC
605 }
431 OUTPUT: 606 OUTPUT:
432 RETVAL 607 RETVAL
433 608
434void 609void
435SDL_GL_SwapBuffers () 610SDL_GL_SwapBuffers ()
611
612char *
613SDL_GetKeyName (int sym)
436 614
437void 615void
438SDL_PollEvent () 616SDL_PollEvent ()
439 PPCODE: 617 PPCODE:
440{ 618{
442 620
443 while (SDL_PollEvent (&ev)) 621 while (SDL_PollEvent (&ev))
444 { 622 {
445 HV *hv = newHV (); 623 HV *hv = newHV ();
446 hv_store (hv, "type", 4, newSViv (ev.type), 0); 624 hv_store (hv, "type", 4, newSViv (ev.type), 0);
625
447 switch (ev.type) 626 switch (ev.type)
448 { 627 {
449 case SDL_KEYDOWN: 628 case SDL_KEYDOWN:
450 case SDL_KEYUP: 629 case SDL_KEYUP:
451 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 630 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
452 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 631 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
453 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 632 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
633 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
454 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 634 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
455 break; 635 break;
456 636
457 case SDL_ACTIVEEVENT: 637 case SDL_ACTIVEEVENT:
458 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 638 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
459 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 639 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
460 break; 640 break;
461 641
462 case SDL_MOUSEMOTION: 642 case SDL_MOUSEMOTION:
643 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644
463 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 645 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
464 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 646 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
465 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 647 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
466 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 648 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
467 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 649 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
468 break; 650 break;
469 651
470 case SDL_MOUSEBUTTONDOWN: 652 case SDL_MOUSEBUTTONDOWN:
471 case SDL_MOUSEBUTTONUP: 653 case SDL_MOUSEBUTTONUP:
654 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
655
472 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 656 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 657 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 658 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 659 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
660 break;
661
662 case SDL_USEREVENT:
663 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
664 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
665 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
666 break;
476 } 667 }
477 668
478 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 669 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
479 } 670 }
480} 671}
481 672
482int 673int
483Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 674Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
484 POSTCALL: 675 POSTCALL:
485 Mix_HookMusicFinished (music_finished); 676 Mix_HookMusicFinished (music_finished);
677 Mix_ChannelFinished (channel_finished);
486 678
487void 679void
488Mix_CloseAudio () 680Mix_CloseAudio ()
489 681
490int 682int
495 CODE: 687 CODE:
496#ifndef _WIN32 688#ifndef _WIN32
497 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 689 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
498#endif 690#endif
499 691
500char * 692void
501gl_version () 693win32_proxy_info ()
502 CODE: 694 PPCODE:
503 RETVAL = (char *)glGetString (GL_VERSION); 695{
504 OUTPUT: 696#ifdef _WIN32
505 RETVAL 697 char buffer[2048];
698 DWORD buflen;
506 699
507char * 700 EXTEND (SP, 3);
508gl_extensions () 701
509 CODE: 702 buflen = sizeof (buffer);
510 RETVAL = (char *)glGetString (GL_EXTENSIONS); 703 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
511 OUTPUT: 704 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
512 RETVAL 705 {
706 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
707
708 buflen = sizeof (buffer);
709 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
710 {
711 PUSHs (newSVpv (buffer, 0));
712
713 buflen = sizeof (buffer);
714 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
715 PUSHs (newSVpv (buffer, 0));
716 }
717 }
718#endif
719}
513 720
514void 721void
515add_font (char *file) 722add_font (char *file)
516 CODE: 723 CODE:
517 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 724 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
518 725
519void 726void
520load_image_inline (SV *image_) 727load_image_inline (SV *image_)
521 ALIAS: 728 ALIAS:
522 load_image_file = 1 729 load_image_file = 1
564 771
565 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 772 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
566 773
567 assert (surface2->pitch == surface2->w * 4); 774 assert (surface2->pitch == surface2->w * 4);
568 775
776 SDL_LockSurface (surface2);
569 EXTEND (SP, 5); 777 EXTEND (SP, 6);
570 PUSHs (sv_2mortal (newSViv (surface2->w))); 778 PUSHs (sv_2mortal (newSViv (surface2->w)));
571 PUSHs (sv_2mortal (newSViv (surface2->h))); 779 PUSHs (sv_2mortal (newSViv (surface2->h)));
572 SDL_LockSurface (surface2);
573 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 780 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
574 SDL_UnlockSurface (surface2);
575 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 781 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
576 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 782 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
577 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 783 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
784 SDL_UnlockSurface (surface2);
578 785
579 SDL_FreeSurface (surface); 786 SDL_FreeSurface (surface);
580 SDL_FreeSurface (surface2); 787 SDL_FreeSurface (surface2);
581} 788}
582 789
604 PUSHs (sv_2mortal (newSViv (b / y))); 811 PUSHs (sv_2mortal (newSViv (b / y)));
605 PUSHs (sv_2mortal (newSViv (a / y))); 812 PUSHs (sv_2mortal (newSViv (a / y)));
606} 813}
607 814
608void 815void
816error (char *message)
817 CODE:
818 fprintf (stderr, "ERROR: %s\n", message);
819#ifdef _WIN32
820 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
821#endif
822
823void
609fatal (char *message) 824fatal (char *message)
610 CODE: 825 CODE:
826 fprintf (stderr, "FATAL: %s\n", message);
611#ifdef _WIN32 827#ifdef _WIN32
612 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 828 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
829#endif
830 _exit (1);
831
832void
833_exit (int retval = 0)
834 CODE:
835#ifdef WIN32
836 ExitThread (retval); // unclean, please beam me up
613#else 837#else
614 fprintf (stderr, "FATAL: %s\n", message); 838 _exit (retval);
615#endif 839#endif
616 exit (1);
617 840
618MODULE = CFClient PACKAGE = CFClient::Font 841MODULE = CFPlus PACKAGE = CFPlus::Font
619 842
620CFClient::Font 843CFPlus::Font
621new_from_file (SV *class, char *path) 844new_from_file (SV *class, char *path, int id = 0)
622 CODE: 845 CODE:
623{ 846{
624 int count; 847 int count;
625 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 848 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
626 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 849 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627 FcPatternDestroy (pattern); 850 FcPatternDestroy (pattern);
628} 851}
629 OUTPUT: 852 OUTPUT:
630 RETVAL 853 RETVAL
631 854
632void 855void
633DESTROY (CFClient::Font self) 856DESTROY (CFPlus::Font self)
634 CODE: 857 CODE:
635 pango_font_description_free (self); 858 pango_font_description_free (self);
636 859
637void 860void
638make_default (CFClient::Font self) 861make_default (CFPlus::Font self)
639 CODE: 862 CODE:
640 default_font = self; 863 default_font = self;
641 864
642MODULE = CFClient PACKAGE = CFClient::Layout 865MODULE = CFPlus PACKAGE = CFPlus::Layout
643 866
644CFClient::Layout 867void
645new (SV *class, int base_height = MIN_FONT_HEIGHT) 868reset_glyph_cache ()
869 CODE:
870 tc_clear ();
871
872CFPlus::Layout
873new (SV *class)
646 CODE: 874 CODE:
647 New (0, RETVAL, 1, struct cf_layout); 875 New (0, RETVAL, 1, struct cf_layout);
876
648 RETVAL->pl = pango_layout_new (context); 877 RETVAL->pl = pango_layout_new (opengl_context);
649 RETVAL->base_height = base_height; 878 RETVAL->r = 1.;
879 RETVAL->g = 1.;
880 RETVAL->b = 1.;
881 RETVAL->a = 1.;
882 RETVAL->base_height = MIN_FONT_HEIGHT;
650 RETVAL->font = 0; 883 RETVAL->font = 0;
884
651 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 885 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652 pango_layout_set_font_description (RETVAL->pl, default_font); 886 layout_update_font (RETVAL);
653 OUTPUT: 887 OUTPUT:
654 RETVAL 888 RETVAL
655 889
656void 890void
657DESTROY (CFClient::Layout self) 891DESTROY (CFPlus::Layout self)
658 CODE: 892 CODE:
659 g_object_unref (self->pl); 893 g_object_unref (self->pl);
660 Safefree (self); 894 Safefree (self);
661 895
662void 896void
663set_text (CFClient::Layout self, SV *text_) 897set_text (CFPlus::Layout self, SV *text_)
664 CODE: 898 CODE:
665{ 899{
666 STRLEN textlen; 900 STRLEN textlen;
667 char *text = SvPVutf8 (text_, textlen); 901 char *text = SvPVutf8 (text_, textlen);
668 902
669 pango_layout_set_text (self->pl, text, textlen); 903 pango_layout_set_text (self->pl, text, textlen);
670} 904}
671 905
672void 906void
673set_markup (CFClient::Layout self, SV *text_) 907set_markup (CFPlus::Layout self, SV *text_)
674 CODE: 908 CODE:
675{ 909{
676 STRLEN textlen; 910 STRLEN textlen;
677 char *text = SvPVutf8 (text_, textlen); 911 char *text = SvPVutf8 (text_, textlen);
678 912
679 pango_layout_set_markup (self->pl, text, textlen); 913 pango_layout_set_markup (self->pl, text, textlen);
680} 914}
681 915
682SV * 916void
917set_shapes (CFPlus::Layout self, ...)
918 CODE:
919{
920 PangoAttrList *attrs = 0;
921 const char *text = pango_layout_get_text (self->pl);
922 const char *pos = text;
923 int arg = 4;
924
925 while (arg < items && (pos = strstr (pos, OBJ_STR)))
926 {
927 PangoRectangle inkrect, rect;
928 PangoAttribute *attr;
929
930 int x = SvIV (ST (arg - 3));
931 int y = SvIV (ST (arg - 2));
932 int w = SvIV (ST (arg - 1));
933 int h = SvIV (ST (arg ));
934
935 inkrect.x = 0;
936 inkrect.y = 0;
937 inkrect.width = 0;
938 inkrect.height = 0;
939
940 rect.x = x * PANGO_SCALE;
941 rect.y = y * PANGO_SCALE;
942 rect.width = w * PANGO_SCALE;
943 rect.height = h * PANGO_SCALE;
944
945 if (!attrs)
946 attrs = pango_layout_get_attributes (self->pl);
947
948 attr = pango_attr_shape_new (&inkrect, &rect);
949 attr->start_index = pos - text;
950 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
951 pango_attr_list_insert (attrs, attr);
952
953 arg += 4;
954 pos += sizeof (OBJ_STR) - 1;
955 }
956
957 if (attrs)
958 pango_layout_set_attributes (self->pl, attrs);
959}
960
961void
683get_text (CFClient::Layout self) 962get_shapes (CFPlus::Layout self)
684 CODE: 963 PPCODE:
964{
965 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
966
967 do
968 {
969 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
970
971 if (run && shape_attr_p (run))
972 {
973 PangoRectangle extents;
974 pango_layout_iter_get_run_extents (iter, 0, &extents);
975
976 EXTEND (SP, 2);
977 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
978 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
979 }
980 }
981 while (pango_layout_iter_next_run (iter));
982
983 pango_layout_iter_free (iter);
984}
985
986int
987has_wrapped (CFPlus::Layout self)
988 CODE:
989{
990 int lines = 1;
991 const char *text = pango_layout_get_text (self->pl);
992
993 while (*text)
994 lines += *text++ == '\n';
995
685 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 996 RETVAL = lines < pango_layout_get_line_count (self->pl);
686 SvUTF8_on (RETVAL); 997}
687 OUTPUT: 998 OUTPUT:
688 RETVAL 999 RETVAL
689 1000
1001SV *
1002get_text (CFPlus::Layout self)
1003 CODE:
1004 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1005 sv_utf8_decode (RETVAL);
1006 OUTPUT:
1007 RETVAL
1008
690void 1009void
1010set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
1011 CODE:
1012 self->r = r;
1013 self->g = g;
1014 self->b = b;
1015 self->a = a;
1016
1017void
691set_font (CFClient::Layout self, CFClient::Font font = 0) 1018set_font (CFPlus::Layout self, CFPlus::Font font = 0)
692 CODE: 1019 CODE:
693 if (self->font != font) 1020 if (self->font != font)
694 { 1021 {
695 self->font = font; 1022 self->font = font;
696 layout_update_font (self); 1023 layout_update_font (self);
697 } 1024 }
698 1025
699void 1026void
700set_height (CFClient::Layout self, int base_height) 1027set_height (CFPlus::Layout self, int base_height)
701 CODE: 1028 CODE:
702 if (self->base_height != base_height) 1029 if (self->base_height != base_height)
703 { 1030 {
704 self->base_height = base_height; 1031 self->base_height = base_height;
705 layout_update_font (self); 1032 layout_update_font (self);
706 } 1033 }
707 1034
708void 1035void
709set_width (CFClient::Layout self, int max_width = -1) 1036set_width (CFPlus::Layout self, int max_width = -1)
710 CODE: 1037 CODE:
711 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 1038 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
712 1039
713void 1040void
1041set_indent (CFPlus::Layout self, int indent)
1042 CODE:
1043 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1044
1045void
1046set_spacing (CFPlus::Layout self, int spacing)
1047 CODE:
1048 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1049
1050void
1051set_ellipsise (CFPlus::Layout self, int ellipsise)
1052 CODE:
1053 pango_layout_set_ellipsize (self->pl,
1054 ellipsise == 1 ? PANGO_ELLIPSIZE_START
1055 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1056 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
1057 : PANGO_ELLIPSIZE_NONE
1058 );
1059
1060void
1061set_single_paragraph_mode (CFPlus::Layout self, int spm)
1062 CODE:
1063 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1064
1065void
714size (CFClient::Layout self) 1066size (CFPlus::Layout self)
715 PPCODE: 1067 PPCODE:
716{ 1068{
717 int w, h; 1069 int w, h;
718 1070
719 layout_get_pixel_size (self, &w, &h); 1071 layout_get_pixel_size (self, &w, &h);
722 PUSHs (sv_2mortal (newSViv (w))); 1074 PUSHs (sv_2mortal (newSViv (w)));
723 PUSHs (sv_2mortal (newSViv (h))); 1075 PUSHs (sv_2mortal (newSViv (h)));
724} 1076}
725 1077
726int 1078int
1079descent (CFPlus::Layout self)
1080 CODE:
1081{
1082 PangoRectangle rect;
1083 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1084 pango_layout_line_get_pixel_extents (line, 0, &rect);
1085 RETVAL = PANGO_DESCENT (rect);
1086}
1087 OUTPUT:
1088 RETVAL
1089
1090int
727xy_to_index (CFClient::Layout self, int x, int y) 1091xy_to_index (CFPlus::Layout self, int x, int y)
728 CODE: 1092 CODE:
729{ 1093{
730 int index, trailing; 1094 int index, trailing;
731 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1095 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
732 RETVAL = index; 1096 RETVAL = index + trailing;
733} 1097}
734 OUTPUT: 1098 OUTPUT:
735 RETVAL 1099 RETVAL
736 1100
737void 1101void
738cursor_pos (CFClient::Layout self, int index) 1102cursor_pos (CFPlus::Layout self, int index)
739 PPCODE: 1103 PPCODE:
740{ 1104{
741 PangoRectangle strong_pos; 1105 PangoRectangle strong_pos;
742 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1106 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
743 1107
746 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1110 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
747 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1111 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
748} 1112}
749 1113
750void 1114void
751render (CFClient::Layout self) 1115index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
752 PPCODE: 1116 PPCODE:
753{ 1117{
754 SV *retval; 1118 int line, x;
755 int w, h;
756 FT_Bitmap bitmap;
757 1119
758 layout_get_pixel_size (self, &w, &h); 1120 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1121 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
759 1122
760 retval = newSV (w * h);
761 SvPOK_only (retval);
762 SvCUR_set (retval, w * h);
763
764 bitmap.rows = h;
765 bitmap.width = w;
766 bitmap.pitch = w;
767 bitmap.buffer = (unsigned char*)SvPVX (retval);
768 bitmap.num_grays = 256;
769 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770
771 memset (bitmap.buffer, 0, w * h);
772
773 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
774
775 EXTEND (SP, 3); 1123 EXTEND (SP, 2);
776 PUSHs (sv_2mortal (newSViv (w))); 1124 PUSHs (sv_2mortal (newSViv (line - 1)));
1125 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1126}
1127
1128void
1129line_x_to_index (CFPlus::Layout self, int line, int x)
1130 PPCODE:
1131{
1132 PangoLayoutLine *lp;
1133 int index, trailing;
1134
1135 if (line < 0)
1136 XSRETURN_EMPTY;
1137
1138 if (!(lp = pango_layout_get_line (self->pl, line)))
1139 XSRETURN_EMPTY; /* do better */
1140
1141 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1142
1143 EXTEND (SP, 2);
1144 if (GIMME_V == G_SCALAR)
1145 PUSHs (sv_2mortal (newSViv (index + trailing)));
1146 else
1147 {
777 PUSHs (sv_2mortal (newSViv (h))); 1148 PUSHs (sv_2mortal (newSViv (index)));
778 PUSHs (sv_2mortal (retval)); 1149 PUSHs (sv_2mortal (newSViv (trailing)));
1150 }
779} 1151}
780 1152
1153void
1154render (CFPlus::Layout self, float x, float y, int flags = 0)
1155 PPCODE:
1156 pango_opengl_render_layout_subpixel (
1157 self->pl,
1158 x * PANGO_SCALE, y * PANGO_SCALE,
1159 self->r, self->g, self->b, self->a,
1160 flags
1161 );
1162
781MODULE = CFClient PACKAGE = CFClient::Texture 1163MODULE = CFPlus PACKAGE = CFPlus::Texture
782 1164
783void 1165void
1166pad2pot (SV *data_, SV *w_, SV *h_)
1167 CODE:
1168{
1169 int ow = SvIV (w_);
1170 int oh = SvIV (h_);
1171
1172 if (ow && oh)
1173 {
1174 int nw = minpot (ow);
1175 int nh = minpot (oh);
1176
1177 if (nw != ow || nh != oh)
1178 {
1179 if (SvOK (data_))
1180 {
1181 STRLEN datalen;
1182 char *data = SvPVbyte (data_, datalen);
1183 int bpp = datalen / (ow * oh);
1184 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1185
1186 SvPOK_only (result_);
1187 SvCUR_set (result_, nw * nh * bpp);
1188
1189 memset (SvPVX (result_), 0, nw * nh * bpp);
1190 while (oh--)
1191 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1192
1193 sv_setsv (data_, result_);
1194 }
1195
1196 sv_setiv (w_, nw);
1197 sv_setiv (h_, nh);
1198 }
1199 }
1200}
1201
1202void
784draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1203draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
785 PROTOTYPE: $$$;$$ 1204 PROTOTYPE: $$$;$$
1205 ALIAS:
1206 draw_quad_alpha = 1
1207 draw_quad_alpha_premultiplied = 2
786 CODE: 1208 CODE:
787{ 1209{
788 HV *hv = (HV *)SvRV (self); 1210 HV *hv = (HV *)SvRV (self);
789 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1211 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1212 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
791 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1213 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
792 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
793 1214
794 if (items < 5) 1215 if (items < 5)
795 { 1216 {
796 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1217 w = SvNV (*hv_fetch (hv, "w", 1, 1));
797 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1218 h = SvNV (*hv_fetch (hv, "h", 1, 1));
798 } 1219 }
799 1220
1221 if (ix)
1222 {
1223 glEnable (GL_BLEND);
1224
1225 if (ix == 2)
1226 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1227 else
1228 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1229 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1230
1231 glEnable (GL_ALPHA_TEST);
1232 glAlphaFunc (GL_GREATER, 0.01f);
1233 }
1234
800 glBindTexture (GL_TEXTURE_2D, name); 1235 glBindTexture (GL_TEXTURE_2D, name);
801 if (wrap_mode) { 1236
802 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
803 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
804 }
805 glBegin (GL_QUADS); 1237 glBegin (GL_QUADS);
806 glTexCoord2f (0, 0); glVertex2f (x , y ); 1238 glTexCoord2f (0, 0); glVertex2f (x , y );
807 glTexCoord2f (0, t); glVertex2f (x , y + h); 1239 glTexCoord2f (0, t); glVertex2f (x , y + h);
808 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1240 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1241 glTexCoord2f (s, 0); glVertex2f (x + w, y );
810 glEnd (); 1242 glEnd ();
811}
812 1243
1244 if (ix)
1245 {
1246 glDisable (GL_ALPHA_TEST);
1247 glDisable (GL_BLEND);
1248 }
1249}
1250
813MODULE = CFClient PACKAGE = CFClient::Map 1251MODULE = CFPlus PACKAGE = CFPlus::Map
814 1252
815CFClient::Map 1253CFPlus::Map
816new (SV *class, int map_width, int map_height) 1254new (SV *class)
817 CODE: 1255 CODE:
818 New (0, RETVAL, 1, struct map); 1256 New (0, RETVAL, 1, struct map);
819 RETVAL->x = 0; 1257 RETVAL->x = 0;
820 RETVAL->y = 0; 1258 RETVAL->y = 0;
821 RETVAL->w = map_width; 1259 RETVAL->w = 0;
822 RETVAL->h = map_height; 1260 RETVAL->h = 0;
823 RETVAL->ox = 0; 1261 RETVAL->ox = 0;
824 RETVAL->oy = 0; 1262 RETVAL->oy = 0;
825 RETVAL->faces = 8192; 1263 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
826 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1264 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
827 RETVAL->texs = 8192;
828 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
829 RETVAL->rows = 0; 1265 RETVAL->rows = 0;
830 RETVAL->row = 0; 1266 RETVAL->row = 0;
831 OUTPUT: 1267 OUTPUT:
832 RETVAL 1268 RETVAL
833 1269
834void 1270void
835DESTROY (CFClient::Map self) 1271DESTROY (CFPlus::Map self)
836 CODE: 1272 CODE:
837{ 1273{
838 map_clear (self); 1274 map_clear (self);
839 Safefree (self->face); 1275 Safefree (self->face2tile);
1276 Safefree (self->tex);
840 Safefree (self); 1277 Safefree (self);
841} 1278}
842 1279
843void 1280void
1281resize (CFPlus::Map self, int map_width, int map_height)
1282 CODE:
1283 self->w = map_width;
1284 self->h = map_height;
1285
1286void
844clear (CFClient::Map self) 1287clear (CFPlus::Map self)
845 CODE: 1288 CODE:
846 map_clear (self); 1289 map_clear (self);
847 1290
848void 1291void
849set_face (CFClient::Map self, int face, int texid) 1292set_tileid (CFPlus::Map self, int face, int tile)
850 CODE: 1293 CODE:
851{ 1294{
852 while (self->faces <= face) 1295 need_facenum (self, face); self->face2tile [face] = tile;
853 { 1296 need_texid (self, tile);
854 Append (mapface, self->face, self->faces, self->faces);
855 self->faces *= 2;
856 }
857
858 self->face [face] = texid;
859} 1297}
860 1298
861void 1299void
862set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1300set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
863 CODE: 1301 CODE:
864{ 1302{
865 while (self->texs <= texid) 1303 need_texid (self, texid);
866 {
867 Append (maptex, self->tex, self->texs, self->texs);
868 self->texs *= 2;
869 }
870 1304
871 { 1305 {
872 maptex *tex = self->tex + texid; 1306 maptex *tex = self->tex + texid;
873 1307
874 tex->name = name; 1308 tex->name = name;
879 tex->r = r; 1313 tex->r = r;
880 tex->g = g; 1314 tex->g = g;
881 tex->b = b; 1315 tex->b = b;
882 tex->a = a; 1316 tex->a = a;
883 } 1317 }
1318
1319 // somewhat hackish, but for textures that require it, it really
1320 // improves the look, and most others don't suffer.
1321 glBindTexture (GL_TEXTURE_2D, name);
1322 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1323 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1324 // use uglier nearest interpolation because linear suffers
1325 // from transparent color bleeding and ugly wrapping effects.
1326 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
884} 1327}
885 1328
886int 1329int
887ox (CFClient::Map self) 1330ox (CFPlus::Map self)
888 ALIAS: 1331 ALIAS:
889 oy = 1 1332 oy = 1
1333 x = 2
1334 y = 3
1335 w = 4
1336 h = 5
890 CODE: 1337 CODE:
891 switch (ix) 1338 switch (ix)
892 { 1339 {
893 case 0: RETVAL = self->ox; break; 1340 case 0: RETVAL = self->ox; break;
894 case 1: RETVAL = self->oy; break; 1341 case 1: RETVAL = self->oy; break;
1342 case 2: RETVAL = self->x; break;
1343 case 3: RETVAL = self->y; break;
1344 case 4: RETVAL = self->w; break;
1345 case 5: RETVAL = self->h; break;
895 } 1346 }
896 OUTPUT: 1347 OUTPUT:
897 RETVAL 1348 RETVAL
898 1349
899void 1350void
900scroll (CFClient::Map self, int dx, int dy) 1351scroll (CFPlus::Map self, int dx, int dy)
901 CODE: 1352 CODE:
902{ 1353{
903 if (dx > 0) 1354 if (dx > 0)
904 map_blank (self, self->x, self->y, dx - 1, self->h); 1355 map_blank (self, self->x, self->y, dx, self->h);
905 else if (dx < 0) 1356 else if (dx < 0)
906 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1357 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
907 1358
908 if (dy > 0) 1359 if (dy > 0)
909 map_blank (self, self->x, self->y, self->w, dy - 1); 1360 map_blank (self, self->x, self->y, self->w, dy);
910 else if (dy < 0) 1361 else if (dy < 0)
911 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1362 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
912 1363
913 self->ox += dx; self->x += dx; 1364 self->ox += dx; self->x += dx;
914 self->oy += dy; self->y += dy; 1365 self->oy += dy; self->y += dy;
915 1366
916 while (self->y < 0) 1367 while (self->y < 0)
921 self->y += MAP_EXTEND_Y; 1372 self->y += MAP_EXTEND_Y;
922 } 1373 }
923} 1374}
924 1375
925void 1376void
926map1a_update (CFClient::Map self, SV *data_) 1377map1a_update (CFPlus::Map self, SV *data_, int extmap)
927 CODE: 1378 CODE:
928{ 1379{
929 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1380 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
930 uint8_t *data_end = (uint8_t *)SvEND (data_); 1381 uint8_t *data_end = (uint8_t *)SvEND (data_);
931 mapcell *cell; 1382 mapcell *cell;
932 int x, y, flags; 1383 int x, y, flags;
933 1384
934 while (data < data_end) 1385 while (data < data_end - 1)
935 { 1386 {
936 flags = (data [0] << 8) + data [1]; data += 2; 1387 flags = (data [0] << 8) + data [1]; data += 2;
937 1388
938 x = ((flags >> 10) & 63) + self->x; 1389 x = self->x + ((flags >> 10) & 63);
939 y = ((flags >> 4) & 63) + self->y; 1390 y = self->y + ((flags >> 4) & 63);
940 1391
941 cell = map_get_cell (self, x, y); 1392 cell = map_get_cell (self, x, y);
942 1393
943 if (flags & 15) 1394 if (flags & 15)
944 { 1395 {
945 if (cell->darkness < 0) 1396 if (!cell->darkness)
946 { 1397 {
1398 memset (cell, 0, sizeof (*cell));
947 cell->darkness = 0; 1399 cell->darkness = 256;
948 cell->face [0] = 0;
949 cell->face [1] = 0;
950 cell->face [2] = 0;
951 } 1400 }
952 1401
953 cell->darkness = flags & 8 ? *data++ : 255;
954
955 //TODO: don't trust server data to be in-range(!) 1402 //TODO: don't trust server data to be in-range(!)
1403
1404 if (flags & 8)
1405 {
1406 if (extmap)
1407 {
1408 uint8_t ext, cmd;
1409
1410 do
1411 {
1412 ext = *data++;
1413 cmd = ext & 0x3f;
1414
1415 if (cmd < 4)
1416 cell->darkness = 255 - ext * 64 + 1;
1417 else if (cmd == 5) // health
1418 {
1419 cell->stat_width = 1;
1420 cell->stat_hp = *data++;
1421 }
1422 else if (cmd == 6) // monster width
1423 cell->stat_width = *data++ + 1;
1424 else if (cmd == 0x47)
1425 {
1426 if (*data == 8)
1427 ; // decode player uuid
1428
1429 data += *data + 1;
1430 }
1431 else if (cmd == 8) // cell flags
1432 cell->flags = *data++;
1433 else if (ext & 0x40) // unknown, multibyte => skip
1434 data += *data + 1;
1435 else
1436 data++;
1437 }
1438 while (ext & 0x80);
1439 }
1440 else
1441 cell->darkness = *data++ + 1;
1442 }
956 1443
957 if (flags & 4) 1444 if (flags & 4)
958 { 1445 {
959 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1446 faceid face = (data [0] << 8) + data [1]; data += 2;
1447 need_facenum (self, face);
1448 cell->tile [0] = self->face2tile [face];
960 } 1449 }
961 1450
962 if (flags & 2) 1451 if (flags & 2)
963 { 1452 {
964 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1453 faceid face = (data [0] << 8) + data [1]; data += 2;
1454 need_facenum (self, face);
1455 cell->tile [1] = self->face2tile [face];
965 } 1456 }
966 1457
967 if (flags & 1) 1458 if (flags & 1)
968 { 1459 {
969 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1460 faceid face = (data [0] << 8) + data [1]; data += 2;
1461 need_facenum (self, face);
1462 cell->tile [2] = self->face2tile [face];
970 } 1463 }
971 } 1464 }
972 else 1465 else
973 cell->darkness = -1; 1466 cell->darkness = 0;
974 } 1467 }
975} 1468}
976 1469
977SV * 1470SV *
978mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1471mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
979 CODE: 1472 CODE:
980{ 1473{
981 int x1, x; 1474 int x1, x;
982 int y1, y; 1475 int y1, y;
983 int z; 1476 int z;
1004 { 1497 {
1005 mapcell *cell = row->col + (x - row->c0); 1498 mapcell *cell = row->col + (x - row->c0);
1006 1499
1007 for (z = 0; z <= 0; z++) 1500 for (z = 0; z <= 0; z++)
1008 { 1501 {
1009 mapface face = cell->face [z];
1010
1011 if (face)
1012 {
1013 maptex tex = self->tex [face]; 1502 maptex tex = self->tex [cell->tile [z]];
1014 int a0 = 255 - tex.a; 1503 int a0 = 255 - tex.a;
1015 int a1 = tex.a; 1504 int a1 = tex.a;
1016 1505
1017 r = (r * a0 + tex.r * a1) / 255; 1506 r = (r * a0 + tex.r * a1) / 255;
1018 g = (g * a0 + tex.g * a1) / 255; 1507 g = (g * a0 + tex.g * a1) / 255;
1019 b = (b * a0 + tex.b * a1) / 255; 1508 b = (b * a0 + tex.b * a1) / 255;
1020 a = (a * a0 + tex.a * a1) / 255; 1509 a = (a * a0 + tex.a * a1) / 255;
1021 }
1022 } 1510 }
1023 } 1511 }
1024 1512
1025 *map++ = (r ) 1513 *map++ = (r )
1026 | (g << 8) 1514 | (g << 8)
1033} 1521}
1034 OUTPUT: 1522 OUTPUT:
1035 RETVAL 1523 RETVAL
1036 1524
1037void 1525void
1038draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1526draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1039 PPCODE: 1527 CODE:
1040{ 1528{
1041 int vx, vy;
1042 int x, y, z; 1529 int x, y, z;
1043 int last_name; 1530 int last_name;
1044 mapface face;
1045 int sw4 = (sw + 3) & ~3;
1046 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1047 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1048
1049 memset (darkness, 255, sw4 * sh);
1050 SvPOK_only (darkness_sv);
1051 SvCUR_set (darkness_sv, sw4 * sh);
1052
1053 vx = self->x + (self->w - sw) / 2 - shift_x;
1054 vy = self->y + (self->h - sh) / 2 - shift_y;
1055
1056 /*
1057 int vx = self->vx = self->w >= sw
1058 ? self->x + (self->w - sw) / 2
1059 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1060
1061 int vy = self->vy = self->h >= sh
1062 ? self->y + (self->h - sh) / 2
1063 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1064 */
1065 1531
1066 glColor4ub (255, 255, 255, 255); 1532 glColor4ub (255, 255, 255, 255);
1067 1533
1534 glEnable (GL_BLEND);
1068 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1535 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1069 glEnable (GL_BLEND);
1070 glEnable (GL_TEXTURE_2D); 1536 glEnable (GL_TEXTURE_2D);
1071 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1537 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1072 1538
1073 glBegin (GL_QUADS); 1539 glBegin (GL_QUADS);
1074 1540
1075 last_name = 0; 1541 last_name = 0;
1076 1542
1543 mx += self->x;
1544 my += self->y;
1545
1077 for (z = 0; z < 3; z++) 1546 for (z = 0; z < 3; z++)
1078 for (y = 0; y < sh; y++) 1547 for (y = 0; y < sh; y++)
1079 if (0 <= y + vy && y + vy < self->rows) 1548 if (0 <= y + my && y + my < self->rows)
1080 { 1549 {
1081 maprow *row = self->row + (y + vy); 1550 maprow *row = self->row + (y + my);
1082 1551
1083 for (x = 0; x < sw; x++) 1552 for (x = 0; x < sw; x++)
1084 if (row->c0 <= x + vx && x + vx < row->c1) 1553 if (row->c0 <= x + mx && x + mx < row->c1)
1085 { 1554 {
1086 mapcell *cell = row->col + (x + vx - row->c0); 1555 mapcell *cell = row->col + (x + mx - row->c0);
1087
1088 darkness[y * sw4 + x] = cell->darkness < 0
1089 ? 255 - FOW_DARKNESS
1090 : 255 - cell->darkness;
1091
1092 face = cell->face [z]; 1556 tileid tile = cell->tile [z];
1093 1557
1094 if (face) 1558 if (tile)
1095 { 1559 {
1096 maptex tex = self->tex [face]; 1560 maptex tex = self->tex [tile];
1097
1098 int px = (x + 1) * 32 - tex.w; 1561 int px = (x + 1) * T - tex.w;
1099 int py = (y + 1) * 32 - tex.h; 1562 int py = (y + 1) * T - tex.h;
1100 1563
1101 if (last_name != tex.name) 1564 if (last_name != tex.name)
1102 { 1565 {
1566 if (!tex.name)
1567 tex = self->tex [2]; /* missing, replace by noface */
1568
1103 glEnd (); 1569 glEnd ();
1104 last_name = tex.name;
1105 glBindTexture (GL_TEXTURE_2D, last_name); 1570 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1106 glBegin (GL_QUADS); 1571 glBegin (GL_QUADS);
1107 } 1572 }
1108 1573
1109 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1574 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1110 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1575 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1111 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1576 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1112 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1577 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1578
1579 if (cell->flags && z == 2)
1580 {
1581 if (cell->flags & 1)
1582 {
1583 maptex tex = self->tex [1];
1584 int px = x * T + T * 2 / 32;
1585 int py = y * T - T * 6 / 32;
1586
1587 glEnd ();
1588 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589 glBegin (GL_QUADS);
1590
1591 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1592 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1593 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1594 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1595 }
1596 }
1113 } 1597 }
1114 } 1598 }
1115 } 1599 }
1116 1600
1117 glEnd (); 1601 glEnd ();
1118 1602
1119 glDisable (GL_TEXTURE_2D); 1603 glDisable (GL_TEXTURE_2D);
1120 glDisable (GL_BLEND); 1604 glDisable (GL_BLEND);
1605
1606 // top layer: overlays such as the health bar
1607 for (y = 0; y < sh; y++)
1608 if (0 <= y + my && y + my < self->rows)
1609 {
1610 maprow *row = self->row + (y + my);
1611
1612 for (x = 0; x < sw; x++)
1613 if (row->c0 <= x + mx && x + mx < row->c1)
1614 {
1615 mapcell *cell = row->col + (x + mx - row->c0);
1616
1617 int px = x * T;
1618 int py = y * T;
1619
1620 if (cell->stat_hp)
1621 {
1622 int width = cell->stat_width * T;
1623 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1624
1625 glColor3ub (0, 0, 0);
1626 glRectf (px + 1, py - thick - 2,
1627 px + width - 1, py);
1628
1629 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1630 glRectf (px + 2,
1631 py - thick - 1,
1632 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1633 }
1634 }
1635 }
1636}
1637
1638void
1639draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1640 CODE:
1641{
1642 static float color[16][3] = {
1643 { 0.00F, 0.00F, 0.00F },
1644 { 1.00F, 1.00F, 1.00F },
1645 { 0.00F, 0.00F, 0.55F },
1646 { 1.00F, 0.00F, 0.00F },
1647
1648 { 1.00F, 0.54F, 0.00F },
1649 { 0.11F, 0.56F, 1.00F },
1650 { 0.93F, 0.46F, 0.00F },
1651 { 0.18F, 0.54F, 0.34F },
1652
1653 { 0.56F, 0.73F, 0.56F },
1654 { 0.80F, 0.80F, 0.80F },
1655 { 0.55F, 0.41F, 0.13F },
1656 { 0.99F, 0.77F, 0.26F },
1657
1658 { 0.74F, 0.65F, 0.41F },
1659
1660 { 0.00F, 1.00F, 1.00F },
1661 { 1.00F, 0.00F, 1.00F },
1662 { 1.00F, 1.00F, 0.00F },
1663 };
1664
1665 int x, y;
1666
1667 glEnable (GL_TEXTURE_2D);
1668 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1669 glEnable (GL_BLEND);
1670 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1671 glBegin (GL_QUADS);
1672
1673 for (y = 0; y < h; y++)
1674 for (x = 0; x < w; x++)
1675 {
1676 unsigned char m = data [x + y * w];
1677
1678 if (m)
1679 {
1680 float *c = color [m & 15];
1681
1682 float tx1 = m & 0x40 ? 0.5 : 0.;
1683 float tx2 = tx1 + 0.5;
1684
1685 glColor4f (c[0], c[1], c[2], 0.75);
1686 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1687 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1688 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1689 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1690 }
1691 }
1692
1693 glEnd ();
1694 glDisable (GL_BLEND);
1695 glDisable (GL_TEXTURE_2D);
1696}
1697
1698void
1699fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1700 PPCODE:
1701{
1702 int x, y;
1703 int sw4 = (sw + 3) & ~3;
1704 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1705 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1706
1707 memset (darkness, 255, sw4 * sh);
1708 SvPOK_only (darkness_sv);
1709 SvCUR_set (darkness_sv, sw4 * sh);
1710
1711 mx += self->x;
1712 my += self->y;
1713
1714 for (y = 0; y < sh; y++)
1715 if (0 <= y + my && y + my < self->rows)
1716 {
1717 maprow *row = self->row + (y + my);
1718
1719 for (x = 0; x < sw; x++)
1720 if (row->c0 <= x + mx && x + mx < row->c1)
1721 {
1722 mapcell *cell = row->col + (x + mx - row->c0);
1723
1724 darkness[y * sw4 + x] = cell->darkness
1725 ? 255 - (cell->darkness - 1)
1726 : 255 - FOW_DARKNESS;
1727 }
1728 }
1121 1729
1122 EXTEND (SP, 3); 1730 EXTEND (SP, 3);
1123 PUSHs (sv_2mortal (newSViv (sw4))); 1731 PUSHs (sv_2mortal (newSViv (sw4)));
1124 PUSHs (sv_2mortal (newSViv (sh))); 1732 PUSHs (sv_2mortal (newSViv (sh)));
1125 PUSHs (darkness_sv); 1733 PUSHs (darkness_sv);
1126} 1734}
1127 1735
1128SV * 1736SV *
1129get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1737get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1130 CODE: 1738 CODE:
1131{ 1739{
1132 int x, y, x1, y1; 1740 int x, y, x1, y1;
1133 SV *data_sv = newSV (w * h * 7 + 5); 1741 SV *data_sv = newSV (w * h * 7 + 5);
1134 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1742 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1159 if (row && row->c0 <= x && x < row->c1) 1767 if (row && row->c0 <= x && x < row->c1)
1160 { 1768 {
1161 mapcell *cell = row->col + (x - row->c0); 1769 mapcell *cell = row->col + (x - row->c0);
1162 uint8_t flags = 0; 1770 uint8_t flags = 0;
1163 1771
1164 if (cell->face [0]) flags |= 1; 1772 if (cell->tile [0]) flags |= 1;
1165 if (cell->face [1]) flags |= 2; 1773 if (cell->tile [1]) flags |= 2;
1166 if (cell->face [2]) flags |= 4; 1774 if (cell->tile [2]) flags |= 4;
1167 1775
1168 *data++ = flags; 1776 *data++ = flags;
1169 1777
1170 if (flags & 1) 1778 if (flags & 1)
1171 { 1779 {
1780 tileid tile = cell->tile [0];
1172 *data++ = cell->face [0] >> 8; 1781 *data++ = tile >> 8;
1173 *data++ = cell->face [0]; 1782 *data++ = tile;
1174 } 1783 }
1175 1784
1176 if (flags & 2) 1785 if (flags & 2)
1177 { 1786 {
1787 tileid tile = cell->tile [1];
1178 *data++ = cell->face [1] >> 8; 1788 *data++ = tile >> 8;
1179 *data++ = cell->face [1]; 1789 *data++ = tile;
1180 } 1790 }
1181 1791
1182 if (flags & 4) 1792 if (flags & 4)
1183 { 1793 {
1794 tileid tile = cell->tile [2];
1184 *data++ = cell->face [2] >> 8; 1795 *data++ = tile >> 8;
1185 *data++ = cell->face [2]; 1796 *data++ = tile;
1186 } 1797 }
1187 } 1798 }
1188 else 1799 else
1189 *data++ = 0; 1800 *data++ = 0;
1190 } 1801 }
1196} 1807}
1197 OUTPUT: 1808 OUTPUT:
1198 RETVAL 1809 RETVAL
1199 1810
1200void 1811void
1201set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1812set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1202 PPCODE: 1813 PPCODE:
1203{ 1814{
1204 int x, y, z; 1815 int x, y, z;
1205 int w, h; 1816 int w, h;
1206 int x1, y1; 1817 int x1, y1;
1230 { 1841 {
1231 uint8_t flags = *data++; 1842 uint8_t flags = *data++;
1232 1843
1233 if (flags) 1844 if (flags)
1234 { 1845 {
1235 mapface face[3] = { 0, 0, 0 };
1236
1237 mapcell *cell = row_get_cell (row, x); 1846 mapcell *cell = row_get_cell (row, x);
1847 tileid tile[3] = { 0, 0, 0 };
1238 1848
1239 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1849 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1240 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1850 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1241 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1851 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1242 1852
1243 if (cell->darkness <= 0) 1853 if (cell->darkness == 0)
1244 { 1854 {
1245 cell->darkness = -1; 1855 cell->darkness = 0;
1246 1856
1247 for (z = 0; z <= 2; z++) 1857 for (z = 0; z <= 2; z++)
1248 { 1858 {
1249 cell->face[z] = face[z]; 1859 tileid t = tile [z];
1250 1860
1251 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 1861 if (t >= self->texs || (t && !self->tex [t].name))
1862 {
1252 XPUSHs (sv_2mortal (newSViv (face[z]))); 1863 XPUSHs (sv_2mortal (newSViv (t)));
1864 need_texid (self, t);
1865 }
1866
1867 cell->tile [z] = t;
1253 } 1868 }
1254 } 1869 }
1255 } 1870 }
1256 } 1871 }
1257 } 1872 }
1258} 1873}
1259 1874
1260MODULE = CFClient PACKAGE = CFClient::MixChunk 1875MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1261 1876
1262CFClient::MixChunk 1877CFPlus::MixChunk
1263new_from_file (SV *class, char *path) 1878new_from_file (SV *class, char *path)
1264 CODE: 1879 CODE:
1265 RETVAL = Mix_LoadWAV (path); 1880 RETVAL = Mix_LoadWAV (path);
1266 OUTPUT: 1881 OUTPUT:
1267 RETVAL 1882 RETVAL
1268 1883
1269void 1884void
1270DESTROY (CFClient::MixChunk self) 1885DESTROY (CFPlus::MixChunk self)
1271 CODE: 1886 CODE:
1272 Mix_FreeChunk (self); 1887 Mix_FreeChunk (self);
1273 1888
1274int 1889int
1275volume (CFClient::MixChunk self, int volume = -1) 1890volume (CFPlus::MixChunk self, int volume = -1)
1276 CODE: 1891 CODE:
1277 RETVAL = Mix_VolumeChunk (self, volume); 1892 RETVAL = Mix_VolumeChunk (self, volume);
1278 OUTPUT: 1893 OUTPUT:
1279 RETVAL 1894 RETVAL
1280 1895
1281int 1896int
1282play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1897play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1283 CODE: 1898 CODE:
1284 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1899 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1285 OUTPUT: 1900 OUTPUT:
1286 RETVAL 1901 RETVAL
1287 1902
1288MODULE = CFClient PACKAGE = CFClient::MixMusic 1903MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1289 1904
1290int 1905int
1291volume (int volume = -1) 1906volume (int volume = -1)
1292 CODE: 1907 CODE:
1293 RETVAL = Mix_VolumeMusic (volume); 1908 RETVAL = Mix_VolumeMusic (volume);
1294 OUTPUT: 1909 OUTPUT:
1295 RETVAL 1910 RETVAL
1296 1911
1297CFClient::MixMusic 1912CFPlus::MixMusic
1298new_from_file (SV *class, char *path) 1913new_from_file (SV *class, char *path)
1299 CODE: 1914 CODE:
1300 RETVAL = Mix_LoadMUS (path); 1915 RETVAL = Mix_LoadMUS (path);
1301 OUTPUT: 1916 OUTPUT:
1302 RETVAL 1917 RETVAL
1303 1918
1304void 1919void
1305DESTROY (CFClient::MixMusic self) 1920DESTROY (CFPlus::MixMusic self)
1306 CODE: 1921 CODE:
1307 Mix_FreeMusic (self); 1922 Mix_FreeMusic (self);
1308 1923
1309int 1924int
1310play (CFClient::MixMusic self, int loops = -1) 1925play (CFPlus::MixMusic self, int loops = -1)
1311 CODE: 1926 CODE:
1312 RETVAL = Mix_PlayMusic (self, loops); 1927 RETVAL = Mix_PlayMusic (self, loops);
1313 OUTPUT: 1928 OUTPUT:
1314 RETVAL 1929 RETVAL
1315 1930
1316MODULE = CFClient PACKAGE = CFClient::OpenGL 1931MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1317 1932
1318BOOT: 1933BOOT:
1319{ 1934{
1320 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1935 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1321 static const struct { 1936 static const struct {
1322 const char *name; 1937 const char *name;
1323 IV iv; 1938 IV iv;
1324 } *civ, const_iv[] = { 1939 } *civ, const_iv[] = {
1325# define const_iv(name) { # name, (IV)name } 1940# define const_iv(name) { # name, (IV)name }
1326 const_iv (GL_COLOR_MATERIAL), 1941 const_iv (GL_COLOR_MATERIAL),
1327 const_iv (GL_SMOOTH), 1942 const_iv (GL_SMOOTH),
1328 const_iv (GL_FLAT), 1943 const_iv (GL_FLAT),
1944 const_iv (GL_DITHER),
1329 const_iv (GL_BLEND), 1945 const_iv (GL_BLEND),
1946 const_iv (GL_CULL_FACE),
1947 const_iv (GL_SCISSOR_TEST),
1948 const_iv (GL_DEPTH_TEST),
1949 const_iv (GL_ALPHA_TEST),
1950 const_iv (GL_NORMALIZE),
1951 const_iv (GL_RESCALE_NORMAL),
1952 const_iv (GL_FRONT),
1953 const_iv (GL_BACK),
1330 const_iv (GL_AND), 1954 const_iv (GL_AND),
1955 const_iv (GL_ONE),
1956 const_iv (GL_ZERO),
1331 const_iv (GL_SRC_ALPHA), 1957 const_iv (GL_SRC_ALPHA),
1958 const_iv (GL_DST_ALPHA),
1332 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1959 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1960 const_iv (GL_ONE_MINUS_DST_ALPHA),
1961 const_iv (GL_SRC_ALPHA_SATURATE),
1333 const_iv (GL_RGB), 1962 const_iv (GL_RGB),
1334 const_iv (GL_RGBA), 1963 const_iv (GL_RGBA),
1964 const_iv (GL_RGBA4),
1965 const_iv (GL_RGBA8),
1966 const_iv (GL_RGB5_A1),
1335 const_iv (GL_UNSIGNED_BYTE), 1967 const_iv (GL_UNSIGNED_BYTE),
1336 const_iv (GL_ALPHA4), 1968 const_iv (GL_UNSIGNED_SHORT),
1969 const_iv (GL_UNSIGNED_INT),
1337 const_iv (GL_ALPHA), 1970 const_iv (GL_ALPHA),
1971 const_iv (GL_INTENSITY),
1972 const_iv (GL_LUMINANCE),
1973 const_iv (GL_LUMINANCE_ALPHA),
1338 const_iv (GL_FLOAT), 1974 const_iv (GL_FLOAT),
1339 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1975 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340 const_iv (GL_COMPILE), 1976 const_iv (GL_COMPILE),
1341 const_iv (GL_TEXTURE_1D), 1977 const_iv (GL_TEXTURE_1D),
1342 const_iv (GL_TEXTURE_2D), 1978 const_iv (GL_TEXTURE_2D),
1344 const_iv (GL_TEXTURE_MAG_FILTER), 1980 const_iv (GL_TEXTURE_MAG_FILTER),
1345 const_iv (GL_TEXTURE_MIN_FILTER), 1981 const_iv (GL_TEXTURE_MIN_FILTER),
1346 const_iv (GL_TEXTURE_ENV_MODE), 1982 const_iv (GL_TEXTURE_ENV_MODE),
1347 const_iv (GL_TEXTURE_WRAP_S), 1983 const_iv (GL_TEXTURE_WRAP_S),
1348 const_iv (GL_TEXTURE_WRAP_T), 1984 const_iv (GL_TEXTURE_WRAP_T),
1985 const_iv (GL_REPEAT),
1349 const_iv (GL_CLAMP), 1986 const_iv (GL_CLAMP),
1350 const_iv (GL_REPEAT), 1987 const_iv (GL_CLAMP_TO_EDGE),
1351 const_iv (GL_NEAREST), 1988 const_iv (GL_NEAREST),
1352 const_iv (GL_LINEAR), 1989 const_iv (GL_LINEAR),
1353 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1990 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1991 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1992 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1993 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357 const_iv (GL_GENERATE_MIPMAP), 1994 const_iv (GL_GENERATE_MIPMAP),
1358 const_iv (GL_LINEAR),
1359 const_iv (GL_MODULATE), 1995 const_iv (GL_MODULATE),
1996 const_iv (GL_DECAL),
1360 const_iv (GL_REPLACE), 1997 const_iv (GL_REPLACE),
1998 const_iv (GL_DEPTH_BUFFER_BIT),
1361 const_iv (GL_COLOR_BUFFER_BIT), 1999 const_iv (GL_COLOR_BUFFER_BIT),
1362 const_iv (GL_PROJECTION), 2000 const_iv (GL_PROJECTION),
1363 const_iv (GL_MODELVIEW), 2001 const_iv (GL_MODELVIEW),
1364 const_iv (GL_COLOR_LOGIC_OP), 2002 const_iv (GL_COLOR_LOGIC_OP),
2003 const_iv (GL_SEPARABLE_2D),
1365 const_iv (GL_CONVOLUTION_2D), 2004 const_iv (GL_CONVOLUTION_2D),
1366 const_iv (GL_CONVOLUTION_BORDER_MODE), 2005 const_iv (GL_CONVOLUTION_BORDER_MODE),
1367 const_iv (GL_CONSTANT_BORDER), 2006 const_iv (GL_CONSTANT_BORDER),
1368 const_iv (GL_LINES), 2007 const_iv (GL_LINES),
2008 const_iv (GL_LINE_STRIP),
2009 const_iv (GL_LINE_LOOP),
1369 const_iv (GL_QUADS), 2010 const_iv (GL_QUADS),
1370 const_iv (GL_LINE_LOOP), 2011 const_iv (GL_QUAD_STRIP),
2012 const_iv (GL_TRIANGLES),
2013 const_iv (GL_TRIANGLE_STRIP),
2014 const_iv (GL_TRIANGLE_FAN),
1371 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 2015 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1372 const_iv (GL_FASTEST), 2016 const_iv (GL_FASTEST),
2017 const_iv (GL_V2F),
2018 const_iv (GL_V3F),
2019 const_iv (GL_T2F_V3F),
2020 const_iv (GL_T2F_N3F_V3F),
1373# undef const_iv 2021# undef const_iv
1374 }; 2022 };
1375 2023
1376 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2024 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1377 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2025 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1378} 2026}
1379 2027
2028char *
2029gl_vendor ()
2030 CODE:
2031 RETVAL = (char *)glGetString (GL_VENDOR);
2032 OUTPUT:
2033 RETVAL
2034
2035char *
2036gl_version ()
2037 CODE:
2038 RETVAL = (char *)glGetString (GL_VERSION);
2039 OUTPUT:
2040 RETVAL
2041
2042char *
2043gl_extensions ()
2044 CODE:
2045 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2046 OUTPUT:
2047 RETVAL
2048
1380int glGetError () 2049int glGetError ()
2050
2051void glFinish ()
1381 2052
1382void glClear (int mask) 2053void glClear (int mask)
1383 2054
1384void glClearColor (float r, float g, float b, float a = 1.0) 2055void glClearColor (float r, float g, float b, float a = 1.0)
1385 PROTOTYPE: @ 2056 PROTOTYPE: @
1392 2063
1393void glHint (int target, int mode) 2064void glHint (int target, int mode)
1394 2065
1395void glBlendFunc (int sfactor, int dfactor) 2066void glBlendFunc (int sfactor, int dfactor)
1396 2067
2068void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2069 CODE:
2070 gl_BlendFuncSeparate (sa, da, saa, daa);
2071
2072void glDepthMask (int flag)
2073
1397void glLogicOp (int opcode) 2074void glLogicOp (int opcode)
1398 2075
2076void glColorMask (int red, int green, int blue, int alpha)
2077
1399void glMatrixMode (int mode) 2078void glMatrixMode (int mode)
1400 2079
1401void glPushMatrix () 2080void glPushMatrix ()
1402 2081
1403void glPopMatrix () 2082void glPopMatrix ()
1404 2083
1405void glLoadIdentity () 2084void glLoadIdentity ()
1406 2085
2086void glDrawBuffer (int buffer)
2087
2088void glReadBuffer (int buffer)
2089
2090# near_ and far_ are due to microsofts buggy "c" compiler
2091void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2092
2093# near_ and far_ are due to microsofts buggy "c" compiler
1407void glOrtho (double left, double right, double bottom, double top, double near, double far) 2094void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408 2095
1409void glViewport (int x, int y, int width, int height) 2096void glViewport (int x, int y, int width, int height)
2097
2098void glScissor (int x, int y, int width, int height)
1410 2099
1411void glTranslate (float x, float y, float z = 0.) 2100void glTranslate (float x, float y, float z = 0.)
1412 CODE: 2101 CODE:
1413 glTranslatef (x, y, z); 2102 glTranslatef (x, y, z);
1414 2103
1415void glScale (float x, float y, float z) 2104void glScale (float x, float y, float z = 1.)
1416 CODE: 2105 CODE:
1417 glScalef (x, y, z); 2106 glScalef (x, y, z);
1418 2107
1419void glRotate (float angle, float x, float y, float z) 2108void glRotate (float angle, float x, float y, float z)
1420 CODE: 2109 CODE:
1424 2113
1425void glEnd () 2114void glEnd ()
1426 2115
1427void glColor (float r, float g, float b, float a = 1.0) 2116void glColor (float r, float g, float b, float a = 1.0)
1428 PROTOTYPE: @ 2117 PROTOTYPE: @
2118 ALIAS:
2119 glColor_premultiply = 1
1429 CODE: 2120 CODE:
2121 if (ix)
2122 {
2123 r *= a;
2124 g *= a;
2125 b *= a;
2126 }
2127 // microsoft visual "c" rounds instead of truncating...
1430 glColor4f (r, g, b, a); 2128 glColor4f (r, g, b, a);
2129
2130void glInterleavedArrays (int format, int stride, char *data)
2131
2132void glDrawElements (int mode, int count, int type, char *indices)
2133
2134# 1.2 void glDrawRangeElements (int mode, int start, int end
2135
2136void glRasterPos (float x, float y, float z = 0.)
2137 CODE:
2138 glRasterPos3f (0, 0, z);
2139 glBitmap (0, 0, 0, 0, x, y, 0);
1431 2140
1432void glVertex (float x, float y, float z = 0.) 2141void glVertex (float x, float y, float z = 0.)
1433 CODE: 2142 CODE:
1434 glVertex3f (x, y, z); 2143 glVertex3f (x, y, z);
1435 2144
1447 2156
1448void glBindTexture (int target, int name) 2157void glBindTexture (int target, int name)
1449 2158
1450void glConvolutionParameter (int target, int pname, float params) 2159void glConvolutionParameter (int target, int pname, float params)
1451 CODE: 2160 CODE:
2161 if (gl.ConvolutionParameterf)
1452 glConvolutionParameterf (target, pname, params); 2162 gl.ConvolutionParameterf (target, pname, params);
1453 2163
1454void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 2164void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
2165 CODE:
2166 if (gl.ConvolutionFilter2D)
2167 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
2168
2169void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2170 CODE:
2171 if (gl.SeparableFilter2D)
2172 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1455 2173
1456void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2174void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1457 2175
1458void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2176void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2177
2178void glDrawPixels (int width, int height, int format, int type, char *pixels)
2179
2180void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1459 2181
1460int glGenTexture () 2182int glGenTexture ()
1461 CODE: 2183 CODE:
1462{ 2184{
1463 GLuint name; 2185 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines