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.57 by root, Fri Apr 21 07:09:10 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
57#define MIN_FONT_HEIGHT 10
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
45typedef Mix_Chunk *CFClient__MixChunk; 88typedef Mix_Chunk *CFPlus__MixChunk;
46typedef Mix_Music *CFClient__MixMusic; 89typedef Mix_Music *CFPlus__MixMusic;
47 90
48static PangoContext *context; 91typedef PangoFontDescription *CFPlus__Font;
49static PangoFontMap *fontmap; 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}
50 110
51typedef struct cf_layout { 111typedef struct cf_layout {
52 PangoLayout *pl; 112 PangoLayout *pl;
113 float r, g, b, a; // default color for rgba mode
53 int base_height; 114 int base_height;
115 CFPlus__Font font;
54} *CFClient__Layout; 116} *CFPlus__Layout;
117
118static CFPlus__Font default_font;
119static PangoContext *opengl_context;
120static PangoFontMap *opengl_fontmap;
55 121
56static void 122static void
57substitute_func (FcPattern *pattern, gpointer data) 123substitute_func (FcPattern *pattern, gpointer data)
58{ 124{
59 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
60 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 129 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
61} 130}
62 131
63static void 132static void
64layout_update (CFClient__Layout self) 133layout_update_font (CFPlus__Layout self)
65{ 134{
66 /* 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
67 * reasonably well with bitstream vera 136 * reasonably well with bitstream vera
68 */ 137 */
69 PangoFontDescription *font = pango_context_get_font_description (context); 138 PangoFontDescription *font = self->font ? self->font : default_font;
70 139
71 int height = self->base_height * (PANGO_SCALE * 8 / 10);
72
73 if (pango_font_description_get_size (font) != height)
74 {
75 pango_font_description_set_absolute_size (font, height); 140 pango_font_description_set_absolute_size (font,
76 pango_layout_context_changed (self->pl); 141 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
77 } 142
143 pango_layout_set_font_description (self->pl, font);
78} 144}
79 145
80static void 146static void
81layout_get_pixel_size (CFClient__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
82{ 148{
83 layout_update (self);
84
85 pango_layout_get_pixel_size (self->pl, w, h); 149 pango_layout_get_pixel_size (self->pl, w, h);
86 150
87 *w = (*w + 3) & ~3;
88 if (!*w) *w = 1; 151 if (!*w) *w = 1;
89 if (!*h) *h = 1; 152 if (!*h) *h = 1;
153
154 *w = (*w + 3) & ~3;
90} 155}
91 156
92typedef uint16_t mapface; 157typedef uint16_t mapface;
93 158
94typedef struct { 159typedef struct {
117 int texs; 182 int texs;
118 maptex *tex; 183 maptex *tex;
119 184
120 int32_t rows; 185 int32_t rows;
121 maprow *row; 186 maprow *row;
122} *CFClient__Map; 187} *CFPlus__Map;
123 188
124static char * 189static char *
125prepend (char *ptr, int sze, int inc) 190prepend (char *ptr, int sze, int inc)
126{ 191{
127 char *p; 192 char *p;
145 210
146#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))
147#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))
148 213
149static maprow * 214static maprow *
150map_get_row (CFClient__Map self, int y) 215map_get_row (CFPlus__Map self, int y)
151{ 216{
152 if (0 > y) 217 if (0 > y)
153 { 218 {
154 int extend = - y + MAP_EXTEND_Y; 219 int extend = - y + MAP_EXTEND_Y;
155 Prepend (maprow, self->row, self->rows, extend); 220 Prepend (maprow, self->row, self->rows, extend);
193 258
194 return row->col + (x - row->c0); 259 return row->col + (x - row->c0);
195} 260}
196 261
197static mapcell * 262static mapcell *
198map_get_cell (CFClient__Map self, int x, int y) 263map_get_cell (CFPlus__Map self, int x, int y)
199{ 264{
200 return row_get_cell (map_get_row (self, y), x); 265 return row_get_cell (map_get_row (self, y), x);
201} 266}
202 267
203static void 268static void
204map_clear (CFClient__Map self) 269map_clear (CFPlus__Map self)
205{ 270{
206 int r; 271 int r;
207 272
208 for (r = 0; r < self->rows; r++) 273 for (r = 0; r < self->rows; r++)
209 Safefree (self->row[r].col); 274 Safefree (self->row[r].col);
217 self->row = 0; 282 self->row = 0;
218 self->rows = 0; 283 self->rows = 0;
219} 284}
220 285
221static void 286static void
222map_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)
223{ 288{
224 int x, y; 289 int x, y;
225 maprow *row; 290 maprow *row;
226 291
227 for (y = y0; y < y0 + h; y++) 292 for (y = y0; y < y0 + h; y++)
242 } 307 }
243 } 308 }
244} 309}
245 310
246static void 311static void
247music_finished () 312music_finished (void)
248{ 313{
249 SDL_UserEvent ev; 314 SDL_UserEvent ev;
250 315
251 ev.type = SDL_USEREVENT; 316 ev.type = SDL_USEREVENT;
252 ev.code = 0; 317 ev.code = 0;
254 ev.data2 = 0; 319 ev.data2 = 0;
255 320
256 SDL_PushEvent ((SDL_Event *)&ev); 321 SDL_PushEvent ((SDL_Event *)&ev);
257} 322}
258 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
259MODULE = CFClient PACKAGE = CFClient 354MODULE = CFPlus PACKAGE = CFPlus
260 355
261PROTOTYPES: ENABLE 356PROTOTYPES: ENABLE
262 357
263BOOT: 358BOOT:
264{ 359{
265 HV *stash = gv_stashpv ("CFClient", 1); 360 HV *stash = gv_stashpv ("CFPlus", 1);
266 static const struct { 361 static const struct {
267 const char *name; 362 const char *name;
268 IV iv; 363 IV iv;
269 } *civ, const_iv[] = { 364 } *civ, const_iv[] = {
270# define const_iv(name) { # name, (IV)name } 365# define const_iv(name) { # name, (IV)name }
369# undef const_iv 464# undef const_iv
370 }; 465 };
371 466
372 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; )
373 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 468 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
374
375 fontmap = pango_ft2_font_map_new ();
376 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
377 context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
378} 469}
379 470
380int 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
381SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 492SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
382 493
383void 494void
384SDL_Quit () 495SDL_Quit ()
385 496
386void 497void
392 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 503 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
393 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 504 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
394 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 505 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
395 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 506 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
396 507
508 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
509 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
510
397 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 511 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
398 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 512 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
399 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 513 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
400 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 514 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
401 515
402 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 516 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
517#if SDL_VERSION_ATLEAST(1,2,10)
403 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
404 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif
405 521
406 SDL_EnableUNICODE (1); 522 SDL_EnableUNICODE (1);
407 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
408 524
409 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
418 534
419 ++m; 535 ++m;
420 } 536 }
421} 537}
422 538
539char *
540SDL_GetError ()
541
423int 542int
424SDL_SetVideoMode (int w, int h, int fullscreen) 543SDL_SetVideoMode (int w, int h, int fullscreen)
425 CODE: 544 CODE:
426 RETVAL = !!SDL_SetVideoMode ( 545 RETVAL = !!SDL_SetVideoMode (
427 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 546 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
428 ); 547 );
548 if (RETVAL)
549 {
429 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 }
430 OUTPUT: 555 OUTPUT:
431 RETVAL 556 RETVAL
432 557
433void 558void
434SDL_GL_SwapBuffers () 559SDL_GL_SwapBuffers ()
560
561char *
562SDL_GetKeyName (int sym)
435 563
436void 564void
437SDL_PollEvent () 565SDL_PollEvent ()
438 PPCODE: 566 PPCODE:
439{ 567{
441 569
442 while (SDL_PollEvent (&ev)) 570 while (SDL_PollEvent (&ev))
443 { 571 {
444 HV *hv = newHV (); 572 HV *hv = newHV ();
445 hv_store (hv, "type", 4, newSViv (ev.type), 0); 573 hv_store (hv, "type", 4, newSViv (ev.type), 0);
574
446 switch (ev.type) 575 switch (ev.type)
447 { 576 {
448 case SDL_KEYDOWN: 577 case SDL_KEYDOWN:
449 case SDL_KEYUP: 578 case SDL_KEYUP:
450 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 579 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
457 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
458 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 587 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
459 break; 588 break;
460 589
461 case SDL_MOUSEMOTION: 590 case SDL_MOUSEMOTION:
591 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
592
462 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 593 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
463 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 594 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
464 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 595 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
465 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 596 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
466 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 597 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
467 break; 598 break;
468 599
469 case SDL_MOUSEBUTTONDOWN: 600 case SDL_MOUSEBUTTONDOWN:
470 case SDL_MOUSEBUTTONUP: 601 case SDL_MOUSEBUTTONUP:
602 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
603
471 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 604 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
472 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
473 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 606 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
474 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 607 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
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;
475 } 615 }
476 616
477 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 617 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
478 } 618 }
479} 619}
480 620
481int 621int
482Mix_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)
483 POSTCALL: 623 POSTCALL:
484 Mix_HookMusicFinished (music_finished); 624 Mix_HookMusicFinished (music_finished);
625 Mix_ChannelFinished (channel_finished);
485 626
486void 627void
487Mix_CloseAudio () 628Mix_CloseAudio ()
488 629
489int 630int
494 CODE: 635 CODE:
495#ifndef _WIN32 636#ifndef _WIN32
496 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
497#endif 638#endif
498 639
499char *
500gl_version ()
501 CODE:
502 RETVAL = (char *)glGetString (GL_VERSION);
503 OUTPUT:
504 RETVAL
505
506char *
507gl_extensions ()
508 CODE:
509 RETVAL = (char *)glGetString (GL_EXTENSIONS);
510 OUTPUT:
511 RETVAL
512
513void 640void
514add_font (char *file) 641add_font (char *file)
515 CODE: 642 CODE:
516 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 643 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
517
518void
519set_font (char *file)
520 CODE:
521{
522 int count;
523 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
524 PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
525 FcPatternDestroy (pattern);
526 pango_context_set_font_description (context, font);
527}
528 644
529void 645void
530load_image_inline (SV *image_) 646load_image_inline (SV *image_)
531 ALIAS: 647 ALIAS:
532 load_image_file = 1 648 load_image_file = 1
574 690
575 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 691 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
576 692
577 assert (surface2->pitch == surface2->w * 4); 693 assert (surface2->pitch == surface2->w * 4);
578 694
695 SDL_LockSurface (surface2);
579 EXTEND (SP, 5); 696 EXTEND (SP, 6);
580 PUSHs (sv_2mortal (newSViv (surface2->w))); 697 PUSHs (sv_2mortal (newSViv (surface2->w)));
581 PUSHs (sv_2mortal (newSViv (surface2->h))); 698 PUSHs (sv_2mortal (newSViv (surface2->h)));
582 SDL_LockSurface (surface2);
583 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 699 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
584 SDL_UnlockSurface (surface2);
585 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)));
586 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 701 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
587 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 702 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
703 SDL_UnlockSurface (surface2);
588 704
589 SDL_FreeSurface (surface); 705 SDL_FreeSurface (surface);
590 SDL_FreeSurface (surface2); 706 SDL_FreeSurface (surface2);
591} 707}
592 708
614 PUSHs (sv_2mortal (newSViv (b / y))); 730 PUSHs (sv_2mortal (newSViv (b / y)));
615 PUSHs (sv_2mortal (newSViv (a / y))); 731 PUSHs (sv_2mortal (newSViv (a / y)));
616} 732}
617 733
618void 734void
735error (char *message)
736 CODE:
737 fprintf (stderr, "ERROR: %s\n", message);
738#ifdef _WIN32
739 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
740#endif
741
742void
619fatal (char *message) 743fatal (char *message)
620 CODE: 744 CODE:
745 fprintf (stderr, "FATAL: %s\n", message);
621#ifdef _WIN32 746#ifdef _WIN32
622 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
623#else
624 fprintf (stderr, "FATAL: %s\n", message);
625#endif 748#endif
626 exit (1); 749 _exit (1);
627 750
751void
752_exit (int retval)
753 CODE:
754 _exit (retval);
755
756MODULE = CFPlus PACKAGE = CFPlus::Font
757
758CFPlus::Font
759new_from_file (SV *class, char *path, int id = 0)
760 CODE:
761{
762 int count;
763 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
764 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
765 FcPatternDestroy (pattern);
766}
767 OUTPUT:
768 RETVAL
769
770void
771DESTROY (CFPlus::Font self)
772 CODE:
773 pango_font_description_free (self);
774
775void
776make_default (CFPlus::Font self)
777 CODE:
778 default_font = self;
779
628MODULE = CFClient PACKAGE = CFClient::Layout 780MODULE = CFPlus PACKAGE = CFPlus::Layout
629 781
630CFClient::Layout 782void
631new (SV *class, int base_height = 10) 783reset_glyph_cache ()
784 CODE:
785 tc_clear ();
786
787CFPlus::Layout
788new (SV *class)
632 CODE: 789 CODE:
633 New (0, RETVAL, 1, struct cf_layout); 790 New (0, RETVAL, 1, struct cf_layout);
634 RETVAL->base_height = base_height; 791
635 RETVAL->pl = pango_layout_new (context); 792 RETVAL->pl = pango_layout_new (opengl_context);
793 RETVAL->r = 1.;
794 RETVAL->g = 1.;
795 RETVAL->b = 1.;
796 RETVAL->a = 1.;
797 RETVAL->base_height = MIN_FONT_HEIGHT;
798 RETVAL->font = 0;
799
636 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 800 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
801 layout_update_font (RETVAL);
637 OUTPUT: 802 OUTPUT:
638 RETVAL 803 RETVAL
639 804
640void 805void
641DESTROY (CFClient::Layout self) 806DESTROY (CFPlus::Layout self)
642 CODE: 807 CODE:
643 g_object_unref (self->pl); 808 g_object_unref (self->pl);
644 Safefree (self); 809 Safefree (self);
645 810
646void 811void
647set_text (CFClient::Layout self, SV *text_) 812set_text (CFPlus::Layout self, SV *text_)
648 CODE: 813 CODE:
649{ 814{
650 STRLEN textlen; 815 STRLEN textlen;
651 char *text = SvPVutf8 (text_, textlen); 816 char *text = SvPVutf8 (text_, textlen);
652 817
653 pango_layout_set_text (self->pl, text, textlen); 818 pango_layout_set_text (self->pl, text, textlen);
654} 819}
655 820
656void 821void
657set_markup (CFClient::Layout self, SV *text_) 822set_markup (CFPlus::Layout self, SV *text_)
658 CODE: 823 CODE:
659{ 824{
660 STRLEN textlen; 825 STRLEN textlen;
661 char *text = SvPVutf8 (text_, textlen); 826 char *text = SvPVutf8 (text_, textlen);
662 827
663 pango_layout_set_markup (self->pl, text, textlen); 828 pango_layout_set_markup (self->pl, text, textlen);
664} 829}
665 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
666SV * 916SV *
667get_text (CFClient::Layout self) 917get_text (CFPlus::Layout self)
668 CODE: 918 CODE:
669 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 919 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
670 SvUTF8_on (RETVAL); 920 sv_utf8_decode (RETVAL);
671 OUTPUT: 921 OUTPUT:
672 RETVAL 922 RETVAL
673 923
674void 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
933set_font (CFPlus::Layout self, CFPlus::Font font = 0)
934 CODE:
935 if (self->font != font)
936 {
937 self->font = font;
938 layout_update_font (self);
939 }
940
941void
675set_height (CFClient::Layout self, int base_height) 942set_height (CFPlus::Layout self, int base_height)
676 CODE: 943 CODE:
944 if (self->base_height != base_height)
945 {
677 self->base_height = base_height; 946 self->base_height = base_height;
947 layout_update_font (self);
948 }
678 949
679void 950void
680set_width (CFClient::Layout self, int max_width = -1) 951set_width (CFPlus::Layout self, int max_width = -1)
681 CODE: 952 CODE:
682 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);
683 954
684void 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
685size (CFClient::Layout self) 981size (CFPlus::Layout self)
686 PPCODE: 982 PPCODE:
687{ 983{
688 int w, h; 984 int w, h;
689 985
690 layout_update (self);
691 layout_get_pixel_size (self, &w, &h); 986 layout_get_pixel_size (self, &w, &h);
692 987
693 EXTEND (SP, 2); 988 EXTEND (SP, 2);
694 PUSHs (sv_2mortal (newSViv (w))); 989 PUSHs (sv_2mortal (newSViv (w)));
695 PUSHs (sv_2mortal (newSViv (h))); 990 PUSHs (sv_2mortal (newSViv (h)));
696} 991}
697 992
698int 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
699xy_to_index (CFClient::Layout self, int x, int y) 1006xy_to_index (CFPlus::Layout self, int x, int y)
700 CODE: 1007 CODE:
701{ 1008{
702 int index, trailing; 1009 int index, trailing;
703
704 layout_update (self);
705 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);
706
707 RETVAL = index; 1011 RETVAL = index;
708} 1012}
709 OUTPUT: 1013 OUTPUT:
710 RETVAL 1014 RETVAL
711 1015
712void 1016void
713cursor_pos (CFClient::Layout self, int index) 1017cursor_pos (CFPlus::Layout self, int index)
714 PPCODE: 1018 PPCODE:
715{ 1019{
716 PangoRectangle strong_pos; 1020 PangoRectangle strong_pos;
717 layout_update (self);
718 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1021 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
719 1022
720 EXTEND (SP, 3); 1023 EXTEND (SP, 3);
721 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1024 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
722 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
723 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
724} 1027}
725 1028
726void 1029void
727render (CFClient::Layout self) 1030render (CFPlus::Layout self, float x, float y)
728 PPCODE: 1031 PPCODE:
729{ 1032 pango_opengl_render_layout_subpixel (
730 SV *retval; 1033 self->pl,
731 int w, h; 1034 x * PANGO_SCALE, y * PANGO_SCALE,
732 FT_Bitmap bitmap; 1035 self->r, self->g, self->b, self->a
1036 );
733 1037
734 layout_update (self); 1038MODULE = CFPlus PACKAGE = CFPlus::Texture
735 layout_get_pixel_size (self, &w, &h);
736 1039
737 retval = newSV (w * h); 1040void
738 SvPOK_only (retval); 1041pad2pot (SV *data_, SV *w_, SV *h_)
739 SvCUR_set (retval, w * h); 1042 CODE:
1043{
1044 int ow = SvIV (w_);
1045 int oh = SvIV (h_);
740 1046
741 bitmap.rows = h; 1047 if (ow && oh)
742 bitmap.width = w; 1048 {
743 bitmap.pitch = w; 1049 int nw = minpot (ow);
744 bitmap.buffer = (unsigned char*)SvPVX (retval); 1050 int nh = minpot (oh);
745 bitmap.num_grays = 256;
746 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
747 1051
748 memset (bitmap.buffer, 0, w * h); 1052 if (nw != ow || nh != oh)
749 1053 {
750 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));
751 1060
752 EXTEND (SP, 3); 1061 SvPOK_only (result_);
753 PUSHs (sv_2mortal (newSViv (w))); 1062 SvCUR_set (result_, nw * nh * bpp);
754 PUSHs (sv_2mortal (newSViv (h)));
755 PUSHs (sv_2mortal (retval));
756}
757 1063
758MODULE = 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);
759 1067
1068 sv_setsv (data_, result_);
1069 }
1070
1071 sv_setiv (w_, nw);
1072 sv_setiv (h_, nh);
1073 }
1074 }
1075}
1076
760void 1077void
761draw_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.)
762 PROTOTYPE: $$$;$$ 1079 PROTOTYPE: $$$;$$
1080 ALIAS:
1081 draw_quad_alpha = 1
1082 draw_quad_alpha_premultiplied = 2
763 CODE: 1083 CODE:
764{ 1084{
765 HV *hv = (HV *)SvRV (self); 1085 HV *hv = (HV *)SvRV (self);
766 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1086 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
767 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1087 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
768 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1088 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
769 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
770 1089
771 if (items < 5) 1090 if (items < 5)
772 { 1091 {
773 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1092 w = SvNV (*hv_fetch (hv, "w", 1, 1));
774 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1093 h = SvNV (*hv_fetch (hv, "h", 1, 1));
775 } 1094 }
776 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
777 glBindTexture (GL_TEXTURE_2D, name); 1110 glBindTexture (GL_TEXTURE_2D, name);
778 if (wrap_mode) { 1111
779 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
780 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
781 }
782 glBegin (GL_QUADS); 1112 glBegin (GL_QUADS);
783 glTexCoord2f (0, 0); glVertex2f (x , y ); 1113 glTexCoord2f (0, 0); glVertex2f (x , y );
784 glTexCoord2f (0, t); glVertex2f (x , y + h); 1114 glTexCoord2f (0, t); glVertex2f (x , y + h);
785 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1115 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
786 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1116 glTexCoord2f (s, 0); glVertex2f (x + w, y );
787 glEnd (); 1117 glEnd ();
788}
789 1118
1119 if (ix)
1120 {
1121 glDisable (GL_ALPHA_TEST);
1122 glDisable (GL_BLEND);
1123 }
1124}
1125
790MODULE = CFClient PACKAGE = CFClient::Map 1126MODULE = CFPlus PACKAGE = CFPlus::Map
791 1127
792CFClient::Map 1128CFPlus::Map
793new (SV *class, int map_width, int map_height) 1129new (SV *class, int map_width, int map_height)
794 CODE: 1130 CODE:
795 New (0, RETVAL, 1, struct map); 1131 New (0, RETVAL, 1, struct map);
796 RETVAL->x = 0; 1132 RETVAL->x = 0;
797 RETVAL->y = 0; 1133 RETVAL->y = 0;
807 RETVAL->row = 0; 1143 RETVAL->row = 0;
808 OUTPUT: 1144 OUTPUT:
809 RETVAL 1145 RETVAL
810 1146
811void 1147void
812DESTROY (CFClient::Map self) 1148DESTROY (CFPlus::Map self)
813 CODE: 1149 CODE:
814{ 1150{
815 map_clear (self); 1151 map_clear (self);
816 Safefree (self->face); 1152 Safefree (self->face);
1153 Safefree (self->tex);
817 Safefree (self); 1154 Safefree (self);
818} 1155}
819 1156
820void 1157void
821clear (CFClient::Map self) 1158clear (CFPlus::Map self)
822 CODE: 1159 CODE:
823 map_clear (self); 1160 map_clear (self);
824 1161
825void 1162void
826set_face (CFClient::Map self, int face, int texid) 1163set_face (CFPlus::Map self, int face, int texid)
827 CODE: 1164 CODE:
828{ 1165{
829 while (self->faces <= face) 1166 while (self->faces <= face)
830 { 1167 {
831 Append (mapface, self->face, self->faces, self->faces); 1168 Append (mapface, self->face, self->faces, self->faces);
834 1171
835 self->face [face] = texid; 1172 self->face [face] = texid;
836} 1173}
837 1174
838void 1175void
839set_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)
840 CODE: 1177 CODE:
841{ 1178{
842 while (self->texs <= texid) 1179 while (self->texs <= texid)
843 { 1180 {
844 Append (maptex, self->tex, self->texs, self->texs); 1181 Append (maptex, self->tex, self->texs, self->texs);
856 tex->r = r; 1193 tex->r = r;
857 tex->g = g; 1194 tex->g = g;
858 tex->b = b; 1195 tex->b = b;
859 tex->a = a; 1196 tex->a = a;
860 } 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);
861} 1207}
862 1208
863int 1209int
864ox (CFClient::Map self) 1210ox (CFPlus::Map self)
865 ALIAS: 1211 ALIAS:
866 oy = 1 1212 oy = 1
1213 x = 2
1214 y = 3
1215 w = 4
1216 h = 5
867 CODE: 1217 CODE:
868 switch (ix) 1218 switch (ix)
869 { 1219 {
870 case 0: RETVAL = self->ox; break; 1220 case 0: RETVAL = self->ox; break;
871 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;
872 } 1226 }
873 OUTPUT: 1227 OUTPUT:
874 RETVAL 1228 RETVAL
875 1229
876void 1230void
877scroll (CFClient::Map self, int dx, int dy) 1231scroll (CFPlus::Map self, int dx, int dy)
878 CODE: 1232 CODE:
879{ 1233{
880 if (dx > 0) 1234 if (dx > 0)
881 map_blank (self, self->x, self->y, dx - 1, self->h); 1235 map_blank (self, self->x, self->y, dx - 1, self->h);
882 else if (dx < 0) 1236 else if (dx < 0)
898 self->y += MAP_EXTEND_Y; 1252 self->y += MAP_EXTEND_Y;
899 } 1253 }
900} 1254}
901 1255
902void 1256void
903map1a_update (CFClient::Map self, SV *data_) 1257map1a_update (CFPlus::Map self, SV *data_)
904 CODE: 1258 CODE:
905{ 1259{
906 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1260 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
907 uint8_t *data_end = (uint8_t *)SvEND (data_); 1261 uint8_t *data_end = (uint8_t *)SvEND (data_);
908 mapcell *cell; 1262 mapcell *cell;
910 1264
911 while (data < data_end) 1265 while (data < data_end)
912 { 1266 {
913 flags = (data [0] << 8) + data [1]; data += 2; 1267 flags = (data [0] << 8) + data [1]; data += 2;
914 1268
915 x = ((flags >> 10) & 63) + self->x; 1269 x = self->x + ((flags >> 10) & 63);
916 y = ((flags >> 4) & 63) + self->y; 1270 y = self->y + ((flags >> 4) & 63);
917 1271
918 cell = map_get_cell (self, x, y); 1272 cell = map_get_cell (self, x, y);
919 1273
920 if (flags & 15) 1274 if (flags & 15)
921 { 1275 {
950 cell->darkness = -1; 1304 cell->darkness = -1;
951 } 1305 }
952} 1306}
953 1307
954SV * 1308SV *
955mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1309mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
956 CODE: 1310 CODE:
957{ 1311{
958 int x1, x; 1312 int x1, x;
959 int y1, y; 1313 int y1, y;
960 int z; 1314 int z;
1010} 1364}
1011 OUTPUT: 1365 OUTPUT:
1012 RETVAL 1366 RETVAL
1013 1367
1014void 1368void
1015draw (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)
1016 PPCODE: 1370 CODE:
1017{ 1371{
1018 int vx, vy; 1372 int vx, vy;
1019 int x, y, z; 1373 int x, y, z;
1020 int last_name; 1374 int last_name;
1021 mapface face; 1375 mapface face;
1022 int sw4 = (sw + 3) & ~3;
1023 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1024 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1025 1376
1026 memset (darkness, 255, sw4 * sh);
1027 SvPOK_only (darkness_sv);
1028 SvCUR_set (darkness_sv, sw4 * sh);
1029
1030 vx = self->x + (self->w - sw) / 2 - shift_x; 1377 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1031 vy = self->y + (self->h - sh) / 2 - shift_y; 1378 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1032 1379
1033 /* 1380 /*
1034 int vx = self->vx = self->w >= sw 1381 int vx = self->vx = self->w >= sw
1035 ? self->x + (self->w - sw) / 2 1382 ? self->x + (self->w - sw) / 2
1036 : 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));
1040 : 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));
1041 */ 1388 */
1042 1389
1043 glColor4ub (255, 255, 255, 255); 1390 glColor4ub (255, 255, 255, 255);
1044 1391
1392 glEnable (GL_BLEND);
1045 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1393 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1046 glEnable (GL_BLEND);
1047 glEnable (GL_TEXTURE_2D); 1394 glEnable (GL_TEXTURE_2D);
1048 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1395 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1049 1396
1050 glBegin (GL_QUADS); 1397 glBegin (GL_QUADS);
1051 1398
1059 1406
1060 for (x = 0; x < sw; x++) 1407 for (x = 0; x < sw; x++)
1061 if (row->c0 <= x + vx && x + vx < row->c1) 1408 if (row->c0 <= x + vx && x + vx < row->c1)
1062 { 1409 {
1063 mapcell *cell = row->col + (x + vx - row->c0); 1410 mapcell *cell = row->col + (x + vx - row->c0);
1064
1065 darkness[y * sw4 + x] = cell->darkness < 0
1066 ? 255 - FOW_DARKNESS
1067 : 255 - cell->darkness;
1068 1411
1069 face = cell->face [z]; 1412 face = cell->face [z];
1070 1413
1071 if (face) 1414 if (face)
1072 { 1415 {
1093 1436
1094 glEnd (); 1437 glEnd ();
1095 1438
1096 glDisable (GL_TEXTURE_2D); 1439 glDisable (GL_TEXTURE_2D);
1097 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 }
1098 1535
1099 EXTEND (SP, 3); 1536 EXTEND (SP, 3);
1100 PUSHs (sv_2mortal (newSViv (sw4))); 1537 PUSHs (sv_2mortal (newSViv (sw4)));
1101 PUSHs (sv_2mortal (newSViv (sh))); 1538 PUSHs (sv_2mortal (newSViv (sh)));
1102 PUSHs (darkness_sv); 1539 PUSHs (darkness_sv);
1103} 1540}
1104 1541
1105SV * 1542SV *
1106get_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)
1107 CODE: 1544 CODE:
1108{ 1545{
1109 int x, y, x1, y1; 1546 int x, y, x1, y1;
1110 SV *data_sv = newSV (w * h * 7 + 5); 1547 SV *data_sv = newSV (w * h * 7 + 5);
1111 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1548 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1173} 1610}
1174 OUTPUT: 1611 OUTPUT:
1175 RETVAL 1612 RETVAL
1176 1613
1177void 1614void
1178set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1615set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1179 PPCODE: 1616 PPCODE:
1180{ 1617{
1181 int x, y, z; 1618 int x, y, z;
1182 int w, h; 1619 int w, h;
1183 int x1, y1; 1620 int x1, y1;
1232 } 1669 }
1233 } 1670 }
1234 } 1671 }
1235} 1672}
1236 1673
1237MODULE = CFClient PACKAGE = CFClient::MixChunk 1674MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1238 1675
1239CFClient::MixChunk 1676CFPlus::MixChunk
1240new_from_file (SV *class, char *path) 1677new_from_file (SV *class, char *path)
1241 CODE: 1678 CODE:
1242 RETVAL = Mix_LoadWAV (path); 1679 RETVAL = Mix_LoadWAV (path);
1243 OUTPUT: 1680 OUTPUT:
1244 RETVAL 1681 RETVAL
1245 1682
1246void 1683void
1247DESTROY (CFClient::MixChunk self) 1684DESTROY (CFPlus::MixChunk self)
1248 CODE: 1685 CODE:
1249 Mix_FreeChunk (self); 1686 Mix_FreeChunk (self);
1250 1687
1251int 1688int
1252volume (CFClient::MixChunk self, int volume = -1) 1689volume (CFPlus::MixChunk self, int volume = -1)
1253 CODE: 1690 CODE:
1254 RETVAL = Mix_VolumeChunk (self, volume); 1691 RETVAL = Mix_VolumeChunk (self, volume);
1255 OUTPUT: 1692 OUTPUT:
1256 RETVAL 1693 RETVAL
1257 1694
1258int 1695int
1259play (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)
1260 CODE: 1697 CODE:
1261 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1698 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1262 OUTPUT: 1699 OUTPUT:
1263 RETVAL 1700 RETVAL
1264 1701
1265MODULE = CFClient PACKAGE = CFClient::MixMusic 1702MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1266 1703
1267int 1704int
1268volume (int volume = -1) 1705volume (int volume = -1)
1269 CODE: 1706 CODE:
1270 RETVAL = Mix_VolumeMusic (volume); 1707 RETVAL = Mix_VolumeMusic (volume);
1271 OUTPUT: 1708 OUTPUT:
1272 RETVAL 1709 RETVAL
1273 1710
1274CFClient::MixMusic 1711CFPlus::MixMusic
1275new_from_file (SV *class, char *path) 1712new_from_file (SV *class, char *path)
1276 CODE: 1713 CODE:
1277 RETVAL = Mix_LoadMUS (path); 1714 RETVAL = Mix_LoadMUS (path);
1278 OUTPUT: 1715 OUTPUT:
1279 RETVAL 1716 RETVAL
1280 1717
1281void 1718void
1282DESTROY (CFClient::MixMusic self) 1719DESTROY (CFPlus::MixMusic self)
1283 CODE: 1720 CODE:
1284 Mix_FreeMusic (self); 1721 Mix_FreeMusic (self);
1285 1722
1286int 1723int
1287play (CFClient::MixMusic self, int loops = -1) 1724play (CFPlus::MixMusic self, int loops = -1)
1288 CODE: 1725 CODE:
1289 RETVAL = Mix_PlayMusic (self, loops); 1726 RETVAL = Mix_PlayMusic (self, loops);
1290 OUTPUT: 1727 OUTPUT:
1291 RETVAL 1728 RETVAL
1292 1729
1293MODULE = CFClient PACKAGE = CFClient::OpenGL 1730MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1294 1731
1295BOOT: 1732BOOT:
1296{ 1733{
1297 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1734 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1298 static const struct { 1735 static const struct {
1299 const char *name; 1736 const char *name;
1300 IV iv; 1737 IV iv;
1301 } *civ, const_iv[] = { 1738 } *civ, const_iv[] = {
1302# define const_iv(name) { # name, (IV)name } 1739# define const_iv(name) { # name, (IV)name }
1303 const_iv (GL_COLOR_MATERIAL), 1740 const_iv (GL_COLOR_MATERIAL),
1304 const_iv (GL_SMOOTH), 1741 const_iv (GL_SMOOTH),
1305 const_iv (GL_FLAT), 1742 const_iv (GL_FLAT),
1743 const_iv (GL_DITHER),
1306 const_iv (GL_BLEND), 1744 const_iv (GL_BLEND),
1745 const_iv (GL_CULL_FACE),
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),
1307 const_iv (GL_AND), 1753 const_iv (GL_AND),
1754 const_iv (GL_ONE),
1755 const_iv (GL_ZERO),
1308 const_iv (GL_SRC_ALPHA), 1756 const_iv (GL_SRC_ALPHA),
1757 const_iv (GL_DST_ALPHA),
1309 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1758 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1759 const_iv (GL_ONE_MINUS_DST_ALPHA),
1760 const_iv (GL_SRC_ALPHA_SATURATE),
1310 const_iv (GL_RGB), 1761 const_iv (GL_RGB),
1311 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),
1312 const_iv (GL_UNSIGNED_BYTE), 1766 const_iv (GL_UNSIGNED_BYTE),
1313 const_iv (GL_ALPHA4), 1767 const_iv (GL_UNSIGNED_SHORT),
1768 const_iv (GL_UNSIGNED_INT),
1314 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),
1315 const_iv (GL_FLOAT), 1773 const_iv (GL_FLOAT),
1316 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1774 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1317 const_iv (GL_COMPILE), 1775 const_iv (GL_COMPILE),
1318 const_iv (GL_TEXTURE_1D), 1776 const_iv (GL_TEXTURE_1D),
1319 const_iv (GL_TEXTURE_2D), 1777 const_iv (GL_TEXTURE_2D),
1321 const_iv (GL_TEXTURE_MAG_FILTER), 1779 const_iv (GL_TEXTURE_MAG_FILTER),
1322 const_iv (GL_TEXTURE_MIN_FILTER), 1780 const_iv (GL_TEXTURE_MIN_FILTER),
1323 const_iv (GL_TEXTURE_ENV_MODE), 1781 const_iv (GL_TEXTURE_ENV_MODE),
1324 const_iv (GL_TEXTURE_WRAP_S), 1782 const_iv (GL_TEXTURE_WRAP_S),
1325 const_iv (GL_TEXTURE_WRAP_T), 1783 const_iv (GL_TEXTURE_WRAP_T),
1784 const_iv (GL_REPEAT),
1326 const_iv (GL_CLAMP), 1785 const_iv (GL_CLAMP),
1327 const_iv (GL_REPEAT), 1786 const_iv (GL_CLAMP_TO_EDGE),
1328 const_iv (GL_NEAREST), 1787 const_iv (GL_NEAREST),
1329 const_iv (GL_LINEAR), 1788 const_iv (GL_LINEAR),
1330 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1789 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1331 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1790 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1332 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1791 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1333 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1792 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1334 const_iv (GL_GENERATE_MIPMAP), 1793 const_iv (GL_GENERATE_MIPMAP),
1335 const_iv (GL_LINEAR),
1336 const_iv (GL_MODULATE), 1794 const_iv (GL_MODULATE),
1795 const_iv (GL_DECAL),
1337 const_iv (GL_REPLACE), 1796 const_iv (GL_REPLACE),
1797 const_iv (GL_DEPTH_BUFFER_BIT),
1338 const_iv (GL_COLOR_BUFFER_BIT), 1798 const_iv (GL_COLOR_BUFFER_BIT),
1339 const_iv (GL_PROJECTION), 1799 const_iv (GL_PROJECTION),
1340 const_iv (GL_MODELVIEW), 1800 const_iv (GL_MODELVIEW),
1341 const_iv (GL_COLOR_LOGIC_OP), 1801 const_iv (GL_COLOR_LOGIC_OP),
1802 const_iv (GL_SEPARABLE_2D),
1342 const_iv (GL_CONVOLUTION_2D), 1803 const_iv (GL_CONVOLUTION_2D),
1343 const_iv (GL_CONVOLUTION_BORDER_MODE), 1804 const_iv (GL_CONVOLUTION_BORDER_MODE),
1344 const_iv (GL_CONSTANT_BORDER), 1805 const_iv (GL_CONSTANT_BORDER),
1345 const_iv (GL_LINES), 1806 const_iv (GL_LINES),
1807 const_iv (GL_LINE_LOOP),
1346 const_iv (GL_QUADS), 1808 const_iv (GL_QUADS),
1347 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),
1348 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1813 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1349 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),
1350# undef const_iv 1819# undef const_iv
1351 }; 1820 };
1352 1821
1353 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; )
1354 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1823 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1355} 1824}
1356 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
1357int glGetError () 1847int glGetError ()
1848
1849void glFinish ()
1358 1850
1359void glClear (int mask) 1851void glClear (int mask)
1360 1852
1361void glClearColor (float r, float g, float b, float a = 1.0) 1853void glClearColor (float r, float g, float b, float a = 1.0)
1362 PROTOTYPE: @ 1854 PROTOTYPE: @
1369 1861
1370void glHint (int target, int mode) 1862void glHint (int target, int mode)
1371 1863
1372void glBlendFunc (int sfactor, int dfactor) 1864void glBlendFunc (int sfactor, int dfactor)
1373 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
1374void glLogicOp (int opcode) 1872void glLogicOp (int opcode)
1375 1873
1874void glColorMask (int red, int green, int blue, int alpha)
1875
1376void glMatrixMode (int mode) 1876void glMatrixMode (int mode)
1377 1877
1378void glPushMatrix () 1878void glPushMatrix ()
1379 1879
1380void glPopMatrix () 1880void glPopMatrix ()
1381 1881
1382void glLoadIdentity () 1882void glLoadIdentity ()
1383 1883
1884void glDrawBuffer (int buffer)
1885
1886void glReadBuffer (int buffer)
1887
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
1384void 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_)
1385 1893
1386void glViewport (int x, int y, int width, int height) 1894void glViewport (int x, int y, int width, int height)
1895
1896void glScissor (int x, int y, int width, int height)
1387 1897
1388void glTranslate (float x, float y, float z = 0.) 1898void glTranslate (float x, float y, float z = 0.)
1389 CODE: 1899 CODE:
1390 glTranslatef (x, y, z); 1900 glTranslatef (x, y, z);
1391 1901
1392void glScale (float x, float y, float z) 1902void glScale (float x, float y, float z = 1.)
1393 CODE: 1903 CODE:
1394 glScalef (x, y, z); 1904 glScalef (x, y, z);
1395 1905
1396void glRotate (float angle, float x, float y, float z) 1906void glRotate (float angle, float x, float y, float z)
1397 CODE: 1907 CODE:
1401 1911
1402void glEnd () 1912void glEnd ()
1403 1913
1404void glColor (float r, float g, float b, float a = 1.0) 1914void glColor (float r, float g, float b, float a = 1.0)
1405 PROTOTYPE: @ 1915 PROTOTYPE: @
1916 ALIAS:
1917 glColor_premultiply = 1
1406 CODE: 1918 CODE:
1919 if (ix)
1920 {
1921 r *= a;
1922 g *= a;
1923 b *= a;
1924 }
1925 // microsoft visual "c" rounds instead of truncating...
1407 glColor4f (r, g, b, a); 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);
1408 1938
1409void glVertex (float x, float y, float z = 0.) 1939void glVertex (float x, float y, float z = 0.)
1410 CODE: 1940 CODE:
1411 glVertex3f (x, y, z); 1941 glVertex3f (x, y, z);
1412 1942
1424 1954
1425void glBindTexture (int target, int name) 1955void glBindTexture (int target, int name)
1426 1956
1427void glConvolutionParameter (int target, int pname, float params) 1957void glConvolutionParameter (int target, int pname, float params)
1428 CODE: 1958 CODE:
1959 if (gl.ConvolutionParameterf)
1429 glConvolutionParameterf (target, pname, params); 1960 gl.ConvolutionParameterf (target, pname, params);
1430 1961
1431void 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)
1963 CODE:
1964 if (gl.ConvolutionFilter2D)
1965 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1966
1967void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1968 CODE:
1969 if (gl.SeparableFilter2D)
1970 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1432 1971
1433void 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)
1434 1973
1435void 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)
1975
1976void glDrawPixels (int width, int height, int format, int type, char *pixels)
1977
1978void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1436 1979
1437int glGenTexture () 1980int glGenTexture ()
1438 CODE: 1981 CODE:
1439{ 1982{
1440 GLuint name; 1983 GLuint name;
1465 2008
1466void glEndList () 2009void glEndList ()
1467 2010
1468void glCallList (int list) 2011void glCallList (int list)
1469 2012
2013

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines