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.138 by root, Mon Aug 14 01:21:01 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);
517#if SDL_VERSION_ATLEAST(1,2,10)
404 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15); 518 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
405 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0); 519 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
520#endif
406 521
407 SDL_EnableUNICODE (1); 522 SDL_EnableUNICODE (1);
408 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 523 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
409 524
410 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 525 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
419 534
420 ++m; 535 ++m;
421 } 536 }
422} 537}
423 538
539char *
540SDL_GetError ()
541
424int 542int
425SDL_SetVideoMode (int w, int h, int fullscreen) 543SDL_SetVideoMode (int w, int h, int fullscreen)
426 CODE: 544 CODE:
427 RETVAL = !!SDL_SetVideoMode ( 545 RETVAL = !!SDL_SetVideoMode (
428 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 546 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
429 ); 547 );
548 if (RETVAL)
549 {
430 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 }
431 OUTPUT: 555 OUTPUT:
432 RETVAL 556 RETVAL
433 557
434void 558void
435SDL_GL_SwapBuffers () 559SDL_GL_SwapBuffers ()
560
561char *
562SDL_GetKeyName (int sym)
436 563
437void 564void
438SDL_PollEvent () 565SDL_PollEvent ()
439 PPCODE: 566 PPCODE:
440{ 567{
442 569
443 while (SDL_PollEvent (&ev)) 570 while (SDL_PollEvent (&ev))
444 { 571 {
445 HV *hv = newHV (); 572 HV *hv = newHV ();
446 hv_store (hv, "type", 4, newSViv (ev.type), 0); 573 hv_store (hv, "type", 4, newSViv (ev.type), 0);
574
447 switch (ev.type) 575 switch (ev.type)
448 { 576 {
449 case SDL_KEYDOWN: 577 case SDL_KEYDOWN:
450 case SDL_KEYUP: 578 case SDL_KEYUP:
451 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 579 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
458 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 586 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
459 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 587 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
460 break; 588 break;
461 589
462 case SDL_MOUSEMOTION: 590 case SDL_MOUSEMOTION:
591 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
592
463 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 593 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
464 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 594 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
465 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 595 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
466 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 596 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
467 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 597 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
468 break; 598 break;
469 599
470 case SDL_MOUSEBUTTONDOWN: 600 case SDL_MOUSEBUTTONDOWN:
471 case SDL_MOUSEBUTTONUP: 601 case SDL_MOUSEBUTTONUP:
602 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
603
472 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 604 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
473 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
474 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 606 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
475 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;
476 } 615 }
477 616
478 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv))); 617 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
479 } 618 }
480} 619}
481 620
482int 621int
483Mix_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)
484 POSTCALL: 623 POSTCALL:
485 Mix_HookMusicFinished (music_finished); 624 Mix_HookMusicFinished (music_finished);
625 Mix_ChannelFinished (channel_finished);
486 626
487void 627void
488Mix_CloseAudio () 628Mix_CloseAudio ()
489 629
490int 630int
495 CODE: 635 CODE:
496#ifndef _WIN32 636#ifndef _WIN32
497 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
498#endif 638#endif
499 639
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 640void
515add_font (char *file) 641add_font (char *file)
516 CODE: 642 CODE:
517 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 643 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
518 644
519void 645void
520load_image_inline (SV *image_) 646load_image_inline (SV *image_)
521 ALIAS: 647 ALIAS:
522 load_image_file = 1 648 load_image_file = 1
564 690
565 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE); 691 surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
566 692
567 assert (surface2->pitch == surface2->w * 4); 693 assert (surface2->pitch == surface2->w * 4);
568 694
695 SDL_LockSurface (surface2);
569 EXTEND (SP, 5); 696 EXTEND (SP, 6);
570 PUSHs (sv_2mortal (newSViv (surface2->w))); 697 PUSHs (sv_2mortal (newSViv (surface2->w)));
571 PUSHs (sv_2mortal (newSViv (surface2->h))); 698 PUSHs (sv_2mortal (newSViv (surface2->h)));
572 SDL_LockSurface (surface2);
573 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 699 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))); 700 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
576 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 701 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
577 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 702 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
703 SDL_UnlockSurface (surface2);
578 704
579 SDL_FreeSurface (surface); 705 SDL_FreeSurface (surface);
580 SDL_FreeSurface (surface2); 706 SDL_FreeSurface (surface2);
581} 707}
582 708
604 PUSHs (sv_2mortal (newSViv (b / y))); 730 PUSHs (sv_2mortal (newSViv (b / y)));
605 PUSHs (sv_2mortal (newSViv (a / y))); 731 PUSHs (sv_2mortal (newSViv (a / y)));
606} 732}
607 733
608void 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
609fatal (char *message) 743fatal (char *message)
610 CODE: 744 CODE:
745 fprintf (stderr, "FATAL: %s\n", message);
611#ifdef _WIN32 746#ifdef _WIN32
612 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
613#else
614 fprintf (stderr, "FATAL: %s\n", message);
615#endif 748#endif
616 exit (1); 749 _exit (1);
617 750
751void
752_exit (int retval)
753 CODE:
754 _exit (retval);
755
618MODULE = CFClient PACKAGE = CFClient::Font 756MODULE = CFPlus PACKAGE = CFPlus::Font
619 757
620CFClient::Font 758CFPlus::Font
621new_from_file (SV *class, char *path) 759new_from_file (SV *class, char *path, int id = 0)
622 CODE: 760 CODE:
623{ 761{
624 int count; 762 int count;
625 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count); 763 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
626 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 764 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
627 FcPatternDestroy (pattern); 765 FcPatternDestroy (pattern);
628} 766}
629 OUTPUT: 767 OUTPUT:
630 RETVAL 768 RETVAL
631 769
632void 770void
633DESTROY (CFClient::Font self) 771DESTROY (CFPlus::Font self)
634 CODE: 772 CODE:
635 pango_font_description_free (self); 773 pango_font_description_free (self);
636 774
637void 775void
638make_default (CFClient::Font self) 776make_default (CFPlus::Font self)
639 CODE: 777 CODE:
640 default_font = self; 778 default_font = self;
641 779
642MODULE = CFClient PACKAGE = CFClient::Layout 780MODULE = CFPlus PACKAGE = CFPlus::Layout
643 781
644CFClient::Layout 782void
645new (SV *class, int base_height = MIN_FONT_HEIGHT) 783reset_glyph_cache ()
784 CODE:
785 tc_clear ();
786
787CFPlus::Layout
788new (SV *class)
646 CODE: 789 CODE:
647 New (0, RETVAL, 1, struct cf_layout); 790 New (0, RETVAL, 1, struct cf_layout);
791
648 RETVAL->pl = pango_layout_new (context); 792 RETVAL->pl = pango_layout_new (opengl_context);
649 RETVAL->base_height = base_height; 793 RETVAL->r = 1.;
794 RETVAL->g = 1.;
795 RETVAL->b = 1.;
796 RETVAL->a = 1.;
797 RETVAL->base_height = MIN_FONT_HEIGHT;
650 RETVAL->font = 0; 798 RETVAL->font = 0;
799
651 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR); 800 pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
652 pango_layout_set_font_description (RETVAL->pl, default_font); 801 layout_update_font (RETVAL);
653 OUTPUT: 802 OUTPUT:
654 RETVAL 803 RETVAL
655 804
656void 805void
657DESTROY (CFClient::Layout self) 806DESTROY (CFPlus::Layout self)
658 CODE: 807 CODE:
659 g_object_unref (self->pl); 808 g_object_unref (self->pl);
660 Safefree (self); 809 Safefree (self);
661 810
662void 811void
663set_text (CFClient::Layout self, SV *text_) 812set_text (CFPlus::Layout self, SV *text_)
664 CODE: 813 CODE:
665{ 814{
666 STRLEN textlen; 815 STRLEN textlen;
667 char *text = SvPVutf8 (text_, textlen); 816 char *text = SvPVutf8 (text_, textlen);
668 817
669 pango_layout_set_text (self->pl, text, textlen); 818 pango_layout_set_text (self->pl, text, textlen);
670} 819}
671 820
672void 821void
673set_markup (CFClient::Layout self, SV *text_) 822set_markup (CFPlus::Layout self, SV *text_)
674 CODE: 823 CODE:
675{ 824{
676 STRLEN textlen; 825 STRLEN textlen;
677 char *text = SvPVutf8 (text_, textlen); 826 char *text = SvPVutf8 (text_, textlen);
678 827
679 pango_layout_set_markup (self->pl, text, textlen); 828 pango_layout_set_markup (self->pl, text, textlen);
680} 829}
681 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
682SV * 916SV *
683get_text (CFClient::Layout self) 917get_text (CFPlus::Layout self)
684 CODE: 918 CODE:
685 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0); 919 RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
686 SvUTF8_on (RETVAL); 920 sv_utf8_decode (RETVAL);
687 OUTPUT: 921 OUTPUT:
688 RETVAL 922 RETVAL
689 923
690void 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
691set_font (CFClient::Layout self, CFClient::Font font = 0) 933set_font (CFPlus::Layout self, CFPlus::Font font = 0)
692 CODE: 934 CODE:
693 if (self->font != font) 935 if (self->font != font)
694 { 936 {
695 self->font = font; 937 self->font = font;
696 layout_update_font (self); 938 layout_update_font (self);
697 } 939 }
698 940
699void 941void
700set_height (CFClient::Layout self, int base_height) 942set_height (CFPlus::Layout self, int base_height)
701 CODE: 943 CODE:
702 if (self->base_height != base_height) 944 if (self->base_height != base_height)
703 { 945 {
704 self->base_height = base_height; 946 self->base_height = base_height;
705 layout_update_font (self); 947 layout_update_font (self);
706 } 948 }
707 949
708void 950void
709set_width (CFClient::Layout self, int max_width = -1) 951set_width (CFPlus::Layout self, int max_width = -1)
710 CODE: 952 CODE:
711 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);
712 954
713void 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
714size (CFClient::Layout self) 981size (CFPlus::Layout self)
715 PPCODE: 982 PPCODE:
716{ 983{
717 int w, h; 984 int w, h;
718 985
719 layout_get_pixel_size (self, &w, &h); 986 layout_get_pixel_size (self, &w, &h);
722 PUSHs (sv_2mortal (newSViv (w))); 989 PUSHs (sv_2mortal (newSViv (w)));
723 PUSHs (sv_2mortal (newSViv (h))); 990 PUSHs (sv_2mortal (newSViv (h)));
724} 991}
725 992
726int 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
727xy_to_index (CFClient::Layout self, int x, int y) 1006xy_to_index (CFPlus::Layout self, int x, int y)
728 CODE: 1007 CODE:
729{ 1008{
730 int index, trailing; 1009 int index, trailing;
731 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);
732 RETVAL = index; 1011 RETVAL = index;
733} 1012}
734 OUTPUT: 1013 OUTPUT:
735 RETVAL 1014 RETVAL
736 1015
737void 1016void
738cursor_pos (CFClient::Layout self, int index) 1017cursor_pos (CFPlus::Layout self, int index)
739 PPCODE: 1018 PPCODE:
740{ 1019{
741 PangoRectangle strong_pos; 1020 PangoRectangle strong_pos;
742 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1021 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
743 1022
746 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
747 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
748} 1027}
749 1028
750void 1029void
751render (CFClient::Layout self) 1030render (CFPlus::Layout self, float x, float y, int flags = 0)
752 PPCODE: 1031 PPCODE:
753{ 1032 pango_opengl_render_layout_subpixel (
754 SV *retval; 1033 self->pl,
755 int w, h; 1034 x * PANGO_SCALE, y * PANGO_SCALE,
756 FT_Bitmap bitmap; 1035 self->r, self->g, self->b, self->a,
1036 flags
1037 );
757 1038
758 layout_get_pixel_size (self, &w, &h); 1039MODULE = CFPlus PACKAGE = CFPlus::Texture
759 1040
760 retval = newSV (w * h); 1041void
761 SvPOK_only (retval); 1042pad2pot (SV *data_, SV *w_, SV *h_)
762 SvCUR_set (retval, w * h); 1043 CODE:
1044{
1045 int ow = SvIV (w_);
1046 int oh = SvIV (h_);
763 1047
764 bitmap.rows = h; 1048 if (ow && oh)
765 bitmap.width = w; 1049 {
766 bitmap.pitch = w; 1050 int nw = minpot (ow);
767 bitmap.buffer = (unsigned char*)SvPVX (retval); 1051 int nh = minpot (oh);
768 bitmap.num_grays = 256;
769 bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
770 1052
771 memset (bitmap.buffer, 0, w * h); 1053 if (nw != ow || nh != oh)
772 1054 {
773 pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE); 1055 if (SvOK (data_))
1056 {
1057 STRLEN datalen;
1058 char *data = SvPVbyte (data_, datalen);
1059 int bpp = datalen / (ow * oh);
1060 SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
774 1061
775 EXTEND (SP, 3); 1062 SvPOK_only (result_);
776 PUSHs (sv_2mortal (newSViv (w))); 1063 SvCUR_set (result_, nw * nh * bpp);
777 PUSHs (sv_2mortal (newSViv (h)));
778 PUSHs (sv_2mortal (retval));
779}
780 1064
781MODULE = CFClient PACKAGE = CFClient::Texture 1065 memset (SvPVX (result_), 0, nw * nh * bpp);
1066 while (oh--)
1067 memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
782 1068
1069 sv_setsv (data_, result_);
1070 }
1071
1072 sv_setiv (w_, nw);
1073 sv_setiv (h_, nh);
1074 }
1075 }
1076}
1077
783void 1078void
784draw_quad (SV *self, float x, float y, float w = 0, float h = 0) 1079draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
785 PROTOTYPE: $$$;$$ 1080 PROTOTYPE: $$$;$$
1081 ALIAS:
1082 draw_quad_alpha = 1
1083 draw_quad_alpha_premultiplied = 2
786 CODE: 1084 CODE:
787{ 1085{
788 HV *hv = (HV *)SvRV (self); 1086 HV *hv = (HV *)SvRV (self);
789 float s = SvNV (*hv_fetch (hv, "s", 1, 1)); 1087 float s = SvNV (*hv_fetch (hv, "s", 1, 1));
790 float t = SvNV (*hv_fetch (hv, "t", 1, 1)); 1088 float t = SvNV (*hv_fetch (hv, "t", 1, 1));
791 int name = SvIV (*hv_fetch (hv, "name", 4, 1)); 1089 int name = SvIV (*hv_fetch (hv, "name", 4, 1));
792 int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
793 1090
794 if (items < 5) 1091 if (items < 5)
795 { 1092 {
796 w = SvNV (*hv_fetch (hv, "w", 1, 1)); 1093 w = SvNV (*hv_fetch (hv, "w", 1, 1));
797 h = SvNV (*hv_fetch (hv, "h", 1, 1)); 1094 h = SvNV (*hv_fetch (hv, "h", 1, 1));
798 } 1095 }
799 1096
1097 if (ix)
1098 {
1099 glEnable (GL_BLEND);
1100
1101 if (ix == 2)
1102 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1103 else
1104 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1105 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1106
1107 glEnable (GL_ALPHA_TEST);
1108 glAlphaFunc (GL_GREATER, 0.01f);
1109 }
1110
800 glBindTexture (GL_TEXTURE_2D, name); 1111 glBindTexture (GL_TEXTURE_2D, name);
801 if (wrap_mode) { 1112
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); 1113 glBegin (GL_QUADS);
806 glTexCoord2f (0, 0); glVertex2f (x , y ); 1114 glTexCoord2f (0, 0); glVertex2f (x , y );
807 glTexCoord2f (0, t); glVertex2f (x , y + h); 1115 glTexCoord2f (0, t); glVertex2f (x , y + h);
808 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1116 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
809 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1117 glTexCoord2f (s, 0); glVertex2f (x + w, y );
810 glEnd (); 1118 glEnd ();
811}
812 1119
1120 if (ix)
1121 {
1122 glDisable (GL_ALPHA_TEST);
1123 glDisable (GL_BLEND);
1124 }
1125}
1126
813MODULE = CFClient PACKAGE = CFClient::Map 1127MODULE = CFPlus PACKAGE = CFPlus::Map
814 1128
815CFClient::Map 1129CFPlus::Map
816new (SV *class, int map_width, int map_height) 1130new (SV *class, int map_width, int map_height)
817 CODE: 1131 CODE:
818 New (0, RETVAL, 1, struct map); 1132 New (0, RETVAL, 1, struct map);
819 RETVAL->x = 0; 1133 RETVAL->x = 0;
820 RETVAL->y = 0; 1134 RETVAL->y = 0;
830 RETVAL->row = 0; 1144 RETVAL->row = 0;
831 OUTPUT: 1145 OUTPUT:
832 RETVAL 1146 RETVAL
833 1147
834void 1148void
835DESTROY (CFClient::Map self) 1149DESTROY (CFPlus::Map self)
836 CODE: 1150 CODE:
837{ 1151{
838 map_clear (self); 1152 map_clear (self);
839 Safefree (self->face); 1153 Safefree (self->face);
1154 Safefree (self->tex);
840 Safefree (self); 1155 Safefree (self);
841} 1156}
842 1157
843void 1158void
844clear (CFClient::Map self) 1159clear (CFPlus::Map self)
845 CODE: 1160 CODE:
846 map_clear (self); 1161 map_clear (self);
847 1162
848void 1163void
849set_face (CFClient::Map self, int face, int texid) 1164set_face (CFPlus::Map self, int face, int texid)
850 CODE: 1165 CODE:
851{ 1166{
852 while (self->faces <= face) 1167 while (self->faces <= face)
853 { 1168 {
854 Append (mapface, self->face, self->faces, self->faces); 1169 Append (mapface, self->face, self->faces, self->faces);
857 1172
858 self->face [face] = texid; 1173 self->face [face] = texid;
859} 1174}
860 1175
861void 1176void
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) 1177set_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: 1178 CODE:
864{ 1179{
865 while (self->texs <= texid) 1180 while (self->texs <= texid)
866 { 1181 {
867 Append (maptex, self->tex, self->texs, self->texs); 1182 Append (maptex, self->tex, self->texs, self->texs);
879 tex->r = r; 1194 tex->r = r;
880 tex->g = g; 1195 tex->g = g;
881 tex->b = b; 1196 tex->b = b;
882 tex->a = a; 1197 tex->a = a;
883 } 1198 }
1199
1200 // somewhat hackish, but for textures that require it, it really
1201 // improves the look, and most others don't suffer.
1202 glBindTexture (GL_TEXTURE_2D, name);
1203 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1204 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1205 // use uglier nearest interpolation because linear suffers
1206 // from transparent color bleeding and ugly wrapping effects.
1207 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
884} 1208}
885 1209
886int 1210int
887ox (CFClient::Map self) 1211ox (CFPlus::Map self)
888 ALIAS: 1212 ALIAS:
889 oy = 1 1213 oy = 1
1214 x = 2
1215 y = 3
1216 w = 4
1217 h = 5
890 CODE: 1218 CODE:
891 switch (ix) 1219 switch (ix)
892 { 1220 {
893 case 0: RETVAL = self->ox; break; 1221 case 0: RETVAL = self->ox; break;
894 case 1: RETVAL = self->oy; break; 1222 case 1: RETVAL = self->oy; break;
1223 case 2: RETVAL = self->x; break;
1224 case 3: RETVAL = self->y; break;
1225 case 4: RETVAL = self->w; break;
1226 case 5: RETVAL = self->h; break;
895 } 1227 }
896 OUTPUT: 1228 OUTPUT:
897 RETVAL 1229 RETVAL
898 1230
899void 1231void
900scroll (CFClient::Map self, int dx, int dy) 1232scroll (CFPlus::Map self, int dx, int dy)
901 CODE: 1233 CODE:
902{ 1234{
903 if (dx > 0) 1235 if (dx > 0)
904 map_blank (self, self->x, self->y, dx - 1, self->h); 1236 map_blank (self, self->x, self->y, dx - 1, self->h);
905 else if (dx < 0) 1237 else if (dx < 0)
921 self->y += MAP_EXTEND_Y; 1253 self->y += MAP_EXTEND_Y;
922 } 1254 }
923} 1255}
924 1256
925void 1257void
926map1a_update (CFClient::Map self, SV *data_) 1258map1a_update (CFPlus::Map self, SV *data_)
927 CODE: 1259 CODE:
928{ 1260{
929 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
930 uint8_t *data_end = (uint8_t *)SvEND (data_); 1262 uint8_t *data_end = (uint8_t *)SvEND (data_);
931 mapcell *cell; 1263 mapcell *cell;
933 1265
934 while (data < data_end) 1266 while (data < data_end)
935 { 1267 {
936 flags = (data [0] << 8) + data [1]; data += 2; 1268 flags = (data [0] << 8) + data [1]; data += 2;
937 1269
938 x = ((flags >> 10) & 63) + self->x; 1270 x = self->x + ((flags >> 10) & 63);
939 y = ((flags >> 4) & 63) + self->y; 1271 y = self->y + ((flags >> 4) & 63);
940 1272
941 cell = map_get_cell (self, x, y); 1273 cell = map_get_cell (self, x, y);
942 1274
943 if (flags & 15) 1275 if (flags & 15)
944 { 1276 {
973 cell->darkness = -1; 1305 cell->darkness = -1;
974 } 1306 }
975} 1307}
976 1308
977SV * 1309SV *
978mapmap (CFClient::Map self, int x0, int y0, int w, int h) 1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
979 CODE: 1311 CODE:
980{ 1312{
981 int x1, x; 1313 int x1, x;
982 int y1, y; 1314 int y1, y;
983 int z; 1315 int z;
1033} 1365}
1034 OUTPUT: 1366 OUTPUT:
1035 RETVAL 1367 RETVAL
1036 1368
1037void 1369void
1038draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1370draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1039 PPCODE: 1371 CODE:
1040{ 1372{
1041 int vx, vy; 1373 int vx, vy;
1042 int x, y, z; 1374 int x, y, z;
1043 int last_name; 1375 int last_name;
1044 mapface face; 1376 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 1377
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; 1378 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1054 vy = self->y + (self->h - sh) / 2 - shift_y; 1379 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1055 1380
1056 /* 1381 /*
1057 int vx = self->vx = self->w >= sw 1382 int vx = self->vx = self->w >= sw
1058 ? self->x + (self->w - sw) / 2 1383 ? self->x + (self->w - sw) / 2
1059 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); 1384 : 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)); 1388 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1064 */ 1389 */
1065 1390
1066 glColor4ub (255, 255, 255, 255); 1391 glColor4ub (255, 255, 255, 255);
1067 1392
1393 glEnable (GL_BLEND);
1068 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1394 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1069 glEnable (GL_BLEND);
1070 glEnable (GL_TEXTURE_2D); 1395 glEnable (GL_TEXTURE_2D);
1071 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1396 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1072 1397
1073 glBegin (GL_QUADS); 1398 glBegin (GL_QUADS);
1074 1399
1082 1407
1083 for (x = 0; x < sw; x++) 1408 for (x = 0; x < sw; x++)
1084 if (row->c0 <= x + vx && x + vx < row->c1) 1409 if (row->c0 <= x + vx && x + vx < row->c1)
1085 { 1410 {
1086 mapcell *cell = row->col + (x + vx - row->c0); 1411 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 1412
1092 face = cell->face [z]; 1413 face = cell->face [z];
1093 1414
1094 if (face) 1415 if (face)
1095 { 1416 {
1116 1437
1117 glEnd (); 1438 glEnd ();
1118 1439
1119 glDisable (GL_TEXTURE_2D); 1440 glDisable (GL_TEXTURE_2D);
1120 glDisable (GL_BLEND); 1441 glDisable (GL_BLEND);
1442}
1443
1444void
1445draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1446 CODE:
1447{
1448 static float color[16][3] = {
1449 { 0.00F, 0.00F, 0.00F },
1450 { 1.00F, 1.00F, 1.00F },
1451 { 0.00F, 0.00F, 0.55F },
1452 { 1.00F, 0.00F, 0.00F },
1453
1454 { 1.00F, 0.54F, 0.00F },
1455 { 0.11F, 0.56F, 1.00F },
1456 { 0.93F, 0.46F, 0.00F },
1457 { 0.18F, 0.54F, 0.34F },
1458
1459 { 0.56F, 0.73F, 0.56F },
1460 { 0.80F, 0.80F, 0.80F },
1461 { 0.55F, 0.41F, 0.13F },
1462 { 0.99F, 0.77F, 0.26F },
1463
1464 { 0.74F, 0.65F, 0.41F },
1465
1466 { 0.00F, 1.00F, 1.00F },
1467 { 1.00F, 0.00F, 1.00F },
1468 { 1.00F, 1.00F, 0.00F },
1469 };
1470
1471 int x, y;
1472
1473 glEnable (GL_TEXTURE_2D);
1474 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1475 glEnable (GL_BLEND);
1476 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1477 glBegin (GL_QUADS);
1478
1479 for (y = 0; y < h; y++)
1480 for (x = 0; x < w; x++)
1481 {
1482 unsigned char m = data [x + y * w];
1483
1484 if (m)
1485 {
1486 float *c = color [m & 15];
1487
1488 float tx1 = m & 0x40 ? 0.5 : 0.;
1489 float tx2 = tx1 + 0.5;
1490
1491 glColor4f (c[0], c[1], c[2], 0.75);
1492 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
1493 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
1494 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
1495 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
1496 }
1497 }
1498
1499 glEnd ();
1500 glDisable (GL_BLEND);
1501 glDisable (GL_TEXTURE_2D);
1502}
1503
1504void
1505fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1506 PPCODE:
1507{
1508 int vx, vy;
1509 int x, y;
1510 int sw4 = (sw + 3) & ~3;
1511 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1512 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1513
1514 memset (darkness, 255, sw4 * sh);
1515 SvPOK_only (darkness_sv);
1516 SvCUR_set (darkness_sv, sw4 * sh);
1517
1518 vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1519 vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1520
1521 for (y = 0; y < sh; y++)
1522 if (0 <= y + vy && y + vy < self->rows)
1523 {
1524 maprow *row = self->row + (y + vy);
1525
1526 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1)
1528 {
1529 mapcell *cell = row->col + (x + vx - row->c0);
1530
1531 darkness[y * sw4 + x] = cell->darkness < 0
1532 ? 255 - FOW_DARKNESS
1533 : 255 - cell->darkness;
1534 }
1535 }
1121 1536
1122 EXTEND (SP, 3); 1537 EXTEND (SP, 3);
1123 PUSHs (sv_2mortal (newSViv (sw4))); 1538 PUSHs (sv_2mortal (newSViv (sw4)));
1124 PUSHs (sv_2mortal (newSViv (sh))); 1539 PUSHs (sv_2mortal (newSViv (sh)));
1125 PUSHs (darkness_sv); 1540 PUSHs (darkness_sv);
1126} 1541}
1127 1542
1128SV * 1543SV *
1129get_rect (CFClient::Map self, int x0, int y0, int w, int h) 1544get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1130 CODE: 1545 CODE:
1131{ 1546{
1132 int x, y, x1, y1; 1547 int x, y, x1, y1;
1133 SV *data_sv = newSV (w * h * 7 + 5); 1548 SV *data_sv = newSV (w * h * 7 + 5);
1134 uint8_t *data = (uint8_t *)SvPVX (data_sv); 1549 uint8_t *data = (uint8_t *)SvPVX (data_sv);
1196} 1611}
1197 OUTPUT: 1612 OUTPUT:
1198 RETVAL 1613 RETVAL
1199 1614
1200void 1615void
1201set_rect (CFClient::Map self, int x0, int y0, uint8_t *data) 1616set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1202 PPCODE: 1617 PPCODE:
1203{ 1618{
1204 int x, y, z; 1619 int x, y, z;
1205 int w, h; 1620 int w, h;
1206 int x1, y1; 1621 int x1, y1;
1255 } 1670 }
1256 } 1671 }
1257 } 1672 }
1258} 1673}
1259 1674
1260MODULE = CFClient PACKAGE = CFClient::MixChunk 1675MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1261 1676
1262CFClient::MixChunk 1677CFPlus::MixChunk
1263new_from_file (SV *class, char *path) 1678new_from_file (SV *class, char *path)
1264 CODE: 1679 CODE:
1265 RETVAL = Mix_LoadWAV (path); 1680 RETVAL = Mix_LoadWAV (path);
1266 OUTPUT: 1681 OUTPUT:
1267 RETVAL 1682 RETVAL
1268 1683
1269void 1684void
1270DESTROY (CFClient::MixChunk self) 1685DESTROY (CFPlus::MixChunk self)
1271 CODE: 1686 CODE:
1272 Mix_FreeChunk (self); 1687 Mix_FreeChunk (self);
1273 1688
1274int 1689int
1275volume (CFClient::MixChunk self, int volume = -1) 1690volume (CFPlus::MixChunk self, int volume = -1)
1276 CODE: 1691 CODE:
1277 RETVAL = Mix_VolumeChunk (self, volume); 1692 RETVAL = Mix_VolumeChunk (self, volume);
1278 OUTPUT: 1693 OUTPUT:
1279 RETVAL 1694 RETVAL
1280 1695
1281int 1696int
1282play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1) 1697play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1283 CODE: 1698 CODE:
1284 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks); 1699 RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1285 OUTPUT: 1700 OUTPUT:
1286 RETVAL 1701 RETVAL
1287 1702
1288MODULE = CFClient PACKAGE = CFClient::MixMusic 1703MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1289 1704
1290int 1705int
1291volume (int volume = -1) 1706volume (int volume = -1)
1292 CODE: 1707 CODE:
1293 RETVAL = Mix_VolumeMusic (volume); 1708 RETVAL = Mix_VolumeMusic (volume);
1294 OUTPUT: 1709 OUTPUT:
1295 RETVAL 1710 RETVAL
1296 1711
1297CFClient::MixMusic 1712CFPlus::MixMusic
1298new_from_file (SV *class, char *path) 1713new_from_file (SV *class, char *path)
1299 CODE: 1714 CODE:
1300 RETVAL = Mix_LoadMUS (path); 1715 RETVAL = Mix_LoadMUS (path);
1301 OUTPUT: 1716 OUTPUT:
1302 RETVAL 1717 RETVAL
1303 1718
1304void 1719void
1305DESTROY (CFClient::MixMusic self) 1720DESTROY (CFPlus::MixMusic self)
1306 CODE: 1721 CODE:
1307 Mix_FreeMusic (self); 1722 Mix_FreeMusic (self);
1308 1723
1309int 1724int
1310play (CFClient::MixMusic self, int loops = -1) 1725play (CFPlus::MixMusic self, int loops = -1)
1311 CODE: 1726 CODE:
1312 RETVAL = Mix_PlayMusic (self, loops); 1727 RETVAL = Mix_PlayMusic (self, loops);
1313 OUTPUT: 1728 OUTPUT:
1314 RETVAL 1729 RETVAL
1315 1730
1316MODULE = CFClient PACKAGE = CFClient::OpenGL 1731MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1317 1732
1318BOOT: 1733BOOT:
1319{ 1734{
1320 HV *stash = gv_stashpv ("CFClient::OpenGL", 1); 1735 HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1321 static const struct { 1736 static const struct {
1322 const char *name; 1737 const char *name;
1323 IV iv; 1738 IV iv;
1324 } *civ, const_iv[] = { 1739 } *civ, const_iv[] = {
1325# define const_iv(name) { # name, (IV)name } 1740# define const_iv(name) { # name, (IV)name }
1326 const_iv (GL_COLOR_MATERIAL), 1741 const_iv (GL_COLOR_MATERIAL),
1327 const_iv (GL_SMOOTH), 1742 const_iv (GL_SMOOTH),
1328 const_iv (GL_FLAT), 1743 const_iv (GL_FLAT),
1744 const_iv (GL_DITHER),
1329 const_iv (GL_BLEND), 1745 const_iv (GL_BLEND),
1746 const_iv (GL_CULL_FACE),
1747 const_iv (GL_SCISSOR_TEST),
1748 const_iv (GL_DEPTH_TEST),
1749 const_iv (GL_ALPHA_TEST),
1750 const_iv (GL_NORMALIZE),
1751 const_iv (GL_RESCALE_NORMAL),
1752 const_iv (GL_FRONT),
1753 const_iv (GL_BACK),
1330 const_iv (GL_AND), 1754 const_iv (GL_AND),
1755 const_iv (GL_ONE),
1756 const_iv (GL_ZERO),
1331 const_iv (GL_SRC_ALPHA), 1757 const_iv (GL_SRC_ALPHA),
1758 const_iv (GL_DST_ALPHA),
1332 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1759 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1760 const_iv (GL_ONE_MINUS_DST_ALPHA),
1761 const_iv (GL_SRC_ALPHA_SATURATE),
1333 const_iv (GL_RGB), 1762 const_iv (GL_RGB),
1334 const_iv (GL_RGBA), 1763 const_iv (GL_RGBA),
1764 const_iv (GL_RGBA4),
1765 const_iv (GL_RGBA8),
1766 const_iv (GL_RGB5_A1),
1335 const_iv (GL_UNSIGNED_BYTE), 1767 const_iv (GL_UNSIGNED_BYTE),
1336 const_iv (GL_ALPHA4), 1768 const_iv (GL_UNSIGNED_SHORT),
1769 const_iv (GL_UNSIGNED_INT),
1337 const_iv (GL_ALPHA), 1770 const_iv (GL_ALPHA),
1771 const_iv (GL_INTENSITY),
1772 const_iv (GL_LUMINANCE),
1773 const_iv (GL_LUMINANCE_ALPHA),
1338 const_iv (GL_FLOAT), 1774 const_iv (GL_FLOAT),
1339 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1775 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1340 const_iv (GL_COMPILE), 1776 const_iv (GL_COMPILE),
1341 const_iv (GL_TEXTURE_1D), 1777 const_iv (GL_TEXTURE_1D),
1342 const_iv (GL_TEXTURE_2D), 1778 const_iv (GL_TEXTURE_2D),
1344 const_iv (GL_TEXTURE_MAG_FILTER), 1780 const_iv (GL_TEXTURE_MAG_FILTER),
1345 const_iv (GL_TEXTURE_MIN_FILTER), 1781 const_iv (GL_TEXTURE_MIN_FILTER),
1346 const_iv (GL_TEXTURE_ENV_MODE), 1782 const_iv (GL_TEXTURE_ENV_MODE),
1347 const_iv (GL_TEXTURE_WRAP_S), 1783 const_iv (GL_TEXTURE_WRAP_S),
1348 const_iv (GL_TEXTURE_WRAP_T), 1784 const_iv (GL_TEXTURE_WRAP_T),
1785 const_iv (GL_REPEAT),
1349 const_iv (GL_CLAMP), 1786 const_iv (GL_CLAMP),
1350 const_iv (GL_REPEAT), 1787 const_iv (GL_CLAMP_TO_EDGE),
1351 const_iv (GL_NEAREST), 1788 const_iv (GL_NEAREST),
1352 const_iv (GL_LINEAR), 1789 const_iv (GL_LINEAR),
1353 const_iv (GL_NEAREST_MIPMAP_NEAREST), 1790 const_iv (GL_NEAREST_MIPMAP_NEAREST),
1354 const_iv (GL_LINEAR_MIPMAP_NEAREST), 1791 const_iv (GL_LINEAR_MIPMAP_NEAREST),
1355 const_iv (GL_NEAREST_MIPMAP_LINEAR), 1792 const_iv (GL_NEAREST_MIPMAP_LINEAR),
1356 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1793 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1357 const_iv (GL_GENERATE_MIPMAP), 1794 const_iv (GL_GENERATE_MIPMAP),
1358 const_iv (GL_LINEAR),
1359 const_iv (GL_MODULATE), 1795 const_iv (GL_MODULATE),
1796 const_iv (GL_DECAL),
1360 const_iv (GL_REPLACE), 1797 const_iv (GL_REPLACE),
1798 const_iv (GL_DEPTH_BUFFER_BIT),
1361 const_iv (GL_COLOR_BUFFER_BIT), 1799 const_iv (GL_COLOR_BUFFER_BIT),
1362 const_iv (GL_PROJECTION), 1800 const_iv (GL_PROJECTION),
1363 const_iv (GL_MODELVIEW), 1801 const_iv (GL_MODELVIEW),
1364 const_iv (GL_COLOR_LOGIC_OP), 1802 const_iv (GL_COLOR_LOGIC_OP),
1803 const_iv (GL_SEPARABLE_2D),
1365 const_iv (GL_CONVOLUTION_2D), 1804 const_iv (GL_CONVOLUTION_2D),
1366 const_iv (GL_CONVOLUTION_BORDER_MODE), 1805 const_iv (GL_CONVOLUTION_BORDER_MODE),
1367 const_iv (GL_CONSTANT_BORDER), 1806 const_iv (GL_CONSTANT_BORDER),
1368 const_iv (GL_LINES), 1807 const_iv (GL_LINES),
1808 const_iv (GL_LINE_STRIP),
1809 const_iv (GL_LINE_LOOP),
1369 const_iv (GL_QUADS), 1810 const_iv (GL_QUADS),
1370 const_iv (GL_LINE_LOOP), 1811 const_iv (GL_QUAD_STRIP),
1812 const_iv (GL_TRIANGLES),
1813 const_iv (GL_TRIANGLE_STRIP),
1814 const_iv (GL_TRIANGLE_FAN),
1371 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1815 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1372 const_iv (GL_FASTEST), 1816 const_iv (GL_FASTEST),
1817 const_iv (GL_V2F),
1818 const_iv (GL_V3F),
1819 const_iv (GL_T2F_V3F),
1820 const_iv (GL_T2F_N3F_V3F),
1373# undef const_iv 1821# undef const_iv
1374 }; 1822 };
1375 1823
1376 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1824 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1377 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1825 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1378} 1826}
1379 1827
1828char *
1829gl_vendor ()
1830 CODE:
1831 RETVAL = (char *)glGetString (GL_VENDOR);
1832 OUTPUT:
1833 RETVAL
1834
1835char *
1836gl_version ()
1837 CODE:
1838 RETVAL = (char *)glGetString (GL_VERSION);
1839 OUTPUT:
1840 RETVAL
1841
1842char *
1843gl_extensions ()
1844 CODE:
1845 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1846 OUTPUT:
1847 RETVAL
1848
1380int glGetError () 1849int glGetError ()
1850
1851void glFinish ()
1381 1852
1382void glClear (int mask) 1853void glClear (int mask)
1383 1854
1384void glClearColor (float r, float g, float b, float a = 1.0) 1855void glClearColor (float r, float g, float b, float a = 1.0)
1385 PROTOTYPE: @ 1856 PROTOTYPE: @
1392 1863
1393void glHint (int target, int mode) 1864void glHint (int target, int mode)
1394 1865
1395void glBlendFunc (int sfactor, int dfactor) 1866void glBlendFunc (int sfactor, int dfactor)
1396 1867
1868void glBlendFuncSeparate (int sa, int da, int saa, int daa)
1869 CODE:
1870 gl_BlendFuncSeparate (sa, da, saa, daa);
1871
1872void glDepthMask (int flag)
1873
1397void glLogicOp (int opcode) 1874void glLogicOp (int opcode)
1398 1875
1876void glColorMask (int red, int green, int blue, int alpha)
1877
1399void glMatrixMode (int mode) 1878void glMatrixMode (int mode)
1400 1879
1401void glPushMatrix () 1880void glPushMatrix ()
1402 1881
1403void glPopMatrix () 1882void glPopMatrix ()
1404 1883
1405void glLoadIdentity () 1884void glLoadIdentity ()
1406 1885
1886void glDrawBuffer (int buffer)
1887
1888void glReadBuffer (int buffer)
1889
1890# near_ and far_ are due to microsofts buggy "c" compiler
1891void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1892
1893# near_ and far_ are due to microsofts buggy "c" compiler
1407void glOrtho (double left, double right, double bottom, double top, double near, double far) 1894void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1408 1895
1409void glViewport (int x, int y, int width, int height) 1896void glViewport (int x, int y, int width, int height)
1897
1898void glScissor (int x, int y, int width, int height)
1410 1899
1411void glTranslate (float x, float y, float z = 0.) 1900void glTranslate (float x, float y, float z = 0.)
1412 CODE: 1901 CODE:
1413 glTranslatef (x, y, z); 1902 glTranslatef (x, y, z);
1414 1903
1424 1913
1425void glEnd () 1914void glEnd ()
1426 1915
1427void glColor (float r, float g, float b, float a = 1.0) 1916void glColor (float r, float g, float b, float a = 1.0)
1428 PROTOTYPE: @ 1917 PROTOTYPE: @
1918 ALIAS:
1919 glColor_premultiply = 1
1429 CODE: 1920 CODE:
1921 if (ix)
1922 {
1923 r *= a;
1924 g *= a;
1925 b *= a;
1926 }
1927 // microsoft visual "c" rounds instead of truncating...
1430 glColor4f (r, g, b, a); 1928 glColor4f (r, g, b, a);
1929
1930void glInterleavedArrays (int format, int stride, char *data)
1931
1932void glDrawElements (int mode, int count, int type, char *indices)
1933
1934# 1.2 void glDrawRangeElements (int mode, int start, int end
1935
1936void glRasterPos (float x, float y, float z = 0.)
1937 CODE:
1938 glRasterPos3f (0, 0, z);
1939 glBitmap (0, 0, 0, 0, x, y, 0);
1431 1940
1432void glVertex (float x, float y, float z = 0.) 1941void glVertex (float x, float y, float z = 0.)
1433 CODE: 1942 CODE:
1434 glVertex3f (x, y, z); 1943 glVertex3f (x, y, z);
1435 1944
1447 1956
1448void glBindTexture (int target, int name) 1957void glBindTexture (int target, int name)
1449 1958
1450void glConvolutionParameter (int target, int pname, float params) 1959void glConvolutionParameter (int target, int pname, float params)
1451 CODE: 1960 CODE:
1961 if (gl.ConvolutionParameterf)
1452 glConvolutionParameterf (target, pname, params); 1962 gl.ConvolutionParameterf (target, pname, params);
1453 1963
1454void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data) 1964void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1965 CODE:
1966 if (gl.ConvolutionFilter2D)
1967 gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1968
1969void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1970 CODE:
1971 if (gl.SeparableFilter2D)
1972 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1455 1973
1456void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1974void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1457 1975
1458void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1976void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1977
1978void glDrawPixels (int width, int height, int format, int type, char *pixels)
1979
1980void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1459 1981
1460int glGenTexture () 1982int glGenTexture ()
1461 CODE: 1983 CODE:
1462{ 1984{
1463 GLuint name; 1985 GLuint name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines