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.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 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>
3# pragma warning(disable:4244) 6# pragma warning(disable:4244)
4#endif 7#endif
5 8
6#include "EXTERN.h" 9#include "EXTERN.h"
7#include "perl.h" 10#include "perl.h"
8#include "XSUB.h" 11#include "XSUB.h"
9 12
13#ifdef _WIN32
14# undef pipe
15#endif
16
17#include <math.h>
10#include <string.h> 18#include <string.h>
11#include <stdio.h> 19#include <stdio.h>
20#include <stdlib.h>
12 21
13#include <SDL.h> 22#include <SDL.h>
23#include <SDL_endian.h>
14#include <SDL_image.h> 24#include <SDL_image.h>
15#include <SDL_mixer.h> 25#include <SDL_mixer.h>
16#include <SDL_opengl.h> 26#include <SDL_opengl.h>
17 27
28#define PANGO_ENABLE_BACKEND
29#define G_DISABLE_CAST_CHECKS
30
18#include <glib/gmacros.h> 31#include <glib/gmacros.h>
19 32
20#include <pango/pango.h> 33#include <pango/pango.h>
21#include <pango/pangofc-fontmap.h>
22#include <pango/pangoft2.h>
23 34
24#ifndef _WIN32 35#ifndef _WIN32
25# include <sys/types.h> 36# include <sys/types.h>
26# include <sys/socket.h> 37# include <sys/socket.h>
27# include <netinet/in.h> 38# include <netinet/in.h>
34 typedef signed char int8_t; 45 typedef signed char int8_t;
35 typedef signed short int16_t; 46 typedef signed short int16_t;
36 typedef signed int int32_t; 47 typedef signed int int32_t;
37#endif 48#endif
38 49
39#include "glext.h" 50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
40 51
41#define FOW_DARKNESS 32 52#define FOW_DARKNESS 32
42 53
43#define MAP_EXTEND_X 32 54#define MAP_EXTEND_X 32
44#define MAP_EXTEND_Y 512 55#define MAP_EXTEND_Y 512
45 56
46#define MIN_FONT_HEIGHT 10 57#define MIN_FONT_HEIGHT 10
47 58
48#define GL_CALL(type,func,args) \ 59#if 0
49 { \ 60# define PARACHUTE SDL_INIT_NOPARACHUTE
50 static int init_; \ 61#else
51 static type fptr_; \ 62# define PARACHUTE 0
52 \ 63#endif
53 if (!init_) \
54 { \
55 init_ = 1; \
56 fptr_ = (type)SDL_GL_GetProcAddress (# func); \
57 } \
58 \
59 if (fptr_) \
60 fptr_ args; \
61 }
62 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
63typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
64typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
65 90
66typedef 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}
67 110
68typedef struct cf_layout { 111typedef struct cf_layout {
69 PangoLayout *pl; 112 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode
70 int base_height; 114 int base_height;
71 CFClient__Font font; 115 CFPlus__Font font;
72} *CFClient__Layout; 116} *CFPlus__Layout;
73 117
74static CFClient__Font default_font; 118static CFPlus__Font default_font;
75static PangoContext *context; 119static PangoContext *opengl_context;
76static PangoFontMap *fontmap; 120static PangoFontMap *opengl_fontmap;
77 121
78static void 122static void
79substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
80{ 124{
81 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
82 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
83} 130}
84 131
85static void 132static void
86layout_update_font (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
87{ 134{
88 /* 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
89 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
90 */ 137 */
91 PangoFontDescription *font = self->font ? self->font : default_font; 138 PangoFontDescription *font = self->font ? self->font : default_font;
95 142
96 pango_layout_set_font_description (self->pl, font); 143 pango_layout_set_font_description (self->pl, font);
97} 144}
98 145
99static void 146static void
100layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
101{ 148{
102 pango_layout_get_pixel_size (self->pl, w, h); 149 pango_layout_get_pixel_size (self->pl, w, h);
103 150
104 *w = (*w + 3) & ~3;
105 if (!*w) *w = 1; 151 if (!*w) *w = 1;
106 if (!*h) *h = 1; 152 if (!*h) *h = 1;
153
154 *w = (*w + 3) & ~3;
107} 155}
108 156
109typedef uint16_t mapface; 157typedef uint16_t mapface;
110 158
111typedef struct { 159typedef struct {
134 int texs; 182 int texs;
135 maptex *tex; 183 maptex *tex;
136 184
137 int32_t rows; 185 int32_t rows;
138 maprow *row; 186 maprow *row;
139} *CFClient__Map; 187} *CFPlus__Map;
140 188
141static char * 189static char *
142prepend (char *ptr, int sze, int inc) 190prepend (char *ptr, int sze, int inc)
143{ 191{
144 char *p; 192 char *p;
162 210
163#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 211#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
164#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 212#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
165 213
166static maprow * 214static maprow *
167map_get_row (CFClient__Map self, int y) 215map_get_row (CFPlus__Map self, int y)
168{ 216{
169 if (0 > y) 217 if (0 > y)
170 { 218 {
171 int extend = - y + MAP_EXTEND_Y; 219 int extend = - y + MAP_EXTEND_Y;
172 Prepend (maprow, self->row, self->rows, extend); 220 Prepend (maprow, self->row, self->rows, extend);
210 258
211 return row->col + (x - row->c0); 259 return row->col + (x - row->c0);
212} 260}
213 261
214static mapcell * 262static mapcell *
215map_get_cell (CFClient__Map self, int x, int y) 263map_get_cell (CFPlus__Map self, int x, int y)
216{ 264{
217 return row_get_cell (map_get_row (self, y), x); 265 return row_get_cell (map_get_row (self, y), x);
218} 266}
219 267
220static void 268static void
221map_clear (CFClient__Map self) 269map_clear (CFPlus__Map self)
222{ 270{
223 int r; 271 int r;
224 272
225 for (r = 0; r < self->rows; r++) 273 for (r = 0; r < self->rows; r++)
226 Safefree (self->row[r].col); 274 Safefree (self->row[r].col);
234 self->row = 0; 282 self->row = 0;
235 self->rows = 0; 283 self->rows = 0;
236} 284}
237 285
238static void 286static void
239map_blank (CFClient__Map self, int x0, int y0, int w, int h) 287map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
240{ 288{
241 int x, y; 289 int x, y;
242 maprow *row; 290 maprow *row;
243 291
244 for (y = y0; y < y0 + h; y++) 292 for (y = y0; y < y0 + h; y++)
284 ev.data2 = 0; 332 ev.data2 = 0;
285 333
286 SDL_PushEvent ((SDL_Event *)&ev); 334 SDL_PushEvent ((SDL_Event *)&ev);
287} 335}
288 336
337static unsigned int
338minpot (unsigned int n)
339{
340 if (!n)
341 return 0;
342
343 --n;
344
345 n |= n >> 1;
346 n |= n >> 2;
347 n |= n >> 4;
348 n |= n >> 8;
349 n |= n >> 16;
350
351 return n + 1;
352}
353
289MODULE = CFClient PACKAGE = CFClient 354MODULE = CFPlus PACKAGE = CFPlus
290 355
291PROTOTYPES: ENABLE 356PROTOTYPES: ENABLE
292 357
293BOOT: 358BOOT:
294{ 359{
295 HV *stash = gv_stashpv ("CFClient", 1); 360 HV *stash = gv_stashpv ("CFPlus", 1);
296 static const struct { 361 static const struct {
297 const char *name; 362 const char *name;
298 IV iv; 363 IV iv;
299 } *civ, const_iv[] = { 364 } *civ, const_iv[] = {
300# define const_iv(name) { # name, (IV)name } 365# define const_iv(name) { # name, (IV)name }
399# undef const_iv 464# undef const_iv
400 }; 465 };
401 466
402 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 467 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
403 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
404
405 fontmap = pango_ft2_font_map_new ();
406 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
407 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
408} 469}
409 470
410int 471int
472in_destruct ()
473 CODE:
474 RETVAL = PL_main_cv == Nullcv;
475 OUTPUT:
476 RETVAL
477
478NV floor (NV x)
479
480NV ceil (NV x)
481
482void
483pango_init ()
484 CODE:
485{
486 opengl_fontmap = pango_opengl_font_map_new ();
487 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
488 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
489}
490
491int
411SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 492SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
412 493
413void 494void
414SDL_Quit () 495SDL_Quit ()
415 496
416void 497void
422 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 503 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
423 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 504 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
424 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 505 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
425 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 506 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
426 507
508 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
509 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
510
427 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 511 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
428 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
429 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
430 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
431 515
432 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
433 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 517 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
434 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 518 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
435 519
436 SDL_EnableUNICODE (1); 520 SDL_EnableUNICODE (1);
437 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 521 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
438 522
439 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 523 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
448 532
449 ++m; 533 ++m;
450 } 534 }
451} 535}
452 536
537char *
538SDL_GetError ()
539
453int 540int
454SDL_SetVideoMode (int w, int h, int fullscreen) 541SDL_SetVideoMode (int w, int h, int fullscreen)
455 CODE: 542 CODE:
456 RETVAL = !!SDL_SetVideoMode ( 543 RETVAL = !!SDL_SetVideoMode (
457 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 544 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
458 ); 545 );
546 if (RETVAL)
547 {
459 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 548 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
549# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
550# include "glfunc.h"
551# undef GL_FUNC
552 }
460 OUTPUT: 553 OUTPUT:
461 RETVAL 554 RETVAL
462 555
463void 556void
464SDL_GL_SwapBuffers () 557SDL_GL_SwapBuffers ()
558
559char *
560SDL_GetKeyName (int sym)
465 561
466void 562void
467SDL_PollEvent () 563SDL_PollEvent ()
468 PPCODE: 564 PPCODE:
469{ 565{
488 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 584 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
489 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 585 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
490 break; 586 break;
491 587
492 case SDL_MOUSEMOTION: 588 case SDL_MOUSEMOTION:
589 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
590
493 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 591 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
494 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 592 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
495 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 593 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
496 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 594 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
497 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 595 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
498 break; 596 break;
499 597
500 case SDL_MOUSEBUTTONDOWN: 598 case SDL_MOUSEBUTTONDOWN:
501 case SDL_MOUSEBUTTONUP: 599 case SDL_MOUSEBUTTONUP:
600 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
601
502 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 602 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
503 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 603 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
504 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 604 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
505 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 605 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
506 break; 606 break;
510 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0); 610 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
511 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0); 611 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
512 break; 612 break;
513 } 613 }
514 614
515 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 615 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
516 } 616 }
517} 617}
518 618
519int 619int
520Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048) 620Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
533 CODE: 633 CODE:
534#ifndef _WIN32 634#ifndef _WIN32
535 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 635 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
536#endif 636#endif
537 637
538char *
539gl_version ()
540 CODE:
541 RETVAL = (char *)glGetString (GL_VERSION);
542 OUTPUT:
543 RETVAL
544
545char *
546gl_extensions ()
547 CODE:
548 RETVAL = (char *)glGetString (GL_EXTENSIONS);
549 OUTPUT:
550 RETVAL
551
552void 638void
553add_font (char *file) 639add_font (char *file)
554 CODE: 640 CODE:
555 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 641 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
556 642
557void 643void
558load_image_inline (SV *image_) 644load_image_inline (SV *image_)
559 ALIAS: 645 ALIAS:
560 load_image_file = 1 646 load_image_file = 1
602 688
603 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 689 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
604 690
605 assert (surface2->pitch == surface2->w * 4); 691 assert (surface2->pitch == surface2->w * 4);
606 692
693 SDL_LockSurface (surface2);
607 EXTEND (SP, 5); 694 EXTEND (SP, 6);
608 PUSHs (sv_2mortal (newSViv (surface2->w))); 695 PUSHs (sv_2mortal (newSViv (surface2->w)));
609 PUSHs (sv_2mortal (newSViv (surface2->h))); 696 PUSHs (sv_2mortal (newSViv (surface2->h)));
610 SDL_LockSurface (surface2);
611 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 697 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
612 SDL_UnlockSurface (surface2);
613 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 698 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
614 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 699 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
615 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 700 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
701 SDL_UnlockSurface (surface2);
616 702
617 SDL_FreeSurface (surface); 703 SDL_FreeSurface (surface);
618 SDL_FreeSurface (surface2); 704 SDL_FreeSurface (surface2);
619} 705}
620 706
644} 730}
645 731
646void 732void
647error (char *message) 733error (char *message)
648 CODE: 734 CODE:
735 fprintf (stderr, "ERROR: %s\n", message);
649#ifdef _WIN32 736#ifdef _WIN32
650 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 737 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
651#else
652 fprintf (stderr, "ERROR: %s\n", message);
653#endif 738#endif
654 739
655void 740void
656fatal (char *message) 741fatal (char *message)
657 CODE: 742 CODE:
743 fprintf (stderr, "FATAL: %s\n", message);
658#ifdef _WIN32 744#ifdef _WIN32
659 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 745 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
660#else
661 fprintf (stderr, "FATAL: %s\n", message);
662#endif 746#endif
663 exit (1); 747 _exit (1);
664 748
749void
750_exit (int retval)
751 CODE:
752 _exit (retval);
753
665MODULE = CFClient PACKAGE = CFClient::Font 754MODULE = CFPlus PACKAGE = CFPlus::Font
666 755
667CFClient::Font 756CFPlus::Font
668new_from_file (SV *class, char *path, int id = 0) 757new_from_file (SV *class, char *path, int id = 0)
669 CODE: 758 CODE:
670{ 759{
671 int count; 760 int count;
672 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 761 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
675} 764}
676 OUTPUT: 765 OUTPUT:
677 RETVAL 766 RETVAL
678 767
679void 768void
680DESTROY (CFClient::Font self) 769DESTROY (CFPlus::Font self)
681 CODE: 770 CODE:
682 pango_font_description_free (self); 771 pango_font_description_free (self);
683 772
684void 773void
685make_default (CFClient::Font self) 774make_default (CFPlus::Font self)
686 CODE: 775 CODE:
687 default_font = self; 776 default_font = self;
688 777
689MODULE = CFClient PACKAGE = CFClient::Layout 778MODULE = CFPlus PACKAGE = CFPlus::Layout
690 779
691CFClient::Layout 780void
692new (SV *class, int base_height = MIN_FONT_HEIGHT) 781reset_glyph_cache ()
782 CODE:
783 tc_clear ();
784
785CFPlus::Layout
786new (SV *class)
693 CODE: 787 CODE:
694 New (0, RETVAL, 1, struct cf_layout); 788 New (0, RETVAL, 1, struct cf_layout);
789
695 RETVAL->pl = pango_layout_new (context); 790 RETVAL->pl = pango_layout_new (opengl_context);
696 RETVAL->base_height = base_height; 791 RETVAL->r = 1.;
792 RETVAL->g = 1.;
793 RETVAL->b = 1.;
794 RETVAL->a = 1.;
795 RETVAL->base_height = MIN_FONT_HEIGHT;
697 RETVAL->font = 0; 796 RETVAL->font = 0;
797
698 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 798 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699 pango_layout_set_font_description (RETVAL->pl, default_font); 799 layout_update_font (RETVAL);
700 OUTPUT: 800 OUTPUT:
701 RETVAL 801 RETVAL
702 802
703void 803void
704DESTROY (CFClient::Layout self) 804DESTROY (CFPlus::Layout self)
705 CODE: 805 CODE:
706 g_object_unref (self->pl); 806 g_object_unref (self->pl);
707 Safefree (self); 807 Safefree (self);
708 808
709void 809void
710set_text (CFClient::Layout self, SV *text_) 810set_text (CFPlus::Layout self, SV *text_)
711 CODE: 811 CODE:
712{ 812{
713 STRLEN textlen; 813 STRLEN textlen;
714 char *text = SvPVutf8 (text_, textlen); 814 char *text = SvPVutf8 (text_, textlen);
715 815
716 pango_layout_set_text (self->pl, text, textlen); 816 pango_layout_set_text (self->pl, text, textlen);
717} 817}
718 818
719void 819void
720set_markup (CFClient::Layout self, SV *text_) 820set_markup (CFPlus::Layout self, SV *text_)
721 CODE: 821 CODE:
722{ 822{
723 STRLEN textlen; 823 STRLEN textlen;
724 char *text = SvPVutf8 (text_, textlen); 824 char *text = SvPVutf8 (text_, textlen);
725 825
726 pango_layout_set_markup (self->pl, text, textlen); 826 pango_layout_set_markup (self->pl, text, textlen);
727} 827}
728 828
829void
830set_shapes (CFPlus::Layout self, ...)
831 CODE:
832{
833 PangoAttrList *attrs = 0;
834 const char *text = pango_layout_get_text (self->pl);
835 const char *pos = text;
836 int arg = 4;
837
838 while (arg < items && (pos = strstr (pos, OBJ_STR)))
839 {
840 PangoRectangle inkrect, rect;
841 PangoAttribute *attr;
842
843 int x = SvIV (ST (arg - 3));
844 int y = SvIV (ST (arg - 2));
845 int w = SvIV (ST (arg - 1));
846 int h = SvIV (ST (arg ));
847
848 inkrect.x = 0;
849 inkrect.y = 0;
850 inkrect.width = 0;
851 inkrect.height = 0;
852
853 rect.x = x * PANGO_SCALE;
854 rect.y = y * PANGO_SCALE;
855 rect.width = w * PANGO_SCALE;
856 rect.height = h * PANGO_SCALE;
857
858 if (!attrs)
859 attrs = pango_layout_get_attributes (self->pl);
860
861 attr = pango_attr_shape_new (&inkrect, &rect);
862 attr->start_index = pos - text;
863 attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
864 pango_attr_list_insert (attrs, attr);
865
866 arg += 4;
867 pos += sizeof (OBJ_STR) - 1;
868 }
869
870 if (attrs)
871 pango_layout_set_attributes (self->pl, attrs);
872}
873
874void
875get_shapes (CFPlus::Layout self)
876 PPCODE:
877{
878 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879
880 do
881 {
882 PangoLayoutRun *run = pango_layout_iter_get_run (iter);
883
884 if (run && shape_attr_p (run))
885 {
886 PangoRectangle extents;
887 pango_layout_iter_get_run_extents (iter, 0, &extents);
888
889 EXTEND (SP, 2);
890 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
891 PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
892 }
893 }
894 while (pango_layout_iter_next_run (iter));
895
896 pango_layout_iter_free (iter);
897}
898
899int
900has_wrapped (CFPlus::Layout self)
901 CODE:
902{
903 int lines = 1;
904 const char *text = pango_layout_get_text (self->pl);
905
906 while (*text)
907 lines += *text++ == '\n';
908
909 RETVAL = lines < pango_layout_get_line_count (self->pl);
910}
911 OUTPUT:
912 RETVAL
913
729SV * 914SV *
730get_text (CFClient::Layout self) 915get_text (CFPlus::Layout self)
731 CODE: 916 CODE:
732 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 917 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733 SvUTF8_on (RETVAL); 918 sv_utf8_decode (RETVAL);
734 OUTPUT: 919 OUTPUT:
735 RETVAL 920 RETVAL
736 921
737void 922void
923set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
924 CODE:
925 self->r = r;
926 self->g = g;
927 self->b = b;
928 self->a = a;
929
930void
738set_font (CFClient::Layout self, CFClient::Font font = 0) 931set_font (CFPlus::Layout self, CFPlus::Font font = 0)
739 CODE: 932 CODE:
740 if (self->font != font) 933 if (self->font != font)
741 { 934 {
742 self->font = font; 935 self->font = font;
743 layout_update_font (self); 936 layout_update_font (self);
744 } 937 }
745 938
746void 939void
747set_height (CFClient::Layout self, int base_height) 940set_height (CFPlus::Layout self, int base_height)
748 CODE: 941 CODE:
749 if (self->base_height != base_height) 942 if (self->base_height != base_height)
750 { 943 {
751 self->base_height = base_height; 944 self->base_height = base_height;
752 layout_update_font (self); 945 layout_update_font (self);
753 } 946 }
754 947
755void 948void
756set_width (CFClient::Layout self, int max_width = -1) 949set_width (CFPlus::Layout self, int max_width = -1)
757 CODE: 950 CODE:
758 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 951 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
759 952
760void 953void
954set_indent (CFPlus::Layout self, int indent)
955 CODE:
956 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
957
958void
959set_spacing (CFPlus::Layout self, int spacing)
960 CODE:
961 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
962
963void
964set_ellipsise (CFPlus::Layout self, int ellipsise)
965 CODE:
966 pango_layout_set_ellipsize (self->pl,
967 ellipsise == 1 ? PANGO_ELLIPSIZE_START
968 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
969 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
970 : PANGO_ELLIPSIZE_NONE
971 );
972
973void
974set_single_paragraph_mode (CFPlus::Layout self, int spm)
975 CODE:
976 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
977
978void
761size (CFClient::Layout self) 979size (CFPlus::Layout self)
762 PPCODE: 980 PPCODE:
763{ 981{
764 int w, h; 982 int w, h;
765 983
766 layout_get_pixel_size (self, &w, &h); 984 layout_get_pixel_size (self, &w, &h);
769 PUSHs (sv_2mortal (newSViv (w))); 987 PUSHs (sv_2mortal (newSViv (w)));
770 PUSHs (sv_2mortal (newSViv (h))); 988 PUSHs (sv_2mortal (newSViv (h)));
771} 989}
772 990
773int 991int
992descent (CFPlus::Layout self)
993 CODE:
994{
995 PangoRectangle rect;
996 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
997 pango_layout_line_get_pixel_extents (line, 0, &rect);
998 RETVAL = PANGO_DESCENT (rect);
999}
1000 OUTPUT:
1001 RETVAL
1002
1003int
774xy_to_index (CFClient::Layout self, int x, int y) 1004xy_to_index (CFPlus::Layout self, int x, int y)
775 CODE: 1005 CODE:
776{ 1006{
777 int index, trailing; 1007 int index, trailing;
778 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1008 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
779 RETVAL = index; 1009 RETVAL = index;
780} 1010}
781 OUTPUT: 1011 OUTPUT:
782 RETVAL 1012 RETVAL
783 1013
784void 1014void
785cursor_pos (CFClient::Layout self, int index) 1015cursor_pos (CFPlus::Layout self, int index)
786 PPCODE: 1016 PPCODE:
787{ 1017{
788 PangoRectangle strong_pos; 1018 PangoRectangle strong_pos;
789 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1019 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
790 1020
793 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1023 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
794 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1024 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
795} 1025}
796 1026
797void 1027void
798render (CFClient::Layout self) 1028render (CFPlus::Layout self, float x, float y)
799 PPCODE: 1029 PPCODE:
800{ 1030 pango_opengl_render_layout_subpixel (
801 SV *retval; 1031 self->pl,
802 int w, h; 1032 x * PANGO_SCALE, y * PANGO_SCALE,
803 FT_Bitmap bitmap; 1033 self->r, self->g, self->b, self->a
1034 );
804 1035
805 layout_get_pixel_size (self, &w, &h); 1036MODULE = CFPlus PACKAGE = CFPlus::Texture
806 1037
807 retval = newSV (w * h); 1038void
808 SvPOK_only (retval); 1039pad2pot (SV *data_, SV *w_, SV *h_)
809 SvCUR_set (retval, w * h); 1040 CODE:
1041{
1042 int ow = SvIV (w_);
1043 int oh = SvIV (h_);
810 1044
811 bitmap.rows = h; 1045 if (ow && oh)
812 bitmap.width = w; 1046 {
813 bitmap.pitch = w; 1047 int nw = minpot (ow);
814 bitmap.buffer = (unsigned char*)SvPVX (retval); 1048 int nh = minpot (oh);
815 bitmap.num_grays = 256;
816 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817 1049
818 memset (bitmap.buffer, 0, w * h); 1050 if (nw != ow || nh != oh)
819 1051 {
820 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 1052 if (SvOK (data_))
1053 {
1054 STRLEN datalen;
1055 char *data = SvPVbyte (data_, datalen);
1056 int bpp = datalen / (ow * oh);
1057 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
821 1058
822 EXTEND (SP, 3); 1059 SvPOK_only (result_);
823 PUSHs (sv_2mortal (newSViv (w))); 1060 SvCUR_set (result_, nw * nh * bpp);
824 PUSHs (sv_2mortal (newSViv (h)));
825 PUSHs (sv_2mortal (retval));
826}
827 1061
828MODULE = CFClient PACKAGE = CFClient::Texture 1062 memset (SvPVX (result_), 0, nw * nh * bpp);
1063 while (oh--)
1064 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
829 1065
1066 sv_setsv (data_, result_);
1067 }
1068
1069 sv_setiv (w_, nw);
1070 sv_setiv (h_, nh);
1071 }
1072 }
1073}
1074
830void 1075void
831draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1076draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
832 PROTOTYPE: $$$;$$ 1077 PROTOTYPE: $$$;$$
1078 ALIAS:
1079 draw_quad_alpha = 1
1080 draw_quad_alpha_premultiplied = 2
833 CODE: 1081 CODE:
834{ 1082{
835 HV *hv = (HV *)SvRV (self); 1083 HV *hv = (HV *)SvRV (self);
836 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1084 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1085 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
838 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1086 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
839 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
840 1087
841 if (items < 5) 1088 if (items < 5)
842 { 1089 {
843 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1090 w = SvNV (*hv_fetch (hv, "w", 1, 1));
844 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1091 h = SvNV (*hv_fetch (hv, "h", 1, 1));
845 } 1092 }
846 1093
1094 if (ix)
1095 {
1096 glEnable (GL_BLEND);
1097
1098 if (ix == 2)
1099 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1100 else
1101 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1102 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1103
1104 glEnable (GL_ALPHA_TEST);
1105 glAlphaFunc (GL_GREATER, 0.01f);
1106 }
1107
847 glBindTexture (GL_TEXTURE_2D, name); 1108 glBindTexture (GL_TEXTURE_2D, name);
848 if (wrap_mode) { 1109
849 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851 }
852 glBegin (GL_QUADS); 1110 glBegin (GL_QUADS);
853 glTexCoord2f (0, 0); glVertex2f (x , y ); 1111 glTexCoord2f (0, 0); glVertex2f (x , y );
854 glTexCoord2f (0, t); glVertex2f (x , y + h); 1112 glTexCoord2f (0, t); glVertex2f (x , y + h);
855 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1113 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1114 glTexCoord2f (s, 0); glVertex2f (x + w, y );
857 glEnd (); 1115 glEnd ();
858}
859 1116
1117 if (ix)
1118 {
1119 glDisable (GL_ALPHA_TEST);
1120 glDisable (GL_BLEND);
1121 }
1122}
1123
860MODULE = CFClient PACKAGE = CFClient::Map 1124MODULE = CFPlus PACKAGE = CFPlus::Map
861 1125
862CFClient::Map 1126CFPlus::Map
863new (SV *class, int map_width, int map_height) 1127new (SV *class, int map_width, int map_height)
864 CODE: 1128 CODE:
865 New (0, RETVAL, 1, struct map); 1129 New (0, RETVAL, 1, struct map);
866 RETVAL->x = 0; 1130 RETVAL->x = 0;
867 RETVAL->y = 0; 1131 RETVAL->y = 0;
877 RETVAL->row = 0; 1141 RETVAL->row = 0;
878 OUTPUT: 1142 OUTPUT:
879 RETVAL 1143 RETVAL
880 1144
881void 1145void
882DESTROY (CFClient::Map self) 1146DESTROY (CFPlus::Map self)
883 CODE: 1147 CODE:
884{ 1148{
885 map_clear (self); 1149 map_clear (self);
886 Safefree (self->face); 1150 Safefree (self->face);
1151 Safefree (self->tex);
887 Safefree (self); 1152 Safefree (self);
888} 1153}
889 1154
890void 1155void
891clear (CFClient::Map self) 1156clear (CFPlus::Map self)
892 CODE: 1157 CODE:
893 map_clear (self); 1158 map_clear (self);
894 1159
895void 1160void
896set_face (CFClient::Map self, int face, int texid) 1161set_face (CFPlus::Map self, int face, int texid)
897 CODE: 1162 CODE:
898{ 1163{
899 while (self->faces <= face) 1164 while (self->faces <= face)
900 { 1165 {
901 Append (mapface, self->face, self->faces, self->faces); 1166 Append (mapface, self->face, self->faces, self->faces);
904 1169
905 self->face [face] = texid; 1170 self->face [face] = texid;
906} 1171}
907 1172
908void 1173void
909set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1174set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
910 CODE: 1175 CODE:
911{ 1176{
912 while (self->texs <= texid) 1177 while (self->texs <= texid)
913 { 1178 {
914 Append (maptex, self->tex, self->texs, self->texs); 1179 Append (maptex, self->tex, self->texs, self->texs);
926 tex->r = r; 1191 tex->r = r;
927 tex->g = g; 1192 tex->g = g;
928 tex->b = b; 1193 tex->b = b;
929 tex->a = a; 1194 tex->a = a;
930 } 1195 }
1196
1197 // somewhat hackish, but for textures that require it, it really
1198 // improves the look, and most others don't suffer.
1199 glBindTexture (GL_TEXTURE_2D, name);
1200 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1201 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1202 // use uglier nearest interpolation because linear suffers
1203 // from transparent color bleeding and ugly wrapping effects.
1204 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
931} 1205}
932 1206
933int 1207int
934ox (CFClient::Map self) 1208ox (CFPlus::Map self)
935 ALIAS: 1209 ALIAS:
936 oy = 1 1210 oy = 1
1211 x = 2
1212 y = 3
1213 w = 4
1214 h = 5
937 CODE: 1215 CODE:
938 switch (ix) 1216 switch (ix)
939 { 1217 {
940 case 0: RETVAL = self->ox; break; 1218 case 0: RETVAL = self->ox; break;
941 case 1: RETVAL = self->oy; break; 1219 case 1: RETVAL = self->oy; break;
1220 case 2: RETVAL = self->x; break;
1221 case 3: RETVAL = self->y; break;
1222 case 4: RETVAL = self->w; break;
1223 case 5: RETVAL = self->h; break;
942 } 1224 }
943 OUTPUT: 1225 OUTPUT:
944 RETVAL 1226 RETVAL
945 1227
946void 1228void
947scroll (CFClient::Map self, int dx, int dy) 1229scroll (CFPlus::Map self, int dx, int dy)
948 CODE: 1230 CODE:
949{ 1231{
950 if (dx > 0) 1232 if (dx > 0)
951 map_blank (self, self->x, self->y, dx - 1, self->h); 1233 map_blank (self, self->x, self->y, dx - 1, self->h);
952 else if (dx < 0) 1234 else if (dx < 0)
968 self->y += MAP_EXTEND_Y; 1250 self->y += MAP_EXTEND_Y;
969 } 1251 }
970} 1252}
971 1253
972void 1254void
973map1a_update (CFClient::Map self, SV *data_) 1255map1a_update (CFPlus::Map self, SV *data_)
974 CODE: 1256 CODE:
975{ 1257{
976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1258 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
977 uint8_t *data_end = (uint8_t *)SvEND (data_); 1259 uint8_t *data_end = (uint8_t *)SvEND (data_);
978 mapcell *cell; 1260 mapcell *cell;
980 1262
981 while (data < data_end) 1263 while (data < data_end)
982 { 1264 {
983 flags = (data [0] << 8) + data [1]; data += 2; 1265 flags = (data [0] << 8) + data [1]; data += 2;
984 1266
985 x = ((flags >> 10) & 63) + self->x; 1267 x = self->x + ((flags >> 10) & 63);
986 y = ((flags >> 4) & 63) + self->y; 1268 y = self->y + ((flags >> 4) & 63);
987 1269
988 cell = map_get_cell (self, x, y); 1270 cell = map_get_cell (self, x, y);
989 1271
990 if (flags & 15) 1272 if (flags & 15)
991 { 1273 {
1020 cell->darkness = -1; 1302 cell->darkness = -1;
1021 } 1303 }
1022} 1304}
1023 1305
1024SV * 1306SV *
1025mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1307mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1026 CODE: 1308 CODE:
1027{ 1309{
1028 int x1, x; 1310 int x1, x;
1029 int y1, y; 1311 int y1, y;
1030 int z; 1312 int z;
1080} 1362}
1081 OUTPUT: 1363 OUTPUT:
1082 RETVAL 1364 RETVAL
1083 1365
1084void 1366void
1085draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1367draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1086 PPCODE: 1368 CODE:
1087{ 1369{
1088 int vx, vy; 1370 int vx, vy;
1089 int x, y, z; 1371 int x, y, z;
1090 int last_name; 1372 int last_name;
1091 mapface face; 1373 mapface face;
1092 int sw4 = (sw + 3) & ~3;
1093 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1094 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1095 1374
1096 memset (darkness, 255, sw4 * sh);
1097 SvPOK_only (darkness_sv);
1098 SvCUR_set (darkness_sv, sw4 * sh);
1099
1100 vx = self->x + (self->w - sw) / 2 - shift_x; 1375 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1101 vy = self->y + (self->h - sh) / 2 - shift_y; 1376 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1102 1377
1103 /* 1378 /*
1104 int vx = self->vx = self->w >= sw 1379 int vx = self->vx = self->w >= sw
1105 ? self->x + (self->w - sw) / 2 1380 ? self->x + (self->w - sw) / 2
1106 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1381 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1110 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy)); 1385 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1111 */ 1386 */
1112 1387
1113 glColor4ub (255, 255, 255, 255); 1388 glColor4ub (255, 255, 255, 255);
1114 1389
1390 glEnable (GL_BLEND);
1115 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1391 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1116 glEnable (GL_BLEND);
1117 glEnable (GL_TEXTURE_2D); 1392 glEnable (GL_TEXTURE_2D);
1118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1393 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1119 1394
1120 glBegin (GL_QUADS); 1395 glBegin (GL_QUADS);
1121 1396
1129 1404
1130 for (x = 0; x < sw; x++) 1405 for (x = 0; x < sw; x++)
1131 if (row->c0 <= x + vx && x + vx < row->c1) 1406 if (row->c0 <= x + vx && x + vx < row->c1)
1132 { 1407 {
1133 mapcell *cell = row->col + (x + vx - row->c0); 1408 mapcell *cell = row->col + (x + vx - row->c0);
1134
1135 darkness[y * sw4 + x] = cell->darkness < 0
1136 ? 255 - FOW_DARKNESS
1137 : 255 - cell->darkness;
1138 1409
1139 face = cell->face [z]; 1410 face = cell->face [z];
1140 1411
1141 if (face) 1412 if (face)
1142 { 1413 {
1163 1434
1164 glEnd (); 1435 glEnd ();
1165 1436
1166 glDisable (GL_TEXTURE_2D); 1437 glDisable (GL_TEXTURE_2D);
1167 glDisable (GL_BLEND); 1438 glDisable (GL_BLEND);
1439}
1440
1441void
1442draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443 CODE:
1444{
1445 static float color[16][3] = {
1446 { 0.00F, 0.00F, 0.00F },
1447 { 1.00F, 1.00F, 1.00F },
1448 { 0.00F, 0.00F, 0.55F },
1449 { 1.00F, 0.00F, 0.00F },
1450
1451 { 1.00F, 0.54F, 0.00F },
1452 { 0.11F, 0.56F, 1.00F },
1453 { 0.93F, 0.46F, 0.00F },
1454 { 0.18F, 0.54F, 0.34F },
1455
1456 { 0.56F, 0.73F, 0.56F },
1457 { 0.80F, 0.80F, 0.80F },
1458 { 0.55F, 0.41F, 0.13F },
1459 { 0.99F, 0.77F, 0.26F },
1460
1461 { 0.74F, 0.65F, 0.41F },
1462
1463 { 0.00F, 1.00F, 1.00F },
1464 { 1.00F, 0.00F, 1.00F },
1465 { 1.00F, 1.00F, 0.00F },
1466 };
1467
1468 int x, y;
1469
1470 glEnable (GL_TEXTURE_2D);
1471 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1472 glEnable (GL_BLEND);
1473 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1474 glBegin (GL_QUADS);
1475
1476 for (y = 0; y < h; y++)
1477 for (x = 0; x < w; x++)
1478 {
1479 unsigned char m = data [x + y * w];
1480
1481 if (m)
1482 {
1483 float *c = color [m & 15];
1484
1485 float tx1 = m & 0x40 ? 0.5 : 0.;
1486 float tx2 = tx1 + 0.5;
1487
1488 glColor4f (c[0], c[1], c[2], 0.75);
1489 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1490 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1491 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1492 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1493 }
1494 }
1495
1496 glEnd ();
1497 glDisable (GL_BLEND);
1498 glDisable (GL_TEXTURE_2D);
1499}
1500
1501void
1502fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1503 PPCODE:
1504{
1505 int vx, vy;
1506 int x, y;
1507 int sw4 = (sw + 3) & ~3;
1508 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1509 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1510
1511 memset (darkness, 255, sw4 * sh);
1512 SvPOK_only (darkness_sv);
1513 SvCUR_set (darkness_sv, sw4 * sh);
1514
1515 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1516 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1517
1518 for (y = 0; y < sh; y++)
1519 if (0 <= y + vy && y + vy < self->rows)
1520 {
1521 maprow *row = self->row + (y + vy);
1522
1523 for (x = 0; x < sw; x++)
1524 if (row->c0 <= x + vx && x + vx < row->c1)
1525 {
1526 mapcell *cell = row->col + (x + vx - row->c0);
1527
1528 darkness[y * sw4 + x] = cell->darkness < 0
1529 ? 255 - FOW_DARKNESS
1530 : 255 - cell->darkness;
1531 }
1532 }
1168 1533
1169 EXTEND (SP, 3); 1534 EXTEND (SP, 3);
1170 PUSHs (sv_2mortal (newSViv (sw4))); 1535 PUSHs (sv_2mortal (newSViv (sw4)));
1171 PUSHs (sv_2mortal (newSViv (sh))); 1536 PUSHs (sv_2mortal (newSViv (sh)));
1172 PUSHs (darkness_sv); 1537 PUSHs (darkness_sv);
1173} 1538}
1174 1539
1175SV * 1540SV *
1176get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1541get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1177 CODE: 1542 CODE:
1178{ 1543{
1179 int x, y, x1, y1; 1544 int x, y, x1, y1;
1180 SV *data_sv = newSV (w * h * 7 + 5); 1545 SV *data_sv = newSV (w * h * 7 + 5);
1181 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1546 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1243} 1608}
1244 OUTPUT: 1609 OUTPUT:
1245 RETVAL 1610 RETVAL
1246 1611
1247void 1612void
1248set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1613set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1249 PPCODE: 1614 PPCODE:
1250{ 1615{
1251 int x, y, z; 1616 int x, y, z;
1252 int w, h; 1617 int w, h;
1253 int x1, y1; 1618 int x1, y1;
1302 } 1667 }
1303 } 1668 }
1304 } 1669 }
1305} 1670}
1306 1671
1307MODULE = CFClient PACKAGE = CFClient::MixChunk 1672MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1308 1673
1309CFClient::MixChunk 1674CFPlus::MixChunk
1310new_from_file (SV *class, char *path) 1675new_from_file (SV *class, char *path)
1311 CODE: 1676 CODE:
1312 RETVAL = Mix_LoadWAV (path); 1677 RETVAL = Mix_LoadWAV (path);
1313 OUTPUT: 1678 OUTPUT:
1314 RETVAL 1679 RETVAL
1315 1680
1316void 1681void
1317DESTROY (CFClient::MixChunk self) 1682DESTROY (CFPlus::MixChunk self)
1318 CODE: 1683 CODE:
1319 Mix_FreeChunk (self); 1684 Mix_FreeChunk (self);
1320 1685
1321int 1686int
1322volume (CFClient::MixChunk self, int volume = -1) 1687volume (CFPlus::MixChunk self, int volume = -1)
1323 CODE: 1688 CODE:
1324 RETVAL = Mix_VolumeChunk (self, volume); 1689 RETVAL = Mix_VolumeChunk (self, volume);
1325 OUTPUT: 1690 OUTPUT:
1326 RETVAL 1691 RETVAL
1327 1692
1328int 1693int
1329play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1694play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1330 CODE: 1695 CODE:
1331 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1696 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1332 OUTPUT: 1697 OUTPUT:
1333 RETVAL 1698 RETVAL
1334 1699
1335MODULE = CFClient PACKAGE = CFClient::MixMusic 1700MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1336 1701
1337int 1702int
1338volume (int volume = -1) 1703volume (int volume = -1)
1339 CODE: 1704 CODE:
1340 RETVAL = Mix_VolumeMusic (volume); 1705 RETVAL = Mix_VolumeMusic (volume);
1341 OUTPUT: 1706 OUTPUT:
1342 RETVAL 1707 RETVAL
1343 1708
1344CFClient::MixMusic 1709CFPlus::MixMusic
1345new_from_file (SV *class, char *path) 1710new_from_file (SV *class, char *path)
1346 CODE: 1711 CODE:
1347 RETVAL = Mix_LoadMUS (path); 1712 RETVAL = Mix_LoadMUS (path);
1348 OUTPUT: 1713 OUTPUT:
1349 RETVAL 1714 RETVAL
1350 1715
1351void 1716void
1352DESTROY (CFClient::MixMusic self) 1717DESTROY (CFPlus::MixMusic self)
1353 CODE: 1718 CODE:
1354 Mix_FreeMusic (self); 1719 Mix_FreeMusic (self);
1355 1720
1356int 1721int
1357play (CFClient::MixMusic self, int loops = -1) 1722play (CFPlus::MixMusic self, int loops = -1)
1358 CODE: 1723 CODE:
1359 RETVAL = Mix_PlayMusic (self, loops); 1724 RETVAL = Mix_PlayMusic (self, loops);
1360 OUTPUT: 1725 OUTPUT:
1361 RETVAL 1726 RETVAL
1362 1727
1363MODULE = CFClient PACKAGE = CFClient::OpenGL 1728MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1364 1729
1365BOOT: 1730BOOT:
1366{ 1731{
1367 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1732 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1368 static const struct { 1733 static const struct {
1369 const char *name; 1734 const char *name;
1370 IV iv; 1735 IV iv;
1371 } *civ, const_iv[] = { 1736 } *civ, const_iv[] = {
1372# define const_iv(name) { # name, (IV)name } 1737# define const_iv(name) { # name, (IV)name }
1373 const_iv (GL_COLOR_MATERIAL), 1738 const_iv (GL_COLOR_MATERIAL),
1374 const_iv (GL_SMOOTH), 1739 const_iv (GL_SMOOTH),
1375 const_iv (GL_FLAT), 1740 const_iv (GL_FLAT),
1376 const_iv (GL_DITHER), 1741 const_iv (GL_DITHER),
1377 const_iv (GL_BLEND), 1742 const_iv (GL_BLEND),
1743 const_iv (GL_CULL_FACE),
1378 const_iv (GL_SCISSOR_TEST), 1744 const_iv (GL_SCISSOR_TEST),
1745 const_iv (GL_DEPTH_TEST),
1746 const_iv (GL_ALPHA_TEST),
1747 const_iv (GL_NORMALIZE),
1748 const_iv (GL_RESCALE_NORMAL),
1749 const_iv (GL_FRONT),
1750 const_iv (GL_BACK),
1379 const_iv (GL_AND), 1751 const_iv (GL_AND),
1380 const_iv (GL_ONE), 1752 const_iv (GL_ONE),
1381 const_iv (GL_ZERO), 1753 const_iv (GL_ZERO),
1382 const_iv (GL_SRC_ALPHA), 1754 const_iv (GL_SRC_ALPHA),
1383 const_iv (GL_SRC_ALPHA_SATURATE), 1755 const_iv (GL_DST_ALPHA),
1384 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1756 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1385 const_iv (GL_ONE_MINUS_DST_ALPHA), 1757 const_iv (GL_ONE_MINUS_DST_ALPHA),
1758 const_iv (GL_SRC_ALPHA_SATURATE),
1386 const_iv (GL_RGB), 1759 const_iv (GL_RGB),
1387 const_iv (GL_RGBA), 1760 const_iv (GL_RGBA),
1761 const_iv (GL_RGBA4),
1762 const_iv (GL_RGBA8),
1763 const_iv (GL_RGB5_A1),
1388 const_iv (GL_UNSIGNED_BYTE), 1764 const_iv (GL_UNSIGNED_BYTE),
1765 const_iv (GL_UNSIGNED_SHORT),
1766 const_iv (GL_UNSIGNED_INT),
1389 const_iv (GL_ALPHA), 1767 const_iv (GL_ALPHA),
1768 const_iv (GL_INTENSITY),
1769 const_iv (GL_LUMINANCE),
1770 const_iv (GL_LUMINANCE_ALPHA),
1390 const_iv (GL_FLOAT), 1771 const_iv (GL_FLOAT),
1391 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1772 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392 const_iv (GL_COMPILE), 1773 const_iv (GL_COMPILE),
1393 const_iv (GL_TEXTURE_1D), 1774 const_iv (GL_TEXTURE_1D),
1394 const_iv (GL_TEXTURE_2D), 1775 const_iv (GL_TEXTURE_2D),
1396 const_iv (GL_TEXTURE_MAG_FILTER), 1777 const_iv (GL_TEXTURE_MAG_FILTER),
1397 const_iv (GL_TEXTURE_MIN_FILTER), 1778 const_iv (GL_TEXTURE_MIN_FILTER),
1398 const_iv (GL_TEXTURE_ENV_MODE), 1779 const_iv (GL_TEXTURE_ENV_MODE),
1399 const_iv (GL_TEXTURE_WRAP_S), 1780 const_iv (GL_TEXTURE_WRAP_S),
1400 const_iv (GL_TEXTURE_WRAP_T), 1781 const_iv (GL_TEXTURE_WRAP_T),
1782 const_iv (GL_REPEAT),
1401 const_iv (GL_CLAMP), 1783 const_iv (GL_CLAMP),
1402 const_iv (GL_REPEAT), 1784 const_iv (GL_CLAMP_TO_EDGE),
1403 const_iv (GL_NEAREST), 1785 const_iv (GL_NEAREST),
1404 const_iv (GL_LINEAR), 1786 const_iv (GL_LINEAR),
1405 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1787 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1406 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1788 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1407 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1789 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1408 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1790 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1409 const_iv (GL_GENERATE_MIPMAP), 1791 const_iv (GL_GENERATE_MIPMAP),
1410 const_iv (GL_MODULATE), 1792 const_iv (GL_MODULATE),
1411 const_iv (GL_DECAL), 1793 const_iv (GL_DECAL),
1412 const_iv (GL_REPLACE), 1794 const_iv (GL_REPLACE),
1795 const_iv (GL_DEPTH_BUFFER_BIT),
1413 const_iv (GL_COLOR_BUFFER_BIT), 1796 const_iv (GL_COLOR_BUFFER_BIT),
1414 const_iv (GL_PROJECTION), 1797 const_iv (GL_PROJECTION),
1415 const_iv (GL_MODELVIEW), 1798 const_iv (GL_MODELVIEW),
1416 const_iv (GL_COLOR_LOGIC_OP), 1799 const_iv (GL_COLOR_LOGIC_OP),
1417 const_iv (GL_SEPARABLE_2D), 1800 const_iv (GL_SEPARABLE_2D),
1418 const_iv (GL_CONVOLUTION_2D), 1801 const_iv (GL_CONVOLUTION_2D),
1419 const_iv (GL_CONVOLUTION_BORDER_MODE), 1802 const_iv (GL_CONVOLUTION_BORDER_MODE),
1420 const_iv (GL_CONSTANT_BORDER), 1803 const_iv (GL_CONSTANT_BORDER),
1421 const_iv (GL_LINES), 1804 const_iv (GL_LINES),
1805 const_iv (GL_LINE_LOOP),
1422 const_iv (GL_QUADS), 1806 const_iv (GL_QUADS),
1423 const_iv (GL_LINE_LOOP), 1807 const_iv (GL_QUAD_STRIP),
1808 const_iv (GL_TRIANGLES),
1809 const_iv (GL_TRIANGLE_STRIP),
1810 const_iv (GL_TRIANGLE_FAN),
1424 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1811 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1425 const_iv (GL_FASTEST), 1812 const_iv (GL_FASTEST),
1813 const_iv (GL_V2F),
1814 const_iv (GL_V3F),
1815 const_iv (GL_T2F_V3F),
1816 const_iv (GL_T2F_N3F_V3F),
1426# undef const_iv 1817# undef const_iv
1427 }; 1818 };
1428 1819
1429 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1820 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1430 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1821 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1431} 1822}
1432 1823
1824char *
1825gl_vendor ()
1826 CODE:
1827 RETVAL = (char *)glGetString (GL_VENDOR);
1828 OUTPUT:
1829 RETVAL
1830
1831char *
1832gl_version ()
1833 CODE:
1834 RETVAL = (char *)glGetString (GL_VERSION);
1835 OUTPUT:
1836 RETVAL
1837
1838char *
1839gl_extensions ()
1840 CODE:
1841 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1842 OUTPUT:
1843 RETVAL
1844
1433int glGetError () 1845int glGetError ()
1846
1847void glFinish ()
1434 1848
1435void glClear (int mask) 1849void glClear (int mask)
1436 1850
1437void glClearColor (float r, float g, float b, float a = 1.0) 1851void glClearColor (float r, float g, float b, float a = 1.0)
1438 PROTOTYPE: @ 1852 PROTOTYPE: @
1445 1859
1446void glHint (int target, int mode) 1860void glHint (int target, int mode)
1447 1861
1448void glBlendFunc (int sfactor, int dfactor) 1862void glBlendFunc (int sfactor, int dfactor)
1449 1863
1864void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1865 CODE:
1866 gl_BlendFuncSeparate (sa, da, saa, daa);
1867
1868void glDepthMask (int flag)
1869
1450void glLogicOp (int opcode) 1870void glLogicOp (int opcode)
1451 1871
1452void glColorMask (int red, int green, int blue, int alpha) 1872void glColorMask (int red, int green, int blue, int alpha)
1453 1873
1454void glMatrixMode (int mode) 1874void glMatrixMode (int mode)
1457 1877
1458void glPopMatrix () 1878void glPopMatrix ()
1459 1879
1460void glLoadIdentity () 1880void glLoadIdentity ()
1461 1881
1882void glDrawBuffer (int buffer)
1883
1884void glReadBuffer (int buffer)
1885
1462# near and far are due to microsofts buggy c compiler 1886# near_ and far_ are due to microsofts buggy "c" compiler
1887void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1888
1889# near_ and far_ are due to microsofts buggy "c" compiler
1463void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1890void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1464 1891
1465void glViewport (int x, int y, int width, int height) 1892void glViewport (int x, int y, int width, int height)
1466 1893
1467void glScissor (int x, int y, int width, int height) 1894void glScissor (int x, int y, int width, int height)
1482 1909
1483void glEnd () 1910void glEnd ()
1484 1911
1485void glColor (float r, float g, float b, float a = 1.0) 1912void glColor (float r, float g, float b, float a = 1.0)
1486 PROTOTYPE: @ 1913 PROTOTYPE: @
1914 ALIAS:
1915 glColor_premultiply = 1
1487 CODE: 1916 CODE:
1488 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1917 if (ix)
1918 {
1919 r *= a;
1920 g *= a;
1921 b *= a;
1922 }
1923 // microsoft visual "c" rounds instead of truncating...
1924 glColor4f (r, g, b, a);
1925
1926void glInterleavedArrays (int format, int stride, char *data)
1927
1928void glDrawElements (int mode, int count, int type, char *indices)
1929
1930# 1.2 void glDrawRangeElements (int mode, int start, int end
1931
1932void glRasterPos (float x, float y, float z = 0.)
1933 CODE:
1934 glRasterPos3f (0, 0, z);
1935 glBitmap (0, 0, 0, 0, x, y, 0);
1489 1936
1490void glVertex (float x, float y, float z = 0.) 1937void glVertex (float x, float y, float z = 0.)
1491 CODE: 1938 CODE:
1492 glVertex3f (x, y, z); 1939 glVertex3f (x, y, z);
1493 1940
1505 1952
1506void glBindTexture (int target, int name) 1953void glBindTexture (int target, int name)
1507 1954
1508void glConvolutionParameter (int target, int pname, float params) 1955void glConvolutionParameter (int target, int pname, float params)
1509 CODE: 1956 CODE:
1510 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1957 if (gl.ConvolutionParameterf)
1958 gl.ConvolutionParameterf (target, pname, params);
1511 1959
1512void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1960void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1513 CODE: 1961 CODE:
1514 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1962 if (gl.ConvolutionFilter2D)
1515 (target, internalformat, width, height, format, type, data)); 1963 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1516 1964
1517void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 1965void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1518 CODE: 1966 CODE:
1519 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1967 if (gl.SeparableFilter2D)
1520 (target, internalformat, width, height, format, type, row, column)); 1968 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1521 1969
1522void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1970void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1523 1971
1524void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1972void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1525 1973
1526void glRasterPos (int x, int y) 1974void glDrawPixels (int width, int height, int format, int type, char *pixels)
1527 CODE:
1528 glRasterPos2i (x, y);
1529 1975
1530void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1976void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1531 1977
1532int glGenTexture () 1978int glGenTexture ()
1533 CODE: 1979 CODE:
1560 2006
1561void glEndList () 2007void glEndList ()
1562 2008
1563void glCallList (int list) 2009void glCallList (int list)
1564 2010
2011

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines