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.63 by root, Mon Apr 24 06:05:33 2006 UTC vs.
Revision 1.152 by root, Sat Aug 19 18:18:36 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines