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.166 by root, Fri Dec 8 15:07:08 2006 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h> 6# include <wininet.h>
7# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761) 8# pragma warning(disable:4761)
9#endif 9#endif
10 10
11//#define DEBUG 1
12#if DEBUG
13# include <valgrind/memcheck.h>
14#endif
15
11#include "EXTERN.h" 16#include "EXTERN.h"
12#include "perl.h" 17#include "perl.h"
13#include "XSUB.h" 18#include "XSUB.h"
14 19
15#ifdef _WIN32 20#ifdef _WIN32
16# undef pipe 21# undef pipe
17#endif 22#endif
18 23
24#include <assert.h>
19#include <math.h> 25#include <math.h>
20#include <string.h> 26#include <string.h>
21#include <stdio.h> 27#include <stdio.h>
22#include <stdlib.h> 28#include <stdlib.h>
23 29
55# define PARACHUTE SDL_INIT_NOPARACHUTE 61# define PARACHUTE SDL_INIT_NOPARACHUTE
56#else 62#else
57# define PARACHUTE 0 63# define PARACHUTE 0
58#endif 64#endif
59 65
66static AV *texture_av;
67
60static struct 68static struct
61{ 69{
62#define GL_FUNC(ptr,name) ptr name; 70#define GL_FUNC(ptr,name) ptr name;
63#include "glfunc.h" 71#include "glfunc.h"
64#undef GL_FUNC 72#undef GL_FUNC
65} gl; 73} gl;
66 74
75static void
67static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa) 76gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68{ 77{
69 if (gl.BlendFuncSeparate) 78 if (gl.BlendFuncSeparate)
70 gl.BlendFuncSeparate (sa, da, saa, daa); 79 gl.BlendFuncSeparate (sa, da, saa, daa);
71 else if (gl.BlendFuncSeparateEXT) 80 else if (gl.BlendFuncSeparateEXT)
72 gl.BlendFuncSeparateEXT (sa, da, saa, daa); 81 gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73 else 82 else
74 glBlendFunc (sa, da); 83 glBlendFunc (sa, da);
75} 84}
76 85
86static GLuint
87gen_texture ()
88{
89 GLuint name;
90
91 if (AvFILL (texture_av) >= 0)
92 name = (GLuint)(size_t)av_pop (texture_av);
93 else
94 glGenTextures (1, &name);
95
96 return name;
97}
98
99static void
100del_texture (GLuint name)
101{
102 /* make a half-assed attempt at returning the memory used by the texture */
103 /* textures are frequently being reused by cfplus anyway */
104 /*glBindTexture (GL_TEXTURE_2D, name);*/
105 /*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
106 av_push (texture_av, (SV *)(size_t)name);
107 glDeleteTextures (1, &name);
108}
109
77#include "texcache.c" 110#include "texcache.c"
78 111
79#include "pango-font.c" 112#include "pango-font.c"
80#include "pango-fontmap.c" 113#include "pango-fontmap.c"
81#include "pango-render.c" 114#include "pango-render.c"
154 187
155 *w = rect.width; 188 *w = rect.width;
156 *h = rect.height; 189 *h = rect.height;
157} 190}
158 191
192typedef uint16_t tileid;
159typedef uint16_t mapface; 193typedef uint16_t faceid;
160 194
161typedef struct { 195typedef struct {
162 GLint name; 196 int name;
163 int w, h; 197 int w, h;
164 float s, t; 198 float s, t;
165 uint8_t r, g, b, a; 199 uint8_t r, g, b, a;
200 tileid smoothtile;
201 uint8_t smoothlevel;
166} maptex; 202} maptex;
167 203
168typedef struct { 204typedef struct {
169 uint32_t player; 205 uint32_t player;
170 mapface face[3]; 206 tileid tile[3];
171 uint16_t darkness; 207 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags; 208 uint8_t stat_width, stat_hp, flags, smoothmax;
173} mapcell; 209} mapcell;
174 210
175typedef struct { 211typedef struct {
176 int32_t c0, c1; 212 int32_t c0, c1;
177 mapcell *col; 213 mapcell *col;
178} maprow; 214} maprow;
179 215
180typedef struct map { 216typedef struct map {
181 int x, y, w, h; 217 int x, y, w, h;
182 int ox, oy; /* offset to virtual global coordinate system */ 218 int ox, oy; /* offset to virtual global coordinate system */
183 int faces; 219 int faces; tileid *face2tile; // [faceid]
184 mapface *face; 220 int texs; maptex *tex; // [tileid]
185
186 int texs;
187 maptex *tex;
188 221
189 int32_t rows; 222 int32_t rows;
190 maprow *row; 223 maprow *row;
191} *CFPlus__Map; 224} *CFPlus__Map;
192 225
212 return ptr; 245 return ptr;
213} 246}
214 247
215#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 248#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
216#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type)) 249#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
250
251static void
252need_facenum (struct map *self, faceid face)
253{
254 while (self->faces <= face)
255 {
256 Append (tileid, self->face2tile, self->faces, self->faces);
257 self->faces *= 2;
258 }
259}
260
261static void
262need_texid (struct map *self, int texid)
263{
264 while (self->texs <= texid)
265 {
266 Append (maptex, self->tex, self->texs, self->texs);
267 self->texs *= 2;
268 }
269}
217 270
218static maprow * 271static maprow *
219map_get_row (CFPlus__Map self, int y) 272map_get_row (CFPlus__Map self, int y)
220{ 273{
221 if (0 > y) 274 if (0 > y)
316 cell->player = 0; 369 cell->player = 0;
317 } 370 }
318 } 371 }
319} 372}
320 373
374typedef struct {
375 tileid tile;
376 uint8_t x, y, level;
377} smooth_key;
378
379static void
380smooth_or_bits (HV *hv, smooth_key *key, IV bits)
381{
382 SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
383
384 if (SvIOK (*sv))
385 SvIV_set (*sv, SvIVX (*sv) | bits);
386 else
387 sv_setiv (*sv, bits);
388}
389
321static void 390static void
322music_finished (void) 391music_finished (void)
323{ 392{
324 SDL_UserEvent ev; 393 SDL_UserEvent ev;
325 394
358 n |= n >> 8; 427 n |= n >> 8;
359 n |= n >> 16; 428 n |= n >> 16;
360 429
361 return n + 1; 430 return n + 1;
362} 431}
432
433/* SDL should provide this, really. */
434#define SDLK_MODIFIER_MIN 300
435#define SDLK_MODIFIER_MAX 314
363 436
364MODULE = CFPlus PACKAGE = CFPlus 437MODULE = CFPlus PACKAGE = CFPlus
365 438
366PROTOTYPES: ENABLE 439PROTOTYPES: ENABLE
367 440
371 static const struct { 444 static const struct {
372 const char *name; 445 const char *name;
373 IV iv; 446 IV iv;
374 } *civ, const_iv[] = { 447 } *civ, const_iv[] = {
375# define const_iv(name) { # name, (IV)name } 448# define const_iv(name) { # name, (IV)name }
449 const_iv (SDLK_MODIFIER_MIN),
450 const_iv (SDLK_MODIFIER_MAX),
451
376 const_iv (SDL_ACTIVEEVENT), 452 const_iv (SDL_ACTIVEEVENT),
377 const_iv (SDL_KEYDOWN), 453 const_iv (SDL_KEYDOWN),
378 const_iv (SDL_KEYUP), 454 const_iv (SDL_KEYUP),
379 const_iv (SDL_MOUSEMOTION), 455 const_iv (SDL_MOUSEMOTION),
380 const_iv (SDL_MOUSEBUTTONDOWN), 456 const_iv (SDL_MOUSEBUTTONDOWN),
389 const_iv (SDL_EVENT_RESERVEDA), 465 const_iv (SDL_EVENT_RESERVEDA),
390 const_iv (SDL_EVENT_RESERVEDB), 466 const_iv (SDL_EVENT_RESERVEDB),
391 const_iv (SDL_VIDEORESIZE), 467 const_iv (SDL_VIDEORESIZE),
392 const_iv (SDL_VIDEOEXPOSE), 468 const_iv (SDL_VIDEOEXPOSE),
393 const_iv (SDL_USEREVENT), 469 const_iv (SDL_USEREVENT),
470
471 const_iv (SDL_APPINPUTFOCUS),
472 const_iv (SDL_APPMOUSEFOCUS),
473 const_iv (SDL_APPACTIVE),
474
394 const_iv (SDLK_KP0), 475 const_iv (SDLK_KP0),
395 const_iv (SDLK_KP1), 476 const_iv (SDLK_KP1),
396 const_iv (SDLK_KP2), 477 const_iv (SDLK_KP2),
397 const_iv (SDLK_KP3), 478 const_iv (SDLK_KP3),
398 const_iv (SDLK_KP4), 479 const_iv (SDLK_KP4),
453 const_iv (SDLK_BREAK), 534 const_iv (SDLK_BREAK),
454 const_iv (SDLK_MENU), 535 const_iv (SDLK_MENU),
455 const_iv (SDLK_POWER), 536 const_iv (SDLK_POWER),
456 const_iv (SDLK_EURO), 537 const_iv (SDLK_EURO),
457 const_iv (SDLK_UNDO), 538 const_iv (SDLK_UNDO),
539
458 const_iv (KMOD_NONE), 540 const_iv (KMOD_NONE),
541 const_iv (KMOD_SHIFT),
459 const_iv (KMOD_LSHIFT), 542 const_iv (KMOD_LSHIFT),
460 const_iv (KMOD_RSHIFT), 543 const_iv (KMOD_RSHIFT),
544 const_iv (KMOD_CTRL),
461 const_iv (KMOD_LCTRL), 545 const_iv (KMOD_LCTRL),
462 const_iv (KMOD_RCTRL), 546 const_iv (KMOD_RCTRL),
547 const_iv (KMOD_ALT),
463 const_iv (KMOD_LALT), 548 const_iv (KMOD_LALT),
464 const_iv (KMOD_RALT), 549 const_iv (KMOD_RALT),
550 const_iv (KMOD_META),
465 const_iv (KMOD_LMETA), 551 const_iv (KMOD_LMETA),
466 const_iv (KMOD_RMETA), 552 const_iv (KMOD_RMETA),
467 const_iv (KMOD_NUM), 553 const_iv (KMOD_NUM),
468 const_iv (KMOD_CAPS), 554 const_iv (KMOD_CAPS),
469 const_iv (KMOD_MODE), 555 const_iv (KMOD_MODE),
470 const_iv (KMOD_CTRL),
471 const_iv (KMOD_SHIFT),
472 const_iv (KMOD_ALT),
473 const_iv (KMOD_META)
474# undef const_iv 556# undef const_iv
475 }; 557 };
476 558
477 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 559 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
478 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 560 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
561
562 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
563 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
479} 564}
565
566void
567weaken (SV *rv)
568 PROTOTYPE: $
569 CODE:
570 sv_rvweaken (rv);
480 571
481int 572int
482in_destruct () 573in_destruct ()
483 CODE: 574 CODE:
484 RETVAL = PL_main_cv == Nullcv; 575 RETVAL = PL_main_cv == Nullcv;
555 RETVAL = !!SDL_SetVideoMode ( 646 RETVAL = !!SDL_SetVideoMode (
556 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 647 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
557 ); 648 );
558 if (RETVAL) 649 if (RETVAL)
559 { 650 {
651 av_clear (texture_av);
652
560 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+"); 653 SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
561# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 654# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
562# include "glfunc.h" 655# include "glfunc.h"
563# undef GL_FUNC 656# undef GL_FUNC
657
564 } 658 }
565 OUTPUT: 659 OUTPUT:
566 RETVAL 660 RETVAL
567 661
568void 662void
569SDL_GL_SwapBuffers () 663SDL_GL_SwapBuffers ()
570 664
571char * 665char *
572SDL_GetKeyName (int sym) 666SDL_GetKeyName (int sym)
573 667
668int
669SDL_GetAppState ()
670
574void 671void
575SDL_PollEvent () 672poll_events ()
576 PPCODE: 673 PPCODE:
577{ 674{
578 SDL_Event ev; 675 SDL_Event ev;
579 676
580 while (SDL_PollEvent (&ev)) 677 SDL_PumpEvents ();
678 while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
581 { 679 {
582 HV *hv = newHV (); 680 HV *hv = newHV ();
583 hv_store (hv, "type", 4, newSViv (ev.type), 0); 681 hv_store (hv, "type", 4, newSViv (ev.type), 0);
584 682
585 switch (ev.type) 683 switch (ev.type)
587 case SDL_KEYDOWN: 685 case SDL_KEYDOWN:
588 case SDL_KEYUP: 686 case SDL_KEYUP:
589 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 687 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
590 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 688 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
591 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 689 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
690 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
592 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 691 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
593 break; 692 break;
594 693
595 case SDL_ACTIVEEVENT: 694 case SDL_ACTIVEEVENT:
596 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 695 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
597 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 696 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
598 break; 697 break;
599 698
600 case SDL_MOUSEMOTION: 699 case SDL_MOUSEMOTION:
700 {
701 int state = ev.motion.state;
702 int x = ev.motion.x;
703 int y = ev.motion.y;
704 int xrel = ev.motion.xrel;
705 int yrel = ev.motion.yrel;
706
707 /* do simplistic event compression */
708 while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
709 && state == ev.motion.state)
710 {
711 xrel += ev.motion.xrel;
712 yrel += ev.motion.yrel;
713 x = ev.motion.x;
714 y = ev.motion.y;
715 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
716 }
717
601 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 718 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
602
603 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 719 hv_store (hv, "state", 5, newSViv (state), 0);
604 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 720 hv_store (hv, "x", 1, newSViv (x), 0);
605 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 721 hv_store (hv, "y", 1, newSViv (y), 0);
606 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 722 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
607 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 723 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
724 }
608 break; 725 break;
609 726
610 case SDL_MOUSEBUTTONDOWN: 727 case SDL_MOUSEBUTTONDOWN:
611 case SDL_MOUSEBUTTONUP: 728 case SDL_MOUSEBUTTONUP:
612 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 729 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
641Mix_AllocateChannels (int numchans = -1) 758Mix_AllocateChannels (int numchans = -1)
642 759
643void 760void
644lowdelay (int fd, int val = 1) 761lowdelay (int fd, int val = 1)
645 CODE: 762 CODE:
646#ifndef _WIN32
647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 763 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
648#endif
649 764
650void 765void
651win32_proxy_info () 766win32_proxy_info ()
652 PPCODE: 767 PPCODE:
653{ 768{
794 ExitThread (retval); // unclean, please beam me up 909 ExitThread (retval); // unclean, please beam me up
795#else 910#else
796 _exit (retval); 911 _exit (retval);
797#endif 912#endif
798 913
914void
915debug ()
916 CODE:
917{
918#if DEBUG
919 VALGRIND_DO_LEAK_CHECK;
920#endif
921}
922
799MODULE = CFPlus PACKAGE = CFPlus::Font 923MODULE = CFPlus PACKAGE = CFPlus::Font
800 924
801CFPlus::Font 925CFPlus::Font
802new_from_file (SV *class, char *path, int id = 0) 926new_from_file (SV *class, char *path, int id = 0)
803 CODE: 927 CODE:
1118 flags 1242 flags
1119 ); 1243 );
1120 1244
1121MODULE = CFPlus PACKAGE = CFPlus::Texture 1245MODULE = CFPlus PACKAGE = CFPlus::Texture
1122 1246
1247int minpot (int n)
1248
1123void 1249void
1124pad2pot (SV *data_, SV *w_, SV *h_) 1250pad2pot (SV *data_, SV *w_, SV *h_)
1125 CODE: 1251 CODE:
1126{ 1252{
1127 int ow = SvIV (w_); 1253 int ow = SvIV (w_);
1204 glDisable (GL_ALPHA_TEST); 1330 glDisable (GL_ALPHA_TEST);
1205 glDisable (GL_BLEND); 1331 glDisable (GL_BLEND);
1206 } 1332 }
1207} 1333}
1208 1334
1335IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1336 CODE:
1337{
1338 GLint width;
1339 glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
1340 glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
1341 RETVAL = width > 0;
1342}
1343 OUTPUT:
1344 RETVAL
1345
1209MODULE = CFPlus PACKAGE = CFPlus::Map 1346MODULE = CFPlus PACKAGE = CFPlus::Map
1210 1347
1211CFPlus::Map 1348CFPlus::Map
1212new (SV *class) 1349new (SV *class)
1213 CODE: 1350 CODE:
1216 RETVAL->y = 0; 1353 RETVAL->y = 0;
1217 RETVAL->w = 0; 1354 RETVAL->w = 0;
1218 RETVAL->h = 0; 1355 RETVAL->h = 0;
1219 RETVAL->ox = 0; 1356 RETVAL->ox = 0;
1220 RETVAL->oy = 0; 1357 RETVAL->oy = 0;
1221 RETVAL->faces = 8192; 1358 RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1222 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1359 RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1223 RETVAL->texs = 8192;
1224 Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1225 RETVAL->rows = 0; 1360 RETVAL->rows = 0;
1226 RETVAL->row = 0; 1361 RETVAL->row = 0;
1227 OUTPUT: 1362 OUTPUT:
1228 RETVAL 1363 RETVAL
1229 1364
1230void 1365void
1231DESTROY (CFPlus::Map self) 1366DESTROY (CFPlus::Map self)
1232 CODE: 1367 CODE:
1233{ 1368{
1234 map_clear (self); 1369 map_clear (self);
1235 Safefree (self->face); 1370 Safefree (self->face2tile);
1236 Safefree (self->tex); 1371 Safefree (self->tex);
1237 Safefree (self); 1372 Safefree (self);
1238} 1373}
1239 1374
1240void 1375void
1247clear (CFPlus::Map self) 1382clear (CFPlus::Map self)
1248 CODE: 1383 CODE:
1249 map_clear (self); 1384 map_clear (self);
1250 1385
1251void 1386void
1252set_face (CFPlus::Map self, int face, int texid) 1387set_tileid (CFPlus::Map self, int face, int tile)
1253 CODE: 1388 CODE:
1254{ 1389{
1255 while (self->faces <= face) 1390 need_facenum (self, face); self->face2tile [face] = tile;
1256 { 1391 need_texid (self, tile);
1257 Append (mapface, self->face, self->faces, self->faces); 1392}
1258 self->faces *= 2;
1259 }
1260 1393
1261 self->face [face] = texid; 1394void
1395set_smooth (CFPlus::Map self, int face, int smooth, int level)
1396 CODE:
1397{
1398 tileid texid;
1399 maptex *tex;
1400
1401 if (face < 0 || face >= self->faces)
1402 return;
1403
1404 if (smooth < 0 || smooth >= self->faces)
1405 return;
1406
1407 texid = self->face2tile [face];
1408
1409 if (!texid)
1410 return;
1411
1412 tex = self->tex + texid;
1413 tex->smoothtile = self->face2tile [smooth];
1414 tex->smoothlevel = level;
1262} 1415}
1263 1416
1264void 1417void
1265set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a) 1418set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1266 CODE: 1419 CODE:
1267{ 1420{
1268 while (self->texs <= texid) 1421 need_texid (self, texid);
1269 {
1270 Append (maptex, self->tex, self->texs, self->texs);
1271 self->texs *= 2;
1272 }
1273 1422
1274 { 1423 {
1275 maptex *tex = self->tex + texid; 1424 maptex *tex = self->tex + texid;
1276 1425
1277 tex->name = name; 1426 tex->name = name;
1321 CODE: 1470 CODE:
1322{ 1471{
1323 if (dx > 0) 1472 if (dx > 0)
1324 map_blank (self, self->x, self->y, dx, self->h); 1473 map_blank (self, self->x, self->y, dx, self->h);
1325 else if (dx < 0) 1474 else if (dx < 0)
1326 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h); 1475 map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1327 1476
1328 if (dy > 0) 1477 if (dy > 0)
1329 map_blank (self, self->x, self->y, self->w, dy); 1478 map_blank (self, self->x, self->y, self->w, dy);
1330 else if (dy < 0) 1479 else if (dy < 0)
1331 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy); 1480 map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1332 1481
1333 self->ox += dx; self->x += dx; 1482 self->ox += dx; self->x += dx;
1334 self->oy += dy; self->y += dy; 1483 self->oy += dy; self->y += dy;
1335 1484
1336 while (self->y < 0) 1485 while (self->y < 0)
1388 cell->stat_width = 1; 1537 cell->stat_width = 1;
1389 cell->stat_hp = *data++; 1538 cell->stat_hp = *data++;
1390 } 1539 }
1391 else if (cmd == 6) // monster width 1540 else if (cmd == 6) // monster width
1392 cell->stat_width = *data++ + 1; 1541 cell->stat_width = *data++ + 1;
1393 else if (cmd == 0x47) // monster width 1542 else if (cmd == 0x47)
1394 { 1543 {
1395 if (*data == 4) 1544 if (*data == 4)
1396 ; // decode player tag 1545 ; // decode player count
1397 1546
1398 data += *data + 1; 1547 data += *data + 1;
1399 } 1548 }
1400 else if (cmd == 8) // cell flags 1549 else if (cmd == 8) // cell flags
1401 cell->flags = *data++; 1550 cell->flags = *data++;
1410 cell->darkness = *data++ + 1; 1559 cell->darkness = *data++ + 1;
1411 } 1560 }
1412 1561
1413 if (flags & 4) 1562 if (flags & 4)
1414 { 1563 {
1415 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1564 faceid face = (data [0] << 8) + data [1]; data += 2;
1565 need_facenum (self, face);
1566 cell->tile [0] = self->face2tile [face];
1416 } 1567 }
1417 1568
1418 if (flags & 2) 1569 if (flags & 2)
1419 { 1570 {
1420 cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2; 1571 faceid face = (data [0] << 8) + data [1]; data += 2;
1572 need_facenum (self, face);
1573 cell->tile [1] = self->face2tile [face];
1421 } 1574 }
1422 1575
1423 if (flags & 1) 1576 if (flags & 1)
1424 { 1577 {
1425 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1578 faceid face = (data [0] << 8) + data [1]; data += 2;
1579 need_facenum (self, face);
1580 cell->tile [2] = self->face2tile [face];
1426 } 1581 }
1427 } 1582 }
1428 else 1583 else
1429 cell->darkness = 0; 1584 cell->darkness = 0;
1430 } 1585 }
1460 { 1615 {
1461 mapcell *cell = row->col + (x - row->c0); 1616 mapcell *cell = row->col + (x - row->c0);
1462 1617
1463 for (z = 0; z <= 0; z++) 1618 for (z = 0; z <= 0; z++)
1464 { 1619 {
1465 mapface face = cell->face [z];
1466
1467 if (face)
1468 {
1469 maptex tex = self->tex [face]; 1620 maptex tex = self->tex [cell->tile [z]];
1470 int a0 = 255 - tex.a; 1621 int a0 = 255 - tex.a;
1471 int a1 = tex.a; 1622 int a1 = tex.a;
1472 1623
1473 r = (r * a0 + tex.r * a1) / 255; 1624 r = (r * a0 + tex.r * a1) / 255;
1474 g = (g * a0 + tex.g * a1) / 255; 1625 g = (g * a0 + tex.g * a1) / 255;
1475 b = (b * a0 + tex.b * a1) / 255; 1626 b = (b * a0 + tex.b * a1) / 255;
1476 a = (a * a0 + tex.a * a1) / 255; 1627 a = (a * a0 + tex.a * a1) / 255;
1477 }
1478 } 1628 }
1479 } 1629 }
1480 1630
1481 *map++ = (r ) 1631 *map++ = (r )
1482 | (g << 8) 1632 | (g << 8)
1489} 1639}
1490 OUTPUT: 1640 OUTPUT:
1491 RETVAL 1641 RETVAL
1492 1642
1493void 1643void
1494draw (CFPlus::Map self, int mx, int my, int sw, int sh) 1644draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1495 CODE: 1645 CODE:
1496{ 1646{
1647 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1648 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1649 static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1650 smooth_key skey;
1497 int x, y, z; 1651 int x, y, z;
1498 int last_name; 1652 int last_name;
1499 mapface face; 1653
1654 // thats current max. sorry.
1655 if (sw > 255) sw = 255;
1656 if (sh > 255) sh = 255;
1657
1658 // clear key, in case of extra padding
1659 memset (&skey, 0, sizeof (skey));
1500 1660
1501 glColor4ub (255, 255, 255, 255); 1661 glColor4ub (255, 255, 255, 255);
1502 1662
1503 glEnable (GL_BLEND); 1663 glEnable (GL_BLEND);
1504 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1664 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1510 last_name = 0; 1670 last_name = 0;
1511 1671
1512 mx += self->x; 1672 mx += self->x;
1513 my += self->y; 1673 my += self->y;
1514 1674
1675 // first pass: determine smooth_max
1676 // rather ugly, if you ask me
1677 // could also be stored inside mapcell and updated on change
1678 memset (smooth_max, 0, sizeof (smooth_max));
1679
1680 for (y = 0; y < sh; y++)
1681 if (0 <= y + my && y + my < self->rows)
1682 {
1683 maprow *row = self->row + (y + my);
1684
1685 for (x = 0; x < sw; x++)
1686 if (row->c0 <= x + mx && x + mx < row->c1)
1687 {
1688 mapcell *cell = row->col + (x + mx - row->c0);
1689
1690 smooth_max[x + 1][y + 1] =
1691 MAX (self->tex [cell->tile [0]].smoothlevel,
1692 MAX (self->tex [cell->tile [1]].smoothlevel,
1693 self->tex [cell->tile [2]].smoothlevel));
1694 }
1695 }
1696
1515 for (z = 0; z < 3; z++) 1697 for (z = 0; z <= 2; z++)
1698 {
1699 memset (smooth_level, 0, sizeof (smooth_level));
1700
1516 for (y = 0; y < sh; y++) 1701 for (y = 0; y < sh; y++)
1517 if (0 <= y + my && y + my < self->rows) 1702 if (0 <= y + my && y + my < self->rows)
1518 { 1703 {
1519 maprow *row = self->row + (y + my); 1704 maprow *row = self->row + (y + my);
1520 1705
1521 for (x = 0; x < sw; x++) 1706 for (x = 0; x < sw; x++)
1522 if (row->c0 <= x + mx && x + mx < row->c1) 1707 if (row->c0 <= x + mx && x + mx < row->c1)
1523 { 1708 {
1524 mapcell *cell = row->col + (x + mx - row->c0); 1709 mapcell *cell = row->col + (x + mx - row->c0);
1525
1526 face = cell->face [z]; 1710 tileid tile = cell->tile [z];
1711
1712 if (tile)
1713 {
1714 maptex tex = self->tex [tile];
1715 int px = (x + 1) * T - tex.w;
1716 int py = (y + 1) * T - tex.h;
1527 1717
1528 if (face && face < self->texs) 1718 // suppressing texture state switches here
1719 // is only moderately effective, but worth the extra effort
1720 if (last_name != tex.name)
1721 {
1722 if (!tex.name)
1723 tex = self->tex [2]; /* missing, replace by noface */
1724
1725 glEnd ();
1726 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1727 glBegin (GL_QUADS);
1728 }
1729
1730 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1731 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1732 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1733 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1734
1735 if (cell->flags && z == 2)
1736 {
1737 if (cell->flags & 1)
1738 {
1739 maptex tex = self->tex [1];
1740 int px = x * T + T * 2 / 32;
1741 int py = y * T - T * 6 / 32;
1742
1743 glEnd ();
1744 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1745 glBegin (GL_QUADS);
1746
1747 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1748 glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1749 glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1750 glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1751 }
1752 }
1753
1754 // update smooth hash
1755 if (tex.smoothtile)
1756 {
1757 skey.tile = tex.smoothtile;
1758 skey.level = tex.smoothlevel;
1759
1760 smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
1761
1762 // add bits to current tile and all neighbours. skey.x|y is
1763 // shifted +1|+1 so we always stay positive.
1764
1765 // bits is ___n cccc CCCC bbbb
1766 // n do not draw borders&corners
1767 // c draw these corners, but...
1768 // C ... not these
1769 // b draw these borders
1770
1771 // borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
1772 // ┃· ·· ·┃ ━━
1773
1774 // corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
1775 // ·· ·· ·┏ ┓·
1776
1777 // full tile
1778 skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1779
1780 // borders
1781 skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1782 skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1783 skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1784 skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1785
1786 // corners
1787 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1788 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1789 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1790 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
1791 }
1792 }
1793 }
1794 }
1795
1796 // go through all smoothlevels, lowest to highest, then draw.
1797 // this is basically counting sort
1798 {
1799 int w, b;
1800
1801 for (w = 0; w < 256 / 32; ++w)
1802 {
1803 uint32_t smask = smooth_level [w];
1804 if (smask)
1805 for (b = 0; b < 32; ++b)
1806 if (smask & (((uint32_t)1) << b))
1529 { 1807 {
1530 maptex tex = self->tex [face]; 1808 int level = (w << 5) | b;
1531 int px = (x + 1) * 32 - tex.w; 1809 HE *he;
1532 int py = (y + 1) * 32 - tex.h;
1533 1810
1534 if (last_name != tex.name) 1811 hv_iterinit (smooth);
1812 while ((he = hv_iternext (smooth)))
1535 { 1813 {
1814 smooth_key *skey = (smooth_key *)HeKEY (he);
1815 IV bits = SvIVX (HeVAL (he));
1816
1817 if (!(bits & 0x1000)
1818 && skey->level == level
1819 && level > smooth_max [skey->x][skey->y])
1820 {
1821 maptex tex = self->tex [skey->tile];
1822 int px = (((int)skey->x) - 1) * T;
1823 int py = (((int)skey->y) - 1) * T;
1824 int border = bits & 15;
1825 int corner = (bits >> 8) & ~(bits >> 4) & 15;
1826 float dx = tex.s * .0625f; // 16 images/row
1827 float dy = tex.t * .5f ; // 2 images/column
1828
1829 // this time naively avoiding texture state changes
1830 // save gobs of state changes.
1831 if (last_name != tex.name)
1832 {
1833 if (!tex.name)
1834 continue; // smoothing not yet available
1835
1536 glEnd (); 1836 glEnd ();
1537 glBindTexture (GL_TEXTURE_2D, last_name = tex.name); 1837 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1538 glBegin (GL_QUADS); 1838 glBegin (GL_QUADS);
1839 }
1840
1841 if (border)
1842 {
1843 float ox = border * dx;
1844
1845 glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
1846 glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
1847 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
1848 glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
1849 }
1850
1851 if (corner)
1852 {
1853 float ox = corner * dx;
1854
1855 glTexCoord2f (ox , dy ); glVertex2f (px , py );
1856 glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1857 glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1858 glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
1859 }
1539 } 1860 }
1540
1541 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1542 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1543 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1544 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1545 }
1546
1547 if (cell->flags && z == 2)
1548 {
1549 if (cell->flags & 1)
1550 {
1551 maptex tex = self->tex [1];
1552 int px = (x + 1) * 32 - tex.w + 2;
1553 int py = (y + 1) * 32 - tex.h - 6;
1554
1555 glEnd ();
1556 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1557 glBegin (GL_QUADS);
1558
1559 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1560 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1561 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1562 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1563 } 1861 }
1564 } 1862 }
1565 }
1566 } 1863 }
1864 }
1865
1866 hv_clear (smooth);
1867 }
1567 1868
1568 glEnd (); 1869 glEnd ();
1569 1870
1570 glDisable (GL_TEXTURE_2D); 1871 glDisable (GL_TEXTURE_2D);
1571 glDisable (GL_BLEND); 1872 glDisable (GL_BLEND);
1579 for (x = 0; x < sw; x++) 1880 for (x = 0; x < sw; x++)
1580 if (row->c0 <= x + mx && x + mx < row->c1) 1881 if (row->c0 <= x + mx && x + mx < row->c1)
1581 { 1882 {
1582 mapcell *cell = row->col + (x + mx - row->c0); 1883 mapcell *cell = row->col + (x + mx - row->c0);
1583 1884
1584 int px = x * 32; 1885 int px = x * T;
1585 int py = y * 32; 1886 int py = y * T;
1586 1887
1587 if (cell->stat_hp) 1888 if (cell->stat_hp)
1588 { 1889 {
1589 int width = cell->stat_width * 32; 1890 int width = cell->stat_width * T;
1590 int thick = sh / 28 + 1 + cell->stat_width; 1891 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1591 1892
1592 glColor3ub (0, 0, 0); 1893 glColor3ub (0, 0, 0);
1593 glRectf (px + 1, py - thick - 2, 1894 glRectf (px + 1, py - thick - 2,
1594 px + width - 1, py); 1895 px + width - 1, py);
1595 1896
1734 if (row && row->c0 <= x && x < row->c1) 2035 if (row && row->c0 <= x && x < row->c1)
1735 { 2036 {
1736 mapcell *cell = row->col + (x - row->c0); 2037 mapcell *cell = row->col + (x - row->c0);
1737 uint8_t flags = 0; 2038 uint8_t flags = 0;
1738 2039
1739 if (cell->face [0]) flags |= 1; 2040 if (cell->tile [0]) flags |= 1;
1740 if (cell->face [1]) flags |= 2; 2041 if (cell->tile [1]) flags |= 2;
1741 if (cell->face [2]) flags |= 4; 2042 if (cell->tile [2]) flags |= 4;
1742 2043
1743 *data++ = flags; 2044 *data++ = flags;
1744 2045
1745 if (flags & 1) 2046 if (flags & 1)
1746 { 2047 {
2048 tileid tile = cell->tile [0];
1747 *data++ = cell->face [0] >> 8; 2049 *data++ = tile >> 8;
1748 *data++ = cell->face [0]; 2050 *data++ = tile;
1749 } 2051 }
1750 2052
1751 if (flags & 2) 2053 if (flags & 2)
1752 { 2054 {
2055 tileid tile = cell->tile [1];
1753 *data++ = cell->face [1] >> 8; 2056 *data++ = tile >> 8;
1754 *data++ = cell->face [1]; 2057 *data++ = tile;
1755 } 2058 }
1756 2059
1757 if (flags & 4) 2060 if (flags & 4)
1758 { 2061 {
2062 tileid tile = cell->tile [2];
1759 *data++ = cell->face [2] >> 8; 2063 *data++ = tile >> 8;
1760 *data++ = cell->face [2]; 2064 *data++ = tile;
1761 } 2065 }
1762 } 2066 }
1763 else 2067 else
1764 *data++ = 0; 2068 *data++ = 0;
1765 } 2069 }
1805 { 2109 {
1806 uint8_t flags = *data++; 2110 uint8_t flags = *data++;
1807 2111
1808 if (flags) 2112 if (flags)
1809 { 2113 {
1810 mapface face[3] = { 0, 0, 0 };
1811
1812 mapcell *cell = row_get_cell (row, x); 2114 mapcell *cell = row_get_cell (row, x);
2115 tileid tile[3] = { 0, 0, 0 };
1813 2116
1814 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 2117 if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1815 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 2118 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1816 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 2119 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1817 2120
1818 if (cell->darkness == 0) 2121 if (cell->darkness == 0)
1819 { 2122 {
1820 cell->darkness = 0; 2123 cell->darkness = 0;
1821 2124
1822 for (z = 0; z <= 2; z++) 2125 for (z = 0; z <= 2; z++)
1823 { 2126 {
1824 cell->face[z] = face[z]; 2127 tileid t = tile [z];
1825 2128
1826 if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name)) 2129 if (t >= self->texs || (t && !self->tex [t].name))
2130 {
1827 XPUSHs (sv_2mortal (newSViv (face[z]))); 2131 XPUSHs (sv_2mortal (newSViv (t)));
2132 need_texid (self, t);
2133 }
2134
2135 cell->tile [z] = t;
1828 } 2136 }
1829 } 2137 }
1830 } 2138 }
1831 } 2139 }
1832 } 2140 }
1867 CODE: 2175 CODE:
1868 RETVAL = Mix_VolumeMusic (volume); 2176 RETVAL = Mix_VolumeMusic (volume);
1869 OUTPUT: 2177 OUTPUT:
1870 RETVAL 2178 RETVAL
1871 2179
2180int
2181fade_out (int ms)
2182 CODE:
2183 RETVAL = Mix_FadeOutMusic (ms);
2184 OUTPUT:
2185 RETVAL
2186
1872CFPlus::MixMusic 2187CFPlus::MixMusic
1873new_from_file (SV *class, char *path) 2188new_from_file (SV *class, char *path)
1874 CODE: 2189 CODE:
1875 RETVAL = Mix_LoadMUS (path); 2190 RETVAL = Mix_LoadMUS (path);
1876 OUTPUT: 2191 OUTPUT:
1883 2198
1884int 2199int
1885play (CFPlus::MixMusic self, int loops = -1) 2200play (CFPlus::MixMusic self, int loops = -1)
1886 CODE: 2201 CODE:
1887 RETVAL = Mix_PlayMusic (self, loops); 2202 RETVAL = Mix_PlayMusic (self, loops);
2203 OUTPUT:
2204 RETVAL
2205
2206int
2207fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2208 CODE:
2209 RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1888 OUTPUT: 2210 OUTPUT:
1889 RETVAL 2211 RETVAL
1890 2212
1891MODULE = CFPlus PACKAGE = CFPlus::OpenGL 2213MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1892 2214
1896 static const struct { 2218 static const struct {
1897 const char *name; 2219 const char *name;
1898 IV iv; 2220 IV iv;
1899 } *civ, const_iv[] = { 2221 } *civ, const_iv[] = {
1900# define const_iv(name) { # name, (IV)name } 2222# define const_iv(name) { # name, (IV)name }
2223 const_iv (GL_VENDOR),
2224 const_iv (GL_VERSION),
2225 const_iv (GL_EXTENSIONS),
1901 const_iv (GL_COLOR_MATERIAL), 2226 const_iv (GL_COLOR_MATERIAL),
1902 const_iv (GL_SMOOTH), 2227 const_iv (GL_SMOOTH),
1903 const_iv (GL_FLAT), 2228 const_iv (GL_FLAT),
1904 const_iv (GL_DITHER), 2229 const_iv (GL_DITHER),
1905 const_iv (GL_BLEND), 2230 const_iv (GL_BLEND),
1932 const_iv (GL_LUMINANCE), 2257 const_iv (GL_LUMINANCE),
1933 const_iv (GL_LUMINANCE_ALPHA), 2258 const_iv (GL_LUMINANCE_ALPHA),
1934 const_iv (GL_FLOAT), 2259 const_iv (GL_FLOAT),
1935 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 2260 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1936 const_iv (GL_COMPILE), 2261 const_iv (GL_COMPILE),
2262 const_iv (GL_PROXY_TEXTURE_1D),
2263 const_iv (GL_PROXY_TEXTURE_2D),
1937 const_iv (GL_TEXTURE_1D), 2264 const_iv (GL_TEXTURE_1D),
1938 const_iv (GL_TEXTURE_2D), 2265 const_iv (GL_TEXTURE_2D),
1939 const_iv (GL_TEXTURE_ENV), 2266 const_iv (GL_TEXTURE_ENV),
1940 const_iv (GL_TEXTURE_MAG_FILTER), 2267 const_iv (GL_TEXTURE_MAG_FILTER),
1941 const_iv (GL_TEXTURE_MIN_FILTER), 2268 const_iv (GL_TEXTURE_MIN_FILTER),
1981# undef const_iv 2308# undef const_iv
1982 }; 2309 };
1983 2310
1984 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2311 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1985 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2312 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2313
2314 texture_av = newAV ();
2315 AvREAL_off (texture_av);
1986} 2316}
1987 2317
1988char * 2318char *
1989gl_vendor () 2319gl_vendor ()
1990 CODE: 2320 CODE:
2001 2331
2002char * 2332char *
2003gl_extensions () 2333gl_extensions ()
2004 CODE: 2334 CODE:
2005 RETVAL = (char *)glGetString (GL_EXTENSIONS); 2335 RETVAL = (char *)glGetString (GL_EXTENSIONS);
2336 OUTPUT:
2337 RETVAL
2338
2339char *glGetString (GLenum pname)
2340
2341GLint glGetInteger (GLenum pname)
2342 CODE:
2343 glGetIntegerv (pname, &RETVAL);
2344 OUTPUT:
2345 RETVAL
2346
2347GLdouble glGetDouble (GLenum pname)
2348 CODE:
2349 glGetDoublev (pname, &RETVAL);
2006 OUTPUT: 2350 OUTPUT:
2007 RETVAL 2351 RETVAL
2008 2352
2009int glGetError () 2353int glGetError ()
2010 2354
2135 2479
2136void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2480void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2137 2481
2138void glDrawPixels (int width, int height, int format, int type, char *pixels) 2482void glDrawPixels (int width, int height, int format, int type, char *pixels)
2139 2483
2484void glPixelZoom (float x, float y)
2485
2140void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 2486void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2141 2487
2142int glGenTexture () 2488int glGenTexture ()
2143 CODE: 2489 CODE:
2144{ 2490 RETVAL = gen_texture ();
2145 GLuint name;
2146 glGenTextures (1, &name);
2147 RETVAL = name;
2148}
2149 OUTPUT: 2491 OUTPUT:
2150 RETVAL 2492 RETVAL
2151 2493
2152void glDeleteTexture (int name) 2494void glDeleteTexture (int name)
2153 CODE: 2495 CODE:
2154{
2155 GLuint name_ = name;
2156 glDeleteTextures (1, &name_); 2496 del_texture (name);
2157} 2497
2158
2159int glGenList () 2498int glGenList ()
2160 CODE: 2499 CODE:
2161 RETVAL = glGenLists (1); 2500 RETVAL = glGenLists (1);
2162 OUTPUT: 2501 OUTPUT:
2163 RETVAL 2502 RETVAL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines