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.76 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2# include <malloc.h> 3# include <malloc.h>
4# include <windows.h>
3# pragma warning(disable:4244) 5# pragma warning(disable:4244)
4#endif 6#endif
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9 11
12#include <math.h>
10#include <string.h> 13#include <string.h>
11#include <stdio.h> 14#include <stdio.h>
12 15
13#include <SDL.h> 16#include <SDL.h>
14#include <SDL_endian.h> 17#include <SDL_endian.h>
… …
81 84
82static void 85static void
83substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
84{ 87{
85 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
86 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93#endif
87} 94}
88 95
89static void 96static void
90layout_update_font (CFClient__Layout self) 97layout_update_font (CFClient__Layout self)
91{ 98{
… …
404# undef const_iv 411# undef const_iv
405 }; 412 };
406 413
407 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 414 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
408 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 415 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416}
409 417
418void
419pango_init ()
420 CODE:
421{
422 // delayed, so it can pick up new fonts added by AddFontResourceEx
410 ft2_fontmap = pango_ft2_font_map_new (); 423 ft2_fontmap = pango_ft2_font_map_new ();
411 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0); 424 pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
412 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap); 425 ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413 426
414 cairo_fontmap = pango_cairo_font_map_get_default (); 427 cairo_fontmap = pango_cairo_font_map_get_default ();
415 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap); 428 cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
416} 429}
417 430
418int 431int
419SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO) 432SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)
420 433
… …
430 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
435 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439 455
440 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
441 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
442 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
443 457
444 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
445 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446 460
447 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
456 470
457 ++m; 471 ++m;
458 } 472 }
459} 473}
460 474
475char *
476SDL_GetError ()
477
461int 478int
462SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
463 CODE: 480 CODE:
464 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
465 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
… …
468 OUTPUT: 485 OUTPUT:
469 RETVAL 486 RETVAL
470 487
471void 488void
472SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
473 493
474void 494void
475SDL_PollEvent () 495SDL_PollEvent ()
476 PPCODE: 496 PPCODE:
477{ 497{
… …
496 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
497 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
498 break; 518 break;
499 519
500 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
501 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
502 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
503 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
504 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
505 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
506 break; 528 break;
507 529
508 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
509 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
510 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
511 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
512 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
513 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
514 break; 538 break;
… …
542#ifndef _WIN32 566#ifndef _WIN32
543 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544#endif 568#endif
545 569
546char * 570char *
571gl_vendor ()
572 CODE:
573 RETVAL = (char *)glGetString (GL_VENDOR);
574 OUTPUT:
575 RETVAL
576
577char *
547gl_version () 578gl_version ()
548 CODE: 579 CODE:
549 RETVAL = (char *)glGetString (GL_VERSION); 580 RETVAL = (char *)glGetString (GL_VERSION);
550 OUTPUT: 581 OUTPUT:
551 RETVAL 582 RETVAL
… …
559 590
560void 591void
561add_font (char *file) 592add_font (char *file)
562 CODE: 593 CODE:
563 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 594 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
595#ifdef _WIN32
596 // cairo... sigh... requires win2000
597 AddFontResourceEx (file, FR_PRIVATE, 0);
598#endif
564 599
565void 600void
566load_image_inline (SV *image_) 601load_image_inline (SV *image_)
567 ALIAS: 602 ALIAS:
568 load_image_file = 1 603 load_image_file = 1
… …
652} 687}
653 688
654void 689void
655error (char *message) 690error (char *message)
656 CODE: 691 CODE:
692 fprintf (stderr, "ERROR: %s\n", message);
657#ifdef _WIN32 693#ifdef _WIN32
658 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 694 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659#else
660 fprintf (stderr, "ERROR: %s\n", message);
661#endif 695#endif
662 696
663void 697void
664fatal (char *message) 698fatal (char *message)
665 CODE: 699 CODE:
700 fprintf (stderr, "FATAL: %s\n", message);
666#ifdef _WIN32 701#ifdef _WIN32
667 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 702 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668#else
669 fprintf (stderr, "FATAL: %s\n", message);
670#endif 703#endif
671 exit (1); 704 exit (1);
672 705
673MODULE = CFClient PACKAGE = CFClient::Font 706MODULE = CFClient PACKAGE = CFClient::Font
674 707
… …
697MODULE = CFClient PACKAGE = CFClient::Layout 730MODULE = CFClient PACKAGE = CFClient::Layout
698 731
699CFClient::Layout 732CFClient::Layout
700new (SV *class, int rgba = 0) 733new (SV *class, int rgba = 0)
701 CODE: 734 CODE:
735#if _WIN32
736 rgba = 0;//D
737#endif
702 New (0, RETVAL, 1, struct cf_layout); 738 New (0, RETVAL, 1, struct cf_layout);
703 739
704 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 740 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
705 RETVAL->rgba = rgba; 741 RETVAL->rgba = rgba;
706 RETVAL->r = 1.; 742 RETVAL->r = 1.;
… …
786set_width (CFClient::Layout self, int max_width = -1) 822set_width (CFClient::Layout self, int max_width = -1)
787 CODE: 823 CODE:
788 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 824 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
789 825
790void 826void
827set_indent (CFClient::Layout self, int indent)
828 CODE:
829 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830
831void
832set_spacing (CFClient::Layout self, int spacing)
833 CODE:
834 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835
836void
837set_ellipsise (CFClient::Layout self, int ellipsise)
838 CODE:
839 pango_layout_set_ellipsize (self->pl,
840 ellipsise == 1 ? PANGO_ELLIPSIZE_START
841 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
843 : PANGO_ELLIPSIZE_NONE
844 );
845
846void
847set_single_paragraph_mode (CFClient::Layout self, int spm)
848 CODE:
849 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850
851void
791size (CFClient::Layout self) 852size (CFClient::Layout self)
792 PPCODE: 853 PPCODE:
793{ 854{
794 int w, h; 855 int w, h;
795 856
… …
861 922
862 while (p < e) 923 while (p < e)
863 { 924 {
864 uint32_t rgba = *p; 925 uint32_t rgba = *p;
865 rgba = (rgba >> 24) | (rgba << 8); 926 rgba = (rgba >> 24) | (rgba << 8);
927#if 0
928#ifdef _WIN32
929 {//D
930 uint8_t r = rgba >> 24;
931 uint8_t g = rgba >> 16;
932 uint8_t b = rgba >> 8;
933 uint8_t a = rgba >> 0;
934
935 rgba = (rgba & 0xffffff00) | a;
936 }
937#endif
938#endif
866 rgba = SDL_SwapBE32 (rgba); 939 rgba = SDL_SwapBE32 (rgba);
867 *p++ = rgba; 940 *p++ = rgba;
868 } 941 }
869 } 942 }
870 943
… …
927 1000
928 if (ix) 1001 if (ix)
929 { 1002 {
930 glEnable (GL_BLEND); 1003 glEnable (GL_BLEND);
931 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 1004 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1005 glEnable (GL_ALPHA_TEST);
1006 glAlphaFunc (GL_GREATER, 0.01f);
932 } 1007 }
933 1008
934 glBindTexture (GL_TEXTURE_2D, name); 1009 glBindTexture (GL_TEXTURE_2D, name);
935 1010
936 if (wrap_mode) 1011 if (wrap_mode)
… …
945 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 1020 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1021 glTexCoord2f (s, 0); glVertex2f (x + w, y );
947 glEnd (); 1022 glEnd ();
948 1023
949 if (ix) 1024 if (ix)
1025 {
1026 glDisable (GL_ALPHA_TEST);
950 glDisable (GL_BLEND); 1027 glDisable (GL_BLEND);
1028 }
951} 1029}
952 1030
953MODULE = CFClient PACKAGE = CFClient::Map 1031MODULE = CFClient PACKAGE = CFClient::Map
954 1032
955CFClient::Map 1033CFClient::Map
… …
1466 const_iv (GL_COLOR_MATERIAL), 1544 const_iv (GL_COLOR_MATERIAL),
1467 const_iv (GL_SMOOTH), 1545 const_iv (GL_SMOOTH),
1468 const_iv (GL_FLAT), 1546 const_iv (GL_FLAT),
1469 const_iv (GL_DITHER), 1547 const_iv (GL_DITHER),
1470 const_iv (GL_BLEND), 1548 const_iv (GL_BLEND),
1549 const_iv (GL_CULL_FACE),
1471 const_iv (GL_SCISSOR_TEST), 1550 const_iv (GL_SCISSOR_TEST),
1551 const_iv (GL_DEPTH_TEST),
1552 const_iv (GL_ALPHA_TEST),
1553 const_iv (GL_NORMALIZE),
1554 const_iv (GL_RESCALE_NORMAL),
1472 const_iv (GL_AND), 1555 const_iv (GL_AND),
1473 const_iv (GL_ONE), 1556 const_iv (GL_ONE),
1474 const_iv (GL_ZERO), 1557 const_iv (GL_ZERO),
1475 const_iv (GL_SRC_ALPHA), 1558 const_iv (GL_SRC_ALPHA),
1476 const_iv (GL_SRC_ALPHA_SATURATE), 1559 const_iv (GL_SRC_ALPHA_SATURATE),
1477 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1560 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478 const_iv (GL_ONE_MINUS_DST_ALPHA), 1561 const_iv (GL_ONE_MINUS_DST_ALPHA),
1479 const_iv (GL_RGB), 1562 const_iv (GL_RGB),
1480 const_iv (GL_RGBA), 1563 const_iv (GL_RGBA),
1481 const_iv (GL_UNSIGNED_BYTE), 1564 const_iv (GL_UNSIGNED_BYTE),
1565 const_iv (GL_UNSIGNED_SHORT),
1566 const_iv (GL_UNSIGNED_INT),
1482 const_iv (GL_ALPHA), 1567 const_iv (GL_ALPHA),
1568 const_iv (GL_INTENSITY),
1483 const_iv (GL_LUMINANCE), 1569 const_iv (GL_LUMINANCE),
1570 const_iv (GL_LUMINANCE_ALPHA),
1484 const_iv (GL_FLOAT), 1571 const_iv (GL_FLOAT),
1485 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1572 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486 const_iv (GL_COMPILE), 1573 const_iv (GL_COMPILE),
1487 const_iv (GL_TEXTURE_1D), 1574 const_iv (GL_TEXTURE_1D),
1488 const_iv (GL_TEXTURE_2D), 1575 const_iv (GL_TEXTURE_2D),
… …
1502 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1589 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503 const_iv (GL_GENERATE_MIPMAP), 1590 const_iv (GL_GENERATE_MIPMAP),
1504 const_iv (GL_MODULATE), 1591 const_iv (GL_MODULATE),
1505 const_iv (GL_DECAL), 1592 const_iv (GL_DECAL),
1506 const_iv (GL_REPLACE), 1593 const_iv (GL_REPLACE),
1594 const_iv (GL_DEPTH_BUFFER_BIT),
1507 const_iv (GL_COLOR_BUFFER_BIT), 1595 const_iv (GL_COLOR_BUFFER_BIT),
1508 const_iv (GL_PROJECTION), 1596 const_iv (GL_PROJECTION),
1509 const_iv (GL_MODELVIEW), 1597 const_iv (GL_MODELVIEW),
1510 const_iv (GL_COLOR_LOGIC_OP), 1598 const_iv (GL_COLOR_LOGIC_OP),
1511 const_iv (GL_SEPARABLE_2D), 1599 const_iv (GL_SEPARABLE_2D),
1512 const_iv (GL_CONVOLUTION_2D), 1600 const_iv (GL_CONVOLUTION_2D),
1513 const_iv (GL_CONVOLUTION_BORDER_MODE), 1601 const_iv (GL_CONVOLUTION_BORDER_MODE),
1514 const_iv (GL_CONSTANT_BORDER), 1602 const_iv (GL_CONSTANT_BORDER),
1515 const_iv (GL_LINES), 1603 const_iv (GL_LINES),
1604 const_iv (GL_LINE_LOOP),
1516 const_iv (GL_QUADS), 1605 const_iv (GL_QUADS),
1517 const_iv (GL_LINE_LOOP), 1606 const_iv (GL_QUAD_STRIP),
1607 const_iv (GL_TRIANGLES),
1608 const_iv (GL_TRIANGLE_STRIP),
1609 const_iv (GL_TRIANGLE_FAN),
1518 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1610 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519 const_iv (GL_FASTEST), 1611 const_iv (GL_FASTEST),
1612 const_iv (GL_V2F),
1613 const_iv (GL_V3F),
1614 const_iv (GL_T2F_V3F),
1615 const_iv (GL_T2F_N3F_V3F),
1520# undef const_iv 1616# undef const_iv
1521 }; 1617 };
1522 1618
1523 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1619 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1524 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1620 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
1539 1635
1540void glHint (int target, int mode) 1636void glHint (int target, int mode)
1541 1637
1542void glBlendFunc (int sfactor, int dfactor) 1638void glBlendFunc (int sfactor, int dfactor)
1543 1639
1640void glDepthMask (int flag)
1641
1544void glLogicOp (int opcode) 1642void glLogicOp (int opcode)
1545 1643
1546void glColorMask (int red, int green, int blue, int alpha) 1644void glColorMask (int red, int green, int blue, int alpha)
1547 1645
1548void glMatrixMode (int mode) 1646void glMatrixMode (int mode)
… …
1551 1649
1552void glPopMatrix () 1650void glPopMatrix ()
1553 1651
1554void glLoadIdentity () 1652void glLoadIdentity ()
1555 1653
1556# near and far are due to microsofts buggy c compiler 1654# near_ and far_ are due to microsofts buggy "c" compiler
1655void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656
1657# near_ and far_ are due to microsofts buggy "c" compiler
1557void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1658void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1558 1659
1559void glViewport (int x, int y, int width, int height) 1660void glViewport (int x, int y, int width, int height)
1560 1661
1561void glScissor (int x, int y, int width, int height) 1662void glScissor (int x, int y, int width, int height)
… …
1577void glEnd () 1678void glEnd ()
1578 1679
1579void glColor (float r, float g, float b, float a = 1.0) 1680void glColor (float r, float g, float b, float a = 1.0)
1580 PROTOTYPE: @ 1681 PROTOTYPE: @
1581 CODE: 1682 CODE:
1582 glColor4ub (r * 255., g * 255., b * 255., a * 255.); 1683 // microsoft visual "c" rounds instead of truncating...
1684 glColor4ub (MIN ((int)(r * 255.f), 255),
1685 MIN ((int)(g * 255.f), 255),
1686 MIN ((int)(b * 255.f), 255),
1687 MIN ((int)(a * 255.f), 255));
1688
1689void glInterleavedArrays (int format, int stride, char *data)
1690
1691void glDrawElements (int mode, int count, int type, char *indices)
1692
1693# 1.2 void glDrawRangeElements (int mode, int start, int end
1694
1695void glRasterPos (float x, float y, float z = 0.)
1696 CODE:
1697 glRasterPos3f (0, 0, z);
1698 glBitmap (0, 0, 0, 0, x, y, 0);
1583 1699
1584void glVertex (float x, float y, float z = 0.) 1700void glVertex (float x, float y, float z = 0.)
1585 CODE: 1701 CODE:
1586 glVertex3f (x, y, z); 1702 glVertex3f (x, y, z);
1587 1703
… …
1615 1731
1616void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1732void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1617 1733
1618void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1734void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1619 1735
1620void glRasterPos (int x, int y) 1736void glDrawPixels (int width, int height, int format, int type, char *pixels)
1621 CODE:
1622 glRasterPos2i (x, y);
1623 1737
1624void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1738void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1625 1739
1626int glGenTexture () 1740int glGenTexture ()
1627 CODE: 1741 CODE:
… …
1654 1768
1655void glEndList () 1769void glEndList ()
1656 1770
1657void glCallList (int list) 1771void glCallList (int list)
1658 1772
1773

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines