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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines