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.63 by root, Mon Apr 24 06:05:33 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines