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.71 by root, Fri May 5 19:05:47 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 = 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;
616
617 case SDL_USEREVENT:
618 hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
619 hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
620 hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
621 break;
506 } 622 }
507 623
508 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 624 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
509 } 625 }
510} 626}
511 627
512int 628int
513Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512) 629Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
514 POSTCALL: 630 POSTCALL:
515 Mix_HookMusicFinished (music_finished); 631 Mix_HookMusicFinished (music_finished);
516 Mix_ChannelFinished (channel_finished); 632 Mix_ChannelFinished (channel_finished);
517 633
518void 634void
526 CODE: 642 CODE:
527#ifndef _WIN32 643#ifndef _WIN32
528 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 644 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
529#endif 645#endif
530 646
531char *
532gl_version ()
533 CODE:
534 RETVAL = (char *)glGetString (GL_VERSION);
535 OUTPUT:
536 RETVAL
537
538char *
539gl_extensions ()
540 CODE:
541 RETVAL = (char *)glGetString (GL_EXTENSIONS);
542 OUTPUT:
543 RETVAL
544
545void 647void
546add_font (char *file) 648add_font (char *file)
547 CODE: 649 CODE:
548 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 650 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
549 651
550void 652void
551load_image_inline (SV *image_) 653load_image_inline (SV *image_)
552 ALIAS: 654 ALIAS:
553 load_image_file = 1 655 load_image_file = 1
595 697
596 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 698 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
597 699
598 assert (surface2->pitch == surface2->w * 4); 700 assert (surface2->pitch == surface2->w * 4);
599 701
702 SDL_LockSurface (surface2);
600 EXTEND (SP, 5); 703 EXTEND (SP, 6);
601 PUSHs (sv_2mortal (newSViv (surface2->w))); 704 PUSHs (sv_2mortal (newSViv (surface2->w)));
602 PUSHs (sv_2mortal (newSViv (surface2->h))); 705 PUSHs (sv_2mortal (newSViv (surface2->h)));
603 SDL_LockSurface (surface2);
604 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 706 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
605 SDL_UnlockSurface (surface2);
606 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)));
607 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 708 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
608 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 709 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
710 SDL_UnlockSurface (surface2);
609 711
610 SDL_FreeSurface (surface); 712 SDL_FreeSurface (surface);
611 SDL_FreeSurface (surface2); 713 SDL_FreeSurface (surface2);
612} 714}
613 715
637} 739}
638 740
639void 741void
640error (char *message) 742error (char *message)
641 CODE: 743 CODE:
744 fprintf (stderr, "ERROR: %s\n", message);
642#ifdef _WIN32 745#ifdef _WIN32
643 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 746 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
644#else
645 fprintf (stderr, "ERROR: %s\n", message);
646#endif 747#endif
647 748
648void 749void
649fatal (char *message) 750fatal (char *message)
650 CODE: 751 CODE:
752 fprintf (stderr, "FATAL: %s\n", message);
651#ifdef _WIN32 753#ifdef _WIN32
652 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 754 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
653#else
654 fprintf (stderr, "FATAL: %s\n", message);
655#endif 755#endif
656 exit (1); 756 _exit (1);
657 757
758void
759_exit (int retval)
760 CODE:
761 _exit (retval);
762
658MODULE = CFClient PACKAGE = CFClient::Font 763MODULE = CFPlus PACKAGE = CFPlus::Font
659 764
660CFClient::Font 765CFPlus::Font
661new_from_file (SV *class, char *path, int id = 0) 766new_from_file (SV *class, char *path, int id = 0)
662 CODE: 767 CODE:
663{ 768{
664 int count; 769 int count;
665 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 770 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
668} 773}
669 OUTPUT: 774 OUTPUT:
670 RETVAL 775 RETVAL
671 776
672void 777void
673DESTROY (CFClient::Font self) 778DESTROY (CFPlus::Font self)
674 CODE: 779 CODE:
675 pango_font_description_free (self); 780 pango_font_description_free (self);
676 781
677void 782void
678make_default (CFClient::Font self) 783make_default (CFPlus::Font self)
679 CODE: 784 CODE:
680 default_font = self; 785 default_font = self;
681 786
682MODULE = CFClient PACKAGE = CFClient::Layout 787MODULE = CFPlus PACKAGE = CFPlus::Layout
683 788
684CFClient::Layout 789void
685new (SV *class, int base_height = MIN_FONT_HEIGHT) 790reset_glyph_cache ()
791 CODE:
792 tc_clear ();
793
794CFPlus::Layout
795new (SV *class)
686 CODE: 796 CODE:
687 New (0, RETVAL, 1, struct cf_layout); 797 New (0, RETVAL, 1, struct cf_layout);
798
688 RETVAL->pl = pango_layout_new (context); 799 RETVAL->pl = pango_layout_new (opengl_context);
689 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;
690 RETVAL->font = 0; 805 RETVAL->font = 0;
806
691 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 807 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
692 pango_layout_set_font_description (RETVAL->pl, default_font); 808 layout_update_font (RETVAL);
693 OUTPUT: 809 OUTPUT:
694 RETVAL 810 RETVAL
695 811
696void 812void
697DESTROY (CFClient::Layout self) 813DESTROY (CFPlus::Layout self)
698 CODE: 814 CODE:
699 g_object_unref (self->pl); 815 g_object_unref (self->pl);
700 Safefree (self); 816 Safefree (self);
701 817
702void 818void
703set_text (CFClient::Layout self, SV *text_) 819set_text (CFPlus::Layout self, SV *text_)
704 CODE: 820 CODE:
705{ 821{
706 STRLEN textlen; 822 STRLEN textlen;
707 char *text = SvPVutf8 (text_, textlen); 823 char *text = SvPVutf8 (text_, textlen);
708 824
709 pango_layout_set_text (self->pl, text, textlen); 825 pango_layout_set_text (self->pl, text, textlen);
710} 826}
711 827
712void 828void
713set_markup (CFClient::Layout self, SV *text_) 829set_markup (CFPlus::Layout self, SV *text_)
714 CODE: 830 CODE:
715{ 831{
716 STRLEN textlen; 832 STRLEN textlen;
717 char *text = SvPVutf8 (text_, textlen); 833 char *text = SvPVutf8 (text_, textlen);
718 834
719 pango_layout_set_markup (self->pl, text, textlen); 835 pango_layout_set_markup (self->pl, text, textlen);
720} 836}
721 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
722SV * 923SV *
723get_text (CFClient::Layout self) 924get_text (CFPlus::Layout self)
724 CODE: 925 CODE:
725 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 926 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
726 SvUTF8_on (RETVAL); 927 sv_utf8_decode (RETVAL);
727 OUTPUT: 928 OUTPUT:
728 RETVAL 929 RETVAL
729 930
730void 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
731set_font (CFClient::Layout self, CFClient::Font font = 0) 940set_font (CFPlus::Layout self, CFPlus::Font font = 0)
732 CODE: 941 CODE:
733 if (self->font != font) 942 if (self->font != font)
734 { 943 {
735 self->font = font; 944 self->font = font;
736 layout_update_font (self); 945 layout_update_font (self);
737 } 946 }
738 947
739void 948void
740set_height (CFClient::Layout self, int base_height) 949set_height (CFPlus::Layout self, int base_height)
741 CODE: 950 CODE:
742 if (self->base_height != base_height) 951 if (self->base_height != base_height)
743 { 952 {
744 self->base_height = base_height; 953 self->base_height = base_height;
745 layout_update_font (self); 954 layout_update_font (self);
746 } 955 }
747 956
748void 957void
749set_width (CFClient::Layout self, int max_width = -1) 958set_width (CFPlus::Layout self, int max_width = -1)
750 CODE: 959 CODE:
751 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);
752 961
753void 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
754size (CFClient::Layout self) 988size (CFPlus::Layout self)
755 PPCODE: 989 PPCODE:
756{ 990{
757 int w, h; 991 int w, h;
758 992
759 layout_get_pixel_size (self, &w, &h); 993 layout_get_pixel_size (self, &w, &h);
762 PUSHs (sv_2mortal (newSViv (w))); 996 PUSHs (sv_2mortal (newSViv (w)));
763 PUSHs (sv_2mortal (newSViv (h))); 997 PUSHs (sv_2mortal (newSViv (h)));
764} 998}
765 999
766int 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
767xy_to_index (CFClient::Layout self, int x, int y) 1013xy_to_index (CFPlus::Layout self, int x, int y)
768 CODE: 1014 CODE:
769{ 1015{
770 int index, trailing; 1016 int index, trailing;
771 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);
772 RETVAL = index; 1018 RETVAL = index;
773} 1019}
774 OUTPUT: 1020 OUTPUT:
775 RETVAL 1021 RETVAL
776 1022
777void 1023void
778cursor_pos (CFClient::Layout self, int index) 1024cursor_pos (CFPlus::Layout self, int index)
779 PPCODE: 1025 PPCODE:
780{ 1026{
781 PangoRectangle strong_pos; 1027 PangoRectangle strong_pos;
782 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1028 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
783 1029
786 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1032 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
787 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1033 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
788} 1034}
789 1035
790void 1036void
791render (CFClient::Layout self) 1037render (CFPlus::Layout self, float x, float y, int flags = 0)
792 PPCODE: 1038 PPCODE:
793{ 1039 pango_opengl_render_layout_subpixel (
794 SV *retval; 1040 self->pl,
795 int w, h; 1041 x * PANGO_SCALE, y * PANGO_SCALE,
796 FT_Bitmap bitmap; 1042 self->r, self->g, self->b, self->a,
1043 flags
1044 );
797 1045
798 layout_get_pixel_size (self, &w, &h); 1046MODULE = CFPlus PACKAGE = CFPlus::Texture
799 1047
800 retval = newSV (w * h); 1048void
801 SvPOK_only (retval); 1049pad2pot (SV *data_, SV *w_, SV *h_)
802 SvCUR_set (retval, w * h); 1050 CODE:
1051{
1052 int ow = SvIV (w_);
1053 int oh = SvIV (h_);
803 1054
804 bitmap.rows = h; 1055 if (ow && oh)
805 bitmap.width = w; 1056 {
806 bitmap.pitch = w; 1057 int nw = minpot (ow);
807 bitmap.buffer = (unsigned char*)SvPVX (retval); 1058 int nh = minpot (oh);
808 bitmap.num_grays = 256;
809 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
810 1059
811 memset (bitmap.buffer, 0, w * h); 1060 if (nw != ow || nh != oh)
812 1061 {
813 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));
814 1068
815 EXTEND (SP, 3); 1069 SvPOK_only (result_);
816 PUSHs (sv_2mortal (newSViv (w))); 1070 SvCUR_set (result_, nw * nh * bpp);
817 PUSHs (sv_2mortal (newSViv (h)));
818 PUSHs (sv_2mortal (retval));
819}
820 1071
821MODULE = 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);
822 1075
1076 sv_setsv (data_, result_);
1077 }
1078
1079 sv_setiv (w_, nw);
1080 sv_setiv (h_, nh);
1081 }
1082 }
1083}
1084
823void 1085void
824draw_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.)
825 PROTOTYPE: $$$;$$ 1087 PROTOTYPE: $$$;$$
1088 ALIAS:
1089 draw_quad_alpha = 1
1090 draw_quad_alpha_premultiplied = 2
826 CODE: 1091 CODE:
827{ 1092{
828 HV *hv = (HV *)SvRV (self); 1093 HV *hv = (HV *)SvRV (self);
829 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1094 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
830 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1095 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
831 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1096 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
832 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
833 1097
834 if (items < 5) 1098 if (items < 5)
835 { 1099 {
836 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1100 w = SvNV (*hv_fetch (hv, "w", 1, 1));
837 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1101 h = SvNV (*hv_fetch (hv, "h", 1, 1));
838 } 1102 }
839 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
840 glBindTexture (GL_TEXTURE_2D, name); 1118 glBindTexture (GL_TEXTURE_2D, name);
841 if (wrap_mode) { 1119
842 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
843 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
844 }
845 glBegin (GL_QUADS); 1120 glBegin (GL_QUADS);
846 glTexCoord2f (0, 0); glVertex2f (x , y ); 1121 glTexCoord2f (0, 0); glVertex2f (x , y );
847 glTexCoord2f (0, t); glVertex2f (x , y + h); 1122 glTexCoord2f (0, t); glVertex2f (x , y + h);
848 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1123 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
849 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1124 glTexCoord2f (s, 0); glVertex2f (x + w, y );
850 glEnd (); 1125 glEnd ();
851}
852 1126
1127 if (ix)
1128 {
1129 glDisable (GL_ALPHA_TEST);
1130 glDisable (GL_BLEND);
1131 }
1132}
1133
853MODULE = CFClient PACKAGE = CFClient::Map 1134MODULE = CFPlus PACKAGE = CFPlus::Map
854 1135
855CFClient::Map 1136CFPlus::Map
856new (SV *class, int map_width, int map_height) 1137new (SV *class, int map_width, int map_height)
857 CODE: 1138 CODE:
858 New (0, RETVAL, 1, struct map); 1139 New (0, RETVAL, 1, struct map);
859 RETVAL->x = 0; 1140 RETVAL->x = 0;
860 RETVAL->y = 0; 1141 RETVAL->y = 0;
870 RETVAL->row = 0; 1151 RETVAL->row = 0;
871 OUTPUT: 1152 OUTPUT:
872 RETVAL 1153 RETVAL
873 1154
874void 1155void
875DESTROY (CFClient::Map self) 1156DESTROY (CFPlus::Map self)
876 CODE: 1157 CODE:
877{ 1158{
878 map_clear (self); 1159 map_clear (self);
879 Safefree (self->face); 1160 Safefree (self->face);
1161 Safefree (self->tex);
880 Safefree (self); 1162 Safefree (self);
881} 1163}
882 1164
883void 1165void
884clear (CFClient::Map self) 1166clear (CFPlus::Map self)
885 CODE: 1167 CODE:
886 map_clear (self); 1168 map_clear (self);
887 1169
888void 1170void
889set_face (CFClient::Map self, int face, int texid) 1171set_face (CFPlus::Map self, int face, int texid)
890 CODE: 1172 CODE:
891{ 1173{
892 while (self->faces <= face) 1174 while (self->faces <= face)
893 { 1175 {
894 Append (mapface, self->face, self->faces, self->faces); 1176 Append (mapface, self->face, self->faces, self->faces);
897 1179
898 self->face [face] = texid; 1180 self->face [face] = texid;
899} 1181}
900 1182
901void 1183void
902set_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)
903 CODE: 1185 CODE:
904{ 1186{
905 while (self->texs <= texid) 1187 while (self->texs <= texid)
906 { 1188 {
907 Append (maptex, self->tex, self->texs, self->texs); 1189 Append (maptex, self->tex, self->texs, self->texs);
919 tex->r = r; 1201 tex->r = r;
920 tex->g = g; 1202 tex->g = g;
921 tex->b = b; 1203 tex->b = b;
922 tex->a = a; 1204 tex->a = a;
923 } 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);
924} 1215}
925 1216
926int 1217int
927ox (CFClient::Map self) 1218ox (CFPlus::Map self)
928 ALIAS: 1219 ALIAS:
929 oy = 1 1220 oy = 1
1221 x = 2
1222 y = 3
1223 w = 4
1224 h = 5
930 CODE: 1225 CODE:
931 switch (ix) 1226 switch (ix)
932 { 1227 {
933 case 0: RETVAL = self->ox; break; 1228 case 0: RETVAL = self->ox; break;
934 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;
935 } 1234 }
936 OUTPUT: 1235 OUTPUT:
937 RETVAL 1236 RETVAL
938 1237
939void 1238void
940scroll (CFClient::Map self, int dx, int dy) 1239scroll (CFPlus::Map self, int dx, int dy)
941 CODE: 1240 CODE:
942{ 1241{
943 if (dx > 0) 1242 if (dx > 0)
944 map_blank (self, self->x, self->y, dx - 1, self->h); 1243 map_blank (self, self->x, self->y, dx - 1, self->h);
945 else if (dx < 0) 1244 else if (dx < 0)
961 self->y += MAP_EXTEND_Y; 1260 self->y += MAP_EXTEND_Y;
962 } 1261 }
963} 1262}
964 1263
965void 1264void
966map1a_update (CFClient::Map self, SV *data_) 1265map1a_update (CFPlus::Map self, SV *data_)
967 CODE: 1266 CODE:
968{ 1267{
969 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1268 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
970 uint8_t *data_end = (uint8_t *)SvEND (data_); 1269 uint8_t *data_end = (uint8_t *)SvEND (data_);
971 mapcell *cell; 1270 mapcell *cell;
973 1272
974 while (data < data_end) 1273 while (data < data_end)
975 { 1274 {
976 flags = (data [0] << 8) + data [1]; data += 2; 1275 flags = (data [0] << 8) + data [1]; data += 2;
977 1276
978 x = ((flags >> 10) & 63) + self->x; 1277 x = self->x + ((flags >> 10) & 63);
979 y = ((flags >> 4) & 63) + self->y; 1278 y = self->y + ((flags >> 4) & 63);
980 1279
981 cell = map_get_cell (self, x, y); 1280 cell = map_get_cell (self, x, y);
982 1281
983 if (flags & 15) 1282 if (flags & 15)
984 { 1283 {
1013 cell->darkness = -1; 1312 cell->darkness = -1;
1014 } 1313 }
1015} 1314}
1016 1315
1017SV * 1316SV *
1018mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1317mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1019 CODE: 1318 CODE:
1020{ 1319{
1021 int x1, x; 1320 int x1, x;
1022 int y1, y; 1321 int y1, y;
1023 int z; 1322 int z;
1073} 1372}
1074 OUTPUT: 1373 OUTPUT:
1075 RETVAL 1374 RETVAL
1076 1375
1077void 1376void
1078draw (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)
1079 PPCODE: 1378 CODE:
1080{ 1379{
1081 int vx, vy; 1380 int vx, vy;
1082 int x, y, z; 1381 int x, y, z;
1083 int last_name; 1382 int last_name;
1084 mapface face; 1383 mapface face;
1085 int sw4 = (sw + 3) & ~3;
1086 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1087 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1088 1384
1089 memset (darkness, 255, sw4 * sh);
1090 SvPOK_only (darkness_sv);
1091 SvCUR_set (darkness_sv, sw4 * sh);
1092
1093 vx = self->x + (self->w - sw) / 2 - shift_x; 1385 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1094 vy = self->y + (self->h - sh) / 2 - shift_y; 1386 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1095 1387
1096 /* 1388 /*
1097 int vx = self->vx = self->w >= sw 1389 int vx = self->vx = self->w >= sw
1098 ? self->x + (self->w - sw) / 2 1390 ? self->x + (self->w - sw) / 2
1099 : 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));
1103 : 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));
1104 */ 1396 */
1105 1397
1106 glColor4ub (255, 255, 255, 255); 1398 glColor4ub (255, 255, 255, 255);
1107 1399
1400 glEnable (GL_BLEND);
1108 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1401 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1109 glEnable (GL_BLEND);
1110 glEnable (GL_TEXTURE_2D); 1402 glEnable (GL_TEXTURE_2D);
1111 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1403 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1112 1404
1113 glBegin (GL_QUADS); 1405 glBegin (GL_QUADS);
1114 1406
1122 1414
1123 for (x = 0; x < sw; x++) 1415 for (x = 0; x < sw; x++)
1124 if (row->c0 <= x + vx && x + vx < row->c1) 1416 if (row->c0 <= x + vx && x + vx < row->c1)
1125 { 1417 {
1126 mapcell *cell = row->col + (x + vx - row->c0); 1418 mapcell *cell = row->col + (x + vx - row->c0);
1127
1128 darkness[y * sw4 + x] = cell->darkness < 0
1129 ? 255 - FOW_DARKNESS
1130 : 255 - cell->darkness;
1131 1419
1132 face = cell->face [z]; 1420 face = cell->face [z];
1133 1421
1134 if (face) 1422 if (face)
1135 { 1423 {
1156 1444
1157 glEnd (); 1445 glEnd ();
1158 1446
1159 glDisable (GL_TEXTURE_2D); 1447 glDisable (GL_TEXTURE_2D);
1160 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 }
1161 1543
1162 EXTEND (SP, 3); 1544 EXTEND (SP, 3);
1163 PUSHs (sv_2mortal (newSViv (sw4))); 1545 PUSHs (sv_2mortal (newSViv (sw4)));
1164 PUSHs (sv_2mortal (newSViv (sh))); 1546 PUSHs (sv_2mortal (newSViv (sh)));
1165 PUSHs (darkness_sv); 1547 PUSHs (darkness_sv);
1166} 1548}
1167 1549
1168SV * 1550SV *
1169get_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)
1170 CODE: 1552 CODE:
1171{ 1553{
1172 int x, y, x1, y1; 1554 int x, y, x1, y1;
1173 SV *data_sv = newSV (w * h * 7 + 5); 1555 SV *data_sv = newSV (w * h * 7 + 5);
1174 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1556 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1236} 1618}
1237 OUTPUT: 1619 OUTPUT:
1238 RETVAL 1620 RETVAL
1239 1621
1240void 1622void
1241set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1623set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1242 PPCODE: 1624 PPCODE:
1243{ 1625{
1244 int x, y, z; 1626 int x, y, z;
1245 int w, h; 1627 int w, h;
1246 int x1, y1; 1628 int x1, y1;
1295 } 1677 }
1296 } 1678 }
1297 } 1679 }
1298} 1680}
1299 1681
1300MODULE = CFClient PACKAGE = CFClient::MixChunk 1682MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1301 1683
1302CFClient::MixChunk 1684CFPlus::MixChunk
1303new_from_file (SV *class, char *path) 1685new_from_file (SV *class, char *path)
1304 CODE: 1686 CODE:
1305 RETVAL = Mix_LoadWAV (path); 1687 RETVAL = Mix_LoadWAV (path);
1306 OUTPUT: 1688 OUTPUT:
1307 RETVAL 1689 RETVAL
1308 1690
1309void 1691void
1310DESTROY (CFClient::MixChunk self) 1692DESTROY (CFPlus::MixChunk self)
1311 CODE: 1693 CODE:
1312 Mix_FreeChunk (self); 1694 Mix_FreeChunk (self);
1313 1695
1314int 1696int
1315volume (CFClient::MixChunk self, int volume = -1) 1697volume (CFPlus::MixChunk self, int volume = -1)
1316 CODE: 1698 CODE:
1317 RETVAL = Mix_VolumeChunk (self, volume); 1699 RETVAL = Mix_VolumeChunk (self, volume);
1318 OUTPUT: 1700 OUTPUT:
1319 RETVAL 1701 RETVAL
1320 1702
1321int 1703int
1322play (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)
1323 CODE: 1705 CODE:
1324 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1706 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1325 OUTPUT: 1707 OUTPUT:
1326 RETVAL 1708 RETVAL
1327 1709
1328MODULE = CFClient PACKAGE = CFClient::MixMusic 1710MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1329 1711
1330int 1712int
1331volume (int volume = -1) 1713volume (int volume = -1)
1332 CODE: 1714 CODE:
1333 RETVAL = Mix_VolumeMusic (volume); 1715 RETVAL = Mix_VolumeMusic (volume);
1334 OUTPUT: 1716 OUTPUT:
1335 RETVAL 1717 RETVAL
1336 1718
1337CFClient::MixMusic 1719CFPlus::MixMusic
1338new_from_file (SV *class, char *path) 1720new_from_file (SV *class, char *path)
1339 CODE: 1721 CODE:
1340 RETVAL = Mix_LoadMUS (path); 1722 RETVAL = Mix_LoadMUS (path);
1341 OUTPUT: 1723 OUTPUT:
1342 RETVAL 1724 RETVAL
1343 1725
1344void 1726void
1345DESTROY (CFClient::MixMusic self) 1727DESTROY (CFPlus::MixMusic self)
1346 CODE: 1728 CODE:
1347 Mix_FreeMusic (self); 1729 Mix_FreeMusic (self);
1348 1730
1349int 1731int
1350play (CFClient::MixMusic self, int loops = -1) 1732play (CFPlus::MixMusic self, int loops = -1)
1351 CODE: 1733 CODE:
1352 RETVAL = Mix_PlayMusic (self, loops); 1734 RETVAL = Mix_PlayMusic (self, loops);
1353 OUTPUT: 1735 OUTPUT:
1354 RETVAL 1736 RETVAL
1355 1737
1356MODULE = CFClient PACKAGE = CFClient::OpenGL 1738MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1357 1739
1358BOOT: 1740BOOT:
1359{ 1741{
1360 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1742 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1361 static const struct { 1743 static const struct {
1362 const char *name; 1744 const char *name;
1363 IV iv; 1745 IV iv;
1364 } *civ, const_iv[] = { 1746 } *civ, const_iv[] = {
1365# define const_iv(name) { # name, (IV)name } 1747# define const_iv(name) { # name, (IV)name }
1366 const_iv (GL_COLOR_MATERIAL), 1748 const_iv (GL_COLOR_MATERIAL),
1367 const_iv (GL_SMOOTH), 1749 const_iv (GL_SMOOTH),
1368 const_iv (GL_FLAT), 1750 const_iv (GL_FLAT),
1369 const_iv (GL_DITHER), 1751 const_iv (GL_DITHER),
1370 const_iv (GL_BLEND), 1752 const_iv (GL_BLEND),
1753 const_iv (GL_CULL_FACE),
1371 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),
1372 const_iv (GL_AND), 1761 const_iv (GL_AND),
1373 const_iv (GL_ONE), 1762 const_iv (GL_ONE),
1374 const_iv (GL_ZERO), 1763 const_iv (GL_ZERO),
1375 const_iv (GL_SRC_ALPHA), 1764 const_iv (GL_SRC_ALPHA),
1376 const_iv (GL_SRC_ALPHA_SATURATE), 1765 const_iv (GL_DST_ALPHA),
1377 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1766 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1378 const_iv (GL_ONE_MINUS_DST_ALPHA), 1767 const_iv (GL_ONE_MINUS_DST_ALPHA),
1768 const_iv (GL_SRC_ALPHA_SATURATE),
1379 const_iv (GL_RGB), 1769 const_iv (GL_RGB),
1380 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),
1381 const_iv (GL_UNSIGNED_BYTE), 1774 const_iv (GL_UNSIGNED_BYTE),
1775 const_iv (GL_UNSIGNED_SHORT),
1776 const_iv (GL_UNSIGNED_INT),
1382 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),
1383 const_iv (GL_FLOAT), 1781 const_iv (GL_FLOAT),
1384 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1782 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1385 const_iv (GL_COMPILE), 1783 const_iv (GL_COMPILE),
1386 const_iv (GL_TEXTURE_1D), 1784 const_iv (GL_TEXTURE_1D),
1387 const_iv (GL_TEXTURE_2D), 1785 const_iv (GL_TEXTURE_2D),
1389 const_iv (GL_TEXTURE_MAG_FILTER), 1787 const_iv (GL_TEXTURE_MAG_FILTER),
1390 const_iv (GL_TEXTURE_MIN_FILTER), 1788 const_iv (GL_TEXTURE_MIN_FILTER),
1391 const_iv (GL_TEXTURE_ENV_MODE), 1789 const_iv (GL_TEXTURE_ENV_MODE),
1392 const_iv (GL_TEXTURE_WRAP_S), 1790 const_iv (GL_TEXTURE_WRAP_S),
1393 const_iv (GL_TEXTURE_WRAP_T), 1791 const_iv (GL_TEXTURE_WRAP_T),
1792 const_iv (GL_REPEAT),
1394 const_iv (GL_CLAMP), 1793 const_iv (GL_CLAMP),
1395 const_iv (GL_REPEAT), 1794 const_iv (GL_CLAMP_TO_EDGE),
1396 const_iv (GL_NEAREST), 1795 const_iv (GL_NEAREST),
1397 const_iv (GL_LINEAR), 1796 const_iv (GL_LINEAR),
1398 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1797 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1399 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1798 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1400 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1799 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1401 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1800 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1402 const_iv (GL_GENERATE_MIPMAP), 1801 const_iv (GL_GENERATE_MIPMAP),
1403 const_iv (GL_MODULATE), 1802 const_iv (GL_MODULATE),
1404 const_iv (GL_DECAL), 1803 const_iv (GL_DECAL),
1405 const_iv (GL_REPLACE), 1804 const_iv (GL_REPLACE),
1805 const_iv (GL_DEPTH_BUFFER_BIT),
1406 const_iv (GL_COLOR_BUFFER_BIT), 1806 const_iv (GL_COLOR_BUFFER_BIT),
1407 const_iv (GL_PROJECTION), 1807 const_iv (GL_PROJECTION),
1408 const_iv (GL_MODELVIEW), 1808 const_iv (GL_MODELVIEW),
1409 const_iv (GL_COLOR_LOGIC_OP), 1809 const_iv (GL_COLOR_LOGIC_OP),
1410 const_iv (GL_SEPARABLE_2D), 1810 const_iv (GL_SEPARABLE_2D),
1411 const_iv (GL_CONVOLUTION_2D), 1811 const_iv (GL_CONVOLUTION_2D),
1412 const_iv (GL_CONVOLUTION_BORDER_MODE), 1812 const_iv (GL_CONVOLUTION_BORDER_MODE),
1413 const_iv (GL_CONSTANT_BORDER), 1813 const_iv (GL_CONSTANT_BORDER),
1414 const_iv (GL_LINES), 1814 const_iv (GL_LINES),
1815 const_iv (GL_LINE_STRIP),
1816 const_iv (GL_LINE_LOOP),
1415 const_iv (GL_QUADS), 1817 const_iv (GL_QUADS),
1416 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),
1417 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1822 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1418 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),
1419# undef const_iv 1828# undef const_iv
1420 }; 1829 };
1421 1830
1422 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; )
1423 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1832 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1424} 1833}
1425 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
1426int glGetError () 1856int glGetError ()
1857
1858void glFinish ()
1427 1859
1428void glClear (int mask) 1860void glClear (int mask)
1429 1861
1430void glClearColor (float r, float g, float b, float a = 1.0) 1862void glClearColor (float r, float g, float b, float a = 1.0)
1431 PROTOTYPE: @ 1863 PROTOTYPE: @
1438 1870
1439void glHint (int target, int mode) 1871void glHint (int target, int mode)
1440 1872
1441void glBlendFunc (int sfactor, int dfactor) 1873void glBlendFunc (int sfactor, int dfactor)
1442 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
1443void glLogicOp (int opcode) 1881void glLogicOp (int opcode)
1444 1882
1445void glColorMask (int red, int green, int blue, int alpha) 1883void glColorMask (int red, int green, int blue, int alpha)
1446 1884
1447void glMatrixMode (int mode) 1885void glMatrixMode (int mode)
1450 1888
1451void glPopMatrix () 1889void glPopMatrix ()
1452 1890
1453void glLoadIdentity () 1891void glLoadIdentity ()
1454 1892
1893void glDrawBuffer (int buffer)
1894
1895void glReadBuffer (int buffer)
1896
1455# 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
1456void 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_)
1457 1902
1458void glViewport (int x, int y, int width, int height) 1903void glViewport (int x, int y, int width, int height)
1459 1904
1460void glScissor (int x, int y, int width, int height) 1905void glScissor (int x, int y, int width, int height)
1475 1920
1476void glEnd () 1921void glEnd ()
1477 1922
1478void glColor (float r, float g, float b, float a = 1.0) 1923void glColor (float r, float g, float b, float a = 1.0)
1479 PROTOTYPE: @ 1924 PROTOTYPE: @
1925 ALIAS:
1926 glColor_premultiply = 1
1480 CODE: 1927 CODE:
1481 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);
1482 1947
1483void glVertex (float x, float y, float z = 0.) 1948void glVertex (float x, float y, float z = 0.)
1484 CODE: 1949 CODE:
1485 glVertex3f (x, y, z); 1950 glVertex3f (x, y, z);
1486 1951
1498 1963
1499void glBindTexture (int target, int name) 1964void glBindTexture (int target, int name)
1500 1965
1501void glConvolutionParameter (int target, int pname, float params) 1966void glConvolutionParameter (int target, int pname, float params)
1502 CODE: 1967 CODE:
1503 GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params)); 1968 if (gl.ConvolutionParameterf)
1969 gl.ConvolutionParameterf (target, pname, params);
1504 1970
1505void 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)
1506 CODE: 1972 CODE:
1507 GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D, 1973 if (gl.ConvolutionFilter2D)
1508 (target, internalformat, width, height, format, type, data)); 1974 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1509 1975
1510void 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)
1511 CODE: 1977 CODE:
1512 GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D, 1978 if (gl.SeparableFilter2D)
1513 (target, internalformat, width, height, format, type, row, column)); 1979 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1514 1980
1515void 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)
1516 1982
1517void 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)
1518 1984
1519void glRasterPos (int x, int y) 1985void glDrawPixels (int width, int height, int format, int type, char *pixels)
1520 CODE:
1521 glRasterPos2i (x, y);
1522 1986
1523void 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)
1524 1988
1525int glGenTexture () 1989int glGenTexture ()
1526 CODE: 1990 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines