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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines