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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines