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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.97 by root, Fri May 26 18:28:23 2006 UTC

… …
84 84
85static void 85static void
86substitute_func (FcPattern *pattern, gpointer data) 86substitute_func (FcPattern *pattern, gpointer data)
87{ 87{
88 FcPatternAddBool (pattern, FC_HINTING , 1); 88 FcPatternAddBool (pattern, FC_HINTING , 1);
89#ifndef _WIN32 89#ifdef _WIN32
90 FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91#else
90 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 92 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91#endif 93#endif
92} 94}
93 95
94static void 96static void
… …
441 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5); 443 SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5); 444 SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5); 445 SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1); 446 SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445 447
448 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450
446 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0); 451 SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 452 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0); 453 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 454 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450 455
451 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 456 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
452 SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
453 SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
454 457
455 SDL_EnableUNICODE (1); 458 SDL_EnableUNICODE (1);
456 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); 459 SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457 460
458 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 461 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
… …
467 470
468 ++m; 471 ++m;
469 } 472 }
470} 473}
471 474
475char *
476SDL_GetError ()
477
472int 478int
473SDL_SetVideoMode (int w, int h, int fullscreen) 479SDL_SetVideoMode (int w, int h, int fullscreen)
474 CODE: 480 CODE:
475 RETVAL = !!SDL_SetVideoMode ( 481 RETVAL = !!SDL_SetVideoMode (
476 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0) 482 w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
… …
479 OUTPUT: 485 OUTPUT:
480 RETVAL 486 RETVAL
481 487
482void 488void
483SDL_GL_SwapBuffers () 489SDL_GL_SwapBuffers ()
490
491char *
492SDL_GetKeyName (int sym)
484 493
485void 494void
486SDL_PollEvent () 495SDL_PollEvent ()
487 PPCODE: 496 PPCODE:
488{ 497{
… …
507 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 516 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
508 hv_store (hv, "state", 5, newSViv (ev.active.state), 0); 517 hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
509 break; 518 break;
510 519
511 case SDL_MOUSEMOTION: 520 case SDL_MOUSEMOTION:
521 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
522
512 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0); 523 hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
513 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0); 524 hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
514 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0); 525 hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
515 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0); 526 hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
516 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0); 527 hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
517 break; 528 break;
518 529
519 case SDL_MOUSEBUTTONDOWN: 530 case SDL_MOUSEBUTTONDOWN:
520 case SDL_MOUSEBUTTONUP: 531 case SDL_MOUSEBUTTONUP:
532 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
533
521 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 534 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
522 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 535 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
523 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 536 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
524 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 537 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
525 break; 538 break;
… …
551lowdelay (int fd, int val = 1) 564lowdelay (int fd, int val = 1)
552 CODE: 565 CODE:
553#ifndef _WIN32 566#ifndef _WIN32
554 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 567 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
555#endif 568#endif
556
557char *
558gl_version ()
559 CODE:
560 RETVAL = (char *)glGetString (GL_VERSION);
561 OUTPUT:
562 RETVAL
563
564char *
565gl_extensions ()
566 CODE:
567 RETVAL = (char *)glGetString (GL_EXTENSIONS);
568 OUTPUT:
569 RETVAL
570 569
571void 570void
572add_font (char *file) 571add_font (char *file)
573 CODE: 572 CODE:
574 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */ 573 FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */
… …
667} 666}
668 667
669void 668void
670error (char *message) 669error (char *message)
671 CODE: 670 CODE:
671 fprintf (stderr, "ERROR: %s\n", message);
672#ifdef _WIN32 672#ifdef _WIN32
673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 673 MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
674#else
675 fprintf (stderr, "ERROR: %s\n", message);
676#endif 674#endif
677 675
678void 676void
679fatal (char *message) 677fatal (char *message)
680 CODE: 678 CODE:
679 fprintf (stderr, "FATAL: %s\n", message);
681#ifdef _WIN32 680#ifdef _WIN32
682 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND); 681 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
683#else
684 fprintf (stderr, "FATAL: %s\n", message);
685#endif 682#endif
686 exit (1); 683 exit (1);
687 684
688MODULE = CFClient PACKAGE = CFClient::Font 685MODULE = CFClient PACKAGE = CFClient::Font
689 686
… …
712MODULE = CFClient PACKAGE = CFClient::Layout 709MODULE = CFClient PACKAGE = CFClient::Layout
713 710
714CFClient::Layout 711CFClient::Layout
715new (SV *class, int rgba = 0) 712new (SV *class, int rgba = 0)
716 CODE: 713 CODE:
714#if _WIN32
715 //rgba = 0;//D make stext nicer, breaks TextView
716#endif
717 New (0, RETVAL, 1, struct cf_layout); 717 New (0, RETVAL, 1, struct cf_layout);
718 718
719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context); 719 RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720 RETVAL->rgba = rgba; 720 RETVAL->rgba = rgba;
721 RETVAL->r = 1.; 721 RETVAL->r = 1.;
… …
801set_width (CFClient::Layout self, int max_width = -1) 801set_width (CFClient::Layout self, int max_width = -1)
802 CODE: 802 CODE:
803 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE); 803 pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
804 804
805void 805void
806set_indent (CFClient::Layout self, int indent)
807 CODE:
808 pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
809
810void
811set_spacing (CFClient::Layout self, int spacing)
812 CODE:
813 pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
814
815void
816set_ellipsise (CFClient::Layout self, int ellipsise)
817 CODE:
818 pango_layout_set_ellipsize (self->pl,
819 ellipsise == 1 ? PANGO_ELLIPSIZE_START
820 : ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
821 : ellipsise == 3 ? PANGO_ELLIPSIZE_END
822 : PANGO_ELLIPSIZE_NONE
823 );
824
825void
826set_single_paragraph_mode (CFClient::Layout self, int spm)
827 CODE:
828 pango_layout_set_single_paragraph_mode (self->pl, !!spm);
829
830void
806size (CFClient::Layout self) 831size (CFClient::Layout self)
807 PPCODE: 832 PPCODE:
808{ 833{
809 int w, h; 834 int w, h;
810 835
… …
876 901
877 while (p < e) 902 while (p < e)
878 { 903 {
879 uint32_t rgba = *p; 904 uint32_t rgba = *p;
880 rgba = (rgba >> 24) | (rgba << 8); 905 rgba = (rgba >> 24) | (rgba << 8);
906#if 0
907#ifdef _WIN32
908 {//D
909 uint8_t r = rgba >> 24;
910 uint8_t g = rgba >> 16;
911 uint8_t b = rgba >> 8;
912 uint8_t a = rgba >> 0;
913
914 rgba = (rgba & 0xffffff00) | a;
915 }
916#endif
917#endif
881 rgba = SDL_SwapBE32 (rgba); 918 rgba = SDL_SwapBE32 (rgba);
882 *p++ = rgba; 919 *p++ = rgba;
883 } 920 }
884 } 921 }
885 922
… …
942 979
943 if (ix) 980 if (ix)
944 { 981 {
945 glEnable (GL_BLEND); 982 glEnable (GL_BLEND);
946 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA); 983 glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
984 glEnable (GL_ALPHA_TEST);
985 glAlphaFunc (GL_GREATER, 0.01f);
947 } 986 }
948 987
949 glBindTexture (GL_TEXTURE_2D, name); 988 glBindTexture (GL_TEXTURE_2D, name);
950 989
951 if (wrap_mode) 990 if (wrap_mode)
… …
960 glTexCoord2f (s, t); glVertex2f (x + w, y + h); 999 glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961 glTexCoord2f (s, 0); glVertex2f (x + w, y ); 1000 glTexCoord2f (s, 0); glVertex2f (x + w, y );
962 glEnd (); 1001 glEnd ();
963 1002
964 if (ix) 1003 if (ix)
1004 {
1005 glDisable (GL_ALPHA_TEST);
965 glDisable (GL_BLEND); 1006 glDisable (GL_BLEND);
1007 }
966} 1008}
967 1009
968MODULE = CFClient PACKAGE = CFClient::Map 1010MODULE = CFClient PACKAGE = CFClient::Map
969 1011
970CFClient::Map 1012CFClient::Map
… …
1034 tex->r = r; 1076 tex->r = r;
1035 tex->g = g; 1077 tex->g = g;
1036 tex->b = b; 1078 tex->b = b;
1037 tex->a = a; 1079 tex->a = a;
1038 } 1080 }
1081
1082 // somewhat hackish, but for textures that require it, it really
1083 // improves the look, and most others don't suffer.
1084 glBindTexture (GL_TEXTURE_2D, name);
1085 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1086 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1039} 1087}
1040 1088
1041int 1089int
1042ox (CFClient::Map self) 1090ox (CFClient::Map self)
1043 ALIAS: 1091 ALIAS:
… …
1481 const_iv (GL_COLOR_MATERIAL), 1529 const_iv (GL_COLOR_MATERIAL),
1482 const_iv (GL_SMOOTH), 1530 const_iv (GL_SMOOTH),
1483 const_iv (GL_FLAT), 1531 const_iv (GL_FLAT),
1484 const_iv (GL_DITHER), 1532 const_iv (GL_DITHER),
1485 const_iv (GL_BLEND), 1533 const_iv (GL_BLEND),
1534 const_iv (GL_CULL_FACE),
1486 const_iv (GL_SCISSOR_TEST), 1535 const_iv (GL_SCISSOR_TEST),
1536 const_iv (GL_DEPTH_TEST),
1537 const_iv (GL_ALPHA_TEST),
1538 const_iv (GL_NORMALIZE),
1539 const_iv (GL_RESCALE_NORMAL),
1487 const_iv (GL_AND), 1540 const_iv (GL_AND),
1488 const_iv (GL_ONE), 1541 const_iv (GL_ONE),
1489 const_iv (GL_ZERO), 1542 const_iv (GL_ZERO),
1490 const_iv (GL_SRC_ALPHA), 1543 const_iv (GL_SRC_ALPHA),
1491 const_iv (GL_SRC_ALPHA_SATURATE), 1544 const_iv (GL_SRC_ALPHA_SATURATE),
1492 const_iv (GL_ONE_MINUS_SRC_ALPHA), 1545 const_iv (GL_ONE_MINUS_SRC_ALPHA),
1493 const_iv (GL_ONE_MINUS_DST_ALPHA), 1546 const_iv (GL_ONE_MINUS_DST_ALPHA),
1494 const_iv (GL_RGB), 1547 const_iv (GL_RGB),
1495 const_iv (GL_RGBA), 1548 const_iv (GL_RGBA),
1496 const_iv (GL_UNSIGNED_BYTE), 1549 const_iv (GL_UNSIGNED_BYTE),
1550 const_iv (GL_UNSIGNED_SHORT),
1551 const_iv (GL_UNSIGNED_INT),
1497 const_iv (GL_ALPHA), 1552 const_iv (GL_ALPHA),
1553 const_iv (GL_INTENSITY),
1498 const_iv (GL_LUMINANCE), 1554 const_iv (GL_LUMINANCE),
1555 const_iv (GL_LUMINANCE_ALPHA),
1499 const_iv (GL_FLOAT), 1556 const_iv (GL_FLOAT),
1500 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV), 1557 const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501 const_iv (GL_COMPILE), 1558 const_iv (GL_COMPILE),
1502 const_iv (GL_TEXTURE_1D), 1559 const_iv (GL_TEXTURE_1D),
1503 const_iv (GL_TEXTURE_2D), 1560 const_iv (GL_TEXTURE_2D),
… …
1517 const_iv (GL_LINEAR_MIPMAP_LINEAR), 1574 const_iv (GL_LINEAR_MIPMAP_LINEAR),
1518 const_iv (GL_GENERATE_MIPMAP), 1575 const_iv (GL_GENERATE_MIPMAP),
1519 const_iv (GL_MODULATE), 1576 const_iv (GL_MODULATE),
1520 const_iv (GL_DECAL), 1577 const_iv (GL_DECAL),
1521 const_iv (GL_REPLACE), 1578 const_iv (GL_REPLACE),
1579 const_iv (GL_DEPTH_BUFFER_BIT),
1522 const_iv (GL_COLOR_BUFFER_BIT), 1580 const_iv (GL_COLOR_BUFFER_BIT),
1523 const_iv (GL_PROJECTION), 1581 const_iv (GL_PROJECTION),
1524 const_iv (GL_MODELVIEW), 1582 const_iv (GL_MODELVIEW),
1525 const_iv (GL_COLOR_LOGIC_OP), 1583 const_iv (GL_COLOR_LOGIC_OP),
1526 const_iv (GL_SEPARABLE_2D), 1584 const_iv (GL_SEPARABLE_2D),
1527 const_iv (GL_CONVOLUTION_2D), 1585 const_iv (GL_CONVOLUTION_2D),
1528 const_iv (GL_CONVOLUTION_BORDER_MODE), 1586 const_iv (GL_CONVOLUTION_BORDER_MODE),
1529 const_iv (GL_CONSTANT_BORDER), 1587 const_iv (GL_CONSTANT_BORDER),
1530 const_iv (GL_LINES), 1588 const_iv (GL_LINES),
1589 const_iv (GL_LINE_LOOP),
1531 const_iv (GL_QUADS), 1590 const_iv (GL_QUADS),
1532 const_iv (GL_LINE_LOOP), 1591 const_iv (GL_QUAD_STRIP),
1592 const_iv (GL_TRIANGLES),
1593 const_iv (GL_TRIANGLE_STRIP),
1594 const_iv (GL_TRIANGLE_FAN),
1533 const_iv (GL_PERSPECTIVE_CORRECTION_HINT), 1595 const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1534 const_iv (GL_FASTEST), 1596 const_iv (GL_FASTEST),
1597 const_iv (GL_V2F),
1598 const_iv (GL_V3F),
1599 const_iv (GL_T2F_V3F),
1600 const_iv (GL_T2F_N3F_V3F),
1535# undef const_iv 1601# undef const_iv
1536 }; 1602 };
1537 1603
1538 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 1604 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1539 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 1605 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1540} 1606}
1541 1607
1608char *
1609gl_vendor ()
1610 CODE:
1611 RETVAL = (char *)glGetString (GL_VENDOR);
1612 OUTPUT:
1613 RETVAL
1614
1615char *
1616gl_version ()
1617 CODE:
1618 RETVAL = (char *)glGetString (GL_VERSION);
1619 OUTPUT:
1620 RETVAL
1621
1622char *
1623gl_extensions ()
1624 CODE:
1625 RETVAL = (char *)glGetString (GL_EXTENSIONS);
1626 OUTPUT:
1627 RETVAL
1628
1542int glGetError () 1629int glGetError ()
1543 1630
1544void glClear (int mask) 1631void glClear (int mask)
1545 1632
1546void glClearColor (float r, float g, float b, float a = 1.0) 1633void glClearColor (float r, float g, float b, float a = 1.0)
… …
1554 1641
1555void glHint (int target, int mode) 1642void glHint (int target, int mode)
1556 1643
1557void glBlendFunc (int sfactor, int dfactor) 1644void glBlendFunc (int sfactor, int dfactor)
1558 1645
1646void glDepthMask (int flag)
1647
1559void glLogicOp (int opcode) 1648void glLogicOp (int opcode)
1560 1649
1561void glColorMask (int red, int green, int blue, int alpha) 1650void glColorMask (int red, int green, int blue, int alpha)
1562 1651
1563void glMatrixMode (int mode) 1652void glMatrixMode (int mode)
… …
1566 1655
1567void glPopMatrix () 1656void glPopMatrix ()
1568 1657
1569void glLoadIdentity () 1658void glLoadIdentity ()
1570 1659
1571# near and far are due to microsofts buggy c compiler 1660# near_ and far_ are due to microsofts buggy "c" compiler
1661void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662
1663# near_ and far_ are due to microsofts buggy "c" compiler
1572void glOrtho (double left, double right, double bottom, double top, double near_, double far_) 1664void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1573 1665
1574void glViewport (int x, int y, int width, int height) 1666void glViewport (int x, int y, int width, int height)
1575 1667
1576void glScissor (int x, int y, int width, int height) 1668void glScissor (int x, int y, int width, int height)
… …
1592void glEnd () 1684void glEnd ()
1593 1685
1594void glColor (float r, float g, float b, float a = 1.0) 1686void glColor (float r, float g, float b, float a = 1.0)
1595 PROTOTYPE: @ 1687 PROTOTYPE: @
1596 CODE: 1688 CODE:
1689 // microsoft visual "c" rounds instead of truncating...
1597 glColor4ub (MIN ((int)(r * 255.f), 255), 1690 glColor4ub (MIN ((int)(r * 255.f), 255),
1598 MIN ((int)(g * 255.f), 255), 1691 MIN ((int)(g * 255.f), 255),
1599 MIN ((int)(b * 255.f), 255), 1692 MIN ((int)(b * 255.f), 255),
1600 MIN ((int)(a * 255.f), 255)); 1693 MIN ((int)(a * 255.f), 255));
1601 1694
1695void glInterleavedArrays (int format, int stride, char *data)
1696
1697void glDrawElements (int mode, int count, int type, char *indices)
1698
1699# 1.2 void glDrawRangeElements (int mode, int start, int end
1700
1701void glRasterPos (float x, float y, float z = 0.)
1702 CODE:
1703 glRasterPos3f (0, 0, z);
1704 glBitmap (0, 0, 0, 0, x, y, 0);
1705
1602void glVertex (float x, float y, float z = 0.) 1706void glVertex (float x, float y, float z = 0.)
1603 CODE: 1707 CODE:
1604 glVertex3f (x, y, z); 1708 glVertex3f (x, y, z);
1605 1709
1606void glTexCoord (float s, float t) 1710void glTexCoord (float s, float t)
… …
1633 1737
1634void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 1738void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1635 1739
1636void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 1740void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1637 1741
1638void glRasterPos (int x, int y) 1742void glDrawPixels (int width, int height, int format, int type, char *pixels)
1639 CODE:
1640 glRasterPos2i (x, y);
1641 1743
1642void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR) 1744void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1643 1745
1644int glGenTexture () 1746int glGenTexture ()
1645 CODE: 1747 CODE:
… …
1672 1774
1673void glEndList () 1775void glEndList ()
1674 1776
1675void glCallList (int list) 1777void glCallList (int list)
1676 1778
1779

Diff Legend

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